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 348, Tue Jun 22 05:43:46 1999 UTC revision 353, Thu Jun 24 09:43:28 1999 UTC
# Line 73  Line 73 
73          in          in
74              Symbol.nameSpaceToString ns :: " " :: Symbol.name s :: r              Symbol.nameSpaceToString ns :: " " :: Symbol.name s :: r
75          end          end
76          fun i_error (s, x as (fn1, _), (fn2, _)) =          fun i_error (s, x as ((f, sbn), e), ((f', sbn'), e')) = let
77              (error (concat (describeSymbol              fun complain () =
78                              (s, [" imported from ", DG.describeFarSBN fn1,                  error (concat (describeSymbol
79                                   " and also from ", DG.describeFarSBN fn2])));                                 (s, [" imported from ", DG.describeSBN sbn,
80               x)                                      " and also from ", DG.describeSBN sbn'])))
81                fun union (NONE, _) = NONE
82                  | union (_, NONE) = NONE
83                  | union (SOME f, SOME f') = SOME (SymbolSet.union (f, f'))
84            in
85                if DG.sbeq (sbn, sbn') then
86                    ((union (f, f'), sbn), DAEnv.LAYER (e, e'))
87                else (complain (); x)
88            end
89          val i_union = SymbolMap.unionWithi i_error          val i_union = SymbolMap.unionWithi i_error
90          val gi_union = SymbolMap.unionWith #1          val gi_union = SymbolMap.unionWith #1
91          fun ld_error (s, f1, f2) =          fun ld_error (s, f1, f2) =
# Line 146  Line 154 
154          end          end
155      in      in
156          if isSome class then noPrimitive ()          if isSome class then noPrimitive ()
157          else case Primitive.fromString primconf (AbsPath.spec sourcepath) of          else case Primitive.fromString primconf (AbsPath.specOf sourcepath) of
158              SOME p => let              SOME p => let
159                  val exports = Primitive.exports primconf p                  val exports = Primitive.exports primconf p
160                  val env = Primitive.da_env primconf p                  val env = Primitive.da_env primconf p

Legend:
Removed from v.348  
changed lines
  Added in v.353

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