Add a helper function to the lexer to tokenize strings that can be identifiers…

Add a helper function to the lexer to tokenize strings that can be identifiers in ES2 and are keywords in ES3. For instance, uint, or the non-square matrix keywords. TRAC #23218 Signed-off-by: Geoff Lang Signed-off-by: Nicolas Capens Author: Jamie Madill git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2390 736b8ea6-26fd-11df-bfd4-992fa37f6226

Add a helper function to the lexer to tokenize strings that can be identifiers…
16242efc · shannonwoods@chromium.org · 35f156d9 · 16242efc · 16242efc
Commit 16242efc authored May 30, 2013 by shannonwoods@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 32 additions and 0 deletions

glslang.l src/compiler/glslang.l +16 -0

glslang_lex.cpp src/compiler/glslang_lex.cpp +16 -0

No files found.
--- a/src/compiler/glslang.l
+++ b/src/compiler/glslang.l
@@ -56,6 +56,7 @@ static int check_type(yyscan_t yyscanner);
 static int reserved_word(yyscan_t yyscanner);
 static int ES2_reserved_ES3_keyword(TParseContext *context, int token);
 static int ES2_keyword_ES3_reserved(TParseContext *context, int token);
+static int ES2_ident_ES3_keyword(TParseContext *context, int token);
 %}

 %option noyywrap nounput never-interactive
@@ -406,6 +407,21 @@ int ES2_keyword_ES3_reserved(TParseContext *context, int token)
    return token;
 }

+int ES2_ident_ES3_keyword(TParseContext *context, int token)
+{
+    struct yyguts_t* yyg = (struct yyguts_t*) context->scanner;
+    yyscan_t yyscanner = (yyscan_t) context->scanner;
+
+    // not a reserved word in GLSL ES 1.00, so could be used as an identifier/type name
+    if (context->shaderVersion < 300)
+    {
+        yylval->lex.string = NewPoolTString(yytext);
+        return check_type(yyscanner);
+    }
+
+    return token;
+}
+
 void yyerror(TParseContext* context, const char* reason) {
    struct yyguts_t* yyg = (struct yyguts_t*) context->scanner;


--- a/src/compiler/glslang_lex.cpp
+++ b/src/compiler/glslang_lex.cpp
@@ -996,6 +996,7 @@ static int check_type(yyscan_t yyscanner);
 static int reserved_word(yyscan_t yyscanner);
 static int ES2_reserved_ES3_keyword(TParseContext *context, int token);
 static int ES2_keyword_ES3_reserved(TParseContext *context, int token);
+static int ES2_ident_ES3_keyword(TParseContext *context, int token);

 #define INITIAL 0
 #define COMMENT 1
@@ -3140,6 +3141,21 @@ int ES2_keyword_ES3_reserved(TParseContext *context, int token)
    return token;
 }

+int ES2_ident_ES3_keyword(TParseContext *context, int token)
+{
+    struct yyguts_t* yyg = (struct yyguts_t*) context->scanner;
+    yyscan_t yyscanner = (yyscan_t) context->scanner;
+
+    // not a reserved word in GLSL ES 1.00, so could be used as an identifier/type name
+    if (context->shaderVersion < 300)
+    {
+        yylval->lex.string = NewPoolTString(yytext);
+        return check_type(yyscanner);
+    }
+
+    return token;
+}
+
 void yyerror(TParseContext* context, const char* reason) {
    struct yyguts_t* yyg = (struct yyguts_t*) context->scanner;