From b76dcd0661a36b5c27f52b598ace341a9d6b1ee9 Mon Sep 17 00:00:00 2001 From: John Millaway Date: Tue, 23 Jul 2002 20:11:21 +0000 Subject: s/yy_globals_t/yyguts_t/g s/yy_globals/yyscanner/g --- tests/test-bison-yylval/scanner.l | 12 ++++++------ tests/test-mem-r/scanner.l | 12 ++++++------ tests/test-multiple-scanners-r/scanner-1.l | 8 ++++---- tests/test-multiple-scanners-r/scanner-2.l | 8 ++++---- tests/test-prefix-r/scanner.l | 18 +++++++++--------- tests/test-pthread/scanner.l | 14 +++++++------- tests/test-yyextra/scanner.l | 2 +- 7 files changed, 37 insertions(+), 37 deletions(-) (limited to 'tests') diff --git a/tests/test-bison-yylval/scanner.l b/tests/test-bison-yylval/scanner.l index 1035c1a..1af8db3 100644 --- a/tests/test-bison-yylval/scanner.l +++ b/tests/test-bison-yylval/scanner.l @@ -49,13 +49,13 @@ enum yesno_t { no=0, yes=1 }; { -"str = STRDUP(yytext); return TEXT;} +"str = STRDUP(yytext); return TEXT;} } { -">" { yy_pop_state( yy_globals ); return GT; } +">" { yy_pop_state( yyscanner ); return GT; } [[:alpha:]][[:alnum:]]* { if( NEED_TAG_NAME == yes){ NEED_TAG_NAME=no; @@ -68,7 +68,7 @@ enum yesno_t { no=0, yes=1 }; } { [^>]{1,512} { } -">" { yy_pop_state(yy_globals);} +">" { yy_pop_state(yyscanner);} } %% diff --git a/tests/test-mem-r/scanner.l b/tests/test-mem-r/scanner.l index 01ac9de..69eae6d 100644 --- a/tests/test-mem-r/scanner.l +++ b/tests/test-mem-r/scanner.l @@ -46,15 +46,15 @@ %% { -"(" { printf("yy_push_state(parens)\n"); yy_push_state(parens,yy_globals); } +"(" { printf("yy_push_state(parens)\n"); yy_push_state(parens,yyscanner); } len=[0-9]+ { printf("About read token where %s\n",yytext); } 0+ { } .|\n { } } { -"(" { printf("yy_push_state(parens)\n"); yy_push_state(parens,yy_globals); } -")" { printf("yy_pop_state()\n");yy_pop_state(yy_globals);} +"(" { printf("yy_push_state(parens)\n"); yy_push_state(parens,yyscanner); } +")" { printf("yy_pop_state()\n");yy_pop_state(yyscanner);} [^()\n]+ { } .|\n { } } @@ -82,7 +82,7 @@ static void dump_mem(FILE* fp){ fprintf(fp,"}\n"); } -void * yyalloc(size_t n , void* yy_globals) +void * yyalloc(size_t n , void* yyscanner) { void * p; struct memsz * old; @@ -112,7 +112,7 @@ void * yyalloc(size_t n , void* yy_globals) return p; } -void * yyrealloc(void* p, size_t n , void* yy_globals) +void * yyrealloc(void* p, size_t n , void* yyscanner) { int i; for (i=0; i < arrsz; i++) @@ -133,7 +133,7 @@ void * yyrealloc(void* p, size_t n , void* yy_globals) exit(1); } -void yyfree(void* p , void* yy_globals) +void yyfree(void* p , void* yyscanner) { int i; for (i=0; i < arrsz; i++) diff --git a/tests/test-multiple-scanners-r/scanner-1.l b/tests/test-multiple-scanners-r/scanner-1.l index 647e4de..9fa1bc0 100644 --- a/tests/test-multiple-scanners-r/scanner-1.l +++ b/tests/test-multiple-scanners-r/scanner-1.l @@ -38,13 +38,13 @@ %x OFF %% { -on yy_push_state(ON, yy_globals); return 10; -off yy_push_state(OFF, yy_globals); return 11; +on yy_push_state(ON, yyscanner); return 10; +off yy_push_state(OFF, yyscanner); return 11; .|\n return 12; } -.|\n yy_pop_state(yy_globals); return 13; +.|\n yy_pop_state(yyscanner); return 13; -.|\n yy_pop_state(yy_globals); return 14; +.|\n yy_pop_state(yyscanner); return 14; %% diff --git a/tests/test-multiple-scanners-r/scanner-2.l b/tests/test-multiple-scanners-r/scanner-2.l index a604288..209ceca 100644 --- a/tests/test-multiple-scanners-r/scanner-2.l +++ b/tests/test-multiple-scanners-r/scanner-2.l @@ -38,12 +38,12 @@ %x ON %% { -on yy_push_state(ON, yy_globals); return 3; -off yy_push_state(OFF, yy_globals); return 4; +on yy_push_state(ON, yyscanner); return 3; +off yy_push_state(OFF, yyscanner); return 4; .|\n return 5; } -.|\n yy_pop_state(yy_globals); return 6; +.|\n yy_pop_state(yyscanner); return 6; -.|\n yy_pop_state(yy_globals); return 7; +.|\n yy_pop_state(yyscanner); return 7; %% diff --git a/tests/test-prefix-r/scanner.l b/tests/test-prefix-r/scanner.l index d6cb6b4..4accbe3 100644 --- a/tests/test-prefix-r/scanner.l +++ b/tests/test-prefix-r/scanner.l @@ -42,15 +42,15 @@ /* Compile, but do not execute the following code. */ if( 0 ) { - FOO_create_buffer( (FILE*)0, 0, yy_globals); - FOO_delete_buffer( (YY_BUFFER_STATE)0, yy_globals); - FOO_flush_buffer( (YY_BUFFER_STATE)0, yy_globals); - FOO_init_buffer( (YY_BUFFER_STATE)0, (FILE*)0, yy_globals); - FOO_load_buffer_state( yy_globals); - FOO_scan_buffer( (char*)0, (yy_size_t)0, yy_globals); - FOO_scan_bytes( (yyconst char*)0, 0, yy_globals); - FOO_scan_string( (yyconst char*)0, yy_globals); - FOO_switch_to_buffer( (YY_BUFFER_STATE)0, yy_globals); + FOO_create_buffer( (FILE*)0, 0, yyscanner); + FOO_delete_buffer( (YY_BUFFER_STATE)0, yyscanner); + FOO_flush_buffer( (YY_BUFFER_STATE)0, yyscanner); + FOO_init_buffer( (YY_BUFFER_STATE)0, (FILE*)0, yyscanner); + FOO_load_buffer_state( yyscanner); + FOO_scan_buffer( (char*)0, (yy_size_t)0, yyscanner); + FOO_scan_bytes( (yyconst char*)0, 0, yyscanner); + FOO_scan_string( (yyconst char*)0, yyscanner); + FOO_switch_to_buffer( (YY_BUFFER_STATE)0, yyscanner); FOOrestart( (FILE*)0, (yyscan_t )0); FOOget_extra( (yyscan_t )0 ); diff --git a/tests/test-pthread/scanner.l b/tests/test-pthread/scanner.l index 77c7528..d4e6bca 100644 --- a/tests/test-pthread/scanner.l +++ b/tests/test-pthread/scanner.l @@ -61,16 +61,16 @@ static int process_text(char* s, yyscan_t scanner); #define NUMBER 200 #define WORD 201 -[[:digit:]]+ { BEGIN(STATE_1); process_text(yytext,yy_globals); return NUMBER; } -[[:alpha:]]+ { BEGIN(STATE_2); process_text(yytext,yy_globals); return WORD; } +[[:digit:]]+ { BEGIN(STATE_1); process_text(yytext,yyscanner); return NUMBER; } +[[:alpha:]]+ { BEGIN(STATE_2); process_text(yytext,yyscanner); return WORD; } -[[:alpha:]]+ { BEGIN(0); process_text(yytext,yy_globals); return WORD; } -[[:digit:]]+ { BEGIN(0); process_text(yytext,yy_globals); return NUMBER; } +[[:alpha:]]+ { BEGIN(0); process_text(yytext,yyscanner); return WORD; } +[[:digit:]]+ { BEGIN(0); process_text(yytext,yyscanner); return NUMBER; } -[[:alpha:]]+ { BEGIN(0); process_text(yytext,yy_globals); return WORD; } -[[:digit:]]+ { BEGIN(0); process_text(yytext,yy_globals); return NUMBER; } +[[:alpha:]]+ { BEGIN(0); process_text(yytext,yyscanner); return WORD; } +[[:digit:]]+ { BEGIN(0); process_text(yytext,yyscanner); return NUMBER; } -" "|\t|\r|\n { process_text(yytext,yy_globals); } +" "|\t|\r|\n { process_text(yytext,yyscanner); } [^[:alnum:][:space:]\t\r\n] { /*fprintf(stderr,"*** Error: bad input char '%c'.\n", yytext[0]); */ yyterminate(); diff --git a/tests/test-yyextra/scanner.l b/tests/test-yyextra/scanner.l index 025f409..375a77b 100644 --- a/tests/test-yyextra/scanner.l +++ b/tests/test-yyextra/scanner.l @@ -55,7 +55,7 @@ static void append_char (char c, yyscan_t scanner ); %% -.|\r|\n { append_char (yytext[0],yy_globals); } +.|\r|\n { append_char (yytext[0],yyscanner); } %% -- cgit v1.2.3