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 335, Thu Jun 17 08:21:08 1999 UTC revision 336, Thu Jun 17 09:23:20 1999 UTC
# Line 70  Line 70 
70    
71      (* arithmetic (number-valued) expression *)      (* arithmetic (number-valued) expression *)
72      val number : int -> aexp      val number : int -> aexp
73      val variable : cm_symbol -> aexp      val variable : GeneralParams.info -> cm_symbol -> aexp
74      val plus : aexp * aexp -> aexp      val plus : aexp * aexp -> aexp
75      val minus : aexp * aexp -> aexp      val minus : aexp * aexp -> aexp
76      val times : aexp * aexp -> aexp      val times : aexp * aexp -> aexp
# Line 80  Line 80 
80    
81      (* (bool-valued) expressions *)      (* (bool-valued) expressions *)
82      val ml_defined : ml_symbol -> exp      val ml_defined : ml_symbol -> exp
83      val cm_defined : cm_symbol -> exp      val cm_defined : GeneralParams.info -> cm_symbol -> exp
84      val conj : exp * exp -> exp      val conj : exp * exp -> exp
85      val disj : exp * exp -> exp      val disj : exp * exp -> exp
86      val beq : exp * exp -> exp      val beq : exp * exp -> exp
# Line 211  Line 211 
211      fun error_export thunk env = (thunk (); SymbolSet.empty)      fun error_export thunk env = (thunk (); SymbolSet.empty)
212    
213      fun number i _ = i      fun number i _ = i
214      fun variable v e = MemberCollection.num_look e v      fun variable gp v e = MemberCollection.num_look gp e v
215      fun plus (e1, e2) e = e1 e + e2 e      fun plus (e1, e2) e = e1 e + e2 e
216      fun minus (e1, e2) e = e1 e - e2 e      fun minus (e1, e2) e = e1 e - e2 e
217      fun times (e1, e2) e = e1 e * e2 e      fun times (e1, e2) e = e1 e * e2 e
# Line 220  Line 220 
220      fun negate ex e = ~(ex e)      fun negate ex e = ~(ex e)
221    
222      fun ml_defined s e = MemberCollection.ml_look e s      fun ml_defined s e = MemberCollection.ml_look e s
223      fun cm_defined s e = MemberCollection.cm_look e s      fun cm_defined gp s e = MemberCollection.cm_look gp e s
224      fun conj (e1, e2) e = e1 e andalso e2 e      fun conj (e1, e2) e = e1 e andalso e2 e
225      fun disj (e1, e2) e = e1 e orelse e2 e      fun disj (e1, e2) e = e1 e orelse e2 e
226      fun beq (e1: exp, e2) e = e1 e = e2 e      fun beq (e1: exp, e2) e = e1 e = e2 e

Legend:
Removed from v.335  
changed lines
  Added in v.336

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