Reformat tokenizer. No functional changes.

TEST=WebGL conformance tests.
TBR=kbr@chromium.org

Review URL: https://codereview.appspot.com/8925044

git-svn-id: http://angleproject.googlecode.com/svn/trunk@2187 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/compiler/glslang.l b/src/compiler/glslang.l
index 140a9ae..3fba683 100644
--- a/src/compiler/glslang.l
+++ b/src/compiler/glslang.l
@@ -83,60 +83,60 @@
 <COMMENT>\n ;
 <COMMENT>"*/"  { yy_pop_state(yyscanner); }
 
-"invariant"    { return(INVARIANT); }
-"highp"        { return(HIGH_PRECISION); }
-"mediump"      { return(MEDIUM_PRECISION); }
-"lowp"         { return(LOW_PRECISION); }
-"precision"    { return(PRECISION); }
+"invariant"    { return INVARIANT; }
+"highp"        { return HIGH_PRECISION; }
+"mediump"      { return MEDIUM_PRECISION; }
+"lowp"         { return LOW_PRECISION; }
+"precision"    { return PRECISION; }
 
-"attribute"    { return(ATTRIBUTE); }
-"const"        { return(CONST_QUAL); }
-"uniform"      { return(UNIFORM); }
-"varying"      { return(VARYING); }
+"attribute"    { return ATTRIBUTE; }
+"const"        { return CONST_QUAL; }
+"uniform"      { return UNIFORM; }
+"varying"      { return VARYING; }
 
-"break"        { return(BREAK); }
-"continue"     { return(CONTINUE); }
-"do"           { return(DO); }
-"for"          { return(FOR); }
-"while"        { return(WHILE); }
+"break"        { return BREAK; }
+"continue"     { return CONTINUE; }
+"do"           { return DO; }
+"for"          { return FOR; }
+"while"        { return WHILE; }
 
-"if"           { return(IF); }
-"else"         { return(ELSE); }
+"if"           { return IF; }
+"else"         { return ELSE; }
 
-"in"           { return(IN_QUAL); }
-"out"          { return(OUT_QUAL); }
-"inout"        { return(INOUT_QUAL); }
+"in"           { return IN_QUAL; }
+"out"          { return OUT_QUAL; }
+"inout"        { return INOUT_QUAL; }
 
-"float"        { context->lexAfterType = true; return(FLOAT_TYPE); }
-"int"          { context->lexAfterType = true; return(INT_TYPE); }
-"void"         { context->lexAfterType = true; return(VOID_TYPE); }
-"bool"         { context->lexAfterType = true; return(BOOL_TYPE); }
-"true"         { yylval->lex.b = true;  return(BOOLCONSTANT); }
-"false"        { yylval->lex.b = false; return(BOOLCONSTANT); }
+"float"        { context->lexAfterType = true; return FLOAT_TYPE; }
+"int"          { context->lexAfterType = true; return INT_TYPE; }
+"void"         { context->lexAfterType = true; return VOID_TYPE; }
+"bool"         { context->lexAfterType = true; return BOOL_TYPE; }
+"true"         { yylval->lex.b = true;  return BOOLCONSTANT; }
+"false"        { yylval->lex.b = false; return BOOLCONSTANT; }
 
-"discard"      { return(DISCARD); }
-"return"       { return(RETURN); }
+"discard"      { return DISCARD; }
+"return"       { return RETURN; }
 
-"mat2"         { context->lexAfterType = true; return(MATRIX2); }
-"mat3"         { context->lexAfterType = true; return(MATRIX3); }
-"mat4"         { context->lexAfterType = true; return(MATRIX4); }
+"mat2"         { context->lexAfterType = true; return MATRIX2; }
+"mat3"         { context->lexAfterType = true; return MATRIX3; }
+"mat4"         { context->lexAfterType = true; return MATRIX4; }
 
-"vec2"         { context->lexAfterType = true; return (VEC2); }
-"vec3"         { context->lexAfterType = true; return (VEC3); }
-"vec4"         { context->lexAfterType = true; return (VEC4); }
-"ivec2"        { context->lexAfterType = true; return (IVEC2); }
-"ivec3"        { context->lexAfterType = true; return (IVEC3); }
-"ivec4"        { context->lexAfterType = true; return (IVEC4); }
-"bvec2"        { context->lexAfterType = true; return (BVEC2); }
-"bvec3"        { context->lexAfterType = true; return (BVEC3); }
-"bvec4"        { context->lexAfterType = true; return (BVEC4); }
+"vec2"         { context->lexAfterType = true; return VEC2; }
+"vec3"         { context->lexAfterType = true; return VEC3; }
+"vec4"         { context->lexAfterType = true; return VEC4; }
+"ivec2"        { context->lexAfterType = true; return IVEC2; }
+"ivec3"        { context->lexAfterType = true; return IVEC3; }
+"ivec4"        { context->lexAfterType = true; return IVEC4; }
+"bvec2"        { context->lexAfterType = true; return BVEC2; }
+"bvec3"        { context->lexAfterType = true; return BVEC3; }
+"bvec4"        { context->lexAfterType = true; return BVEC4; }
 
