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

maint: fix syntax-check issues

Browse Source 
* cfg.mk: Ignore strcmp in local.at.
* tests/conflicts.at: Use AT_PARSER_CHECK.
* tests/regression.at: Preserve the exit status of the generated parsers.

* tests/local.mk ($(TESTSUITE)): Map @tb@ to a tabulation.
* tests/c++.at, tests/input.at, tests/regression.at: Use @tb@.
* cfg.mk: (space-tab): There are no longer exceptions.
This commit is contained in:
Akim Demaille
2013-01-28 17:17:12 +01:00
parent 312c0cff71
commit bb1c50d88b
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cfg.mk
View File

@@ -172,9 +172,8 @@ $(call exclude, \
prohibit_doubled_word=^tests/named-refs.at$$ \ prohibit_doubled_word=^tests/named-refs.at$$ \
prohibit_magic_number_exit=^doc/bison.texi$$ \ prohibit_magic_number_exit=^doc/bison.texi$$ \
prohibit_magic_number_exit+=?|^tests/(conflicts|regression).at$$ \ prohibit_magic_number_exit+=?|^tests/(conflicts|regression).at$$ \
prohibit_strcmp=^doc/bison\.texi$$ \ prohibit_strcmp=^doc/bison\.texi|tests/local\.at$$ \
prohibit_tab_based_indentation=\.(am|mk)$$|^djgpp/|^\.git \ prohibit_tab_based_indentation=\.(am|mk)$$|^djgpp/|^\.git \
require_config_h_first=^(lib/yyerror|data/(glr|yacc))\.c$$ \ require_config_h_first=^(lib/yyerror|data/(glr|yacc))\.c$$ \
space_tab=^tests/(input|c\+\+)\.at$$ \
unmarked_diagnostics=^(djgpp/|doc/bison.texi$$|tests/c\+\+\.at$$) \ unmarked_diagnostics=^(djgpp/|doc/bison.texi$$|tests/c\+\+\.at$$) \
) )

5
tests/c++.at
View File

@@ -395,6 +395,7 @@ void
]AT_MAIN_DEFINE[ ]AT_MAIN_DEFINE[
]]) ]])
AT_BISON_CHECK([[-o input.cc input.y]]) AT_BISON_CHECK([[-o input.cc input.y]])
m4_if([$#], [1], m4_if([$#], [1],
@@ -413,8 +414,8 @@ AT_SETUP([[Absolute namespace references]])
AT_TEST([[::foo]]) AT_TEST([[::foo]])
AT_TEST([[::foo::bar]]) AT_TEST([[::foo::bar]])
AT_TEST([[::foo::bar::baz]]) AT_TEST([[::foo::bar::baz]])
AT_TEST([[ ::foo]]) AT_TEST([[@tb@::foo]])
AT_TEST([[ ::foo::bar]]) AT_TEST([[ @tb@ ::foo::bar]])
AT_TEST([[ ::foo::bar::baz]]) AT_TEST([[ ::foo::bar::baz]])
AT_CLEANUP AT_CLEANUP

2
tests/conflicts.at
View File

@@ -80,7 +80,7 @@ int main (void)
AT_FULL_COMPILE([input]) AT_FULL_COMPILE([input])
AT_CHECK([./input]) AT_PARSER_CHECK([./input])
AT_BISON_OPTION_POPDEFS AT_BISON_OPTION_POPDEFS

8
tests/input.at
View File

@@ -1513,22 +1513,22 @@ AT_BISON_CHECK([[input.y]], [1], [],
AT_CHECK_NAMESPACE_ERROR([[]], AT_CHECK_NAMESPACE_ERROR([[]],
[[namespace reference is empty]]) [[namespace reference is empty]])
AT_CHECK_NAMESPACE_ERROR([[ ]], AT_CHECK_NAMESPACE_ERROR([[ @tb@@tb@ @tb@ @tb@]],
[[namespace reference is empty]]) [[namespace reference is empty]])
AT_CHECK_NAMESPACE_ERROR([[foo::::bar]], AT_CHECK_NAMESPACE_ERROR([[foo::::bar]],
[[namespace reference has consecutive "::"]]) [[namespace reference has consecutive "::"]])
AT_CHECK_NAMESPACE_ERROR([[foo:: ::bar]], AT_CHECK_NAMESPACE_ERROR([[foo:: @tb@::bar]],
[[namespace reference has consecutive "::"]]) [[namespace reference has consecutive "::"]])
AT_CHECK_NAMESPACE_ERROR([[::::bar]], AT_CHECK_NAMESPACE_ERROR([[::::bar]],
[[namespace reference has consecutive "::"]]) [[namespace reference has consecutive "::"]])
AT_CHECK_NAMESPACE_ERROR([[:: ::bar]], AT_CHECK_NAMESPACE_ERROR([[:: ::bar]],
[[namespace reference has consecutive "::"]]) [[namespace reference has consecutive "::"]])
AT_CHECK_NAMESPACE_ERROR([[foo::bar:: ::]], AT_CHECK_NAMESPACE_ERROR([[foo::bar::@tb@::]],
[[namespace reference has consecutive "::"]], [[namespace reference has consecutive "::"]],
[[namespace reference has a trailing "::"]]) [[namespace reference has a trailing "::"]])
AT_CHECK_NAMESPACE_ERROR([[foo::bar::]], AT_CHECK_NAMESPACE_ERROR([[foo::bar::]],
[[namespace reference has a trailing "::"]]) [[namespace reference has a trailing "::"]])
AT_CHECK_NAMESPACE_ERROR([[foo::bar:: ]], AT_CHECK_NAMESPACE_ERROR([[foo::bar:: @tb@]],
[[namespace reference has a trailing "::"]]) [[namespace reference has a trailing "::"]])
AT_CHECK_NAMESPACE_ERROR([[::]], AT_CHECK_NAMESPACE_ERROR([[::]],
[[namespace reference has a trailing "::"]]) [[namespace reference has a trailing "::"]])

1
tests/local.mk
View File

@@ -72,6 +72,7 @@ AUTOTESTFLAGS = -I $(top_srcdir)/tests
$(TESTSUITE): $(TESTSUITE_AT) $(TESTSUITE): $(TESTSUITE_AT)
$(AM_V_GEN) \ $(AM_V_GEN) \
$(AUTOTEST) $(AUTOTESTFLAGS) $(srcdir)/tests/testsuite.at -o $@.tmp $(AUTOTEST) $(AUTOTESTFLAGS) $(srcdir)/tests/testsuite.at -o $@.tmp
$(AM_V_at)$(PERL) -pi -e 's/\@tb\@/\t/g' $@.tmp
$(AM_V_at)mv $@.tmp $@ $(AM_V_at)mv $@.tmp $@

4
tests/regression.at
View File

@@ -1545,7 +1545,7 @@ AT_DATA_GRAMMAR([input.y],
%parse-param { int x } %parse-param { int x }
// Spaces, tabs, and new lines. // Spaces, tabs, and new lines.
%parse-param { @&t@ %parse-param { @&t@
int y @&t@ @tb@ int y@tb@ @&t@
@&t@ @&t@
@&t@ @&t@
} }
@@ -1573,7 +1573,7 @@ yyparse (int x, int y)
int int
main (void) main (void)
{ {
return !!yyparse(1, 2); return yyparse(1, 2);
} }
]]) ]])