diff options
| author | Akim Demaille <akim.demaille@gmail.com> | 2021-11-06 19:24:04 +0100 |
|---|---|---|
| committer | Akim Demaille <akim.demaille@gmail.com> | 2021-11-06 19:30:06 +0100 |
| commit | c95d0dd5f54b98825e4cfe00a807db78a073e376 (patch) | |
| tree | 7db099d7f168367ece95bca3c42010df3f373331 /src/scan-skel.l | |
| parent | 76301e739956a929ac0710fbd3d51fd4fc5ee9cf (diff) | |
| download | bison-c95d0dd5f54b98825e4cfe00a807db78a073e376.tar.gz | |
warnings: be less picky about occurrences of m4_/b4_ in the output
Reported by Marko Mäkelä.
<https://lists.gnu.org/r/bug-bison/2021-10/msg00026.html>
* src/scan-skel.l: It is ok to have foob4_ or foom4_.
* tests/skeletons.at (Suspicious sequences): New.
Diffstat (limited to 'src/scan-skel.l')
| -rw-r--r-- | src/scan-skel.l | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/scan-skel.l b/src/scan-skel.l index 60232a2e..5a93ce03 100644 --- a/src/scan-skel.l +++ b/src/scan-skel.l @@ -54,7 +54,9 @@ static void output_mapped_file (char const *name); %} /* Identifiers of our M4 macros. */ -macro [bm]4_[a-zA-Z_0-9]* +macro [bm]4_[a-zA-Z_0-9]* +/* Safe sequence of word-constituent characters. */ +identifier [A-Za-z_0-9]+ %x SC_AT_DIRECTIVE_ARGS %x SC_AT_DIRECTIVE_SKIP_WS @@ -90,7 +92,7 @@ macro [bm]4_[a-zA-Z_0-9]* /* This pattern must not match more than the previous @ patterns. */ @[^@{}''(\n]* fail_for_invalid_at (yytext); \n out_lineno++; ECHO; -[^bm@\n]+ ECHO; +[^a-z@\n]+ ECHO; /* If there are still identifiers that look like macros, such as b4_synbol, this probably an error, say a typo in M4, or @@ -104,6 +106,7 @@ macro [bm]4_[a-zA-Z_0-9]* "suspicious sequence in the output: %s", yytext); ECHO; } +{identifier} ECHO; . ECHO; <INITIAL><<EOF>> { |