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

Parent Directory | Revision Log | Patch

	revision 684, Thu Mar 24 14:11:47 2011 UTC	revision 685, Thu Mar 24 14:12:05 2011 UTC
#	Line 45	Line 45
45	| T_Field of {diff : dim, dim : dim, shape : dim list}	| T_Field of {diff : dim, dim : dim, shape : dim list}
46	| T_Tensor of dim list	| T_Tensor of dim list
47	| T_Image of {dim : dim, shape : dim list}	| T_Image of {dim : dim, shape : dim list}
48	| T_Array of ty * dim list	| T_Array of ty * dim
49
50	and var_decl	and var_decl
51	= VD_Mark of var_decl mark	= VD_Mark of var_decl mark
#	Line 83	Line 83
83	| E_Cond of expr * expr * expr    (* e1 'if' e2 'else' e3 *)	| E_Cond of expr * expr * expr    (* e1 'if' e2 'else' e3 *)
84	| E_BinOp of expr * var * expr	| E_BinOp of expr * var * expr
85	| E_UnaryOp of var * expr	| E_UnaryOp of var * expr
86	| E_Slice of expr * expr option list	| E_Slice of expr * expr option list      (* tensor slicing *)
87		| E_Subscript of expr * expr              (* e "{" e' "}" -- array subscription *)
88	| E_Tuple of expr list	| E_Tuple of expr list
89	| E_Apply of var * expr list	| E_Apply of var * expr list
90	| E_Cons of expr list     (* tensor construction *)	| E_Cons of expr list     (* tensor construction *)

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.684   changed lines   Added in v.685

---

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