Fix bugged tokens marked as reserved/free in ES2.

src/compiler/translator/glslang.l

@@ -102,12 +102,12 @@ O           [0-7]
 "if"           { return IF; }
 "else"         { return ELSE; }
 "switch"       { return ES2_reserved_ES3_keyword(context, SWITCH); }
-"case"         { return ES2_reserved_ES3_keyword(context, CASE); }
+"case"         { return ES2_ident_ES3_keyword(context, CASE); }
 "default"      { return ES2_reserved_ES3_keyword(context, DEFAULT); }
 
-"centroid"     { return ES2_reserved_ES3_keyword(context, CENTROID); }
+"centroid"     { return ES2_ident_ES3_keyword(context, CENTROID); }
 "flat"         { return ES2_reserved_ES3_keyword(context, FLAT); }
-"smooth"       { return ES2_reserved_ES3_keyword(context, SMOOTH); }
+"smooth"       { return ES2_ident_ES3_keyword(context, SMOOTH); }
 
 "in"           { return IN_QUAL; }
 "out"          { return OUT_QUAL; }
@@ -167,7 +167,7 @@ O           [0-7]
 "usampler3D"           { return ES2_ident_ES3_keyword(context, USAMPLER3D); }
 "usamplerCube"         { return ES2_ident_ES3_keyword(context, USAMPLERCUBE); }
 "usampler2DArray"      { return ES2_ident_ES3_keyword(context, USAMPLER2DARRAY); }
-"sampler2DShadow"      { return ES2_ident_ES3_keyword(context, SAMPLER2DSHADOW); }
+"sampler2DShadow"      { return ES2_reserved_ES3_keyword(context, SAMPLER2DSHADOW); }
 "samplerCubeShadow"    { return ES2_ident_ES3_keyword(context, SAMPLERCUBESHADOW); }
 "sampler2DArrayShadow" { return ES2_ident_ES3_keyword(context, SAMPLER2DARRAYSHADOW); }
 

src/compiler/translator/glslang.y

@@ -15,7 +15,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
 
 %{
 //
-// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
+// Copyright (c) 2002-2014 The ANGLE Project Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //

src/compiler/translator/glslang_lex.cpp

@@ -1420,7 +1420,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-{ return ES2_reserved_ES3_keyword(context, CASE); }
+{ return ES2_ident_ES3_keyword(context, CASE); }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
@@ -1428,7 +1428,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-{ return ES2_reserved_ES3_keyword(context, CENTROID); }
+{ return ES2_ident_ES3_keyword(context, CENTROID); }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
@@ -1436,7 +1436,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-{ return ES2_reserved_ES3_keyword(context, SMOOTH); }
+{ return ES2_ident_ES3_keyword(context, SMOOTH); }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
@@ -1644,7 +1644,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-{ return ES2_ident_ES3_keyword(context, SAMPLER2DSHADOW); }
+{ return ES2_reserved_ES3_keyword(context, SAMPLER2DSHADOW); }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP

src/compiler/translator/glslang_tab.cpp

-/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
+/* A Bison parser, made by GNU Bison 2.7.1.  */
 
 /* Bison implementation for Yacc-like parsers in C
    
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.7.12-4996"
+#define YYBISON_VERSION "2.7.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"

src/compiler/translator/glslang_tab.h

-/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
+/* A Bison parser, made by GNU Bison 2.7.1.  */
 
 /* Bison interface for Yacc-like parsers in C