glsl2: Commit generated files changed by previous commit

1 files changed, 252 insertions, 228 deletions

diff --git a/src/glsl/glsl_lexer.cpp b/src/glsl/glsl_lexer.cpp
index 672b0b1359..f75f7b5171 100644
--- a/src/glsl/glsl_lexer.cpp
+++ b/src/glsl/glsl_lexer.cpp
@@ -54,7 +54,6 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -85,6 +84,8 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! C99 */
+
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -158,7 +159,15 @@ typedef void* yyscan_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
 #define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -934,8 +943,18 @@ static yyconst flex_int16_t yy_chk[1076] =
       }								 \
    } while (0)
 
+#define RESERVED_WORD(version, token)					\
+   do {									\
+      if (yyextra->language_version >= version) {			\
+	 return token;							\
+      } else {								\
+	 _mesa_glsl_error(yylloc, yyextra,				\
+			  "Illegal use of reserved word `%s'", yytext);	\
+	 return ERROR_TOK;						\
+      }									\
+   } while (0)
 
-#line 939 "glsl_lexer.cpp"
+#line 958 "glsl_lexer.cpp"
 
 #define INITIAL 0
 #define PP 1
@@ -1069,7 +1088,12 @@ static int input (yyscan_t yyscanner );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
 #define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -1077,7 +1101,7 @@ static int input (yyscan_t yyscanner );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1088,7 +1112,7 @@ static int input (yyscan_t yyscanner );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		int n; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -1176,10 +1200,10 @@ YY_DECL
 	register int yy_act;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-#line 66 "glsl_lexer.lpp"
+#line 76 "glsl_lexer.lpp"
 
 
-#line 1183 "glsl_lexer.cpp"
+#line 1207 "glsl_lexer.cpp"
 
     yylval = yylval_param;
 
@@ -1265,7 +1289,7 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 68 "glsl_lexer.lpp"
+#line 78 "glsl_lexer.lpp"
 ;
 	YY_BREAK
 /* Preprocessor tokens. */ 