-"sampler2D"       { context->lexAfterType = true; return SAMPLER2D; }
-"samplerCube"     { context->lexAfterType = true; return SAMPLERCUBE; }
+"sampler2D"          { context->lexAfterType = true; return SAMPLER2D; }
+"samplerCube"        { context->lexAfterType = true; return SAMPLERCUBE; }
 "samplerExternalOES" { context->lexAfterType = true; return SAMPLER_EXTERNAL_OES; }
-"sampler2DRect" { context->lexAfterType = true; return SAMPLER2DRECT; }
+"sampler2DRect"      { context->lexAfterType = true; return SAMPLER2DRECT; }
 
-"struct"       { context->lexAfterType = true; return(STRUCT); }
+"struct"       { context->lexAfterType = true; return STRUCT; }
 
 "asm"          { return reserved_word(yyscanner); }
 
@@ -183,13 +183,11 @@
 "fvec3"        { return reserved_word(yyscanner); }
 "fvec4"        { return reserved_word(yyscanner); }
 
-"sampler1D"    { return reserved_word(yyscanner); }
-"sampler3D"    { return reserved_word(yyscanner); }
-
-"sampler1DShadow" { return reserved_word(yyscanner); }
-"sampler2DShadow" { return reserved_word(yyscanner); }
-
-"sampler3DRect" { return reserved_word(yyscanner); }
+"sampler1D"           { return reserved_word(yyscanner); }
+"sampler3D"           { return reserved_word(yyscanner); }
+"sampler1DShadow"     { return reserved_word(yyscanner); }
+"sampler2DShadow"     { return reserved_word(yyscanner); }
+"sampler3DRect"       { return reserved_word(yyscanner); }
 "sampler2DRectShadow" { return reserved_word(yyscanner); }
 
 "sizeof"       { return reserved_word(yyscanner); }
@@ -203,61 +201,61 @@
    return check_type(yyscanner);
 }
 
-0[xX]{H}+         { yylval->lex.i = static_cast<int>(strtol(yytext, 0, 0)); return(INTCONSTANT); }
-0{O}+             { yylval->lex.i = static_cast<int>(strtol(yytext, 0, 0)); return(INTCONSTANT); }
+0[xX]{H}+         { yylval->lex.i = static_cast<int>(strtol(yytext, 0, 0)); return INTCONSTANT; }
+0{O}+             { yylval->lex.i = static_cast<int>(strtol(yytext, 0, 0)); return INTCONSTANT; }
 0{D}+             { context->error(yylineno, "Invalid Octal number.", yytext); context->recover(); return 0;}
-{D}+              { yylval->lex.i = static_cast<int>(strtol(yytext, 0, 0)); return(INTCONSTANT); }
+{D}+              { yylval->lex.i = static_cast<int>(strtol(yytext, 0, 0)); return INTCONSTANT; }
 
-{D}+{E}           { yylval->lex.f = static_cast<float>(atof_dot(yytext)); return(FLOATCONSTANT); }
-{D}+"."{D}*({E})? { yylval->lex.f = static_cast<float>(atof_dot(yytext)); return(FLOATCONSTANT); }
-"."{D}+({E})?     { yylval->lex.f = static_cast<float>(atof_dot(yytext)); return(FLOATCONSTANT); }
+{D}+{E}           { yylval->lex.f = static_cast<float>(atof_dot(yytext)); return FLOATCONSTANT; }
+{D}+"."{D}*({E})? { yylval->lex.f = static_cast<float>(atof_dot(yytext)); return FLOATCONSTANT; }
+"."{D}+({E})?     { yylval->lex.f = static_cast<float>(atof_dot(yytext)); return FLOATCONSTANT; }
 
