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

SCM Repository

[diderot] Diff of /branches/chiw17/src/compiler/parser/diderot-1.0.grm
ViewVC logotype

Diff of /branches/chiw17/src/compiler/parser/diderot-1.0.grm

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

revision 5029, Tue Jul 11 22:38:23 2017 UTC revision 5030, Tue Jul 11 22:53:10 2017 UTC
# Line 44  Line 44 
44    | KW_vec3             ("vec3")    | KW_vec3             ("vec3")
45    | KW_vec4             ("vec4")    | KW_vec4             ("vec4")
46    | KW_zeros            ("zeros")       (* zero tensor *)    | KW_zeros            ("zeros")       (* zero tensor *)
 | KW_fem                      ("fem")  
47  | KW_mesh                     ("mesh")  | KW_mesh                     ("mesh")
48  | KW_toField                  ("toField")  | KW_toField                  ("toField")
49  | KW_poly                     ("poly")  | KW_poly                     ("ofield")
50    | OP_eq               ("=")    | OP_eq               ("=")
51    | OP_pluseq           ("+=")    | OP_pluseq           ("+=")
52    | OP_minuseq          ("-=")    | OP_minuseq          ("-=")
# Line 103  Line 102 
102    KW_bool, KW_continue, KW_die, KW_else, KW_field, KW_foreach, KW_function, KW_identity,    KW_bool, KW_continue, KW_die, KW_else, KW_field, KW_foreach, KW_function, KW_identity,
103    KW_if, KW_global, KW_image, KW_initially, KW_int, KW_kernel, KW_load,KW_new, KW_output, KW_print,    KW_if, KW_global, KW_image, KW_initially, KW_int, KW_kernel, KW_load,KW_new, KW_output, KW_print,
104    KW_real, KW_return, KW_stabilize, KW_strand, KW_string, KW_tensor, KW_update, KW_vec2,    KW_real, KW_return, KW_stabilize, KW_strand, KW_string, KW_tensor, KW_update, KW_vec2,
105    KW_vec3, KW_vec4, KW_zeros,KW_fem,KW_toField, KW_poly ;    KW_vec3, KW_vec4, KW_zeros,KW_mesh ,KW_toField, KW_poly ;
106    
107  %defs (  %defs (
108    structure PT = ParseTree    structure PT = ParseTree
# Line 369  Line 368 
368          | "kernel" "#" INT          | "kernel" "#" INT
369                  => (markTy(FULL_SPAN, PT.T_Kernel INT))                  => (markTy(FULL_SPAN, PT.T_Kernel INT))
370          | ConcreteType          | ConcreteType
371  | "fem" "#" INT "(" Dimension ")" Dimensions  | "ofield" "#" INT "(" Dimension ")" Dimensions
372  => (markTy(FULL_SPAN, PT.T_Mesh{  => (markTy(FULL_SPAN, PT.T_OField{
 diff = INT,  
 shape = Dimensions,  
 dim = Dimension  
 }))  
 | "poly" "#" INT "(" Dimension ")" Dimensions  
 => (markTy(FULL_SPAN, PT.T_Poly{  
373  diff = INT,  diff = INT,
374  shape = Dimensions,  shape = Dimensions,
375  dim = Dimension  dim = Dimension

Legend:
Removed from v.5029  
changed lines
  Added in v.5030

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