Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/lamont/src/compiler/parser/parse-tree.sml
ViewVC logotype

Diff of /branches/lamont/src/compiler/parser/parse-tree.sml

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

revision 2094, Tue Nov 20 15:12:37 2012 UTC revision 2095, Tue Nov 20 15:15:55 2012 UTC
# Line 12  Line 12 
12      type 'a mark = 'a Error.mark      type 'a mark = 'a Error.mark
13    
14      type var = Atom.atom      type var = Atom.atom
15        type sname = Atom.atom
16      type field = Atom.atom      type field = Atom.atom
17      type dim = IntInf.int      type dim = IntInf.int
18    
# Line 55  Line 56 
56      and var_decl      and var_decl
57        = VD_Mark of var_decl mark        = VD_Mark of var_decl mark
58        | VD_Decl of ty * var * expr        | VD_Decl of ty * var * expr
59          | VD_SDecl of var * (ty * strand_set) list * expr
60    
61        and strand_set
62           = SS_Active
63           | SS_Stable
64           | SS_Dead
65    
66        and reduction
67           = R_Max
68           | R_Min
69           | R_Or
70           | R_And
71           | R_Xor
72           | R_Product
73           | R_Sum
74    
75      and method      and method
76        = M_Mark of method mark        = M_Mark of method mark
# Line 88  Line 104 
104        | E_Lit of Literal.literal        | E_Lit of Literal.literal
105        | E_OrElse of expr * expr        | E_OrElse of expr * expr
106        | E_SphereQuery of expr        | E_SphereQuery of expr
107          | E_Reduction of reduction * var_decl
108        | E_AndAlso of expr * expr        | E_AndAlso of expr * expr
109        | E_Cond of expr * expr * expr    (* e1 'if' e2 'else' e3 *)        | E_Cond of expr * expr * expr    (* e1 'if' e2 'else' e3 *)
110        | E_BinOp of expr * var * expr        | E_BinOp of expr * var * expr

Legend:
Removed from v.2094  
changed lines
  Added in v.2095

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