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/semant.sml
ViewVC logotype

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

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

revision 267, Sat May 8 13:53:45 1999 UTC revision 268, Mon May 10 07:00:02 1999 UTC
# Line 10  Line 10 
10      exception ExplicitError of string      exception ExplicitError of string
11      exception ExpressionError of exn      exception ExpressionError of exn
12    
13      type pathname      type pathname = AbsPath.t
14      type ml_symbol      type ml_symbol
15      type cm_symbol      type cm_symbol
16    
# Line 97  Line 97 
97    
98      type group = unit      type group = unit
99    
100      type environment = MemberCollection.environment      type environment = MemberCollection.collection
101    
102      type perms = { required : StringSet.set, granted : StringSet.set }      type perms = { required : StringSet.set, granted : StringSet.set }
103    
# Line 142  Line 142 
142               { required = required, granted = StringSet.add (granted, s) })               { required = required, granted = StringSet.add (granted, s) })
143      end      end
144    
145      fun emptyMembers env = MemberCollection.empty      fun emptyMembers env = env
146      fun member (f, c) env = MemberCollection.expandOne (f, c)      fun member (f, c) env =
147      fun members (m1, m2) env = let          MemberCollection.sequential (env, MemberCollection.expandOne (f, c))
148          val c1 = m1 env      fun members (m1, m2) env = m2 (m1 env)
         val c2 = m2 (MemberCollection.envOf c1)  
     in  
         MemberCollection.sequential (c1, c2)  
     end  
149      fun guarded_members (c, (m1, m2)) env =      fun guarded_members (c, (m1, m2)) env =
150          if saveEval (c, env) then m1 env else m2 env          if saveEval (c, env) then m1 env else m2 env
151      fun error_member m env = raise ExplicitError m      fun error_member m env = raise ExplicitError m

Legend:
Removed from v.267  
changed lines
  Added in v.268

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