Diff of /trunk/src/parser/diderot.grm

Parent Directory | Revision Log | Patch

	revision 25, Mon Feb 8 22:51:42 2010 UTC	revision 26, Tue Feb 9 00:43:01 2010 UTC
#	Line 46	Line 46
46	| COMMA               (",")	| COMMA               (",")
47	| SEMICOLON           (";")	| SEMICOLON           (";")
48	| HASH                ("#")	| HASH                ("#")
49		| BANG                ("!")
50	| INT of IntInf.int	| INT of IntInf.int
51	| FLOAT of FloatLit.float	| FLOAT of FloatLit.float
52	| STRING of string	| STRING of string
#	Line 141	Line 142
142	(***** Types *****)	(***** Types *****)
143
144	Type    : "image" "<" Dimensions ">"	Type    : "image" "<" Dimensions ">"
145		=> (markTy(FULL_SPAN, PT.T_Image Dimensions))
146	| "tensor" "<" Dimensions ">"	| "tensor" "<" Dimensions ">"
147		=> (markTy(FULL_SPAN, PT.T_Tensor Dimensions))
148	| "field" "#" Dimension "<" Dimensions ">"	| "field" "#" Dimension "<" Dimensions ">"
149		=> (markTy(FULL_SPAN, PT.T_Field(Dimension, Dimensions)))
150	| "kernel" "#" Dimension	| "kernel" "#" Dimension
151		=> (markTy(FULL_SPAN, PT.T_Kernel Dimension))
152	| "vec" "<" Dimension ">"	| "vec" "<" Dimension ">"
153		=> (markTy(FULL_SPAN, PT.T_Vec Dimension))
154	| "bool"	| "bool"
155		=> (markTy(FULL_SPAN, PT.T_Bool))
156	| "int"	| "int"
157		=> (markTy(FULL_SPAN, PT.T_Int))
158	| "real"	| "real"
159		=> (markTy(FULL_SPAN, PT.T_Real))
160	| "string"	| "string"
161		=> (markTy(FULL_SPAN, PT.T_String))
162	;	;
163
164	Dimensions	Dimensions
#	Line 199	Line 209
209
210	Expr6	Expr6
211	: AtomExp	: AtomExp
212	| "-" AtomExp	| "-" Expr6
213		| "!" Expr6
214	;	;
215
216	AtomExp	AtomExp

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.25   changed lines   Added in v.26

---

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