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 651, Thu Jun 1 18:34:03 2000 UTC revision 652, Tue Jun 6 02:14:56 2000 UTC
# Line 111  Line 111 
111              in              in
112                  Symbol.nameSpaceToString ns :: " " :: Symbol.name s :: r                  Symbol.nameSpaceToString ns :: " " :: Symbol.name s :: r
113              end              end
114              fun i_error (s, x as ((f, sbn), e), ((f', sbn'), e')) = let              fun i_error (s, x as (nth, e, allsyms), (nth', e', allsyms')) = let
115                    val (f, sbn) = nth ()
116                    val (f', sbn') = nth' ()
117                  fun complain () =                  fun complain () =
118                      error (concat (describeSymbol                      error (concat (describeSymbol
119                                         (s, [" imported from ",                                         (s, [" imported from ",
# Line 123  Line 125 
125                    | union (SOME f, SOME f') = SOME (SymbolSet.union (f, f'))                    | union (SOME f, SOME f') = SOME (SymbolSet.union (f, f'))
126              in              in
127                  if DG.sbeq (sbn, sbn') then                  if DG.sbeq (sbn, sbn') then
128                      ((union (f, f'), sbn), DAEnv.LAYER (e, e'))                      let val fsbn = (union (f, f'), sbn)
129                        in
130                            (fn () => fsbn, DAEnv.LAYER (e, e'),
131                             SymbolSet.union (allsyms, allsyms'))
132                        end
133                  else (complain (); x)                  else (complain (); x)
134              end              end
135              val i_union = SymbolMap.unionWithi i_error              val i_union = SymbolMap.unionWithi i_error

Legend:
Removed from v.651  
changed lines
  Added in v.652

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