Skip to content

A
angle
Commit e49f1e95 by Luc Ferron Committed by Commit Bot
Options

Revert 3 files from previous merge

I accidentally got the 3 files I was asked to revert part of the merge. This reverts them. Bug: angleproject:1695 Change-Id: I93a85776e890d0d35a5ff24973860006836c736f Reviewed-on: https://chromium-review.googlesource.com/884105Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Luc Ferron <lucferron@google.com>
parent 1b1a8640
Showing with 239 additions and 142 deletions
src/compiler/preprocessor/Tokenizer.cpp
...@@ -49,210 +49,253 @@ ...@@ -49,210 +49,253 @@
#define yy_create_buffer pp_create_buffer #define yy_create_buffer pp_create_buffer
#endif #endif
#ifdef yy_delete_buffer #ifdef yy_delete_buffer
#define pp_delete_buffer_ALREADY_DEFINED #define pp_delete_buffer_ALREADY_DEFINED
#else #else
#define yy_delete_buffer pp_delete_buffer #define yy_delete_buffer pp_delete_buffer
#endif #endif
#ifdef yy_scan_buffer #ifdef yy_scan_buffer
#define pp_scan_buffer_ALREADY_DEFINED #define pp_scan_buffer_ALREADY_DEFINED
#else #else
#define yy_scan_buffer pp_scan_buffer #define yy_scan_buffer pp_scan_buffer
#endif #endif
#ifdef yy_scan_string #ifdef yy_scan_string
#define pp_scan_string_ALREADY_DEFINED #define pp_scan_string_ALREADY_DEFINED
#else #else
#define yy_scan_string pp_scan_string #define yy_scan_string pp_scan_string
#endif #endif
#ifdef yy_scan_bytes #ifdef yy_scan_bytes
#define pp_scan_bytes_ALREADY_DEFINED #define pp_scan_bytes_ALREADY_DEFINED
#else #else
#define yy_scan_bytes pp_scan_bytes #define yy_scan_bytes pp_scan_bytes
#endif #endif
#ifdef yy_init_buffer #ifdef yy_init_buffer
#define pp_init_buffer_ALREADY_DEFINED #define pp_init_buffer_ALREADY_DEFINED
#else #else
#define yy_init_buffer pp_init_buffer #define yy_init_buffer pp_init_buffer
#endif #endif
#ifdef yy_flush_buffer #ifdef yy_flush_buffer
#define pp_flush_buffer_ALREADY_DEFINED #define pp_flush_buffer_ALREADY_DEFINED
#else #else
#define yy_flush_buffer pp_flush_buffer #define yy_flush_buffer pp_flush_buffer
#endif #endif
#ifdef yy_load_buffer_state #ifdef yy_load_buffer_state
#define pp_load_buffer_state_ALREADY_DEFINED #define pp_load_buffer_state_ALREADY_DEFINED
#else #else
#define yy_load_buffer_state pp_load_buffer_state #define yy_load_buffer_state pp_load_buffer_state
#endif #endif
#ifdef yy_switch_to_buffer #ifdef yy_switch_to_buffer
#define pp_switch_to_buffer_ALREADY_DEFINED #define pp_switch_to_buffer_ALREADY_DEFINED
#else #else
#define yy_switch_to_buffer pp_switch_to_buffer #define yy_switch_to_buffer pp_switch_to_buffer
#endif #endif
#ifdef yypush_buffer_state #ifdef yypush_buffer_state
#define pppush_buffer_state_ALREADY_DEFINED #define pppush_buffer_state_ALREADY_DEFINED
#else #else
#define yypush_buffer_state pppush_buffer_state #define yypush_buffer_state pppush_buffer_state
#endif #endif
#ifdef yypop_buffer_state #ifdef yypop_buffer_state
#define pppop_buffer_state_ALREADY_DEFINED #define pppop_buffer_state_ALREADY_DEFINED
#else #else
#define yypop_buffer_state pppop_buffer_state #define yypop_buffer_state pppop_buffer_state
#endif #endif
#ifdef yyensure_buffer_stack #ifdef yyensure_buffer_stack
#define ppensure_buffer_stack_ALREADY_DEFINED #define ppensure_buffer_stack_ALREADY_DEFINED
#else #else
#define yyensure_buffer_stack ppensure_buffer_stack #define yyensure_buffer_stack ppensure_buffer_stack
#endif #endif
#ifdef yylex #ifdef yylex
#define pplex_ALREADY_DEFINED #define pplex_ALREADY_DEFINED
#else #else
#define yylex pplex #define yylex pplex
#endif #endif
#ifdef yyrestart #ifdef yyrestart
#define pprestart_ALREADY_DEFINED #define pprestart_ALREADY_DEFINED
#else #else
#define yyrestart pprestart #define yyrestart pprestart
#endif #endif
#ifdef yylex_init #ifdef yylex_init
#define pplex_init_ALREADY_DEFINED #define pplex_init_ALREADY_DEFINED
#else #else
#define yylex_init pplex_init #define yylex_init pplex_init
#endif #endif
#ifdef yylex_init_extra #ifdef yylex_init_extra
#define pplex_init_extra_ALREADY_DEFINED #define pplex_init_extra_ALREADY_DEFINED
#else #else
#define yylex_init_extra pplex_init_extra #define yylex_init_extra pplex_init_extra
#endif #endif
#ifdef yylex_destroy #ifdef yylex_destroy
#define pplex_destroy_ALREADY_DEFINED #define pplex_destroy_ALREADY_DEFINED
#else #else
#define yylex_destroy pplex_destroy #define yylex_destroy pplex_destroy
#endif #endif
#ifdef yyget_debug #ifdef yyget_debug
#define ppget_debug_ALREADY_DEFINED #define ppget_debug_ALREADY_DEFINED
#else #else
#define yyget_debug ppget_debug #define yyget_debug ppget_debug
#endif #endif
#ifdef yyset_debug #ifdef yyset_debug
#define ppset_debug_ALREADY_DEFINED #define ppset_debug_ALREADY_DEFINED
#else #else
#define yyset_debug ppset_debug #define yyset_debug ppset_debug
#endif #endif
#ifdef yyget_extra #ifdef yyget_extra
#define ppget_extra_ALREADY_DEFINED #define ppget_extra_ALREADY_DEFINED
#else #else
#define yyget_extra ppget_extra #define yyget_extra ppget_extra
#endif #endif
#ifdef yyset_extra #ifdef yyset_extra
#define ppset_extra_ALREADY_DEFINED #define ppset_extra_ALREADY_DEFINED
#else #else
#define yyset_extra ppset_extra #define yyset_extra ppset_extra
#endif #endif
#ifdef yyget_in #ifdef yyget_in
#define ppget_in_ALREADY_DEFINED #define ppget_in_ALREADY_DEFINED
#else #else
#define yyget_in ppget_in #define yyget_in ppget_in
#endif #endif
#ifdef yyset_in #ifdef yyset_in
#define ppset_in_ALREADY_DEFINED #define ppset_in_ALREADY_DEFINED
#else #else
#define yyset_in ppset_in #define yyset_in ppset_in
#endif #endif
#ifdef yyget_out #ifdef yyget_out
#define ppget_out_ALREADY_DEFINED #define ppget_out_ALREADY_DEFINED
#else #else
#define yyget_out ppget_out #define yyget_out ppget_out
#endif #endif
#ifdef yyset_out #ifdef yyset_out
#define ppset_out_ALREADY_DEFINED #define ppset_out_ALREADY_DEFINED
#else #else
#define yyset_out ppset_out #define yyset_out ppset_out
#endif #endif
#ifdef yyget_leng #ifdef yyget_leng
#define ppget_leng_ALREADY_DEFINED #define ppget_leng_ALREADY_DEFINED
#else #else
#define yyget_leng ppget_leng #define yyget_leng ppget_leng
#endif #endif
#ifdef yyget_text #ifdef yyget_text
#define ppget_text_ALREADY_DEFINED #define ppget_text_ALREADY_DEFINED
#else #else
#define yyget_text ppget_text #define yyget_text ppget_text
#endif #endif
#ifdef yyget_lineno #ifdef yyget_lineno
#define ppget_lineno_ALREADY_DEFINED #define ppget_lineno_ALREADY_DEFINED
#else #else
#define yyget_lineno ppget_lineno #define yyget_lineno ppget_lineno
#endif #endif
#ifdef yyset_lineno #ifdef yyset_lineno
#define ppset_lineno_ALREADY_DEFINED #define ppset_lineno_ALREADY_DEFINED
#else #else
#define yyset_lineno ppset_lineno #define yyset_lineno ppset_lineno
#endif #endif
#ifdef yyget_column #ifdef yyget_column
#define ppget_column_ALREADY_DEFINED #define ppget_column_ALREADY_DEFINED
#else #else
#define yyget_column ppget_column #define yyget_column ppget_column
#endif #endif
#ifdef yyset_column #ifdef yyset_column
#define ppset_column_ALREADY_DEFINED #define ppset_column_ALREADY_DEFINED
#else #else
#define yyset_column ppset_column #define yyset_column ppset_column
#endif #endif
#ifdef yywrap #ifdef yywrap
#define ppwrap_ALREADY_DEFINED #define ppwrap_ALREADY_DEFINED
#else #else
#define yywrap ppwrap #define yywrap ppwrap
#endif #endif
#ifdef yyget_lval #ifdef yyget_lval
#define ppget_lval_ALREADY_DEFINED #define ppget_lval_ALREADY_DEFINED
#else #else
#define yyget_lval ppget_lval #define yyget_lval ppget_lval
#endif #endif
#ifdef yyset_lval #ifdef yyset_lval
#define ppset_lval_ALREADY_DEFINED #define ppset_lval_ALREADY_DEFINED
#else #else
#define yyset_lval ppset_lval #define yyset_lval ppset_lval
#endif #endif
#ifdef yyget_lloc #ifdef yyget_lloc
#define ppget_lloc_ALREADY_DEFINED #define ppget_lloc_ALREADY_DEFINED
#else #else
#define yyget_lloc ppget_lloc #define yyget_lloc ppget_lloc
#endif #endif
#ifdef yyset_lloc #ifdef yyset_lloc
#define ppset_lloc_ALREADY_DEFINED #define ppset_lloc_ALREADY_DEFINED
#else #else
...@@ -268,12 +311,14 @@ ...@@ -268,12 +311,14 @@
#define yyalloc ppalloc #define yyalloc ppalloc
#endif #endif
#ifdef yyrealloc #ifdef yyrealloc
#define pprealloc_ALREADY_DEFINED #define pprealloc_ALREADY_DEFINED
#else #else
#define yyrealloc pprealloc #define yyrealloc pprealloc
#endif #endif
#ifdef yyfree #ifdef yyfree
#define ppfree_ALREADY_DEFINED #define ppfree_ALREADY_DEFINED
#else #else
...@@ -308,7 +353,7 @@ ...@@ -308,7 +353,7 @@
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
* if you want the limit (max/min) macros for int types. * if you want the limit (max/min) macros for int types.
*/ */
#ifndef __STDC_LIMIT_MACROS #ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS 1 #define __STDC_LIMIT_MACROS 1
...@@ -325,7 +370,7 @@ typedef uint32_t flex_uint32_t; ...@@ -325,7 +370,7 @@ typedef uint32_t flex_uint32_t;
typedef signed char flex_int8_t; typedef signed char flex_int8_t;
typedef short int flex_int16_t; typedef short int flex_int16_t;
typedef int flex_int32_t; typedef int flex_int32_t;
typedef unsigned char flex_uint8_t; typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t; typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t; typedef unsigned int flex_uint32_t;
...@@ -490,10 +535,10 @@ typedef size_t yy_size_t; ...@@ -490,10 +535,10 @@ typedef size_t yy_size_t;
#define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_CONTINUE_SCAN 0
#define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_END_OF_FILE 1
#define EOB_ACT_LAST_MATCH 2 #define EOB_ACT_LAST_MATCH 2
#define YY_LESS_LINENO(n) #define YY_LESS_LINENO(n)
#define YY_LINENO_REWIND_TO(ptr) #define YY_LINENO_REWIND_TO(ptr)
/* Return all but the first "n" matched characters back to the input stream. */ /* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \ #define yyless(n) \
do \ do \
...@@ -975,11 +1020,19 @@ struct yyguts_t ...@@ -975,11 +1020,19 @@ struct yyguts_t
static int yy_init_globals ( yyscan_t yyscanner ); static int yy_init_globals ( yyscan_t yyscanner );
/* This must go here because YYSTYPE and YYLTYPE are included /* This must go here because YYSTYPE and YYLTYPE are included
* from bison output in section 1.*/ * from bison output in section 1.*/
# define yylval yyg->yylval_r # define yylval yyg->yylval_r
# define yylloc yyg->yylloc_r # define yylloc yyg->yylloc_r
int yylex_init (yyscan_t* scanner); int yylex_init (yyscan_t* scanner);
...@@ -1060,9 +1113,15 @@ YYSTYPE * yyget_lval ( yyscan_t yyscanner ); ...@@ -1060,9 +1113,15 @@ YYSTYPE * yyget_lval ( yyscan_t yyscanner );
void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner );
YYLTYPE *yyget_lloc ( yyscan_t yyscanner ); YYLTYPE *yyget_lloc ( yyscan_t yyscanner );
void yyset_lloc ( YYLTYPE * yylloc_param , yyscan_t yyscanner ); void yyset_lloc ( YYLTYPE * yylloc_param , yyscan_t yyscanner );
/* Macros after this point can all be overridden by user definitions in /* Macros after this point can all be overridden by user definitions in
* section 1. * section 1.
...@@ -1077,7 +1136,7 @@ extern int yywrap ( yyscan_t yyscanner ); ...@@ -1077,7 +1136,7 @@ extern int yywrap ( yyscan_t yyscanner );
#endif #endif
#ifndef YY_NO_UNPUT #ifndef YY_NO_UNPUT
#endif #endif
...@@ -1196,6 +1255,22 @@ static int input ( yyscan_t yyscanner ); ...@@ -1196,6 +1255,22 @@ static int input ( yyscan_t yyscanner );
#ifndef YY_DECL #ifndef YY_DECL
#define YY_DECL_IS_OURS 1 #define YY_DECL_IS_OURS 1
extern int yylex \ extern int yylex \
(YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner); (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner);
...@@ -2125,8 +2200,8 @@ static void yy_load_buffer_state (yyscan_t yyscanner) ...@@ -2125,8 +2200,8 @@ static void yy_load_buffer_state (yyscan_t yyscanner)
YY_BUFFER_STATE yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) YY_BUFFER_STATE yy_create_buffer (FILE * file, int size , yyscan_t yyscanner)
{ {
YY_BUFFER_STATE b; YY_BUFFER_STATE b;
b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner );
if ( ! b ) if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
...@@ -2192,9 +2267,12 @@ static void yy_load_buffer_state (yyscan_t yyscanner) ...@@ -2192,9 +2267,12 @@ static void yy_load_buffer_state (yyscan_t yyscanner)
b->yy_bs_column = 0; b->yy_bs_column = 0;
} }
b->yy_is_interactive = 0; b->yy_is_interactive = 0;
errno = oerrno; errno = oerrno;
} }
/** Discard all buffered characters. On the next scan, YY_INPUT will be called. /** Discard all buffered characters. On the next scan, YY_INPUT will be called.
...@@ -2234,18 +2312,18 @@ static void yy_load_buffer_state (yyscan_t yyscanner) ...@@ -2234,18 +2312,18 @@ static void yy_load_buffer_state (yyscan_t yyscanner)
void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
if (new_buffer == nullptr) if (new_buffer == NULL)
return; return;
yyensure_buffer_stack(yyscanner); yyensure_buffer_stack(yyscanner);
/* This block is copied from yy_switch_to_buffer. */ /* This block is copied from yy_switch_to_buffer. */
if (YY_CURRENT_BUFFER) if ( YY_CURRENT_BUFFER )
{ {
/* Flush out information for old buffer. */ /* Flush out information for old buffer. */
*yyg->yy_c_buf_p = yyg->yy_hold_char; *yyg->yy_c_buf_p = yyg->yy_hold_char;
YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
} }
/* Only push if top exists. Otherwise, replace top. */ /* Only push if top exists. Otherwise, replace top. */
...@@ -2270,8 +2348,8 @@ void yypop_buffer_state (yyscan_t yyscanner) ...@@ -2270,8 +2348,8 @@ void yypop_buffer_state (yyscan_t yyscanner)
return; return;
yy_delete_buffer(YY_CURRENT_BUFFER , yyscanner); yy_delete_buffer(YY_CURRENT_BUFFER , yyscanner);
YY_CURRENT_BUFFER_LVALUE = nullptr; YY_CURRENT_BUFFER_LVALUE = NULL;
if (yyg->yy_buffer_stack_top > 0) if (yyg->yy_buffer_stack_top > 0)
--yyg->yy_buffer_stack_top; --yyg->yy_buffer_stack_top;
if (YY_CURRENT_BUFFER) { if (YY_CURRENT_BUFFER) {
...@@ -2342,22 +2420,22 @@ static void yyensure_buffer_stack (yyscan_t yyscanner) ...@@ -2342,22 +2420,22 @@ static void yyensure_buffer_stack (yyscan_t yyscanner)
YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner)
{ {
YY_BUFFER_STATE b; YY_BUFFER_STATE b;
if ( size < 2 || if ( size < 2 ||
base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-2] != YY_END_OF_BUFFER_CHAR ||
base[size-1] != YY_END_OF_BUFFER_CHAR ) base[size-1] != YY_END_OF_BUFFER_CHAR )
/* They forgot to leave room for the EOB's. */ /* They forgot to leave room for the EOB's. */
return nullptr; return NULL;
b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner );
if ( ! b ) if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */
b->yy_buf_pos = b->yy_ch_buf = base; b->yy_buf_pos = b->yy_ch_buf = base;
b->yy_is_our_buffer = 0; b->yy_is_our_buffer = 0;
b->yy_input_file = nullptr; b->yy_input_file = NULL;
b->yy_n_chars = b->yy_buf_size; b->yy_n_chars = b->yy_buf_size;
b->yy_is_interactive = 0; b->yy_is_interactive = 0;
b->yy_at_bol = 1; b->yy_at_bol = 1;
b->yy_fill_buffer = 0; b->yy_fill_buffer = 0;
...@@ -2381,8 +2459,8 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscann ...@@ -2381,8 +2459,8 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscann
*/ */
YY_BUFFER_STATE yy_scan_string (const char * yystr , yyscan_t yyscanner) YY_BUFFER_STATE yy_scan_string (const char * yystr , yyscan_t yyscanner)
{ {
return yy_scan_bytes( yystr, (int) strlen(yystr) , yyscanner); return yy_scan_bytes( yystr, (int) strlen(yystr) , yyscanner);
} }
...@@ -2401,8 +2479,8 @@ YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len , yyscan ...@@ -2401,8 +2479,8 @@ YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len , yyscan
char *buf; char *buf;
yy_size_t n; yy_size_t n;
int i; int i;
/* Get memory for full buffer, including space for trailing EOB's. */ /* Get memory for full buffer, including space for trailing EOB's. */
n = (yy_size_t) (_yybytes_len + 2); n = (yy_size_t) (_yybytes_len + 2);
buf = (char *) yyalloc( n , yyscanner ); buf = (char *) yyalloc( n , yyscanner );
if ( ! buf ) if ( ! buf )
...@@ -2487,9 +2565,10 @@ int yyget_lineno (yyscan_t yyscanner) ...@@ -2487,9 +2565,10 @@ int yyget_lineno (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
if (! YY_CURRENT_BUFFER) if (! YY_CURRENT_BUFFER)
return 0; return 0;
return yylineno; return yylineno;
} }
...@@ -2503,9 +2582,10 @@ int yyget_column (yyscan_t yyscanner) ...@@ -2503,9 +2582,10 @@ int yyget_column (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
if (! YY_CURRENT_BUFFER) if (! YY_CURRENT_BUFFER)
return 0; return 0;
return yycolumn; return yycolumn;
} }
...@@ -2576,10 +2656,11 @@ void yyset_lineno (int _line_number , yyscan_t yyscanner) ...@@ -2576,10 +2656,11 @@ void yyset_lineno (int _line_number , yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
/* lineno is only valid if an input buffer exists. */ /* lineno is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER ) if (! YY_CURRENT_BUFFER )
YY_FATAL_ERROR( "yyset_lineno called with no buffer" ); YY_FATAL_ERROR( "yyset_lineno called with no buffer" );
yylineno = _line_number; yylineno = _line_number;
} }
...@@ -2594,10 +2675,11 @@ void yyset_column (int _column_no , yyscan_t yyscanner) ...@@ -2594,10 +2675,11 @@ void yyset_column (int _column_no , yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
/* column is only valid if an input buffer exists. */ /* column is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER ) if (! YY_CURRENT_BUFFER )
YY_FATAL_ERROR( "yyset_column called with no buffer" ); YY_FATAL_ERROR( "yyset_column called with no buffer" );
yycolumn = _column_no; yycolumn = _column_no;
} }
...@@ -2660,17 +2742,26 @@ void yyset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner) ...@@ -2660,17 +2742,26 @@ void yyset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner)
yylval = yylval_param; yylval = yylval_param;
} }
YYLTYPE *yyget_lloc (yyscan_t yyscanner) YYLTYPE *yyget_lloc (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
return yylloc; return yylloc;
} }
void yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner) void yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
yylloc = yylloc_param; yylloc = yylloc_param;
} }
/* User-visible API */ /* User-visible API */
...@@ -2680,16 +2771,14 @@ void yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner) ...@@ -2680,16 +2771,14 @@ void yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner)
*/ */
int yylex_init(yyscan_t* ptr_yy_globals) int yylex_init(yyscan_t* ptr_yy_globals)
{ {
if (ptr_yy_globals == nullptr) if (ptr_yy_globals == NULL){
{
errno = EINVAL; errno = EINVAL;
return 1; return 1;
} }
*ptr_yy_globals = (yyscan_t)yyalloc(sizeof(struct yyguts_t), nullptr); *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL );
if (*ptr_yy_globals == nullptr) if (*ptr_yy_globals == NULL){
{
errno = ENOMEM; errno = ENOMEM;
return 1; return 1;
} }
...@@ -2714,16 +2803,14 @@ int yylex_init_extra( YY_EXTRA_TYPE yy_user_defined, yyscan_t* ptr_yy_globals ) ...@@ -2714,16 +2803,14 @@ int yylex_init_extra( YY_EXTRA_TYPE yy_user_defined, yyscan_t* ptr_yy_globals )
yyset_extra (yy_user_defined, &dummy_yyguts); yyset_extra (yy_user_defined, &dummy_yyguts);
if (ptr_yy_globals == nullptr) if (ptr_yy_globals == NULL){
{
errno = EINVAL; errno = EINVAL;
return 1; return 1;
} }
*ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
if (*ptr_yy_globals == nullptr) if (*ptr_yy_globals == NULL){
{
errno = ENOMEM; errno = ENOMEM;
return 1; return 1;
} }
...@@ -2745,25 +2832,31 @@ static int yy_init_globals (yyscan_t yyscanner) ...@@ -2745,25 +2832,31 @@ static int yy_init_globals (yyscan_t yyscanner)
* This function is called from yylex_destroy(), so don't allocate here. * This function is called from yylex_destroy(), so don't allocate here.
*/ */
yyg->yy_buffer_stack = nullptr;
yyg->yy_buffer_stack = NULL;
yyg->yy_buffer_stack_top = 0; yyg->yy_buffer_stack_top = 0;
yyg->yy_buffer_stack_max = 0; yyg->yy_buffer_stack_max = 0;
yyg->yy_c_buf_p = nullptr; yyg->yy_c_buf_p = NULL;
yyg->yy_init = 0; yyg->yy_init = 0;
yyg->yy_start = 0; yyg->yy_start = 0;
yyg->yy_start_stack_ptr = 0; yyg->yy_start_stack_ptr = 0;
yyg->yy_start_stack_depth = 0; yyg->yy_start_stack_depth = 0;
yyg->yy_start_stack = nullptr; yyg->yy_start_stack = NULL;
/* Defined in main.c */ /* Defined in main.c */
#ifdef YY_STDINIT #ifdef YY_STDINIT
yyin = stdin; yyin = stdin;
yyout = stdout; yyout = stdout;
#else #else
yyin = nullptr; yyin = NULL;
yyout = nullptr; yyout = NULL;
#endif #endif
/* For future reference: Set errno on error, since we are called by /* For future reference: Set errno on error, since we are called by
...@@ -2781,26 +2874,30 @@ int yylex_destroy (yyscan_t yyscanner) ...@@ -2781,26 +2874,30 @@ int yylex_destroy (yyscan_t yyscanner)
/* Pop the buffer stack, destroying each element. */ /* Pop the buffer stack, destroying each element. */
while(YY_CURRENT_BUFFER){ while(YY_CURRENT_BUFFER){
yy_delete_buffer( YY_CURRENT_BUFFER , yyscanner ); yy_delete_buffer( YY_CURRENT_BUFFER , yyscanner );
YY_CURRENT_BUFFER_LVALUE = nullptr; YY_CURRENT_BUFFER_LVALUE = NULL;
yypop_buffer_state(yyscanner); yypop_buffer_state(yyscanner);
} }
/* Destroy the stack itself. */ /* Destroy the stack itself. */
yyfree(yyg->yy_buffer_stack , yyscanner); yyfree(yyg->yy_buffer_stack , yyscanner);
yyg->yy_buffer_stack = nullptr; yyg->yy_buffer_stack = NULL;
/* Destroy the start condition stack. */
/* Destroy the start condition stack. */
yyfree( yyg->yy_start_stack , yyscanner ); yyfree( yyg->yy_start_stack , yyscanner );
yyg->yy_start_stack = nullptr; yyg->yy_start_stack = NULL;
/* Reset the globals. This is important in a non-reentrant scanner so the next time
* yylex() is called, initialization will occur. */
yy_init_globals(yyscanner);
/* Destroy the main struct (reentrant only). */
yyfree(yyscanner, yyscanner); /* Reset the globals. This is important in a non-reentrant scanner so the next time
yyscanner = nullptr; * yylex() is called, initialization will occur. */
return 0; yy_init_globals( yyscanner);
/* Destroy the main struct (reentrant only). */
yyfree ( yyscanner , yyscanner );
yyscanner = NULL;
return 0;
} }
......
src/compiler/translator/glslang_lex.cpp
...@@ -63,14 +63,14 @@ ...@@ -63,14 +63,14 @@
#ifdef yyget_lval #ifdef yyget_lval
#define yyget_lval_ALREADY_DEFINED #define yyget_lval_ALREADY_DEFINED
#else #else
#define yyget_lval yyget_lval #define yyget_lval yyget_lval
#endif #endif
#ifdef yyset_lval #ifdef yyset_lval
#define yyset_lval_ALREADY_DEFINED #define yyset_lval_ALREADY_DEFINED
#else #else
...@@ -80,14 +80,14 @@ ...@@ -80,14 +80,14 @@
#ifdef yyget_lloc #ifdef yyget_lloc
#define yyget_lloc_ALREADY_DEFINED #define yyget_lloc_ALREADY_DEFINED
#else #else
#define yyget_lloc yyget_lloc #define yyget_lloc yyget_lloc
#endif #endif
#ifdef yyset_lloc #ifdef yyset_lloc
#define yyset_lloc_ALREADY_DEFINED #define yyset_lloc_ALREADY_DEFINED
#else #else
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
* if you want the limit (max/min) macros for int types. * if you want the limit (max/min) macros for int types.
*/ */
#ifndef __STDC_LIMIT_MACROS #ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS 1 #define __STDC_LIMIT_MACROS 1
...@@ -141,7 +141,7 @@ typedef uint32_t flex_uint32_t; ...@@ -141,7 +141,7 @@ typedef uint32_t flex_uint32_t;
typedef signed char flex_int8_t; typedef signed char flex_int8_t;
typedef short int flex_int16_t; typedef short int flex_int16_t;
typedef int flex_int32_t; typedef int flex_int32_t;
typedef unsigned char flex_uint8_t; typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t; typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t; typedef unsigned int flex_uint32_t;
...@@ -306,7 +306,7 @@ typedef size_t yy_size_t; ...@@ -306,7 +306,7 @@ typedef size_t yy_size_t;
#define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_CONTINUE_SCAN 0
#define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_END_OF_FILE 1
#define EOB_ACT_LAST_MATCH 2 #define EOB_ACT_LAST_MATCH 2
/* Note: We specifically omit the test for yy_rule_can_match_eol because it requires /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
* access to the local variable yy_act. Since yyless() is a macro, it would break * access to the local variable yy_act. Since yyless() is a macro, it would break
* existing scanners that call yyless() from OUTSIDE yylex. * existing scanners that call yyless() from OUTSIDE yylex.
...@@ -328,7 +328,7 @@ typedef size_t yy_size_t; ...@@ -328,7 +328,7 @@ typedef size_t yy_size_t;
if ( *p == '\n' )\ if ( *p == '\n' )\
--yylineno;\ --yylineno;\
}while(0) }while(0)
/* Return all but the first "n" matched characters back to the input stream. */ /* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \ #define yyless(n) \
do \ do \
...@@ -424,7 +424,7 @@ struct yy_buffer_state ...@@ -424,7 +424,7 @@ struct yy_buffer_state
*/ */
#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \ #define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \
? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \ ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \
: nullptr) : NULL)
/* Same as previous macro, but useful when we know that the buffer stack is not /* Same as previous macro, but useful when we know that the buffer stack is not
* NULL or when we need an lvalue. For internal use only. * NULL or when we need an lvalue. For internal use only.
*/ */
...@@ -1144,18 +1144,18 @@ static const flex_int16_t yy_chk[1173] = ...@@ -1144,18 +1144,18 @@ static const flex_int16_t yy_chk[1173] =
/* Table of booleans, true if rule could match eol. */ /* Table of booleans, true if rule could match eol. */
static const flex_int32_t yy_rule_can_match_eol[248] = static const flex_int32_t yy_rule_can_match_eol[248] =
{ 0, { 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 1, 0, 0, }; 0, 0, 0, 0, 0, 1, 0, 0, };
/* The intent behind this definition is that it'll catch /* The intent behind this definition is that it'll catch
...@@ -1296,15 +1296,15 @@ static int yy_init_globals ( yyscan_t yyscanner ); ...@@ -1296,15 +1296,15 @@ static int yy_init_globals ( yyscan_t yyscanner );
/* This must go here because YYSTYPE and YYLTYPE are included /* This must go here because YYSTYPE and YYLTYPE are included
* from bison output in section 1.*/ * from bison output in section 1.*/
# define yylval yyg->yylval_r # define yylval yyg->yylval_r
# define yylloc yyg->yylloc_r # define yylloc yyg->yylloc_r
int yylex_init (yyscan_t* scanner); int yylex_init (yyscan_t* scanner);
...@@ -1387,13 +1387,13 @@ YYSTYPE * yyget_lval ( yyscan_t yyscanner ); ...@@ -1387,13 +1387,13 @@ YYSTYPE * yyget_lval ( yyscan_t yyscanner );
void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner );
YYLTYPE *yyget_lloc ( yyscan_t yyscanner ); YYLTYPE *yyget_lloc ( yyscan_t yyscanner );
void yyset_lloc ( YYLTYPE * yylloc_param , yyscan_t yyscanner ); void yyset_lloc ( YYLTYPE * yylloc_param , yyscan_t yyscanner );
/* Macros after this point can all be overridden by user definitions in /* Macros after this point can all be overridden by user definitions in
...@@ -1409,7 +1409,7 @@ extern int yywrap ( yyscan_t yyscanner ); ...@@ -1409,7 +1409,7 @@ extern int yywrap ( yyscan_t yyscanner );
#endif #endif
#ifndef YY_NO_UNPUT #ifndef YY_NO_UNPUT
#endif #endif
...@@ -1533,15 +1533,15 @@ static int input ( yyscan_t yyscanner ); ...@@ -1533,15 +1533,15 @@ static int input ( yyscan_t yyscanner );
extern int yylex \ extern int yylex \
...@@ -1673,7 +1673,7 @@ yy_find_action: ...@@ -1673,7 +1673,7 @@ yy_find_action:
int yyl; int yyl;
for ( yyl = 0; yyl < yyleng; ++yyl ) for ( yyl = 0; yyl < yyleng; ++yyl )
if ( yytext[yyl] == '\n' ) if ( yytext[yyl] == '\n' )
do{ yylineno++; do{ yylineno++;
yycolumn=0; yycolumn=0;
}while(0) }while(0)
...@@ -2155,10 +2155,10 @@ case 140: ...@@ -2155,10 +2155,10 @@ case 140:
case 141: case 141:
case 142: case 142:
YY_RULE_SETUP YY_RULE_SETUP
{ {
if (context->getShaderVersion() < 300) { if (context->getShaderVersion() < 300) {
yylval->lex.string = NewPoolTString(yytext); yylval->lex.string = NewPoolTString(yytext);
return check_type(yyscanner); return check_type(yyscanner);
} }
return reserved_word(yyscanner); return reserved_word(yyscanner);
} }
...@@ -2223,7 +2223,7 @@ YY_RULE_SETUP ...@@ -2223,7 +2223,7 @@ YY_RULE_SETUP
case 184: case 184:
YY_RULE_SETUP YY_RULE_SETUP
{ {
yylval->lex.string = NewPoolTString(yytext); yylval->lex.string = NewPoolTString(yytext);
return check_type(yyscanner); return check_type(yyscanner);
} }
YY_BREAK YY_BREAK
...@@ -2912,7 +2912,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -2912,7 +2912,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
yyg->yy_hold_char = *++yyg->yy_c_buf_p; yyg->yy_hold_char = *++yyg->yy_c_buf_p;
if ( c == '\n' ) if ( c == '\n' )
do{ yylineno++; do{ yylineno++;
yycolumn=0; yycolumn=0;
}while(0) }while(0)
...@@ -2997,7 +2997,7 @@ static void yy_load_buffer_state (yyscan_t yyscanner) ...@@ -2997,7 +2997,7 @@ static void yy_load_buffer_state (yyscan_t yyscanner)
YY_BUFFER_STATE yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) YY_BUFFER_STATE yy_create_buffer (FILE * file, int size , yyscan_t yyscanner)
{ {
YY_BUFFER_STATE b; YY_BUFFER_STATE b;
b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner );
if ( ! b ) if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
...@@ -3065,9 +3065,9 @@ static void yy_load_buffer_state (yyscan_t yyscanner) ...@@ -3065,9 +3065,9 @@ static void yy_load_buffer_state (yyscan_t yyscanner)
} }
b->yy_is_interactive = 0; b->yy_is_interactive = 0;
errno = oerrno; errno = oerrno;
} }
...@@ -3217,7 +3217,7 @@ static void yyensure_buffer_stack (yyscan_t yyscanner) ...@@ -3217,7 +3217,7 @@ static void yyensure_buffer_stack (yyscan_t yyscanner)
YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner)
{ {
YY_BUFFER_STATE b; YY_BUFFER_STATE b;
if ( size < 2 || if ( size < 2 ||
base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-2] != YY_END_OF_BUFFER_CHAR ||
base[size-1] != YY_END_OF_BUFFER_CHAR ) base[size-1] != YY_END_OF_BUFFER_CHAR )
...@@ -3256,7 +3256,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscann ...@@ -3256,7 +3256,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscann
*/ */
YY_BUFFER_STATE yy_scan_string (const char * yystr , yyscan_t yyscanner) YY_BUFFER_STATE yy_scan_string (const char * yystr , yyscan_t yyscanner)
{ {
return yy_scan_bytes( yystr, (int) strlen(yystr) , yyscanner); return yy_scan_bytes( yystr, (int) strlen(yystr) , yyscanner);
} }
...@@ -3276,7 +3276,7 @@ YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len , yyscan ...@@ -3276,7 +3276,7 @@ YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len , yyscan
char *buf; char *buf;
yy_size_t n; yy_size_t n;
int i; int i;
/* Get memory for full buffer, including space for trailing EOB's. */ /* Get memory for full buffer, including space for trailing EOB's. */
n = (yy_size_t) (_yybytes_len + 2); n = (yy_size_t) (_yybytes_len + 2);
buf = (char *) yyalloc( n , yyscanner ); buf = (char *) yyalloc( n , yyscanner );
...@@ -3362,10 +3362,10 @@ int yyget_lineno (yyscan_t yyscanner) ...@@ -3362,10 +3362,10 @@ int yyget_lineno (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
if (! YY_CURRENT_BUFFER) if (! YY_CURRENT_BUFFER)
return 0; return 0;
return yylineno; return yylineno;
} }
...@@ -3379,10 +3379,10 @@ int yyget_column (yyscan_t yyscanner) ...@@ -3379,10 +3379,10 @@ int yyget_column (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
if (! YY_CURRENT_BUFFER) if (! YY_CURRENT_BUFFER)
return 0; return 0;
return yycolumn; return yycolumn;
} }
...@@ -3453,11 +3453,11 @@ void yyset_lineno (int _line_number , yyscan_t yyscanner) ...@@ -3453,11 +3453,11 @@ void yyset_lineno (int _line_number , yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
/* lineno is only valid if an input buffer exists. */ /* lineno is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER ) if (! YY_CURRENT_BUFFER )
YY_FATAL_ERROR( "yyset_lineno called with no buffer" ); YY_FATAL_ERROR( "yyset_lineno called with no buffer" );
yylineno = _line_number; yylineno = _line_number;
} }
...@@ -3472,11 +3472,11 @@ void yyset_column (int _column_no , yyscan_t yyscanner) ...@@ -3472,11 +3472,11 @@ void yyset_column (int _column_no , yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
/* column is only valid if an input buffer exists. */ /* column is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER ) if (! YY_CURRENT_BUFFER )
YY_FATAL_ERROR( "yyset_column called with no buffer" ); YY_FATAL_ERROR( "yyset_column called with no buffer" );
yycolumn = _column_no; yycolumn = _column_no;
} }
...@@ -3541,21 +3541,21 @@ void yyset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner) ...@@ -3541,21 +3541,21 @@ void yyset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner)
YYLTYPE *yyget_lloc (yyscan_t yyscanner) YYLTYPE *yyget_lloc (yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
return yylloc; return yylloc;
} }
void yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner) void yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner)
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
yylloc = yylloc_param; yylloc = yylloc_param;
} }
...@@ -3568,14 +3568,14 @@ void yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner) ...@@ -3568,14 +3568,14 @@ void yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner)
*/ */
int yylex_init(yyscan_t* ptr_yy_globals) int yylex_init(yyscan_t* ptr_yy_globals)
{ {
if (ptr_yy_globals == nullptr){ if (ptr_yy_globals == NULL){
errno = EINVAL; errno = EINVAL;
return 1; return 1;
} }
*ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), nullptr ); *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL );
if (*ptr_yy_globals == nullptr){ if (*ptr_yy_globals == NULL){
errno = ENOMEM; errno = ENOMEM;
return 1; return 1;
} }
...@@ -3600,14 +3600,14 @@ int yylex_init_extra( YY_EXTRA_TYPE yy_user_defined, yyscan_t* ptr_yy_globals ) ...@@ -3600,14 +3600,14 @@ int yylex_init_extra( YY_EXTRA_TYPE yy_user_defined, yyscan_t* ptr_yy_globals )
yyset_extra (yy_user_defined, &dummy_yyguts); yyset_extra (yy_user_defined, &dummy_yyguts);
if (ptr_yy_globals == nullptr){ if (ptr_yy_globals == NULL){
errno = EINVAL; errno = EINVAL;
return 1; return 1;
} }
*ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
if (*ptr_yy_globals == nullptr){ if (*ptr_yy_globals == NULL){
errno = ENOMEM; errno = ENOMEM;
return 1; return 1;
} }
...@@ -3630,19 +3630,19 @@ static int yy_init_globals (yyscan_t yyscanner) ...@@ -3630,19 +3630,19 @@ static int yy_init_globals (yyscan_t yyscanner)
*/ */
yyg->yy_buffer_stack = NULL;
yyg->yy_buffer_stack = nullptr;
yyg->yy_buffer_stack_top = 0; yyg->yy_buffer_stack_top = 0;
yyg->yy_buffer_stack_max = 0; yyg->yy_buffer_stack_max = 0;
yyg->yy_c_buf_p = nullptr; yyg->yy_c_buf_p = NULL;
yyg->yy_init = 0; yyg->yy_init = 0;
yyg->yy_start = 0; yyg->yy_start = 0;
yyg->yy_start_stack_ptr = 0; yyg->yy_start_stack_ptr = 0;
yyg->yy_start_stack_depth = 0; yyg->yy_start_stack_depth = 0;
yyg->yy_start_stack = nullptr; yyg->yy_start_stack = NULL;
...@@ -3654,8 +3654,8 @@ static int yy_init_globals (yyscan_t yyscanner) ...@@ -3654,8 +3654,8 @@ static int yy_init_globals (yyscan_t yyscanner)
yyin = stdin; yyin = stdin;
yyout = stdout; yyout = stdout;
#else #else
yyin = nullptr; yyin = NULL;
yyout = nullptr; yyout = NULL;
#endif #endif
/* For future reference: Set errno on error, since we are called by /* For future reference: Set errno on error, since we are called by
...@@ -3673,18 +3673,18 @@ int yylex_destroy (yyscan_t yyscanner) ...@@ -3673,18 +3673,18 @@ int yylex_destroy (yyscan_t yyscanner)
/* Pop the buffer stack, destroying each element. */ /* Pop the buffer stack, destroying each element. */
while(YY_CURRENT_BUFFER){ while(YY_CURRENT_BUFFER){
yy_delete_buffer( YY_CURRENT_BUFFER , yyscanner ); yy_delete_buffer( YY_CURRENT_BUFFER , yyscanner );
YY_CURRENT_BUFFER_LVALUE = nullptr; YY_CURRENT_BUFFER_LVALUE = NULL;
yypop_buffer_state(yyscanner); yypop_buffer_state(yyscanner);
} }
/* Destroy the stack itself. */ /* Destroy the stack itself. */
yyfree(yyg->yy_buffer_stack , yyscanner); yyfree(yyg->yy_buffer_stack , yyscanner);
yyg->yy_buffer_stack = nullptr; yyg->yy_buffer_stack = NULL;
/* Destroy the start condition stack. */ /* Destroy the start condition stack. */
yyfree( yyg->yy_start_stack , yyscanner ); yyfree( yyg->yy_start_stack , yyscanner );
yyg->yy_start_stack = nullptr; yyg->yy_start_stack = NULL;
...@@ -3695,7 +3695,7 @@ int yylex_destroy (yyscan_t yyscanner) ...@@ -3695,7 +3695,7 @@ int yylex_destroy (yyscan_t yyscanner)
/* Destroy the main struct (reentrant only). */ /* Destroy the main struct (reentrant only). */
yyfree ( yyscanner , yyscanner ); yyfree ( yyscanner , yyscanner );
yyscanner = nullptr; yyscanner = NULL;
return 0; return 0;
} }
...@@ -4006,7 +4006,7 @@ int yuvcscstandardext_constant(TParseContext *context) ...@@ -4006,7 +4006,7 @@ int yuvcscstandardext_constant(TParseContext *context)
} }
int glslang_initialize(TParseContext* context) { int glslang_initialize(TParseContext* context) {
yyscan_t scanner = nullptr; yyscan_t scanner = NULL;
if (yylex_init_extra(context, &scanner)) if (yylex_init_extra(context, &scanner))
return 1; return 1;
...@@ -4016,9 +4016,9 @@ int glslang_initialize(TParseContext* context) { ...@@ -4016,9 +4016,9 @@ int glslang_initialize(TParseContext* context) {
int glslang_finalize(TParseContext* context) { int glslang_finalize(TParseContext* context) {
yyscan_t scanner = context->getScanner(); yyscan_t scanner = context->getScanner();
if (scanner == nullptr) return 0; if (scanner == NULL) return 0;
context->setScanner(nullptr); context->setScanner(NULL);
yylex_destroy(scanner); yylex_destroy(scanner);
return 0; return 0;
...@@ -4026,7 +4026,7 @@ int glslang_finalize(TParseContext* context) { ...@@ -4026,7 +4026,7 @@ int glslang_finalize(TParseContext* context) {
int glslang_scan(size_t count, const char* const string[], const int length[], int glslang_scan(size_t count, const char* const string[], const int length[],
TParseContext* context) { TParseContext* context) {
yyrestart(nullptr, context->getScanner()); yyrestart(NULL, context->getScanner());
yyset_column(0, context->getScanner()); yyset_column(0, context->getScanner());
yyset_lineno(1, context->getScanner()); yyset_lineno(1, context->getScanner());
......
src/compiler/translator/glslang_tab.cpp
...@@ -3203,7 +3203,7 @@ yyreduce: ...@@ -3203,7 +3203,7 @@ yyreduce:
{ {
ES3_OR_NEWER((yyvsp[-3].lex).string->c_str(), (yylsp[-4]), "interface blocks"); ES3_OR_NEWER((yyvsp[-3].lex).string->c_str(), (yylsp[-4]), "interface blocks");
(yyval.interm.intermNode) = context->addInterfaceBlock(*(yyvsp[-4].interm.typeQualifierBuilder), (yylsp[-3]), *(yyvsp[-3].lex).string, (yyvsp[-2].interm.fieldList), nullptr, (yyloc), nullptr, (yyloc)); (yyval.interm.intermNode) = context->addInterfaceBlock(*(yyvsp[-4].interm.typeQualifierBuilder), (yylsp[-3]), *(yyvsp[-3].lex).string, (yyvsp[-2].interm.fieldList), NULL, (yyloc), NULL, (yyloc));
} }
break; break;
...@@ -3212,7 +3212,7 @@ yyreduce: ...@@ -3212,7 +3212,7 @@ yyreduce:
{ {
ES3_OR_NEWER((yyvsp[-4].lex).string->c_str(), (yylsp[-5]), "interface blocks"); ES3_OR_NEWER((yyvsp[-4].lex).string->c_str(), (yylsp[-5]), "interface blocks");
(yyval.interm.intermNode) = context->addInterfaceBlock(*(yyvsp[-5].interm.typeQualifierBuilder), (yylsp[-4]), *(yyvsp[-4].lex).string, (yyvsp[-3].interm.fieldList), (yyvsp[-1].lex).string, (yylsp[-1]), nullptr, (yyloc)); (yyval.interm.intermNode) = context->addInterfaceBlock(*(yyvsp[-5].interm.typeQualifierBuilder), (yylsp[-4]), *(yyvsp[-4].lex).string, (yyvsp[-3].interm.fieldList), (yyvsp[-1].lex).string, (yylsp[-1]), NULL, (yyloc));
} }
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment