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 296, Thu May 27 05:31:04 1999 UTC revision 297, Thu May 27 08:29:19 1999 UTC
# Line 14  Line 14 
14      type symbol = Symbol.symbol      type symbol = Symbol.symbol
15      type smlinfo = SmlInfo.info      type smlinfo = SmlInfo.info
16      type impexp = DependencyGraph.impexp      type impexp = DependencyGraph.impexp
17        type region = GenericVC.SourceMap.region
18    
19      type collection      type collection
20    
21      val empty : collection      val empty : collection
22    
23      val expandOne : GeneralParams.params * (AbsPath.t -> GroupGraph.group)      val expandOne : GeneralParams.params * (AbsPath.t -> GroupGraph.group)
24          -> { sourcepath: AbsPath.t, group: AbsPath.t,          -> { sourcepath: AbsPath.t, group: AbsPath.t * region,
25               class: string option,               class: string option }
              error : GenericVC.ErrorMsg.complainer }  
26          -> collection          -> collection
27      val sequential : collection * collection * (string -> unit) -> collection      val sequential : collection * collection * (string -> unit) -> collection
28    
29      val build : collection * SymbolSet.set option * (string -> unit)      val build :
30            collection * SymbolSet.set option * (string -> unit) *
31            GeneralParams.params
32          -> impexp SymbolMap.map          -> impexp SymbolMap.map
33    
34      val subgroups : collection -> GroupGraph.group list      val subgroups : collection -> GroupGraph.group list
# Line 47  Line 49 
49      type smlinfo = SmlInfo.info      type smlinfo = SmlInfo.info
50      type symbol = Symbol.symbol      type symbol = Symbol.symbol
51      type impexp = DG.impexp      type impexp = DG.impexp
52        type region = GenericVC.SourceMap.region
53    
54      datatype collection =      datatype collection =
55          COLLECTION of { imports: impexp SymbolMap.map,          COLLECTION of { imports: impexp SymbolMap.map,
# Line 91  Line 94 
94    
95      fun expandOne (params, rparse) arg = let      fun expandOne (params, rparse) arg = let
96          val primconf = #primconf params          val primconf = #primconf params
97          val { sourcepath, group, class, error } = arg          val { sourcepath, group, class } = arg
98            val error = GroupReg.error (#groupreg params) group
99          fun noPrimitive () = let          fun noPrimitive () = let
100              fun e0 s = error EM.COMPLAIN s EM.nullErrorBody              fun e0 s = error EM.COMPLAIN s EM.nullErrorBody
101              fun w0 s = error EM.WARN s EM.nullErrorBody              fun w0 s = error EM.WARN s EM.nullErrorBody
# Line 106  Line 110 
110                  end                  end
111                | exp2coll (PrivateTools.SMLSOURCE src) = let                | exp2coll (PrivateTools.SMLSOURCE src) = let
112                      val { sourcepath = p, history = h, share = s } = src                      val { sourcepath = p, history = h, share = s } = src
113                      val i =  SmlInfo.info                      val i =  SmlInfo.info params
114                          params                          { sourcepath = p,
115                          { sourcepath = p, group = group,                            group = group,
                           error = error,  
                           history = h,  
116                            share = s }                            share = s }
117                      val exports = SmlInfo.exports i                      val exports = SmlInfo.exports params i
118                      val _ = if SS.isEmpty exports then w0 "no module exports"                      val _ = if SS.isEmpty exports then w0 "no module exports"
119                              else ()                              else ()
120                      fun addLD (s, m) = SymbolMap.insert (m, s, i)                      fun addLD (s, m) = SymbolMap.insert (m, s, i)
# Line 152  Line 154 
154            | NONE => noPrimitive ()            | NONE => noPrimitive ()
155      end      end
156    
157      fun build (COLLECTION c, fopt, error) = BuildDepend.build (c, fopt, error)      fun build (COLLECTION c, fopt, error, gp) =
158            BuildDepend.build (c, fopt, error, gp)
159    
160      fun subgroups (COLLECTION { subgroups = sg, ... }) = sg      fun subgroups (COLLECTION { subgroups = sg, ... }) = sg
161    

Legend:
Removed from v.296  
changed lines
  Added in v.297

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