HLSL: Support {...} initializer lists that are too short.
diff --git a/hlsl/hlslGrammar.cpp b/hlsl/hlslGrammar.cpp
index b202dca..10dfcc8 100755
--- a/hlsl/hlslGrammar.cpp
+++ b/hlsl/hlslGrammar.cpp
@@ -1896,7 +1896,8 @@
}
// initializer
-// : LEFT_BRACE initializer_list RIGHT_BRACE
+// : LEFT_BRACE RIGHT_BRACE
+// | LEFT_BRACE initializer_list RIGHT_BRACE
//
// initializer_list
// : assignment_expression COMMA assignment_expression COMMA ...
@@ -1907,8 +1908,15 @@
if (! acceptTokenClass(EHTokLeftBrace))
return false;
- // initializer_list
+ // RIGHT_BRACE
TSourceLoc loc = token.loc;
+ if (acceptTokenClass(EHTokRightBrace)) {
+ // a zero-length initializer list
+ node = intermediate.makeAggregate(loc);
+ return true;
+ }
+
+ // initializer_list
node = nullptr;
do {
// assignment_expression