HLSL: Non-functional: Don't process function name/parameters before expected a function declaration.
diff --git a/hlsl/hlslGrammar.cpp b/hlsl/hlslGrammar.cpp
index 9641e31..01f9c12 100755
--- a/hlsl/hlslGrammar.cpp
+++ b/hlsl/hlslGrammar.cpp
@@ -326,14 +326,20 @@
HlslToken idToken;
TIntermAggregate* initializers = nullptr;
while (acceptIdentifier(idToken)) {
- TString* fnName = idToken.string;
+ if (peekTokenClass(EHTokLeftParen)) {
+ // looks like function parameters
+ TString* fnName = idToken.string;
- // Potentially rename shader entry point function. No-op most of the time.
- parseContext.renameShaderFunction(fnName);
+ // Potentially rename shader entry point function. No-op most of the time.
+ parseContext.renameShaderFunction(fnName);
- // function_parameters
- TFunction& function = *new TFunction(fnName, declaredType);
- if (acceptFunctionParameters(function)) {
+ // function_parameters
+ TFunction& function = *new TFunction(fnName, declaredType);
+ if (!acceptFunctionParameters(function)) {
+ expected("function parameter list");
+ return false;
+ }
+
// post_decls
acceptPostDecls(function.getWritableType().getQualifier());