HLSL: Fix #919: for-init-statement is arbitrary declaration or expression.
Unlike "if (XXX)" and "while (XXX)", with "for (YYY...", the YYY can be
more kinds of statements than the XXX.
diff --git a/hlsl/hlslGrammar.cpp b/hlsl/hlslGrammar.cpp
index 6915585..2329246 100755
--- a/hlsl/hlslGrammar.cpp
+++ b/hlsl/hlslGrammar.cpp
@@ -3039,6 +3039,37 @@
return true;
}
+// simple_statement
+// : SEMICOLON
+// | declaration_statement
+// | expression SEMICOLON
+//
+bool HlslGrammar::acceptSimpleStatement(TIntermNode*& statement)
+{
+ // SEMICOLON
+ if (acceptTokenClass(EHTokSemicolon))
+ return true;
+
+ // declaration
+ if (acceptDeclaration(statement))
+ return true;
+
+ // expression
+ TIntermTyped* node;
+ if (acceptExpression(node))
+ statement = node;
+ else
+ return false;
+
+ // SEMICOLON (following an expression)
+ if (acceptTokenClass(EHTokSemicolon))
+ return true;
+ else {
+ expected(";");
+ return false;
+ }
+}
+
// compound_statement
// : LEFT_CURLY statement statement ... RIGHT_CURLY
//
@@ -3096,12 +3127,11 @@
//
// attributed_statement
// : compound_statement
-// | SEMICOLON
-// | expression SEMICOLON
-// | declaration_statement
+// | simple_statement
// | selection_statement
// | switch_statement
// | case_label
+// | default_label
// | iteration_statement
// | jump_statement
//
@@ -3140,33 +3170,13 @@
case EHTokDefault:
return acceptDefaultLabel(statement);
- case EHTokSemicolon:
- return acceptTokenClass(EHTokSemicolon);
-
case EHTokRightBrace:
// Performance: not strictly necessary, but stops a bunch of hunting early,
// and is how sequences of statements end.
return false;
default:
- {
- // declaration
- if (acceptDeclaration(statement))
- return true;
-
- // expression
- TIntermTyped* node;
- if (acceptExpression(node))
- statement = node;
- else
- return false;
-
- // SEMICOLON (following an expression)
- if (! acceptTokenClass(EHTokSemicolon)) {
- expected(";");
- return false;
- }
- }
+ return acceptSimpleStatement(statement);
}
return true;
@@ -3420,14 +3430,8 @@
// initializer
TIntermNode* initNode = nullptr;
- if (! acceptControlDeclaration(initNode)) {
- TIntermTyped* initExpr = nullptr;
- acceptExpression(initExpr);
- initNode = initExpr;
- }
- // SEMI_COLON
- if (! acceptTokenClass(EHTokSemicolon))
- expected(";");
+ if (! acceptSimpleStatement(initNode))
+ expected("for-loop initializer statement");
parseContext.nestLooping();