Add arrays of arrays grammar, and adapt existing 1D array semantics to keep working as before.

glslang/MachineIndependent/ParseHelper.cpp

@@ -745,17 +745,16 @@ bool TParseContext::arrayQualifierErrorCheck(int line, TPublicType type)
 }
 
 //
-// See if this type can be an array.
+// Require array to have size
 //
 // Returns true if there is an error.
 //
-bool TParseContext::arrayTypeErrorCheck(int line, TPublicType type)
+bool TParseContext::arraySizeRequiredErrorCheck(int line, int& size)
 {
-    //
-    // Can the type be an array?
-    //
-    if (type.array) {
-        error(line, "cannot declare arrays of arrays", TType(type).getCompleteString().c_str(), "");
+    if (size == 0) {
+        error(line, "array size required", "", "");
+        size = 1;
+
         return true;
     }
 

glslang/MachineIndependent/ParseHelper.h

@@ -103,7 +103,7 @@ struct TParseContext {
     bool constructorErrorCheck(int line, TIntermNode*, TFunction&, TOperator, TType*);
     bool arraySizeErrorCheck(int line, TIntermTyped* expr, int& size);
     bool arrayQualifierErrorCheck(int line, TPublicType type);
-    bool arrayTypeErrorCheck(int line, TPublicType type);
+    bool arraySizeRequiredErrorCheck(int line, int& size);
     bool arrayErrorCheck(int line, TString& identifier, TPublicType type, TVariable*& variable);
     bool insertBuiltInArrayAtGlobalLevel();
     bool voidErrorCheck(int, const TString&, const TPublicType&);

glslang/MachineIndependent/glslang.l

@@ -100,6 +100,8 @@ TSourceLoc yylineno;
 "patch"        {  pyylval->lex.line = yylineno; return(PATCH); }
 "sample"       {  pyylval->lex.line = yylineno; return(SAMPLE); }
 "uniform"      {  pyylval->lex.line = yylineno; return(UNIFORM); }
+"buffer"       {  pyylval->lex.line = yylineno; return(BUFFER); }
+"shared"       {  pyylval->lex.line = yylineno; return(SHARED); }
 "coherent"     {  pyylval->lex.line = yylineno; return(COHERENT); }
 "volatile"     {  pyylval->lex.line = yylineno; return(VOLATILE); }
 "restrict"     {  pyylval->lex.line = yylineno; return(RESTRICT); }