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

SCM Repository

[diderot] Diff of /branches/lamont/src/compiler/parser/diderot.grm
ViewVC logotype

Diff of /branches/lamont/src/compiler/parser/diderot.grm

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

revision 36, Thu Feb 11 01:04:40 2010 UTC revision 37, Thu Feb 11 03:51:36 2010 UTC
# Line 178  Line 178 
178    
179  Type    : "image" "<" Dimensions ">"  Type    : "image" "<" Dimensions ">"
180                  => (markTy(FULL_SPAN, PT.T_Image Dimensions))                  => (markTy(FULL_SPAN, PT.T_Image Dimensions))
         | "tensor" "<" Dimensions ">"  
                 => (markTy(FULL_SPAN, PT.T_Tensor Dimensions))  
181          | "field" "#" Dimension "<" Dimensions ">"          | "field" "#" Dimension "<" Dimensions ">"
182                  => (markTy(FULL_SPAN, PT.T_Field(Dimension, Dimensions)))                  => (markTy(FULL_SPAN, PT.T_Field(Dimension, Dimensions)))
183          | "kernel" "#" Dimension          | "kernel" "#" Dimension
184                  => (markTy(FULL_SPAN, PT.T_Kernel Dimension))                  => (markTy(FULL_SPAN, PT.T_Kernel Dimension))
185            | ValueType
186                    => (ValueType)
187            ;
188    
189    ValueType
190            : "tensor" "<" Dimensions ">"
191                    => (markTy(FULL_SPAN, PT.T_Tensor Dimensions))
192          | "vec" "<" Dimension ">"          | "vec" "<" Dimension ">"
193                  => (markTy(FULL_SPAN, PT.T_Vec Dimension))                  => (markTy(FULL_SPAN, PT.T_Vec Dimension))
194          | "bool"          | "bool"
# Line 267  Line 272 
272                       of NONE => markExpr(FULL_SPAN, PT.E_Var ID)                       of NONE => markExpr(FULL_SPAN, PT.E_Var ID)
273                        | SOME args => markExpr(FULL_SPAN, PT.E_Apply(ID, args))                        | SOME args => markExpr(FULL_SPAN, PT.E_Apply(ID, args))
274                      (* end case *))                      (* end case *))
275            | ValueType "(" Arguments ")"
276                    => (markExpr(FULL_SPAN, PT.E_Cons(ValueType, Arguments)))
277          | POSINT          | POSINT
278                  => (markExpr(FULL_SPAN, PT.E_Lit(L.Int POSINT)))                  => (markExpr(FULL_SPAN, PT.E_Lit(L.Int POSINT)))
279          | NEGINT          | NEGINT

Legend:
Removed from v.36  
changed lines
  Added in v.37

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