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.grm
ViewVC logotype

Diff of /branches/chiw17/src/compiler/parser/diderot.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 52  Line 52 
52    | KW_vec3                     ("vec3")    | KW_vec3                     ("vec3")
53    | KW_vec4                     ("vec4")    | KW_vec4                     ("vec4")
54    | KW_zeros                    ("zeros")    | KW_zeros                    ("zeros")
   | KW_fem                      ("fem")  
55    | KW_mesh                     ("mesh")    | KW_mesh                     ("mesh")
56    | KW_toField                  ("toField")    | KW_toField                  ("toField")
57    | KW_poly                     ("poly")    | KW_poly                     ("ofield")
58    | OP_eq                       ("=")    | OP_eq                       ("=")
59    | OP_pluseq                   ("+=")    | OP_pluseq                   ("+=")
60    | OP_minuseq                  ("-=")    | OP_minuseq                  ("-=")
# Line 113  Line 112 
112    KW_initialize, KW_input, KW_int, KW_kernel, KW_load_image, KW_load_sequence, KW_mat2,    KW_initialize, KW_input, KW_int, KW_kernel, KW_load_image, KW_load_sequence, KW_mat2,
113    KW_mat3, KW_mat4, KW_nan, KW_new, KW_output, KW_print, KW_real, KW_return, KW_stabilize,    KW_mat3, KW_mat4, KW_nan, KW_new, KW_output, KW_print, KW_real, KW_return, KW_stabilize,
114    KW_start, KW_strand, KW_string, KW_tensor, KW_true, KW_update, KW_vec2, KW_vec3, KW_vec4,    KW_start, KW_strand, KW_string, KW_tensor, KW_true, KW_update, KW_vec2, KW_vec3, KW_vec4,
115    KW_zeros,KW_fem,KW_toField, KW_poly ;    KW_zeros,KW_mesh ,KW_toField, KW_poly;
116    
117  %defs (  %defs (
118    structure PT = ParseTree    structure PT = ParseTree
# Line 338  Line 337 
337                  => (markTy (FULL_SPAN, PT.T_Image{dim=ConstExpr, shape=Shape}))                  => (markTy (FULL_SPAN, PT.T_Image{dim=ConstExpr, shape=Shape}))
338          | "field" "#" Continuity "(" ConstExpr ")" Shape          | "field" "#" Continuity "(" ConstExpr ")" Shape
339                  => (markTy (FULL_SPAN, PT.T_Field{diff=Continuity, dim=ConstExpr, shape=Shape}))                  => (markTy (FULL_SPAN, PT.T_Field{diff=Continuity, dim=ConstExpr, shape=Shape}))
340          | "fem" "#" Continuity "(" ConstExpr ")" Shape          | "ofield" "#" Continuity "(" ConstExpr ")" Shape
341                  => (markTy (FULL_SPAN, PT.T_Mesh{diff=Continuity, dim=ConstExpr, shape=Shape}))              => (markTy (FULL_SPAN, PT.T_OField{diff=Continuity, dim=ConstExpr, shape=Shape}))
         | "poly" "#" Continuity "(" ConstExpr ")" Shape  
             => (markTy (FULL_SPAN, PT.T_Poly{diff=Continuity, dim=ConstExpr, shape=Shape}))  
342          | "kernel" "#" Continuity          | "kernel" "#" Continuity
343                  => (markTy (FULL_SPAN, PT.T_Kernel Continuity))                  => (markTy (FULL_SPAN, PT.T_Kernel Continuity))
344          | ConcreteType          | ConcreteType

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