Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

m4: catch suspicions of unevaluated macros

Browse Source 
Check in m4's output if there are sequences such as m4_foo or b4_foo,
which are probably resulting from incorrect m4 processing.

It actually already is useful:

- it caught a leaking b4_lac_if leaking from glr.c, where LAC is not
  supported, hence b4_lac_if is not defined.

- it also caught references to location.hh in position.hh when
  location.hh does not exist.

- while making "Code injection" robust to these new warnings (it is
  its very purpose to let b4_canary pass unevaluated), I saw that it
  did not check lalr1.d, and when adding lalr1.d, it revealed it did
  underquote ocurrences of token value types.

* src/scan-skel.l (macro): New abbreviation.
Use it.
* data/skeletons/glr.c: Don't use b4_lac_if, we don't have it.
* data/skeletons/location.cc: Don't generate position.hh when we don't
generate location.hh.
* data/skeletons/d.m4 (b4_basic_symbol_constructor_define): Fix
underquotation.
* data/skeletons/bison.m4 (b4_canary): New.
* tests/input.at (Code injection): Use it, and check lalr1.d too.
This commit is contained in:
Akim Demaille
2021-08-07 09:30:24 +02:00
parent 6118406c3e
commit 80db1029e6
7 changed files with 57 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tests/input.at
View File

@@ -2889,26 +2889,26 @@ m4_pattern_allow([^m4_errprintn$])
# Try to have MACRO be run by bison.
m4_pushdef([AT_TEST],
[AT_DATA([[input.y]],
[[%type <$1(DEAD %type)> exp
%token <$1(DEAD %token)> a
[[%type <$1(%type)> exp
%token <$1(%token)> a
%token b
%initial-action
{
$$;
$<$1(DEAD %initial-action)>$
$<$1(%initial-action)>$
};
%printer
{
$$
$<$1(DEAD %printer)>$
$<$1(%printer)>$
} <> <*>;
%lex-param
{
$1(DEAD %lex-param)
$1(%lex-param)
};
%parse-param
{
$1(DEAD %parse-param)
$1(%parse-param)
};
%%
exp:
@@ -2916,25 +2916,24 @@ exp:
{
$$;
$][1;
$<$1(DEAD action 1)>$
$<$1(DEAD action 2)>1
$<$1(DEAD action 3)>name
$<$1(DEAD action 4)>0
$<$1(action 1)>$
$<$1(action 2)>1
$<$1(action 3)>name
$<$1(action 4)>0
;
};
]])
# FIXME: Provide a means to iterate over all the skeletons.
AT_BISON_CHECK([[-d input.y]])
AT_BISON_CHECK([[-d -S glr.c input.y]])
AT_BISON_CHECK([[-d -S lalr1.cc input.y]])
AT_BISON_CHECK([[-d -S glr.cc input.y]])
AT_BISON_CHECK([[-d -S glr2.cc input.y]])
AT_BISON_CHECK([[ -S lalr1.java input.y]])
# Disable -Wother to avoid the warnings about the suspicious presence
# of `b4_canary` in the output.
m4_foreach([b4_skel],
[[yacc.c], [glr.c], [lalr1.cc], [glr.cc], [glr2.cc], [lalr1.d], [lalr1.java]],
[AT_BISON_CHECK([[-Wno-other -S ]b4_skel[ ]m4_bmatch(b4_skel, [.*\.java$], [], [-d])[ input.y]])
])
])
AT_TEST([m4_errprintn])
AT_TEST([@:>@m4_errprintn])
AT_TEST([b4_canary])
AT_TEST([@:>@b4_canary])
m4_popdef([AT_TEST])