commit e3218e270e252fd5f77ce3673562b79cd2a9406f
author John Kessenich <cepheus@frii.com> Mon Sep 05 14:37:03 2016 -0600
committer John Kessenich <cepheus@frii.com> Mon Sep 05 14:37:03 2016 -0600
tree 922aab6191c9fb30f0196fcadfd9784eb05034ee
parent 7735b9440364c43f02969fd774bb5fb777968806

HLSL: Accept layout(...) also as a post-decl.  Issue #454.

hlsl/hlslGrammar.cpp

diff --git a/hlsl/hlslGrammar.cpp b/hlsl/hlslGrammar.cpp
index 7d2f0af..d627b15 100755
--- a/hlsl/hlslGrammar.cpp
+++ b/hlsl/hlslGrammar.cpp
@@ -521,7 +521,7 @@
 }
 
 // layout_qualifier_list
-//      : LEFT_PAREN layout_qualifier COMMA layout_qualifier ... RIGHT_PAREN
+//      : LAYOUT LEFT_PAREN layout_qualifier COMMA layout_qualifier ... RIGHT_PAREN
 //
 // layout_qualifier
 //      : identifier
@@ -2594,6 +2594,7 @@
 //      : COLON semantic                                                            // optional
 //        COLON PACKOFFSET LEFT_PAREN c[Subcomponent][.component]       RIGHT_PAREN // optional
 //        COLON REGISTER LEFT_PAREN [shader_profile,] Type#[subcomp]opt RIGHT_PAREN // optional
+//        COLON LAYOUT layout_qualifier_list
 //        annotations                                                               // optional
 //
 void HlslGrammar::acceptPostDecls(TQualifier& qualifier)
@@ -2602,7 +2603,9 @@
         // COLON 
         if (acceptTokenClass(EHTokColon)) {
             HlslToken idToken;
-            if (acceptTokenClass(EHTokPackOffset)) {
+            if (peekTokenClass(EHTokLayout))
+                acceptLayoutQualifierList(qualifier);
+            else if (acceptTokenClass(EHTokPackOffset)) {
                 // PACKOFFSET LEFT_PAREN c[Subcomponent][.component] RIGHT_PAREN
                 if (! acceptTokenClass(EHTokLeftParen)) {
                     expected("(");
@@ -2626,7 +2629,7 @@
                 }
                 parseContext.handlePackOffset(locationToken.loc, qualifier, *locationToken.string, componentToken.string);
             } else if (! acceptIdentifier(idToken)) {
-                expected("semantic or packoffset or register");
+                expected("layout, semantic, packoffset, or register");
                 return;
             } else if (*idToken.string == "register") {
                 // REGISTER LEFT_PAREN [shader_profile,] Type#[subcomp]opt RIGHT_PAREN