Lexer does not need to handle unknown-char case.

It is handled by the preprocessor. Added an assert. TEST=WebGL conformance tests. TBR=kbr@chromium.org Review URL: https://codereview.appspot.com/8653052 git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@2231 736b8ea6-26fd-11df-bfd4-992fa37f6226

Lexer does not need to handle unknown-char case.
e37bfa0f · shannonwoods@chromium.org · 95d411fb · e37bfa0f · e37bfa0f
Commit e37bfa0f authored May 17, 2013 by shannonwoods@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 11 deletions

glslang.l src/compiler/glslang.l +3 -7

glslang_lex.cpp src/compiler/glslang_lex.cpp +2 -4

No files found.
--- a/src/compiler/glslang.l
+++ b/src/compiler/glslang.l
@@ -69,10 +69,6 @@ O           [0-7]
 %%
-%{
-    TParseContext* context = yyextra;
-%}
 "invariant"    { return INVARIANT; }
 "highp"        { return HIGH_PRECISION; }
 "mediump"      { return MEDIUM_PRECISION; }
@@ -253,9 +249,9 @@ O           [0-7]
 }
 <FIELDS>[ \t\v\f\r] {}
-[ \t\v\n\f\r]   {  }
+[ \t\v\n\f\r] { }
-<*><<EOF>>      { yyterminate(); }
+<*><<EOF>>    { yyterminate(); }
-<*>.            { context->warning(yylineno, "Unknown char", yytext, ""); return 0; }
+<*>.          { assert(false); return 0; }
 %%

--- a/src/compiler/glslang_lex.cpp
+++ b/src/compiler/glslang_lex.cpp
@@ -1037,8 +1037,6 @@ YY_DECL
 	register int yy_act;
    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    TParseContext* context = yyextra;
    yylval = yylval_param;
 	if ( !yyg->yy_init )
@@ -1724,7 +1722,7 @@ YY_RULE_SETUP
 case 147:
 /* rule 147 can match eol */
 YY_RULE_SETUP
-{  }
+{ }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(FIELDS):
@@ -1732,7 +1730,7 @@ case YY_STATE_EOF(FIELDS):
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-{ context->warning(yylineno, "Unknown char", yytext, ""); return 0; }
+{ assert(false); return 0; }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP