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 278, Mon May 17 14:53:49 1999 UTC revision 279, Tue May 18 08:10:36 1999 UTC
# Line 81  Line 81 
81          in          in
82              Symbol.nameSpaceToString ns :: " " :: Symbol.name s :: r              Symbol.nameSpaceToString ns :: " " :: Symbol.name s :: r
83          end          end
84          fun se_error (s, x as ((_, n1), _), ((_, n2), _)) =          fun se_error (s, x as (fn1, _), (fn2, _)) =
85              (error (concat (describeSymbol              (error (concat (describeSymbol
86                              (s, [" imported from ", DG.describeNode n1,                              (s, [" imported from ", DG.describeFarNode fn1,
87                                   " and also from ", DG.describeNode n2])));                                   " and also from ", DG.describeFarNode fn2])));
88               x)               x)
89          val se_union = SymbolMap.unionWithi se_error          val se_union = SymbolMap.unionWithi se_error
90          fun ld_error (s, f1, f2) =          fun ld_error (s, f1, f2) =
# Line 136  Line 136 
136                      val cmenv = Primitive.lookup p s                      val cmenv = Primitive.lookup p s
137                      val env = convertEnv cmenv                      val env = convertEnv cmenv
138                  in                  in
139                      SymbolMap.insert (m, s, ((NONE, DG.PNODE p), env))                      SymbolMap.insert (m, s, (DG.PNODE p, env))
140                  end                  end
141                  val se = SymbolSet.foldl addFN SymbolMap.empty exports                  val se = SymbolSet.foldl addFN SymbolMap.empty exports
142              in              in

Legend:
Removed from v.278  
changed lines
  Added in v.279

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