mojoshader_parser_hlsl.lemon
changeset 788 9f4d32456f78
parent 787 04d5c34d8b40
child 789 10a36d0c418c
--- a/mojoshader_parser_hlsl.lemon	Tue Aug 25 23:20:02 2009 -0400
+++ b/mojoshader_parser_hlsl.lemon	Tue Aug 25 23:40:10 2009 -0400
@@ -21,7 +21,7 @@
 
 // Some shift-reduce conflicts are basically unavoidable, but if the final
 //  conflict count matches this value, we consider it known and acceptable.
-%expect 1
+%expect 2
 
 %start_symbol shader
 %token_prefix TOKEN_HLSL_
@@ -224,6 +224,11 @@
 variable_attribute ::= ROWMAJOR.
 variable_attribute ::= COLUMNMAJOR.
 
+initializer_block_list ::= expression.
+initializer_block_list ::= initializer_block_list COMMA expression.
+initializer_block ::= LBRACE initializer_block_list RBRACE.
+
+initializer ::= ASSIGN initializer_block.
 initializer ::= ASSIGN expression.
 
 intrinsic_datatype ::= datatype_vector.