mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-09 20:33:03 +00:00
040984073a
* data/glr.c (ATTRIBUTE_UNUSED): Remove, since it infringes on the user's name space. All uses changed to __attribute__ ((__unused__)). (yyFail, yyMemoryExhausted, yyreportAmbiguity): Add __attribute__ ((__noreturn__)). * etc/clcommit: Remove. We weren't using it, and it failed "make maintainer-distcheck". * Makefile.maint: Merge from coreutils. (CVS_LIST, CVS_LIST_EXCEPT): New macros. (syntax-check-rules): Change list of rules as described below. (sc_cast_of_alloca_return_value, sc_dd_max_sym_length): (sc_file_system, sc_obsolete_symbols, sc_prohibit_atoi_atof): (sc_prohibit_jm_in_m4, sc_root_tests, sc_tight_scope): (sc_trailing_space): New rules. (sc_xalloc_h_in_src): Remove. (sc_cast_of_argument_to_free, sc_cast_of_x_alloc_return_value): (sc_space_tab, sc_error_exit_success, sc_changelog): (sc_system_h_headers, sc_sun_os_names, sc_unmarked_diagnostics): (makefile-check, po-check, author_mark_check): (makefile_path_separator_check, copyright-check): Use grep -n, to make it easier to find violations. Use CVS_LIST and CVS_LIST_EXCEPT. (header_regexp, h_re): Remove. (dd_c): New macro. (sc_dd_max_sym_length, .re-list, news-date-check): New rules. (my-distcheck): Use more-modern GCC flags. (signatures, %.asc): Remove. (rel-files, announcement): Remove signatures. Restore old updating code, even though we don't use it, so that we're the same as coreutils. (alpha, beta, major): Depend on news-date-check. Make the upload commands. * data/c.m4, data/lalr1.cc, data/yacc.c: Normalize white space. * lib/abitset.h, lib/bbitset.h, lib/bitset.h: Likewise. * lib/bitset_stats.c, lib/ebitset.h, lib/lbitset.c: Likewise. * lib/libitset.h, lib/timevar.c, lib/vbitset.h: Likewise. * src/Makefile.am, src/gram.c, src/muscle_tab.h: Likewise. * src/parse-gram.y, src/system.h, src/tables.c, src/vcg.c: Likewise. * src/vcg_defaults.h, tests/cxx-type.at, tests/existing.at: Likewise. * tests/sets.at: Likewise. * data/m4sugar/m4sugar.m4: Sync from Autoconf, except that we comment out the Autoconf version number. * doc/bison.texinfo (Calc++ Scanner): Don't use atoi, as it's error-prone and "make maintainer-distcheck" rejects it. * lib/subpipe.c: Include <fcntl.h> without checking for HAVE_FCNTL_H. Indent calls to "error" to pacify "make maintainer-distcheck", when the calls are not intended to be translated. * m4/subpipe.m4 (BISON_PREREQ_SUBPIPE): Don't check for fcntl.h. * src/Makefile.am (DEFS): Use +=, to pacify "make maintainer-distcheck". (bison_SOURCES): Add scan-skel.h. (sc_tight_scope): New rule, from coreutils. * src/files.c (src_extension, header_extension): Now static, not extern. * src/getargs.c (short_options): Likewise. * src/muscle_tab.c (muscle_table): Likewise. * src/parse-gram.y (current_class, current_type, current_prec): Likewise. * src/reader.c (grammar_end, previous_rule_end): Likewise. * src/getargs.h: Redo comments to pacify "make maintainer-distcheck". * src/main.c (main): Cast bindtextdomain and textdomain calls to void, to avoid warning when NLS is disabled. * src/output.c: Include scan-skel.h. (scan_skel): Remove decl, since scan-skel.h does this. (output_skeleton): Indent calls to "error" to pacify "make maintainer-distcheck". * src/print_graph.c: Don't include <obstack.h>, as system.h does this. * src/reader.h (gram_end, gram_lineno): New decls to pacify "make maintainer-distcheck". * src/scan-skel.l (skel_lex, skel_get_lineno, skel_get_in): (skel_get_out, skel_get_leng, skel_get_text, skel_set_lineno): (skel_set_in, skel_set_out, skel_get_debug, skel_set_debug): (skel_lex_destroy, scan_skel): Move these decls to... * src/scan-skel.h: New file. * src/uniqstr.c (uniqstr_assert): Indent calls to "error" to pacify "make maintainer-distcheck". * tests/Makefile.am ($(srcdir)/package.m4): Use $(VAR), not @VAR@. * tests/torture.at: Revamp to avoid misuse of atoi that "make maintainer-distcheck" complained about.
379 lines
8.6 KiB
Plaintext
379 lines
8.6 KiB
Plaintext
# Checking GLR Parsing. -*- Autotest -*-
|
|
# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 2, or (at your option)
|
|
# any later version.
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
# 02110-1301, USA.
|
|
|
|
AT_BANNER([[C++ Type Syntax (GLR).]])
|
|
|
|
# _AT_TEST_GLR_CXXTYPES(DECL, RESOLVE1, RESOLVE2)
|
|
# -----------------------------------------------
|
|
# Store into types.y the calc program, with DECL inserted as a declaration,
|
|
# and with RESOLVE1 and RESOLVE2 as annotations on the conflicted rule for
|
|
# stmt. Then compile the result.
|
|
m4_define([_AT_TEST_GLR_CXXTYPES],
|
|
[
|
|
AT_BISON_OPTION_PUSHDEFS([$1])
|
|
|
|
AT_DATA_GRAMMAR([types.y],
|
|
[[/* Simplified C++ Type and Expression Grammar. */
|
|
|
|
$1
|
|
|
|
%{
|
|
#include <stdio.h>
|
|
#define YYSTYPE char *
|
|
]m4_bmatch([$2], [stmtMerge],
|
|
[ static YYSTYPE stmtMerge (YYSTYPE x0, YYSTYPE x1);])[
|
|
#define YYINITDEPTH 10
|
|
#define YYSTACKEXPANDABLE 1
|
|
static char *format (char const *, ...);
|
|
struct YYLTYPE;
|
|
#if YYPURE
|
|
# if YYLSP_NEEDED
|
|
# define LEX_PARAMETERS YYSTYPE *lvalp, struct YYLTYPE *llocp
|
|
# define ERROR_PARAMETERS struct YYLTYPE *llocp, char const *s
|
|
# else
|
|
# define LEX_PARAMETERS YYSTYPE *lvalp
|
|
# endif
|
|
#endif
|
|
#ifndef LEX_PARAMETERS
|
|
# define LEX_PARAMETERS void
|
|
#endif
|
|
#ifndef ERROR_PARAMETERS
|
|
# define ERROR_PARAMETERS char const *s
|
|
#endif
|
|
int yylex (LEX_PARAMETERS);
|
|
void yyerror (ERROR_PARAMETERS);
|
|
%}
|
|
|
|
%token TYPENAME ID
|
|
|
|
%right '='
|
|
%left '+'
|
|
|
|
%glr-parser
|
|
|
|
%destructor { free ($$); } TYPENAME ID
|
|
|
|
%%
|
|
|
|
prog :
|
|
| prog stmt {
|
|
]AT_LOCATION_IF([
|
|
printf ("%d.%d-%d.%d: ",
|
|
@2.first_line, @2.first_column,
|
|
@2.last_line, @2.last_column);])[
|
|
printf ("%s\n", ]$[2);
|
|
}
|
|
;
|
|
|
|
stmt : expr ';' $2 { $$ = ]$[1; }
|
|
| decl $3
|
|
| error ';' { static char error_msg[] = "<error>"; $$ = error_msg; }
|
|
| '@' { YYACCEPT; }
|
|
;
|
|
|
|
expr : ID
|
|
| TYPENAME '(' expr ')' { $$ = format ("<cast>(%s,%s)", ]$[3, ]$[1); }
|
|
| expr '+' expr { $$ = format ("+(%s,%s)", ]$[1, ]$[3); }
|
|
| expr '=' expr { $$ = format ("=(%s,%s)", ]$[1, ]$[3); }
|
|
;
|
|
|
|
decl : TYPENAME declarator ';'
|
|
{ $$ = format ("<declare>(%s,%s)", ]$[1, ]$[2); }
|
|
| TYPENAME declarator '=' expr ';'
|
|
{ $$ = format ("<init-declare>(%s,%s,%s)", ]$[1, ]$[2, ]$[4); }
|
|
;
|
|
|
|
declarator : ID
|
|
| '(' declarator ')' { $$ = ]$[2; }
|
|
;
|
|
|
|
%%
|
|
|
|
#include <ctype.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <stdarg.h>
|
|
|
|
int
|
|
main (int argc, char **argv)
|
|
{
|
|
if (argc != 2)
|
|
abort ();
|
|
if (!freopen (argv[1], "r", stdin))
|
|
return 3;
|
|
return yyparse ();
|
|
}
|
|
|
|
int
|
|
yylex (LEX_PARAMETERS)
|
|
{
|
|
char buffer[256];
|
|
int c;
|
|
unsigned int i;
|
|
static int lineNum = 1;
|
|
static int colNum = 0;
|
|
|
|
#if YYPURE
|
|
# define yylloc (*llocp)
|
|
# define yylval (*lvalp)
|
|
#endif
|
|
|
|
while (1)
|
|
{
|
|
c = getchar ();
|
|
switch (c)
|
|
{
|
|
case EOF:
|
|
return 0;
|
|
case '\t':
|
|
colNum = (colNum + 7) & ~7;
|
|
break;
|
|
case ' ': case '\f':
|
|
colNum += 1;
|
|
break;
|
|
case '\n':
|
|
lineNum += 1;
|
|
colNum = 0;
|
|
break;
|
|
default:
|
|
{
|
|
int tok;
|
|
#if YYLSP_NEEDED
|
|
yylloc.first_line = yylloc.last_line = lineNum;
|
|
yylloc.first_column = colNum;
|
|
#endif
|
|
if (isalpha (c))
|
|
{
|
|
i = 0;
|
|
|
|
do
|
|
{
|
|
buffer[i++] = c;
|
|
colNum += 1;
|
|
if (i == sizeof buffer - 1)
|
|
abort ();
|
|
c = getchar ();
|
|
}
|
|
while (isalnum (c) || c == '_');
|
|
|
|
ungetc (c, stdin);
|
|
buffer[i++] = 0;
|
|
tok = isupper ((unsigned char) buffer[0]) ? TYPENAME : ID;
|
|
yylval = strcpy ((char *) malloc (i), buffer);
|
|
}
|
|
else
|
|
{
|
|
static char empty_string[] = "";
|
|
colNum += 1;
|
|
tok = c;
|
|
yylval = empty_string;
|
|
}
|
|
#if YYLSP_NEEDED
|
|
yylloc.last_column = colNum-1;
|
|
#endif
|
|
return tok;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
yyerror (ERROR_PARAMETERS)
|
|
{
|
|
#if YYPURE && YYLSP_NEEDED
|
|
/* Pacify GCC by using llocp. */
|
|
if (! llocp)
|
|
abort ();
|
|
#endif
|
|
fprintf (stderr, "%s\n", s);
|
|
}
|
|
|
|
|
|
static char *
|
|
format (char const *form, ...)
|
|
{
|
|
char buffer[1024];
|
|
va_list args;
|
|
va_start (args, form);
|
|
vsprintf (buffer, form, args);
|
|
va_end (args);
|
|
return strcpy ((char *) malloc (strlen (buffer) + 1), buffer);
|
|
}
|
|
|
|
]]
|
|
m4_bmatch([$2], [stmtMerge],
|
|
[[static YYSTYPE
|
|
stmtMerge (YYSTYPE x0, YYSTYPE x1)
|
|
{
|
|
return format ("<OR>(%s,%s)", x0, x1);
|
|
}
|
|
]])
|
|
)
|
|
|
|
AT_DATA([test-input],
|
|
[[
|
|
|
|
z + q;
|
|
|
|
T x;
|
|
|
|
T x = y;
|
|
|
|
x = y;
|
|
|
|
T (x) + y;
|
|
|
|
T (x);
|
|
|
|
T (y) = z + q;
|
|
|
|
T (y y) = z + q;
|
|
|
|
z + q;
|
|
|
|
@
|
|
|
|
This is total garbage, but it should be ignored.
|
|
]])
|
|
|
|
AT_CHECK([bison -o types.c types.y], 0, [], ignore)
|
|
AT_COMPILE([types])
|
|
AT_BISON_OPTION_POPDEFS
|
|
])
|
|
|
|
m4_define([_AT_RESOLVED_GLR_OUTPUT],
|
|
[[+(z,q)
|
|
<declare>(T,x)
|
|
<init-declare>(T,x,y)
|
|
=(x,y)
|
|
+(<cast>(x,T),y)
|
|
<declare>(T,x)
|
|
<init-declare>(T,y,+(z,q))
|
|
<error>
|
|
+(z,q)
|
|
]])
|
|
|
|
m4_define([_AT_RESOLVED_GLR_OUTPUT_WITH_LOC],
|
|
[[3.0-3.5: +(z,q)
|
|
5.0-5.3: <declare>(T,x)
|
|
7.0-7.7: <init-declare>(T,x,y)
|
|
9.0-9.5: =(x,y)
|
|
11.0-11.9: +(<cast>(x,T),y)
|
|
13.0-13.5: <declare>(T,x)
|
|
15.0-15.13: <init-declare>(T,y,+(z,q))
|
|
17.0-17.15: <error>
|
|
19.0-19.5: +(z,q)
|
|
]])
|
|
|
|
m4_define([_AT_AMBIG_GLR_OUTPUT],
|
|
[[+(z,q)
|
|
<declare>(T,x)
|
|
<init-declare>(T,x,y)
|
|
=(x,y)
|
|
+(<cast>(x,T),y)
|
|
<OR>(<declare>(T,x),<cast>(x,T))
|
|
<OR>(<init-declare>(T,y,+(z,q)),=(<cast>(y,T),+(z,q)))
|
|
<error>
|
|
+(z,q)
|
|
]])
|
|
|
|
m4_define([_AT_AMBIG_GLR_OUTPUT_WITH_LOC],
|
|
[[3.0-3.5: +(z,q)
|
|
5.0-5.3: <declare>(T,x)
|
|
7.0-7.7: <init-declare>(T,x,y)
|
|
9.0-9.5: =(x,y)
|
|
11.0-11.9: +(<cast>(x,T),y)
|
|
13.0-13.5: <OR>(<declare>(T,x),<cast>(x,T))
|
|
15.0-15.13: <OR>(<init-declare>(T,y,+(z,q)),=(<cast>(y,T),+(z,q)))
|
|
17.0-17.15: <error>
|
|
19.0-19.5: +(z,q)
|
|
]])
|
|
|
|
m4_define([_AT_GLR_STDERR],
|
|
[[syntax error
|
|
]])
|
|
|
|
m4_define([_AT_VERBOSE_GLR_STDERR],
|
|
[[syntax error, unexpected ID, expecting '=' or '+' or ')'
|
|
]])
|
|
|
|
## ---------------------------------------------------- ##
|
|
## Compile the grammar described in the documentation. ##
|
|
## ---------------------------------------------------- ##
|
|
|
|
AT_SETUP([GLR: Resolve ambiguity, impure, no locations])
|
|
_AT_TEST_GLR_CXXTYPES([],
|
|
[%dprec 1], [%dprec 2])
|
|
AT_PARSER_CHECK([[./types test-input]], 0,
|
|
_AT_RESOLVED_GLR_OUTPUT, _AT_GLR_STDERR)
|
|
AT_CLEANUP
|
|
|
|
AT_SETUP([GLR: Resolve ambiguity, impure, locations])
|
|
_AT_TEST_GLR_CXXTYPES([%locations],[%dprec 1],[%dprec 2])
|
|
AT_PARSER_CHECK([[./types test-input]], 0,
|
|
_AT_RESOLVED_GLR_OUTPUT_WITH_LOC, _AT_GLR_STDERR)
|
|
AT_CLEANUP
|
|
|
|
AT_SETUP([GLR: Resolve ambiguity, pure, no locations])
|
|
_AT_TEST_GLR_CXXTYPES([%pure-parser],
|
|
[%dprec 1], [%dprec 2])
|
|
AT_PARSER_CHECK([[./types test-input]], 0,
|
|
_AT_RESOLVED_GLR_OUTPUT, _AT_GLR_STDERR)
|
|
AT_CLEANUP
|
|
|
|
AT_SETUP([GLR: Resolve ambiguity, pure, locations])
|
|
_AT_TEST_GLR_CXXTYPES([%pure-parser %locations],
|
|
[%dprec 1], [%dprec 2])
|
|
AT_PARSER_CHECK([[./types test-input]], 0,
|
|
_AT_RESOLVED_GLR_OUTPUT_WITH_LOC, _AT_GLR_STDERR)
|
|
AT_CLEANUP
|
|
|
|
AT_SETUP([GLR: Merge conflicting parses, impure, no locations])
|
|
_AT_TEST_GLR_CXXTYPES([],
|
|
[%merge <stmtMerge>], [%merge <stmtMerge>])
|
|
AT_PARSER_CHECK([[./types test-input]], 0,
|
|
_AT_AMBIG_GLR_OUTPUT, _AT_GLR_STDERR)
|
|
AT_CLEANUP
|
|
|
|
AT_SETUP([GLR: Merge conflicting parses, impure, locations])
|
|
_AT_TEST_GLR_CXXTYPES([%locations],
|
|
[%merge <stmtMerge>], [%merge <stmtMerge>])
|
|
AT_PARSER_CHECK([[./types test-input]], 0,
|
|
_AT_AMBIG_GLR_OUTPUT_WITH_LOC, _AT_GLR_STDERR)
|
|
AT_CLEANUP
|
|
|
|
AT_SETUP([GLR: Merge conflicting parses, pure, no locations])
|
|
_AT_TEST_GLR_CXXTYPES([%pure-parser],
|
|
[%merge <stmtMerge>], [%merge <stmtMerge>])
|
|
AT_PARSER_CHECK([[./types test-input]], 0,
|
|
_AT_AMBIG_GLR_OUTPUT, _AT_GLR_STDERR)
|
|
AT_CLEANUP
|
|
AT_SETUP([GLR: Merge conflicting parses, pure, locations])
|
|
_AT_TEST_GLR_CXXTYPES([%pure-parser %locations],
|
|
[%merge <stmtMerge>],[%merge <stmtMerge>])
|
|
AT_PARSER_CHECK([[./types test-input]], 0,
|
|
_AT_AMBIG_GLR_OUTPUT_WITH_LOC, _AT_GLR_STDERR)
|
|
AT_CLEANUP
|
|
|
|
AT_SETUP([GLR: Verbose messages, resolve ambiguity, impure, no locations])
|
|
_AT_TEST_GLR_CXXTYPES([%error-verbose],
|
|
[%merge <stmtMerge>], [%merge <stmtMerge>])
|
|
AT_PARSER_CHECK([[./types test-input]], 0,
|
|
_AT_AMBIG_GLR_OUTPUT, _AT_VERBOSE_GLR_STDERR)
|
|
AT_CLEANUP
|