-"+="            {  return(ADD_ASSIGN); }
-"-="            {  return(SUB_ASSIGN); }
-"*="            {  return(MUL_ASSIGN); }
-"/="            {  return(DIV_ASSIGN); }
-"%="            {  return(MOD_ASSIGN); }
-"<<="           {  return(LEFT_ASSIGN); }
-">>="           {  return(RIGHT_ASSIGN); }
-"&="            {  return(AND_ASSIGN); }
-"^="            {  return(XOR_ASSIGN); }
-"|="            {  return(OR_ASSIGN); }
+"+="            { return ADD_ASSIGN; }
+"-="            { return SUB_ASSIGN; }
+"*="            { return MUL_ASSIGN; }
+"/="            { return DIV_ASSIGN; }
+"%="            { return MOD_ASSIGN; }
+"<<="           { return LEFT_ASSIGN; }
+">>="           { return RIGHT_ASSIGN; }
+"&="            { return AND_ASSIGN; }
+"^="            { return XOR_ASSIGN; }
+"|="            { return OR_ASSIGN; }
 
-"++"            {  return(INC_OP); }
-"--"            {  return(DEC_OP); }
-"&&"            {  return(AND_OP); }
-"||"            {  return(OR_OP); }
-"^^"            {  return(XOR_OP); }
-"<="            {  return(LE_OP); }
-">="            {  return(GE_OP); }
-"=="            {  return(EQ_OP); }
-"!="            {  return(NE_OP); }
-"<<"            {  return(LEFT_OP); }
-">>"            {  return(RIGHT_OP); }
-";"             { context->lexAfterType = false; return(SEMICOLON); }
-("{"|"<%")      { context->lexAfterType = false; return(LEFT_BRACE); }
-("}"|"%>")      { return(RIGHT_BRACE); }
-","         { if (context->inTypeParen) context->lexAfterType = false; return(COMMA); }
-":"         { return(COLON); }
-"="         { context->lexAfterType = false; return(EQUAL); }
-"("         { context->lexAfterType = false; context->inTypeParen = true; return(LEFT_PAREN); }
-")"         { context->inTypeParen = false; return(RIGHT_PAREN); }
-("["|"<:")      { return(LEFT_BRACKET); }
-("]"|":>")      { return(RIGHT_BRACKET); }
-"."         { BEGIN(FIELDS);  return(DOT); }
-"!"         { return(BANG); }
-"-"         { return(DASH); }
-"~"         { return(TILDE); }
-"+"         { return(PLUS); }
-"*"         { return(STAR); }
-"/"         { return(SLASH); }
-"%"         { return(PERCENT); }
-"<"         { return(LEFT_ANGLE); }
-">"         { return(RIGHT_ANGLE); }
-"|"         { return(VERTICAL_BAR); }
-"^"         { return(CARET); }
-"&"         { return(AMPERSAND); }
-"?"         { return(QUESTION); }
+"++"            { return INC_OP; }
+"--"            { return DEC_OP; }
+"&&"            { return AND_OP; }
+"||"            { return OR_OP; }
+"^^"            { return XOR_OP; }
+"<="            { return LE_OP; }
+">="            { return GE_OP; }
+"=="            { return EQ_OP; }
+"!="            { return NE_OP; }
+"<<"            { return LEFT_OP; }
+">>"            { return RIGHT_OP; }
+";"             { context->lexAfterType = false; return SEMICOLON; }
+("{"|"<%")      { context->lexAfterType = false; return LEFT_BRACE; }
+("}"|"%>")      { return RIGHT_BRACE; }
+","         { if (context->inTypeParen) context->lexAfterType = false; return COMMA; }
+":"         { return COLON; }
+"="         { context->lexAfterType = false; return EQUAL; }
+"("         { context->lexAfterType = false; context->inTypeParen = true; return LEFT_PAREN; }
+")"         { context->inTypeParen = false; return RIGHT_PAREN; }
+("["|"<:")  { return LEFT_BRACKET; }
+("]"|":>")  { return RIGHT_BRACKET; }
+"."         { BEGIN(FIELDS); return DOT; }
+"!"         { return BANG; }
+"-"         { return DASH; }
+"~"         { return TILDE; }
+"+"         { return PLUS; }
+"*"         { return STAR; }
+"/"         { return SLASH; }
+"%"         { return PERCENT; }
+"<"         { return LEFT_ANGLE; }
+">"         { return RIGHT_ANGLE; }
+"|"         { return VERTICAL_BAR; }
+"^"         { return CARET; }
+"&"         { return AMPERSAND; }
+"?"         { return QUESTION; }
 
 <FIELDS>{L}({L}|{D})* { 
     BEGIN(INITIAL);
diff --git a/src/compiler/glslang_lex.cpp b/src/compiler/glslang_lex.cpp
index a60dad5..092942d 100644
--- a/src/compiler/glslang_lex.cpp
+++ b/src/compiler/glslang_lex.cpp
@@ -1168,159 +1168,159 @@
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-{ return(INVARIANT); }
+{ return INVARIANT; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-{ return(HIGH_PRECISION); }
+{ return HIGH_PRECISION; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-{ return(MEDIUM_PRECISION); }
+{ return MEDIUM_PRECISION; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-{ return(LOW_PRECISION); }
+{ return LOW_PRECISION; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-{ return(PRECISION); }
+{ return PRECISION; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-{ return(ATTRIBUTE); }
+{ return ATTRIBUTE; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-{ return(CONST_QUAL); }
+{ return CONST_QUAL; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-{ return(UNIFORM); }
+{ return UNIFORM; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-{ return(VARYING); }
+{ return VARYING; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-{ return(BREAK); }
+{ return BREAK; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-{ return(CONTINUE); }
+{ return CONTINUE; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-{ return(DO); }
+{ return DO; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-{ return(FOR); }
+{ return FOR; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-{ return(WHILE); }
+{ return WHILE; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-{ return(IF); }
+{ return IF; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-{ return(ELSE); }
+{ return ELSE; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-{ return(IN_QUAL); }
+{ return IN_QUAL; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-{ return(OUT_QUAL); }
+{ return OUT_QUAL; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-{ return(INOUT_QUAL); }
+{ return INOUT_QUAL; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-{ context->lexAfterType = true; return(FLOAT_TYPE); }
+{ context->lexAfterType = true; return FLOAT_TYPE; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-{ context->lexAfterType = true; return(INT_TYPE); }
+{ context->lexAfterType = true; return INT_TYPE; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-{ context->lexAfterType = true; return(VOID_TYPE); }
+{ context->lexAfterType = true; return VOID_TYPE; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-{ context->lexAfterType = true; return(BOOL_TYPE); }
+{ context->lexAfterType = true; return BOOL_TYPE; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-{ yylval->lex.b = true;  return(BOOLCONSTANT); }
+{ yylval->lex.b = true;  return BOOLCONSTANT; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-{ yylval->lex.b = false; return(BOOLCONSTANT); }
+{ yylval->lex.b = false; return BOOLCONSTANT; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-{ return(DISCARD); }
+{ return DISCARD; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-{ return(RETURN); }
+{ return RETURN; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-{ context->lexAfterType = true; return(MATRIX2); }
+{ context->lexAfterType = true; return MATRIX2; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-{ context->lexAfterType = true; return(MATRIX3); }
+{ context->lexAfterType = true; return MATRIX3; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-{ context->lexAfterType = true; return(MATRIX4); }
+{ context->lexAfterType = true; return MATRIX4; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-{ context->lexAfterType = true; return (VEC2); }
+{ context->lexAfterType = true; return VEC2; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-{ context->lexAfterType = true; return (VEC3); }
+{ context->lexAfterType = true; return VEC3; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-{ context->lexAfterType = true; return (VEC4); }
+{ context->lexAfterType = true; return VEC4; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-{ context->lexAfterType = true; return (IVEC2); }
+{ context->lexAfterType = true; return IVEC2; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-{ context->lexAfterType = true; return (IVEC3); }
+{ context->lexAfterType = true; return IVEC3; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-{ context->lexAfterType = true; return (IVEC4); }
+{ context->lexAfterType = true; return IVEC4; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-{ context->lexAfterType = true; return (BVEC2); }
+{ context->lexAfterType = true; return BVEC2; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-{ context->lexAfterType = true; return (BVEC3); }
+{ context->lexAfterType = true; return BVEC3; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-{ context->lexAfterType = true; return (BVEC4); }
+{ context->lexAfterType = true; return BVEC4; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
@@ -1340,7 +1340,7 @@
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-{ context->lexAfterType = true; return(STRUCT); }
+{ context->lexAfterType = true; return STRUCT; }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
@@ -1543,11 +1543,11 @@
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-{ yylval->lex.i = static_cast<int>(strtol(yytext, 0, 0)); return(INTCONSTANT); }
+{ yylval->lex.i = static_cast<int>(strtol(yytext, 0, 0)); return INTCONSTANT; }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-{ yylval->lex.i = static_cast<int>(strtol(yytext, 0, 0)); return(INTCONSTANT); }
+{ yylval->lex.i = static_cast<int>(strtol(yytext, 0, 0)); return INTCONSTANT; }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
@@ -1555,199 +1555,199 @@
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-{ yylval->lex.i = static_cast<int>(strtol(yytext, 0, 0)); return(INTCONSTANT); }
+{ yylval->lex.i = static_cast<int>(strtol(yytext, 0, 0)); return INTCONSTANT; }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-{ yylval->lex.f = static_cast<float>(atof_dot(yytext)); return(FLOATCONSTANT); }
+{ yylval->lex.f = static_cast<float>(atof_dot(yytext)); return FLOATCONSTANT; }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-{ yylval->lex.f = static_cast<float>(atof_dot(yytext)); return(FLOATCONSTANT); }
+{ yylval->lex.f = static_cast<float>(atof_dot(yytext)); return FLOATCONSTANT; }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-{ yylval->lex.f = static_cast<float>(atof_dot(yytext)); return(FLOATCONSTANT); }
+{ yylval->lex.f = static_cast<float>(atof_dot(yytext)); return FLOATCONSTANT; }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-{  return(ADD_ASSIGN); }
+{ return ADD_ASSIGN; }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-{  return(SUB_ASSIGN); }
+{ return SUB_ASSIGN; }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-{  return(MUL_ASSIGN); }
+{ return MUL_ASSIGN; }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-{  return(DIV_ASSIGN); }
+{ return DIV_ASSIGN; }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-{  return(MOD_ASSIGN); }
+{ return MOD_ASSIGN; }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-{  return(LEFT_ASSIGN); }
+{ return LEFT_ASSIGN; }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-{  return(RIGHT_ASSIGN); }
+{ return RIGHT_ASSIGN; }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-{  return(AND_ASSIGN); }
+{ return AND_ASSIGN; }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-{  return(XOR_ASSIGN); }
+{ return XOR_ASSIGN; }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-{  return(OR_ASSIGN); }
+{ return OR_ASSIGN; }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-{  return(INC_OP); }
+{ return INC_OP; }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-{  return(DEC_OP); }
+{ return DEC_OP; }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-{  return(AND_OP); }
+{ return AND_OP; }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-{  return(OR_OP); }
+{ return OR_OP; }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-{  return(XOR_OP); }
+{ return XOR_OP; }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-{  return(LE_OP); }
+{ return LE_OP; }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-{  return(GE_OP); }
+{ return GE_OP; }
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-{  return(EQ_OP); }
+{ return EQ_OP; }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-{  return(NE_OP); }
+{ return NE_OP; }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-{  return(LEFT_OP); }
+{ return LEFT_OP; }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-{  return(RIGHT_OP); }
+{ return RIGHT_OP; }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-{ context->lexAfterType = false; return(SEMICOLON); }
+{ context->lexAfterType = false; return SEMICOLON; }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-{ context->lexAfterType = false; return(LEFT_BRACE); }
+{ context->lexAfterType = false; return LEFT_BRACE; }
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-{ return(RIGHT_BRACE); }
+{ return RIGHT_BRACE; }
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-{ if (context->inTypeParen) context->lexAfterType = false; return(COMMA); }
+{ if (context->inTypeParen) context->lexAfterType = false; return COMMA; }
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-{ return(COLON); }
+{ return COLON; }
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-{ context->lexAfterType = false; return(EQUAL); }
+{ context->lexAfterType = false; return EQUAL; }
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-{ context->lexAfterType = false; context->inTypeParen = true; return(LEFT_PAREN); }
+{ context->lexAfterType = false; context->inTypeParen = true; return LEFT_PAREN; }
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-{ context->inTypeParen = false; return(RIGHT_PAREN); }
+{ context->inTypeParen = false; return RIGHT_PAREN; }
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-{ return(LEFT_BRACKET); }
+{ return LEFT_BRACKET; }
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-{ return(RIGHT_BRACKET); }
+{ return RIGHT_BRACKET; }
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-{ BEGIN(FIELDS);  return(DOT); }
+{ BEGIN(FIELDS); return DOT; }
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-{ return(BANG); }
+{ return BANG; }
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-{ return(DASH); }
+{ return DASH; }
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-{ return(TILDE); }
+{ return TILDE; }
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-{ return(PLUS); }
+{ return PLUS; }
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-{ return(STAR); }
+{ return STAR; }
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-{ return(SLASH); }
+{ return SLASH; }
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-{ return(PERCENT); }
+{ return PERCENT; }
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-{ return(LEFT_ANGLE); }
+{ return LEFT_ANGLE; }
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-{ return(RIGHT_ANGLE); }
+{ return RIGHT_ANGLE; }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-{ return(VERTICAL_BAR); }
+{ return VERTICAL_BAR; }
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-{ return(CARET); }
+{ return CARET; }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-{ return(AMPERSAND); }
+{ return AMPERSAND; }
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-{ return(QUESTION); }
+{ return QUESTION; }
 	YY_BREAK
 case 151:
 YY_RULE_SETUP