diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2020-11-16 17:32:40 -0500 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2020-11-16 17:32:40 -0500 |
| commit | 654ab2012f9345798ef3a214ccb6ebd1f1b4d12d (patch) | |
| tree | 8b39eb6c20095a25000488c3c23013557ca55d33 | |
| parent | a67532dd5799676b9e1629b8fd2dc9f526383e09 (diff) | |
| download | flex-git-654ab2012f9345798ef3a214ccb6ebd1f1b4d12d.tar.gz | |
Up-gun a test to use the lineno code in the array+BOL case...
...and fix the bug that turned up.
| -rw-r--r-- | src/c99-flex.skl | 2 | ||||
| -rw-r--r-- | src/cpp-flex.skl | 2 | ||||
| -rw-r--r-- | tests/yymorearraybol.rules | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/c99-flex.skl b/src/c99-flex.skl index e4af687..75228e2 100644 --- a/src/c99-flex.skl +++ b/src/c99-flex.skl @@ -2187,7 +2187,7 @@ m4_ifdef([[M4_MODE_FIND_ACTION_COMPRESSED]], [[ yy_act = yy_accept[yy_current_s m4_ifdef( [[M4_MODE_YYLINENO]],[[ m4_define([[M4_YYL_BASE]], [[m4_ifdef([[M4_MODE_YYMORE_USED]], [[m4_ifdef([[M4_MODE_YYTEXT_IS_ARRAY]], - [["yyscanner->yy_prev_more_offset"]], [["yyscanner->yy_more_len"]])]], [[0]])]]) + [[yyscanner->yy_prev_more_offset]], [[yyscanner->yy_more_len]])]], [[0]])]]) if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) { int yyl; for ( yyl = M4_YYL_BASE; yyl < yyscanner->yyleng_r; ++yyl ) { diff --git a/src/cpp-flex.skl b/src/cpp-flex.skl index 3e3b247..2d7abe1 100644 --- a/src/cpp-flex.skl +++ b/src/cpp-flex.skl @@ -2055,7 +2055,7 @@ m4_ifdef([[M4_MODE_FIND_ACTION_COMPRESSED]], [[ yy_act = yy_accept[yy_current_s m4_ifdef( [[M4_MODE_YYLINENO]],[[ m4_define([[M4_YYL_BASE]], [[m4_ifdef([[M4_MODE_YYMORE_USED]], [[m4_ifdef([[M4_MODE_YYTEXT_IS_ARRAY]], - [["YY_G(yy_prev_more_offset)"]], [["YY_G(yy_more_len)"]])]], [[0]])]]) + [[YY_G(yy_prev_more_offset)]], [[YY_G(yy_more_len)]])]], [[0]])]]) if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) { int yyl; for ( yyl = M4_YYL_BASE; yyl < yyleng; ++yyl ) { diff --git a/tests/yymorearraybol.rules b/tests/yymorearraybol.rules index 80f6b8e..8683ac2 100644 --- a/tests/yymorearraybol.rules +++ b/tests/yymorearraybol.rules @@ -31,7 +31,7 @@ */ %array -%option nounput noyywrap noyylineno warn noinput +%option nounput noyywrap yylineno warn noinput %% ^foo {yymore();} bar {if (!(yyleng == 6)) {fprintf(stderr,"ASSERT FAILED.\n"); exit(1);}} |