summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormillaway <millaway>2003-03-14 02:11:56 +0000
committermillaway <millaway>2003-03-14 02:11:56 +0000
commit52fc3929d3c81461480f3485b3d3242d323adb9a (patch)
treed0654354a9c8bdbe30a889ef3991eab94b52bb14
parentda687c9954466a64848b035fa377fe67378677ea (diff)
downloadflex-52fc3929d3c81461480f3485b3d3242d323adb9a.tar.gz
Moved test-tables to m4.
-rw-r--r--flex.skl1
-rw-r--r--tests/test-table-opts/scanner.l16
2 files changed, 9 insertions, 8 deletions
diff --git a/flex.skl b/flex.skl
index 32d8942..82c7fe1 100644
--- a/flex.skl
+++ b/flex.skl
@@ -2860,6 +2860,7 @@ return_rv:
int yytables_fload YYFARGS1(FILE *, fp)
{
M4_YY_DECL_GUTS_VAR();
+
if( yytbl_fload(fp, YYTABLES_NAME M4_YY_CALL_LAST_ARG) != 0)
return -1;
return 0;
diff --git a/tests/test-table-opts/scanner.l b/tests/test-table-opts/scanner.l
index 95e71f3..18e776b 100644
--- a/tests/test-table-opts/scanner.l
+++ b/tests/test-table-opts/scanner.l
@@ -55,26 +55,26 @@ m4_ifdef( [[M4_YY_REENTRANT]],
#ifdef YY_TABLES_EXTERNAL
if((fp = fopen(argv[1],"r"))== NULL)
- yy_fatal_error("could not open tables file for reading" YY_CALL_LAST_ARG);
+ yy_fatal_error("could not open tables file for reading" M4_YY_CALL_LAST_ARG);
- if(yytables_fload(fp YY_CALL_LAST_ARG) < 0)
- yy_fatal_error("yytables_fload returned < 0" YY_CALL_LAST_ARG);
- if(YY_TABLES_VERIFY)
+ if(yytables_fload(fp M4_YY_CALL_LAST_ARG) < 0)
+ yy_fatal_error("yytables_fload returned < 0" M4_YY_CALL_LAST_ARG);
+ if(M4_YY_TABLES_VERIFY)
exit(0);
#endif
if(argc > 2){
if((fp = fopen(argv[2],"r"))== NULL)
- yy_fatal_error("could not open input file for reading" YY_CALL_LAST_ARG);
+ yy_fatal_error("could not open input file for reading" M4_YY_CALL_LAST_ARG);
yyin = fp;
}
- while(yylex(YY_CALL_ONLY_ARG) != 0)
+ while(yylex(M4_YY_CALL_ONLY_ARG) != 0)
;
#ifdef YY_TABLES_EXTERNAL
- yytables_destroy(YY_CALL_ONLY_ARG);
+ yytables_destroy(M4_YY_CALL_ONLY_ARG);
#endif
- yylex_destroy(YY_CALL_ONLY_ARG);
+ yylex_destroy(M4_YY_CALL_ONLY_ARG);
if(argc < 0) /* silence the compiler */
yyscanner = (void*)fp;