Home My Page Projects Code Snippets Project Openings SML/NJ
Summary Activity Forums Tracker Lists Tasks Docs Surveys News SCM Files

SCM Repository

[smlnj] Diff of /sml/trunk/src/cm/semant/members.sml
ViewVC logotype

Diff of /sml/trunk/src/cm/semant/members.sml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 280, Tue May 18 09:05:13 1999 UTC revision 282, Wed May 19 05:14:03 1999 UTC
# Line 18  Line 18 
18    
19      type farlooker =      type farlooker =
20          AbsPath.t ->          AbsPath.t ->
21          (DependencyGraph.farnode * DependencyGraph.env) SymbolMap.map          (DependencyGraph.farsbnode * DependencyGraph.env) SymbolMap.map
22    
23      val empty : collection      val empty : collection
24    
# Line 29  Line 29 
29      val sequential : collection * collection * (string -> unit) -> collection      val sequential : collection * collection * (string -> unit) -> collection
30    
31      val build : collection      val build : collection
32          -> { nodemap: DependencyGraph.node SymbolMap.map,          -> { nodemap: DependencyGraph.snode SymbolMap.map,
33               rootset: DependencyGraph.node list }               rootset: DependencyGraph.snode list }
34    
35    
36      val num_look : collection -> string -> int      val num_look : collection -> string -> int
# Line 48  Line 48 
48      type symbol = Symbol.symbol      type symbol = Symbol.symbol
49    
50      datatype collection =      datatype collection =
51          COLLECTION of { subexports: (DG.farnode * DG.env) SymbolMap.map,          COLLECTION of { subexports: (DG.farsbnode * DG.env) SymbolMap.map,
52                          smlfiles: smlinfo list,                          smlfiles: smlinfo list,
53                          localdefs: smlinfo SymbolMap.map }                          localdefs: smlinfo SymbolMap.map }
54    
55      type farlooker =      type farlooker =
56          AbsPath.t ->          AbsPath.t ->
57          (DependencyGraph.farnode * DependencyGraph.env) SymbolMap.map          (DependencyGraph.farsbnode * DependencyGraph.env) SymbolMap.map
58    
59      val empty =      val empty =
60          COLLECTION { subexports = SymbolMap.empty,          COLLECTION { subexports = SymbolMap.empty,
# Line 88  Line 88 
88          end          end
89          fun se_error (s, x as (fn1, _), (fn2, _)) =          fun se_error (s, x as (fn1, _), (fn2, _)) =
90              (error (concat (describeSymbol              (error (concat (describeSymbol
91                              (s, [" imported from ", DG.describeFarNode fn1,                              (s, [" imported from ", DG.describeFarSBN fn1,
92                                   " and also from ", DG.describeFarNode fn2])));                                   " and also from ", DG.describeFarSBN fn2])));
93               x)               x)
94          val se_union = SymbolMap.unionWithi se_error          val se_union = SymbolMap.unionWithi se_error
95          fun ld_error (s, f1, f2) =          fun ld_error (s, f1, f2) =
# Line 140  Line 140 
140                  fun addFN (s, m) = let                  fun addFN (s, m) = let
141                      val cmenv = Primitive.lookup p s                      val cmenv = Primitive.lookup p s
142                      val env = convertEnv cmenv                      val env = convertEnv cmenv
143                        val fsbn = (NONE, DG.SB_BNODE (DG.PNODE p))
144                  in                  in
145                      SymbolMap.insert (m, s, (DG.PNODE p, env))                      SymbolMap.insert (m, s, (fsbn, env))
146                  end                  end
147                  val se = SymbolSet.foldl addFN SymbolMap.empty exports                  val se = SymbolSet.foldl addFN SymbolMap.empty exports
148              in              in

Legend:
Removed from v.280  
changed lines
  Added in v.282

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0