ARB prog: rename POINT, SIZE to POINT_TOK, SIZE_TOK

Fixes symbol collisions with typedefs in Microsoft headers.
Perhaps we should prefix/suffix all the lexer tokens to avoid this.

diff --git a/src/mesa/shader/lex.yy.c b/src/mesa/shader/lex.yy.c
index 6d661bd18744ec08b9085c6afcdd7c95435f0d77..2ff2a4f5a3ed9bd4827b60f2407dae8fb867b0a5 100644 (file)
--- a/src/mesa/shader/lex.yy.c
+++ b/src/mesa/shader/lex.yy.c
@@ -53,6 +53,7 @@ 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
@@ -83,8 +84,6 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
-#endif /* ! C99 */
-
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -158,15 +157,7 @@ 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.
@@ -1011,7 +1002,7 @@ swiz_from_char(char c)
    } while(0);
 
 #define YY_EXTRA_TYPE struct asm_parser_state *
-#line 1015 "lex.yy.c"
+#line 1006 "lex.yy.c"
 
 #define INITIAL 0
 
@@ -1148,12 +1139,7 @@ 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. */
@@ -1161,7 +1147,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 do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#define ECHO fwrite( yytext, yyleng, 1, yyout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1172,7 +1158,7 @@ static int input (yyscan_t yyscanner );
        if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
                { \
                int c = '*'; \
-               size_t n; \
+               unsigned n; \
                for ( n = 0; n < max_size && \
                             (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
                        buf[n] = (char) c; \
@@ -1260,7 +1246,7 @@ YY_DECL
 #line 135 "program_lexer.l"
 
 
-#line 1264 "lex.yy.c"
+#line 1250 "lex.yy.c"
 
     yylval = yylval_param;
 
@@ -1928,7 +1914,7 @@ YY_RULE_SETUP
 case 116:
 YY_RULE_SETUP
 #line 270 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, POINT); }
+{ return_token_or_DOT(require_ARB_vp, POINT_TOK); }
        YY_BREAK
 case 117:
 YY_RULE_SETUP
@@ -1978,7 +1964,7 @@ YY_RULE_SETUP
 case 126:
 YY_RULE_SETUP
 #line 280 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, SIZE); }
+{ return_token_or_DOT(require_ARB_vp, SIZE_TOK); }
        YY_BREAK
 case 127:
 YY_RULE_SETUP
@@ -2392,7 +2378,7 @@ YY_RULE_SETUP
 #line 474 "program_lexer.l"
 ECHO;
        YY_BREAK
-#line 2396 "lex.yy.c"
+#line 2382 "lex.yy.c"
 case YY_STATE_EOF(INITIAL):
        yyterminate();
 
@@ -3160,8 +3146,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)
 
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * scan from a @e copy of @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 bytes the byte buffer to scan
+ * @param 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.
  */

diff --git a/src/mesa/shader/program_lexer.l b/src/mesa/shader/program_lexer.l
index c50c7c57399c18c36511e5c89afdad5562c33ed0..bc209435ef14705f305edabbf7372b0d4ec3b4f9 100644 (file)
--- a/src/mesa/shader/program_lexer.l
+++ b/src/mesa/shader/program_lexer.l
@@ -267,7 +267,7 @@ result                    { return RESULT; }
 {dot}palette              { return PALETTE; }
 {dot}params               { return PARAMS; }
 {dot}plane                { return PLANE; }
-{dot}point                { return_token_or_DOT(require_ARB_vp, POINT); }
+{dot}point                { return_token_or_DOT(require_ARB_vp, POINT_TOK); }
 {dot}pointsize            { return_token_or_DOT(require_ARB_vp, POINTSIZE); }
 {dot}position             { return POSITION; }
 {dot}primary              { return PRIMARY; }
@@ -277,7 +277,7 @@ result                    { return RESULT; }
 {dot}scenecolor           { return SCENECOLOR; }
 {dot}secondary            { return SECONDARY; }
 {dot}shininess            { return SHININESS; }
-{dot}size                 { return_token_or_DOT(require_ARB_vp, SIZE); }
+{dot}size                 { return_token_or_DOT(require_ARB_vp, SIZE_TOK); }
 {dot}specular             { return SPECULAR; }
 {dot}spot                 { return SPOT; }
 {dot}texcoord             { return TEXCOORD; }

diff --git a/src/mesa/shader/program_parse.tab.c b/src/mesa/shader/program_parse.tab.c
index 979e574921f97fb0b9be52b5376635aca60c176c..4d99e45fbed2692ab4b2f1ebcd25d632e9779b1f 100644 (file)
--- a/src/mesa/shader/program_parse.tab.c
+++ b/src/mesa/shader/program_parse.tab.c
@@ -251,7 +251,7 @@ static struct asm_instruction *asm_instruction_ctor(gl_inst_opcode op,
      PALETTE = 309,
      PARAMS = 310,
      PLANE = 311,
-     POINT = 312,
+     POINT_TOK = 312,
      POINTSIZE = 313,
      POSITION = 314,
      PRIMARY = 315,
@@ -263,7 +263,7 @@ static struct asm_instruction *asm_instruction_ctor(gl_inst_opcode op,
      SCENECOLOR = 321,
      SECONDARY = 322,
      SHININESS = 323,
-     SIZE = 324,
+     SIZE_TOK = 324,
      SPECULAR = 325,
      SPOT = 326,
      STATE = 327,
@@ -806,9 +806,9 @@ static const char *const yytname[] =
   "EYE", "FOG", "FOGCOORD", "FRAGMENT", "FRONT", "HALF", "INVERSE",
   "INVTRANS", "LIGHT", "LIGHTMODEL", "LIGHTPROD", "LOCAL", "MATERIAL",
   "MAT_PROGRAM", "MATRIX", "MATRIXINDEX", "MODELVIEW", "MVP", "NORMAL",
-  "OBJECT", "PALETTE", "PARAMS", "PLANE", "POINT", "POINTSIZE", "POSITION",
-  "PRIMARY", "PROGRAM", "PROJECTION", "RANGE", "RESULT", "ROW",
-  "SCENECOLOR", "SECONDARY", "SHININESS", "SIZE", "SPECULAR", "SPOT",
+  "OBJECT", "PALETTE", "PARAMS", "PLANE", "POINT_TOK", "POINTSIZE",
+  "POSITION", "PRIMARY", "PROGRAM", "PROJECTION", "RANGE", "RESULT", "ROW",
+  "SCENECOLOR", "SECONDARY", "SHININESS", "SIZE_TOK", "SPECULAR", "SPOT",
   "STATE", "TEXCOORD", "TEXENV", "TEXGEN", "TEXGEN_Q", "TEXGEN_R",
   "TEXGEN_S", "TEXGEN_T", "TEXTURE", "TRANSPOSE", "TEXTURE_UNIT", "TEX_1D",
   "TEX_2D", "TEX_3D", "TEX_CUBE", "TEX_RECT", "TEX_SHADOW1D",

diff --git a/src/mesa/shader/program_parse.tab.h b/src/mesa/shader/program_parse.tab.h
index de08fb747f23f680db6b2b47cb2debb46868c59d..b0f757ffa002ba06f4261edf6114d73d9cbed089 100644 (file)
--- a/src/mesa/shader/program_parse.tab.h
+++ b/src/mesa/shader/program_parse.tab.h
@@ -93,7 +93,7 @@
      PALETTE = 309,
      PARAMS = 310,
      PLANE = 311,
-     POINT = 312,
+     POINT_TOK = 312,
      POINTSIZE = 313,
      POSITION = 314,
      PRIMARY = 315,
@@ -105,7 +105,7 @@
      SCENECOLOR = 321,
      SECONDARY = 322,
      SHININESS = 323,
-     SIZE = 324,
+     SIZE_TOK = 324,
      SPECULAR = 325,
      SPOT = 326,
      STATE = 327,

diff --git a/src/mesa/shader/program_parse.y b/src/mesa/shader/program_parse.y
index 46f300408bee47aaa999da5541ea6af6202a15fc..2f5d3037f4250447874dc8ac903821e2ef31d47a 100644 (file)
--- a/src/mesa/shader/program_parse.y
+++ b/src/mesa/shader/program_parse.y
@@ -159,9 +159,9 @@ static struct asm_instruction *asm_instruction_ctor(gl_inst_opcode op,
 %token MATERIAL MAT_PROGRAM MATRIX MATRIXINDEX MODELVIEW MVP
 %token NORMAL
 %token OBJECT
-%token PALETTE PARAMS PLANE POINT POINTSIZE POSITION PRIMARY PROGRAM PROJECTION
+%token PALETTE PARAMS PLANE POINT_TOK POINTSIZE POSITION PRIMARY PROGRAM PROJECTION
 %token RANGE RESULT ROW
-%token SCENECOLOR SECONDARY SHININESS SIZE SPECULAR SPOT STATE
+%token SCENECOLOR SECONDARY SHININESS SIZE_TOK SPECULAR SPOT STATE
 %token TEXCOORD TEXENV TEXGEN TEXGEN_Q TEXGEN_R TEXGEN_S TEXGEN_T TEXTURE TRANSPOSE
 %token TEXTURE_UNIT TEX_1D TEX_2D TEX_3D TEX_CUBE TEX_RECT
 %token TEX_SHADOW1D TEX_SHADOW2D TEX_SHADOWRECT
@@ -1353,14 +1353,14 @@ stateClipPlaneNum: INTEGER
        }
        ;
 
-statePointItem: POINT statePointProperty
+statePointItem: POINT_TOK statePointProperty
        {
           memset($$, 0, sizeof($$));
           $$[0] = $2;
        }
        ;
 
-statePointProperty: SIZE
+statePointProperty: SIZE_TOK
        {
           $$ = STATE_POINT_SIZE;
        }