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

SCM Repository

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

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

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

revision 2489, Mon Oct 21 19:43:32 2013 UTC revision 2490, Mon Oct 21 21:17:25 2013 UTC
# Line 84  Line 84 
84    
85  %keywords  %keywords
86    KW_bool, KW_die, KW_else, KW_field, KW_identity, KW_if, KW_image, KW_initially,    KW_bool, KW_die, KW_else, KW_field, KW_identity, KW_if, KW_image, KW_initially,
87    KW_int, KW_kernel, KW_new, KW_output, KW_print, KW_real, KW_stabilize, KW_strand,    KW_int, KW_kernel, KW_new, KW_output, KW_print, KW_real, KW_return, KW_stabilize,
88    KW_string, KW_tensor, KW_update, KW_vec2, KW_vec3, KW_vec4, KW_zeros;    KW_strand, KW_string, KW_tensor, KW_update, KW_vec2, KW_vec3, KW_vec4, KW_zeros;
89    
90  %defs (  %defs (
91    structure PT = ParseTree    structure PT = ParseTree
# Line 149  Line 149 
149    
150  InputDecl  InputDecl
151          : "input" ValueType ID ("(" STRING ")")? ( "=" Initializer )? ";"          : "input" ValueType ID ("(" STRING ")")? ( "=" Initializer )? ";"
152                  => (markDecl(FULL_SPAN, PT.D_Input(ValueType, ID, Option.getOpt(SR1, ""), SR2)))                  => (markDecl(FULL_SPAN, PT.D_Input(ValueType, ID, SR1, SR2)))
153          ;          ;
154    
155    
# Line 313  Line 313 
313          : ValueType SeqDimensions          : ValueType SeqDimensions
314                  => (markTy(FULL_SPAN, SeqDimensions ValueType))                  => (markTy(FULL_SPAN, SeqDimensions ValueType))
315          ;          ;
316    
317  SeqDimensions  SeqDimensions
318          : (* empty *)          : (* empty *)
319                  => (fn ty => ty)                  => (fn ty => ty)

Legend:
Removed from v.2489  
changed lines
  Added in v.2490

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