Reland "Mark GLSL reserved names as reserved in SkSL grammar."

This reverts commit 5f15c695f9.

Reason for revert: landed http://ag/15959743 to fix Android roll

Original change's description:
> Revert "Mark GLSL reserved names as reserved in SkSL grammar."
>
> This reverts commit 57f3fc4cde.
>
> Reason for revert: breaking Android roll
>
> Original change's description:
> > Mark GLSL reserved names as reserved in SkSL grammar.
> >
> > We now reject every reserved name in the ES2 docs as an unexpected
> > token, except for the rule that all names beginning with `gl_` are
> > reserved. (Unfortunately, sksl_frag bends the rules by directly
> > declaring a builtin variable named `gl_SecondaryFragColorEXT`.)
> >
> > Change-Id: I5dcb40b754720ca97fe3d80e2f9072beaa39fcdb
> > Bug: skia:11115
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/454737
> > Auto-Submit: John Stiles <johnstiles@google.com>
> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
>
> Bug: skia:11115
> Change-Id: Ica56f48dc76ef1e52780acaf59b8ad9143637637
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/454860
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

Bug: skia:11115
Change-Id: I012b8d4e03be7f9c888c26d912552412529b4fb6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/455159
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>

gn/sksl_tests.gni

@@ -123,6 +123,44 @@ sksl_error_tests = [
   "/sksl/errors/RedeclareStructTypeWithName.sksl",
   "/sksl/errors/RedeclareUserType.sksl",
   "/sksl/errors/RedeclareVariable.sksl",
+  "/sksl/errors/ReservedNameAsm.sksl",
+  "/sksl/errors/ReservedNameCast.sksl",
+  "/sksl/errors/ReservedNameDouble.sksl",
+  "/sksl/errors/ReservedNameDvec2.sksl",
+  "/sksl/errors/ReservedNameDvec3.sksl",
+  "/sksl/errors/ReservedNameDvec4.sksl",
+  "/sksl/errors/ReservedNameEnum.sksl",
+  "/sksl/errors/ReservedNameExtern.sksl",
+  "/sksl/errors/ReservedNameExternal.sksl",
+  "/sksl/errors/ReservedNameFixed.sksl",
+  "/sksl/errors/ReservedNameFvec2.sksl",
+  "/sksl/errors/ReservedNameFvec3.sksl",
+  "/sksl/errors/ReservedNameFvec4.sksl",
+  "/sksl/errors/ReservedNameGoto.sksl",
+  "/sksl/errors/ReservedNameHvec2.sksl",
+  "/sksl/errors/ReservedNameHvec3.sksl",
+  "/sksl/errors/ReservedNameHvec4.sksl",
+  "/sksl/errors/ReservedNameInput.sksl",
+  "/sksl/errors/ReservedNameInterface.sksl",
+  "/sksl/errors/ReservedNameLong.sksl",
+  "/sksl/errors/ReservedNameNamespace.sksl",
+  "/sksl/errors/ReservedNameOutput.sksl",
+  "/sksl/errors/ReservedNamePacked.sksl",
+  "/sksl/errors/ReservedNamePublic.sksl",
+  "/sksl/errors/ReservedNameSampler1DShadow.sksl",
+  "/sksl/errors/ReservedNameSampler2DRectShadow.sksl",
+  "/sksl/errors/ReservedNameSampler2DShadow.sksl",
+  "/sksl/errors/ReservedNameSampler3DRect.sksl",
+  "/sksl/errors/ReservedNameSizeof.sksl",
+  "/sksl/errors/ReservedNameStatic.sksl",
+  "/sksl/errors/ReservedNameSuperp.sksl",
+  "/sksl/errors/ReservedNameTemplate.sksl",
+  "/sksl/errors/ReservedNameThis.sksl",
+  "/sksl/errors/ReservedNameTypedef.sksl",
+  "/sksl/errors/ReservedNameUnion.sksl",
+  "/sksl/errors/ReservedNameUnsigned.sksl",
+  "/sksl/errors/ReservedNameUsing.sksl",
+  "/sksl/errors/ReservedNameVolatile.sksl",
   "/sksl/errors/ReturnDifferentType.sksl",
   "/sksl/errors/ReturnFromVoid.sksl",
   "/sksl/errors/ReturnMissingValue.sksl",

resources/sksl/errors/ReservedNameAsm.sksl

@@ -0,0 +1 @@
+int asm;

resources/sksl/errors/ReservedNameCast.sksl

@@ -0,0 +1 @@
+int cast;

resources/sksl/errors/ReservedNameDouble.sksl

@@ -0,0 +1 @@
+int double;

resources/sksl/errors/ReservedNameDvec2.sksl

@@ -0,0 +1 @@
+int dvec2;

resources/sksl/errors/ReservedNameDvec3.sksl

@@ -0,0 +1 @@
+int dvec3;

resources/sksl/errors/ReservedNameDvec4.sksl

@@ -0,0 +1 @@
+int dvec4;

resources/sksl/errors/ReservedNameEnum.sksl

@@ -0,0 +1 @@
+int enum;

resources/sksl/errors/ReservedNameExtern.sksl

@@ -0,0 +1 @@
+int extern;

resources/sksl/errors/ReservedNameExternal.sksl

@@ -0,0 +1 @@
+int external;

resources/sksl/errors/ReservedNameFixed.sksl

@@ -0,0 +1 @@
+int fixed;

resources/sksl/errors/ReservedNameFvec2.sksl

@@ -0,0 +1 @@
+int fvec2;

resources/sksl/errors/ReservedNameFvec3.sksl

@@ -0,0 +1 @@
+int fvec3;

resources/sksl/errors/ReservedNameFvec4.sksl

@@ -0,0 +1 @@
+int fvec4;

resources/sksl/errors/ReservedNameGoto.sksl

@@ -0,0 +1 @@
+int goto;

resources/sksl/errors/ReservedNameHvec2.sksl

@@ -0,0 +1 @@
+int hvec2;

resources/sksl/errors/ReservedNameHvec3.sksl

@@ -0,0 +1 @@
+int hvec3;

resources/sksl/errors/ReservedNameHvec4.sksl

@@ -0,0 +1 @@
+int hvec4;

resources/sksl/errors/ReservedNameInput.sksl

@@ -0,0 +1 @@
+int input;

resources/sksl/errors/ReservedNameInterface.sksl

@@ -0,0 +1 @@
+int interface;

resources/sksl/errors/ReservedNameLong.sksl

@@ -0,0 +1 @@
+int long;

resources/sksl/errors/ReservedNameNamespace.sksl

@@ -0,0 +1 @@
+int namespace;

resources/sksl/errors/ReservedNameOutput.sksl

@@ -0,0 +1 @@
+int output;

resources/sksl/errors/ReservedNamePacked.sksl

@@ -0,0 +1 @@
+int packed;

resources/sksl/errors/ReservedNamePublic.sksl

@@ -0,0 +1 @@
+int public;

resources/sksl/errors/ReservedNameSampler1DShadow.sksl

@@ -0,0 +1 @@
+int sampler1DShadow;

resources/sksl/errors/ReservedNameSampler2DRectShadow.sksl

@@ -0,0 +1 @@
+int sampler2DRectShadow;

resources/sksl/errors/ReservedNameSampler2DShadow.sksl

@@ -0,0 +1 @@
+int sampler2DShadow;

resources/sksl/errors/ReservedNameSampler3DRect.sksl

@@ -0,0 +1 @@
+int sampler3DRect;

resources/sksl/errors/ReservedNameSizeof.sksl

@@ -0,0 +1 @@
+int sizeof;

resources/sksl/errors/ReservedNameStatic.sksl

@@ -0,0 +1 @@
+int static;

resources/sksl/errors/ReservedNameSuperp.sksl

@@ -0,0 +1 @@
+int superp;

resources/sksl/errors/ReservedNameTemplate.sksl

@@ -0,0 +1 @@
+int template;

resources/sksl/errors/ReservedNameThis.sksl

@@ -0,0 +1 @@
+int this;

resources/sksl/errors/ReservedNameTypedef.sksl

@@ -0,0 +1 @@
+int typedef;

resources/sksl/errors/ReservedNameUnion.sksl

@@ -0,0 +1 @@
+int union;

resources/sksl/errors/ReservedNameUnsigned.sksl

@@ -0,0 +1 @@
+int unsigned;

resources/sksl/errors/ReservedNameUsing.sksl

@@ -0,0 +1 @@
+int using;

resources/sksl/errors/ReservedNameVolatile.sksl

@@ -0,0 +1 @@
+int volatile;

src/sksl/SkSLLexer.h

@@ -51,6 +51,7 @@ struct Token {
         TK_MEDIUMP,
         TK_LOWP,
         TK_ES3,
+        TK_RESERVED,
         TK_IDENTIFIER,
         TK_DIRECTIVE,
         TK_LPAREN,

src/sksl/generated/sksl_public.dehydrated.sksl

@@ -2417,7 +2417,7 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {199,3,
 46,13,2,2,
 1,
 45,
-55,139,2,0,3,0,1,2,50,
+55,139,2,0,3,0,1,2,51,
 27,
 46,153,0,185,0,2,
 45,
@@ -2434,7 +2434,7 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {199,3,
 46,8,2,2,
 1,
 45,
-55,141,2,0,3,0,1,2,50,
+55,141,2,0,3,0,1,2,51,
 27,
 46,145,0,177,0,2,
 45,

src/sksl/lex/sksl.lex

@@ -43,8 +43,9 @@ HIGHP          = "highp"
 MEDIUMP        = "mediump"
 LOWP           = "lowp"
 ES3            = "$es3"
-IDENTIFIER     = [a-zA-Z_$]([0-9]|[a-zA-Z_$])*
+RESERVED       = asm|class|union|enum|typedef|template|this|packed|goto|volatile|public|static|extern|external|interface|long|double|fixed|unsigned|superp|input|output|hvec[234]|dvec[234]|fvec[234]|sampler[12]DShadow|sampler3DRect|sampler2DRectShadow|sizeof|cast|namespace|using
-DIRECTIVE      = #[a-zA-Z_$]([0-9]|[a-zA-Z_$])*
+IDENTIFIER     = [a-zA-Z_$][0-9a-zA-Z_$]*
+DIRECTIVE      = #[a-zA-Z_$][0-9a-zA-Z_$]*
 LPAREN         = "("
 RPAREN         = ")"
 LBRACE         = "{"

tests/sksl/errors/ReservedNameAsm.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'asm'
+1 error

tests/sksl/errors/ReservedNameCast.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'cast'
+1 error

tests/sksl/errors/ReservedNameDouble.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'double'
+1 error

tests/sksl/errors/ReservedNameDvec2.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'dvec2'
+1 error

tests/sksl/errors/ReservedNameDvec3.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'dvec3'
+1 error

tests/sksl/errors/ReservedNameDvec4.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'dvec4'
+1 error

tests/sksl/errors/ReservedNameEnum.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'enum'
+1 error

tests/sksl/errors/ReservedNameExtern.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'extern'
+1 error

tests/sksl/errors/ReservedNameExternal.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'external'
+1 error

tests/sksl/errors/ReservedNameFixed.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'fixed'
+1 error

tests/sksl/errors/ReservedNameFvec2.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'fvec2'
+1 error

tests/sksl/errors/ReservedNameFvec3.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'fvec3'
+1 error

tests/sksl/errors/ReservedNameFvec4.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'fvec4'
+1 error

tests/sksl/errors/ReservedNameGoto.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'goto'
+1 error

tests/sksl/errors/ReservedNameHvec2.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'hvec2'
+1 error

tests/sksl/errors/ReservedNameHvec3.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'hvec3'
+1 error

tests/sksl/errors/ReservedNameHvec4.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'hvec4'
+1 error

tests/sksl/errors/ReservedNameInput.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'input'
+1 error

tests/sksl/errors/ReservedNameInterface.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'interface'
+1 error

tests/sksl/errors/ReservedNameLong.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'long'
+1 error

tests/sksl/errors/ReservedNameNamespace.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'namespace'
+1 error

tests/sksl/errors/ReservedNameOutput.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'output'
+1 error

tests/sksl/errors/ReservedNamePacked.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'packed'
+1 error

tests/sksl/errors/ReservedNamePublic.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'public'
+1 error

tests/sksl/errors/ReservedNameSampler1DShadow.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'sampler1DShadow'
+1 error

tests/sksl/errors/ReservedNameSampler2DRectShadow.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'sampler2DRectShadow'
+1 error

tests/sksl/errors/ReservedNameSampler2DShadow.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'sampler2DShadow'
+1 error

tests/sksl/errors/ReservedNameSampler3DRect.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'sampler3DRect'
+1 error

tests/sksl/errors/ReservedNameSizeof.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'sizeof'
+1 error

tests/sksl/errors/ReservedNameStatic.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'static'
+1 error

tests/sksl/errors/ReservedNameSuperp.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'superp'
+1 error

tests/sksl/errors/ReservedNameTemplate.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'template'
+1 error

tests/sksl/errors/ReservedNameThis.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'this'
+1 error

tests/sksl/errors/ReservedNameTypedef.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'typedef'
+1 error

tests/sksl/errors/ReservedNameUnion.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'union'
+1 error

tests/sksl/errors/ReservedNameUnsigned.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'unsigned'
+1 error

tests/sksl/errors/ReservedNameUsing.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'using'
+1 error

tests/sksl/errors/ReservedNameVolatile.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'volatile'
+1 error

tests/sksl/errors/ReservedNames.glsl

@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found 'asm'
+1 error