@@ -1274,17 +1298,17 @@ case 2:
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 71 "glsl_lexer.lpp"
+#line 81 "glsl_lexer.lpp"
 ;
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 72 "glsl_lexer.lpp"
+#line 82 "glsl_lexer.lpp"
 { BEGIN PP; return VERSION; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 73 "glsl_lexer.lpp"
+#line 83 "glsl_lexer.lpp"
 { BEGIN PP; return EXTENSION; }
 	YY_BREAK
 case 5:
@@ -1292,7 +1316,7 @@ case 5:
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 74 "glsl_lexer.lpp"
+#line 84 "glsl_lexer.lpp"
 {
 				   /* Eat characters until the first digit is
 				    * encountered
@@ -1314,7 +1338,7 @@ case 6:
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 89 "glsl_lexer.lpp"
+#line 99 "glsl_lexer.lpp"
 {
 				   /* Eat characters until the first digit is
 				    * encountered
@@ -1332,27 +1356,27 @@ YY_RULE_SETUP
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 103 "glsl_lexer.lpp"
+#line 113 "glsl_lexer.lpp"
 { BEGIN PP; return PRAGMA; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 104 "glsl_lexer.lpp"
+#line 114 "glsl_lexer.lpp"
 { }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 105 "glsl_lexer.lpp"
+#line 115 "glsl_lexer.lpp"
 { }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 106 "glsl_lexer.lpp"
+#line 116 "glsl_lexer.lpp"
 return COLON;
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 107 "glsl_lexer.lpp"
+#line 117 "glsl_lexer.lpp"
 {
 				   yylval->identifier = strdup(yytext);
 				   return IDENTIFIER;
@@ -1360,7 +1384,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 111 "glsl_lexer.lpp"
+#line 121 "glsl_lexer.lpp"
 {
 				    yylval->n = strtol(yytext, NULL, 10);
 				    return INTCONSTANT;
@@ -1369,283 +1393,283 @@ YY_RULE_SETUP
 case 13:
 /* rule 13 can match eol */
 YY_RULE_SETUP
-#line 115 "glsl_lexer.lpp"
+#line 125 "glsl_lexer.lpp"
 { BEGIN 0; yylineno++; yycolumn = 0; return EOL; }
 	YY_BREAK
 case 14:
 /* rule 14 can match eol */
 YY_RULE_SETUP
-#line 117 "glsl_lexer.lpp"
+#line 127 "glsl_lexer.lpp"
 { yylineno++; yycolumn = 0; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 119 "glsl_lexer.lpp"
+#line 129 "glsl_lexer.lpp"
 return ATTRIBUTE;
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 120 "glsl_lexer.lpp"
+#line 130 "glsl_lexer.lpp"
 return CONST_TOK;
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 121 "glsl_lexer.lpp"
+#line 131 "glsl_lexer.lpp"
 return BOOL;
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 122 "glsl_lexer.lpp"
+#line 132 "glsl_lexer.lpp"
 return FLOAT;
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 123 "glsl_lexer.lpp"
+#line 133 "glsl_lexer.lpp"
 return INT;
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 125 "glsl_lexer.lpp"
+#line 135 "glsl_lexer.lpp"
 return BREAK;
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 126 "glsl_lexer.lpp"
+#line 136 "glsl_lexer.lpp"
 return CONTINUE;
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 127 "glsl_lexer.lpp"
+#line 137 "glsl_lexer.lpp"
 return DO;
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 128 "glsl_lexer.lpp"
+#line 138 "glsl_lexer.lpp"
 return WHILE;
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 129 "glsl_lexer.lpp"
+#line 139 "glsl_lexer.lpp"
 return ELSE;
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 130 "glsl_lexer.lpp"
+#line 140 "glsl_lexer.lpp"
 return FOR;
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 131 "glsl_lexer.lpp"
+#line 141 "glsl_lexer.lpp"
 return IF;
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 132 "glsl_lexer.lpp"
+#line 142 "glsl_lexer.lpp"
 return DISCARD;
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 133 "glsl_lexer.lpp"
+#line 143 "glsl_lexer.lpp"
 return RETURN;
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 135 "glsl_lexer.lpp"
+#line 145 "glsl_lexer.lpp"
 return BVEC2;
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 136 "glsl_lexer.lpp"
+#line 146 "glsl_lexer.lpp"
 return BVEC3;
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 137 "glsl_lexer.lpp"
+#line 147 "glsl_lexer.lpp"
 return BVEC4;
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 138 "glsl_lexer.lpp"
+#line 148 "glsl_lexer.lpp"
 return IVEC2;
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 139 "glsl_lexer.lpp"
+#line 149 "glsl_lexer.lpp"
 return IVEC3;
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 140 "glsl_lexer.lpp"
+#line 150 "glsl_lexer.lpp"
 return IVEC4;
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 141 "glsl_lexer.lpp"
+#line 151 "glsl_lexer.lpp"
 return VEC2;
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 142 "glsl_lexer.lpp"
+#line 152 "glsl_lexer.lpp"
 return VEC3;
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 143 "glsl_lexer.lpp"
+#line 153 "glsl_lexer.lpp"
 return VEC4;
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 144 "glsl_lexer.lpp"
+#line 154 "glsl_lexer.lpp"
 return MAT2;
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 145 "glsl_lexer.lpp"
+#line 155 "glsl_lexer.lpp"
 return MAT3;
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 146 "glsl_lexer.lpp"
+#line 156 "glsl_lexer.lpp"
 return MAT4;
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 147 "glsl_lexer.lpp"
+#line 157 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(120, MAT2X2);
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 148 "glsl_lexer.lpp"
+#line 158 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(120, MAT2X3);
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 149 "glsl_lexer.lpp"
+#line 159 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(120, MAT2X4);
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 150 "glsl_lexer.lpp"
+#line 160 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(120, MAT3X2);
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 151 "glsl_lexer.lpp"
+#line 161 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(120, MAT3X3);
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 152 "glsl_lexer.lpp"
+#line 162 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(120, MAT3X4);
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 153 "glsl_lexer.lpp"
+#line 163 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(120, MAT4X2);
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 154 "glsl_lexer.lpp"
+#line 164 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(120, MAT4X3);
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 155 "glsl_lexer.lpp"
+#line 165 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(120, MAT4X4);
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 157 "glsl_lexer.lpp"
+#line 167 "glsl_lexer.lpp"
 return IN;
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 158 "glsl_lexer.lpp"
+#line 168 "glsl_lexer.lpp"
 return OUT;
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 159 "glsl_lexer.lpp"
+#line 169 "glsl_lexer.lpp"
 return INOUT;
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 160 "glsl_lexer.lpp"
+#line 170 "glsl_lexer.lpp"
 return UNIFORM;
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 161 "glsl_lexer.lpp"
+#line 171 "glsl_lexer.lpp"
 return VARYING;
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 162 "glsl_lexer.lpp"
+#line 172 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(120, CENTROID);
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 163 "glsl_lexer.lpp"
+#line 173 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(120, INVARIANT);
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 165 "glsl_lexer.lpp"
+#line 175 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, FLAT);
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 166 "glsl_lexer.lpp"
+#line 176 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, SMOOTH);
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 167 "glsl_lexer.lpp"
+#line 177 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, NOPERSPECTIVE);
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 169 "glsl_lexer.lpp"
+#line 179 "glsl_lexer.lpp"
 return SAMPLER1D;
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 170 "glsl_lexer.lpp"
+#line 180 "glsl_lexer.lpp"
 return SAMPLER2D;
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 171 "glsl_lexer.lpp"
+#line 181 "glsl_lexer.lpp"
 return SAMPLER3D;
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 172 "glsl_lexer.lpp"
+#line 182 "glsl_lexer.lpp"
 return SAMPLERCUBE;
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 173 "glsl_lexer.lpp"
+#line 183 "glsl_lexer.lpp"
 return SAMPLER1DSHADOW;
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 174 "glsl_lexer.lpp"
+#line 184 "glsl_lexer.lpp"
 return SAMPLER2DSHADOW;
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 176 "glsl_lexer.lpp"
+#line 186 "glsl_lexer.lpp"
 return STRUCT;
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 177 "glsl_lexer.lpp"
+#line 187 "glsl_lexer.lpp"
 return VOID;
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 179 "glsl_lexer.lpp"
+#line 189 "glsl_lexer.lpp"
 {
 		  if ((yyextra->language_version >= 140)
 		      || (yyextra->ARB_fragment_coord_conventions_enable)){
@@ -1658,102 +1682,102 @@ YY_RULE_SETUP
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 189 "glsl_lexer.lpp"
+#line 199 "glsl_lexer.lpp"
 return INC_OP;
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 190 "glsl_lexer.lpp"
+#line 200 "glsl_lexer.lpp"
 return DEC_OP;
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 191 "glsl_lexer.lpp"
+#line 201 "glsl_lexer.lpp"
 return LE_OP;
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 192 "glsl_lexer.lpp"
+#line 202 "glsl_lexer.lpp"
 return GE_OP;
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 193 "glsl_lexer.lpp"
+#line 203 "glsl_lexer.lpp"
 return EQ_OP;
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 194 "glsl_lexer.lpp"
+#line 204 "glsl_lexer.lpp"
 return NE_OP;
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 195 "glsl_lexer.lpp"
+#line 205 "glsl_lexer.lpp"
 return AND_OP;
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 196 "glsl_lexer.lpp"
+#line 206 "glsl_lexer.lpp"
 return OR_OP;
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 197 "glsl_lexer.lpp"
+#line 207 "glsl_lexer.lpp"
 return XOR_OP;
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 199 "glsl_lexer.lpp"
+#line 209 "glsl_lexer.lpp"
 return MUL_ASSIGN;
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 200 "glsl_lexer.lpp"
+#line 210 "glsl_lexer.lpp"
 return DIV_ASSIGN;
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 201 "glsl_lexer.lpp"
+#line 211 "glsl_lexer.lpp"
 return ADD_ASSIGN;
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 202 "glsl_lexer.lpp"
+#line 212 "glsl_lexer.lpp"
 return MOD_ASSIGN;
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 203 "glsl_lexer.lpp"
+#line 213 "glsl_lexer.lpp"
 return LEFT_ASSIGN;
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 204 "glsl_lexer.lpp"
+#line 214 "glsl_lexer.lpp"
 return RIGHT_ASSIGN;
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 205 "glsl_lexer.lpp"
+#line 215 "glsl_lexer.lpp"
 return AND_ASSIGN;
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 206 "glsl_lexer.lpp"
+#line 216 "glsl_lexer.lpp"
 return XOR_ASSIGN;
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 207 "glsl_lexer.lpp"
+#line 217 "glsl_lexer.lpp"
 return OR_ASSIGN;
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 208 "glsl_lexer.lpp"
+#line 218 "glsl_lexer.lpp"
 return SUB_ASSIGN;
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 210 "glsl_lexer.lpp"
+#line 220 "glsl_lexer.lpp"
 {
 			    yylval->n = strtol(yytext, NULL, 10);
 			    return INTCONSTANT;
@@ -1761,7 +1785,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 214 "glsl_lexer.lpp"
+#line 224 "glsl_lexer.lpp"
 {
 			    yylval->n = strtol(yytext + 2, NULL, 16);
 			    return INTCONSTANT;
@@ -1769,7 +1793,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 218 "glsl_lexer.lpp"
+#line 228 "glsl_lexer.lpp"
 {
 			    yylval->n = strtol(yytext, NULL, 8);
 			    return INTCONSTANT;
@@ -1777,7 +1801,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 223 "glsl_lexer.lpp"
+#line 233 "glsl_lexer.lpp"
 {
 			    yylval->real = strtod(yytext, NULL);
 			    return FLOATCONSTANT;
@@ -1785,7 +1809,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 227 "glsl_lexer.lpp"
+#line 237 "glsl_lexer.lpp"
 {
 			    yylval->real = strtod(yytext, NULL);
 			    return FLOATCONSTANT;
@@ -1793,7 +1817,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 231 "glsl_lexer.lpp"
+#line 241 "glsl_lexer.lpp"
 {
 			    yylval->real = strtod(yytext, NULL);
 			    return FLOATCONSTANT;
@@ -1801,7 +1825,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 235 "glsl_lexer.lpp"
+#line 245 "glsl_lexer.lpp"
 {
 			    yylval->real = strtod(yytext, NULL);
 			    return FLOATCONSTANT;
@@ -1809,7 +1833,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 239 "glsl_lexer.lpp"
+#line 249 "glsl_lexer.lpp"
 {
 			    yylval->real = strtod(yytext, NULL);
 			    return FLOATCONSTANT;
@@ -1817,7 +1841,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 244 "glsl_lexer.lpp"
+#line 254 "glsl_lexer.lpp"
 {
 			    yylval->n = 1;
 			    return BOOLCONSTANT;
@@ -1825,7 +1849,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 248 "glsl_lexer.lpp"
+#line 258 "glsl_lexer.lpp"
 {
 			    yylval->n = 0;
 			    return BOOLCONSTANT;
@@ -1834,394 +1858,394 @@ YY_RULE_SETUP
 /* Reserved words in GLSL 1.10. */
 case 98:
 YY_RULE_SETUP
-#line 255 "glsl_lexer.lpp"
-return ASM;
+#line 265 "glsl_lexer.lpp"
+RESERVED_WORD(999, ASM);
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 256 "glsl_lexer.lpp"
-return CLASS;
+#line 266 "glsl_lexer.lpp"
+RESERVED_WORD(999, CLASS);
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 257 "glsl_lexer.lpp"
-return UNION;
+#line 267 "glsl_lexer.lpp"
+RESERVED_WORD(999, UNION);
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 258 "glsl_lexer.lpp"
-return ENUM;
+#line 268 "glsl_lexer.lpp"
+RESERVED_WORD(999, ENUM);
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 259 "glsl_lexer.lpp"
-return TYPEDEF;
+#line 269 "glsl_lexer.lpp"
+RESERVED_WORD(999, TYPEDEF);
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 260 "glsl_lexer.lpp"
-return TEMPLATE;
+#line 270 "glsl_lexer.lpp"
+RESERVED_WORD(999, TEMPLATE);
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 261 "glsl_lexer.lpp"
-return THIS;
+#line 271 "glsl_lexer.lpp"
+RESERVED_WORD(999, THIS);
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 262 "glsl_lexer.lpp"
-return PACKED;
+#line 272 "glsl_lexer.lpp"
+RESERVED_WORD(999, PACKED);
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 263 "glsl_lexer.lpp"
-return GOTO;
+#line 273 "glsl_lexer.lpp"
+RESERVED_WORD(999, GOTO);
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 264 "glsl_lexer.lpp"
-return SWITCH;
+#line 274 "glsl_lexer.lpp"
+RESERVED_WORD(130, SWITCH);
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 265 "glsl_lexer.lpp"
-return DEFAULT;
+#line 275 "glsl_lexer.lpp"
+RESERVED_WORD(130, DEFAULT);
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 266 "glsl_lexer.lpp"
-return INLINE_TOK;
+#line 276 "glsl_lexer.lpp"
+RESERVED_WORD(999, INLINE_TOK);
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 267 "glsl_lexer.lpp"
-return NOINLINE;
+#line 277 "glsl_lexer.lpp"
+RESERVED_WORD(999, NOINLINE);
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 268 "glsl_lexer.lpp"
-return VOLATILE;
+#line 278 "glsl_lexer.lpp"
+RESERVED_WORD(999, VOLATILE);
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 269 "glsl_lexer.lpp"
-return PUBLIC_TOK;
+#line 279 "glsl_lexer.lpp"
+RESERVED_WORD(999, PUBLIC_TOK);
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 270 "glsl_lexer.lpp"
-return STATIC;
+#line 280 "glsl_lexer.lpp"
+RESERVED_WORD(999, STATIC);
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 271 "glsl_lexer.lpp"
-return EXTERN;
+#line 281 "glsl_lexer.lpp"
+RESERVED_WORD(999, EXTERN);
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 272 "glsl_lexer.lpp"
-return EXTERNAL;
+#line 282 "glsl_lexer.lpp"
+RESERVED_WORD(999, EXTERNAL);
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 273 "glsl_lexer.lpp"
-return INTERFACE;
+#line 283 "glsl_lexer.lpp"
+RESERVED_WORD(999, INTERFACE);
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 274 "glsl_lexer.lpp"
-return LONG;
+#line 284 "glsl_lexer.lpp"
+RESERVED_WORD(999, LONG);
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 275 "glsl_lexer.lpp"
-return SHORT;
+#line 285 "glsl_lexer.lpp"
+RESERVED_WORD(999, SHORT);
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 276 "glsl_lexer.lpp"
-return DOUBLE;
+#line 286 "glsl_lexer.lpp"
+RESERVED_WORD(999, DOUBLE);
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 277 "glsl_lexer.lpp"
-return HALF;
+#line 287 "glsl_lexer.lpp"
+RESERVED_WORD(999, HALF);
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 278 "glsl_lexer.lpp"
-return FIXED;
+#line 288 "glsl_lexer.lpp"
+RESERVED_WORD(999, FIXED);
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 279 "glsl_lexer.lpp"
-return UNSIGNED;
+#line 289 "glsl_lexer.lpp"
+RESERVED_WORD(999, UNSIGNED);
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 280 "glsl_lexer.lpp"
-return INPUT;
+#line 290 "glsl_lexer.lpp"
+RESERVED_WORD(999, INPUT);
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 281 "glsl_lexer.lpp"
-return OUTPUT;
+#line 291 "glsl_lexer.lpp"
+RESERVED_WORD(999, OUTPUT);
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 282 "glsl_lexer.lpp"
-return HVEC2;
+#line 292 "glsl_lexer.lpp"
+RESERVED_WORD(999, HVEC2);
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 283 "glsl_lexer.lpp"
-return HVEC3;
+#line 293 "glsl_lexer.lpp"
+RESERVED_WORD(999, HVEC3);
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 284 "glsl_lexer.lpp"
-return HVEC4;
+#line 294 "glsl_lexer.lpp"
+RESERVED_WORD(999, HVEC4);
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 285 "glsl_lexer.lpp"
-return DVEC2;
+#line 295 "glsl_lexer.lpp"
+RESERVED_WORD(999, DVEC2);
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 286 "glsl_lexer.lpp"
-return DVEC3;
+#line 296 "glsl_lexer.lpp"
+RESERVED_WORD(999, DVEC3);
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 287 "glsl_lexer.lpp"
-return DVEC4;
+#line 297 "glsl_lexer.lpp"
+RESERVED_WORD(999, DVEC4);
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 288 "glsl_lexer.lpp"
-return FVEC2;
+#line 298 "glsl_lexer.lpp"
+RESERVED_WORD(999, FVEC2);
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 289 "glsl_lexer.lpp"
-return FVEC3;
+#line 299 "glsl_lexer.lpp"
+RESERVED_WORD(999, FVEC3);
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 290 "glsl_lexer.lpp"
-return FVEC4;
+#line 300 "glsl_lexer.lpp"
+RESERVED_WORD(999, FVEC4);
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 291 "glsl_lexer.lpp"
+#line 301 "glsl_lexer.lpp"
 return SAMPLER2DRECT;
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 292 "glsl_lexer.lpp"
-return SAMPLER3DRECT;
+#line 302 "glsl_lexer.lpp"
+RESERVED_WORD(999, SAMPLER3DRECT);
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 293 "glsl_lexer.lpp"
+#line 303 "glsl_lexer.lpp"
 return SAMPLER2DRECTSHADOW;
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 294 "glsl_lexer.lpp"
-return SIZEOF;
+#line 304 "glsl_lexer.lpp"
+RESERVED_WORD(999, SIZEOF);
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 295 "glsl_lexer.lpp"
-return CAST;
+#line 305 "glsl_lexer.lpp"
+RESERVED_WORD(999, CAST);
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 296 "glsl_lexer.lpp"
-return NAMESPACE;
+#line 306 "glsl_lexer.lpp"
+RESERVED_WORD(999, NAMESPACE);
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 297 "glsl_lexer.lpp"
-return USING;
+#line 307 "glsl_lexer.lpp"
+RESERVED_WORD(999, USING);
 	YY_BREAK
 /* Additional reserved words in GLSL 1.20. */
 case 141:
 YY_RULE_SETUP
-#line 300 "glsl_lexer.lpp"
+#line 310 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(120, LOWP);
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 301 "glsl_lexer.lpp"
+#line 311 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(120, MEDIUMP);
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 302 "glsl_lexer.lpp"
+#line 312 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(120, HIGHP);
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 303 "glsl_lexer.lpp"
+#line 313 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(120, PRECISION);
 	YY_BREAK
 /* Additional reserved words in GLSL 1.30. */
 case 145:
 YY_RULE_SETUP
-#line 306 "glsl_lexer.lpp"
+#line 316 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, COMMON);
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 307 "glsl_lexer.lpp"
+#line 317 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, PARTITION);
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 308 "glsl_lexer.lpp"
+#line 318 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, ACTIVE);
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 309 "glsl_lexer.lpp"
+#line 319 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, SUPERP);
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 310 "glsl_lexer.lpp"
+#line 320 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, SAMPLERBUFFER);
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 311 "glsl_lexer.lpp"
+#line 321 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, FILTER);
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 312 "glsl_lexer.lpp"
+#line 322 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, IMAGE1D);
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 313 "glsl_lexer.lpp"
+#line 323 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, IMAGE2D);
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 314 "glsl_lexer.lpp"
+#line 324 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, IMAGE3D);
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 315 "glsl_lexer.lpp"
+#line 325 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, IMAGECUBE);
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 316 "glsl_lexer.lpp"
+#line 326 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, IIMAGE1D);
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
-#line 317 "glsl_lexer.lpp"
+#line 327 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, IIMAGE2D);
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 318 "glsl_lexer.lpp"
+#line 328 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, IIMAGE3D);
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
-#line 319 "glsl_lexer.lpp"
+#line 329 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, IIMAGECUBE);
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
-#line 320 "glsl_lexer.lpp"
+#line 330 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, UIMAGE1D);
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
-#line 321 "glsl_lexer.lpp"
+#line 331 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, UIMAGE2D);
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
-#line 322 "glsl_lexer.lpp"
+#line 332 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, UIMAGE3D);
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
-#line 323 "glsl_lexer.lpp"
+#line 333 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, UIMAGECUBE);
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
-#line 324 "glsl_lexer.lpp"
+#line 334 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, IMAGE1DARRAY);
 	YY_BREAK
 case 164:
 YY_RULE_SETUP
-#line 325 "glsl_lexer.lpp"
+#line 335 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, IMAGE2DARRAY);
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
-#line 326 "glsl_lexer.lpp"
+#line 336 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, IIMAGE1DARRAY);
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
-#line 327 "glsl_lexer.lpp"
+#line 337 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, IIMAGE2DARRAY);
 	YY_BREAK
 case 167:
 YY_RULE_SETUP
-#line 328 "glsl_lexer.lpp"
+#line 338 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, UIMAGE1DARRAY);
 	YY_BREAK
 case 168:
 YY_RULE_SETUP
-#line 329 "glsl_lexer.lpp"
+#line 339 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, UIMAGE2DARRAY);
 	YY_BREAK
 case 169:
 YY_RULE_SETUP
-#line 330 "glsl_lexer.lpp"
+#line 340 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, IMAGE1DSHADOW);
 	YY_BREAK
 case 170:
 YY_RULE_SETUP
-#line 331 "glsl_lexer.lpp"
+#line 341 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, IMAGE2DSHADOW);
 	YY_BREAK
 case 171:
 YY_RULE_SETUP
-#line 332 "glsl_lexer.lpp"
+#line 342 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, IMAGEBUFFER);
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
-#line 333 "glsl_lexer.lpp"
+#line 343 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, IIMAGEBUFFER);
 	YY_BREAK
 case 173:
 YY_RULE_SETUP
-#line 334 "glsl_lexer.lpp"
+#line 344 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, UIMAGEBUFFER);
 	YY_BREAK
 case 174:
 YY_RULE_SETUP
-#line 335 "glsl_lexer.lpp"
+#line 345 "glsl_lexer.lpp"
 TOKEN_OR_IDENTIFIER(130, ROW_MAJOR);
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
-#line 337 "glsl_lexer.lpp"
+#line 347 "glsl_lexer.lpp"
 {
 			    struct _mesa_glsl_parse_state *state = yyextra;
 			    void *ctx = state;	
@@ -2231,15 +2255,15 @@ YY_RULE_SETUP
 	YY_BREAK
 case 176:
 YY_RULE_SETUP
-#line 344 "glsl_lexer.lpp"
+#line 354 "glsl_lexer.lpp"
 { return yytext[0]; }
 	YY_BREAK
 case 177:
 YY_RULE_SETUP
-#line 346 "glsl_lexer.lpp"
+#line 356 "glsl_lexer.lpp"
 ECHO;
 	YY_BREAK
-#line 2243 "glsl_lexer.cpp"
+#line 2267 "glsl_lexer.cpp"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(PP):
 	yyterminate();
@@ -2974,8 +2998,8 @@ YY_BUFFER_STATE _mesa_glsl__scan_string (yyconst char * yystr , yyscan_t yyscann
 
 /** Setup the input buffer state to scan the given bytes. The next call to _mesa_glsl_lex() will
  * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
  * @param yyscanner The scanner object.
  * @return the newly allocated buffer state object.
  */
@@ -3381,7 +3405,7 @@ void _mesa_glsl_free (void * ptr , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 346 "glsl_lexer.lpp"
+#line 356 "glsl_lexer.lpp"