X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/8def5cd0c3a14a2ba6b2c807a6be0e2f67094f89..56d60c19479822159e56960616cb3602e31f2a2c:/tests/calc.at?ds=inline diff --git a/tests/calc.at b/tests/calc.at index 3b32194c..c5040083 100644 --- a/tests/calc.at +++ b/tests/calc.at @@ -1,22 +1,19 @@ # Simple calculator. -*- Autotest -*- -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software -# Foundation, Inc. +# Copyright (C) 2000-2012 Free Software Foundation, Inc. -# This program is free software; you can redistribute it and/or modify +# 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. - +# the Free Software Foundation, either version 3 of the License, 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. +# along with this program. If not, see <http://www.gnu.org/licenses/>. ## ---------------------------------------------------- ## ## Compile the grammar described in the documentation. ## @@ -30,21 +27,187 @@ # _AT_DATA_CALC_Y($1, $2, $3, [BISON-DIRECTIVES]) # ----------------------------------------------- -# Produce `calc.y'. Don't call this macro directly, because it contains -# some occurrences of `$1' etc. which will be interpreted by m4. So -# you should call it with $1, $2, and $3 as arguments, which is what -# AT_DATA_CALC_Y does. +# Produce `calc.y' and, if %defines was specified, `calc-lex.c' or +# `calc-lex.cc'. +# +# Don't call this macro directly, because it contains some occurrences +# of `$1' etc. which will be interpreted by m4. So you should call it +# with $1, $2, and $3 as arguments, which is what AT_DATA_CALC_Y does. m4_define([_AT_DATA_CALC_Y], [m4_if([$1$2$3], $[1]$[2]$[3], [], [m4_fatal([$0: Invalid arguments: $@])])dnl +m4_pushdef([AT_CALC_LEX], +[[#include <ctype.h> + +int ]AT_NAME_PREFIX[lex (]AT_LEX_FORMALS[); +static int get_char (]AT_LEX_FORMALS[); +static void unget_char (]AT_LEX_PRE_FORMALS[ int c); + +]AT_LOCATION_IF([ +static YYLTYPE last_yylloc; +])[ +static int +get_char (]AT_LEX_FORMALS[) +{ + int res = getc (input); + ]AT_USE_LEX_ARGS[; +]AT_LOCATION_IF([ + last_yylloc = AT_LOC; + if (res == '\n') + { + AT_LOC_LAST_LINE++; + AT_LOC_LAST_COLUMN = 1; + } + else + AT_LOC_LAST_COLUMN++; +])[ + return res; +} + +static void +unget_char (]AT_LEX_PRE_FORMALS[ int c) +{ + ]AT_USE_LEX_ARGS[; +]AT_LOCATION_IF([ + /* Wrong when C == `\n'. */ + AT_LOC = last_yylloc; +])[ + ungetc (c, input); +} + +static int +read_signed_integer (]AT_LEX_FORMALS[) +{ + int c = get_char (]AT_LEX_ARGS[); + int sign = 1; + int n = 0; + + ]AT_USE_LEX_ARGS[; + if (c == '-') + { + c = get_char (]AT_LEX_ARGS[); + sign = -1; + } + + while (isdigit (c)) + { + n = 10 * n + (c - '0'); + c = get_char (]AT_LEX_ARGS[); + } + + unget_char (]AT_LEX_PRE_ARGS[ c); + + return sign * n; +} + + +/*---------------------------------------------------------------. +| Lexical analyzer returns an integer on the stack and the token | +| NUM, or the ASCII character read if not a number. Skips all | +| blanks and tabs, returns 0 for EOF. | +`---------------------------------------------------------------*/ + +int +]AT_NAME_PREFIX[lex (]AT_LEX_FORMALS[) +{ + static int init = 1; + int c; + + if (init) + { + init = 0; +]AT_LOCATION_IF([ + AT_LOC_LAST_COLUMN = 1; + AT_LOC_LAST_LINE = 1; +])[ + } + + /* Skip current token, then white spaces. */ + do + { +]AT_LOCATION_IF( +[ AT_LOC_FIRST_COLUMN = AT_LOC_LAST_COLUMN; + AT_LOC_FIRST_LINE = AT_LOC_LAST_LINE; +])[ + } + while ((c = get_char (]AT_LEX_ARGS[)) == ' ' || c == '\t'); + + /* process numbers */ + if (c == '.' || isdigit (c)) + { + unget_char (]AT_LEX_PRE_ARGS[ c); + ]AT_VAL[.ival = read_signed_integer (]AT_LEX_ARGS[); + return NUM; + } + + /* Return end-of-file. */ + if (c == EOF) + return CALC_EOF; + + /* Return single chars. */ + return c; +} +]]) + AT_DATA_GRAMMAR([calc.y], [[/* Infix notation calculator--calc */ ]$4 AT_SKEL_CC_IF( -[%define "global_tokens_and_yystype"])[ -%{ +[%define global_tokens_and_yystype])[ +%code requires +{ +]AT_LOCATION_TYPE_IF([[ +# include <iostream> + struct Point + { + int l; + int c; + }; + + struct Span + { + Point first; + Point last; + }; + +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (N) \ + { \ + (Current).first = YYRHSLOC (Rhs, 1).first; \ + (Current).last = YYRHSLOC (Rhs, N).last; \ + } \ + else \ + { \ + (Current).first = (Current).last = YYRHSLOC (Rhs, 0).last; \ + } \ + while (false) + +]])[ + /* Exercise pre-prologue dependency to %union. */ + typedef int semantic_value; +} + +/* Exercise %union. */ +%union +{ + semantic_value ival; +}; + +%code provides +{ #include <stdio.h> +/* The input. */ +extern FILE *input;]AT_SKEL_CC_IF([[ +#ifndef YYLTYPE +# define YYLTYPE ]AT_NAME_PREFIX[::parser::location_type +#endif +]])[ +} +%code +{ +#include <assert.h> #include <stdlib.h> #include <string.h> #if HAVE_UNISTD_H @@ -53,33 +216,14 @@ AT_SKEL_CC_IF( # undef alarm # define alarm(seconds) /* empty */ #endif -#include <ctype.h> #define USE(Var) -/* Exercise pre-prologue dependency to %union. */ -typedef int semantic_value; - +FILE *input; static semantic_value global_result = 0; static int global_count = 0; -%} - -/* Exercise %union. */ -%union -{ - semantic_value ival; -}; - -%{ static int power (int base, int exponent); -]AT_SKEL_CC_IF( -[#ifndef YYLTYPE -[#] define YYLTYPE AT_NAME_PREFIX::location -#endif -#define first_line begin.line -#define first_column begin.column -#define last_line end.line -#define last_column end.column -], + +]AT_SKEL_CC_IF(, [/* yyerror receives the location if: - %location & %pure & %glr - %location & %pure & %yacc & %parse-param. */ @@ -87,21 +231,19 @@ static void yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *llocp, ]) AT_PARAM_IF([semantic_value *result, int *count, ]) const char *s );])[ -static int yylex (]AT_LEX_FORMALS[); -static int get_char (]AT_LEX_FORMALS[); -static void unget_char (]AT_LEX_PRE_FORMALS[ int c); -%} +int yylex (]AT_LEX_FORMALS[); +} -]AT_SKEL_CC_IF( -[/* The lalr1.cc skeleton, for backward compatibility, defines +]AT_SKEL_CC_IF([AT_LOCATION_TYPE_IF([], [ +/* The lalr1.cc skeleton, for backward compatibility, defines a constructor for position that initializes the filename. The glr.cc skeleton does not (and in fact cannot: location/position are stored in a union, from which objects with constructors are excluded in C++. */ %initial-action { - @$.initialize (0); + @$.initialize (); } -])[ +])])[ /* Bison Declarations */ %token CALC_EOF 0 "end of input" @@ -141,23 +283,35 @@ exp: | '-' exp %prec NEG { $$ = -$2; } | exp '^' exp { $$ = power ($1, $3); } | '(' exp ')' { $$ = $2; } -| '(' error ')' { $$ = 1111; } +| '(' error ')' { $$ = 1111; yyerrok; } | '!' { $$ = 0; YYERROR; } | '-' error { $$ = 0; YYERROR; } ; %% -/* The input. */ -static FILE *input; ]AT_SKEL_CC_IF( -[/* A C++ error reporting function. */ +[AT_LOCATION_TYPE_IF([[ + std::ostream& + operator<< (std::ostream& o, const Span& s) + { + o << s.first.l << '.' << s.first.c; + if (s.first.l != s.last.l) + o << '-' << s.last.l << '.' << s.last.c - 1; + else if (s.first.c != s.last.c - 1) + o << '-' << s.last.c - 1; + return o; + } +]]) + +/* A C++ error reporting function. */ void -AT_NAME_PREFIX::parser::error (const location& l, const std::string& m) +AT_NAME_PREFIX::parser::error (const location_type& l, const std::string& m) { (void) l; std::cerr << AT_LOCATION_IF([l << ": " << ])m << std::endl; } +/* A C++ yyparse that simulates the C signature. */ int yyparse (AT_PARAM_IF([semantic_value *result, int *count])) { @@ -168,7 +322,8 @@ yyparse (AT_PARAM_IF([semantic_value *result, int *count])) return parser.parse (); } ], -[static void +[/* A C error reporting function. */ +static void yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *llocp, ]) AT_PARAM_IF([semantic_value *result, int *count, ]) const char *s) @@ -176,141 +331,31 @@ yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *llocp, ]) AT_PARAM_IF([(void) result; (void) count;]) AT_YYERROR_SEES_LOC_IF([ fprintf (stderr, "%d.%d", - AT_LOC.first_line, AT_LOC.first_column); - if (AT_LOC.first_line != AT_LOC.last_line) + AT_LOC_FIRST_LINE, AT_LOC_FIRST_COLUMN); + if (AT_LOC_FIRST_LINE != AT_LOC_LAST_LINE) fprintf (stderr, "-%d.%d", - AT_LOC.last_line, AT_LOC.last_column - 1); - else if (AT_LOC.first_column != AT_LOC.last_column - 1) + AT_LOC_LAST_LINE, AT_LOC_LAST_COLUMN - 1); + else if (AT_LOC_FIRST_COLUMN != AT_LOC_LAST_COLUMN - 1) fprintf (stderr, "-%d", - AT_LOC.last_column - 1); + AT_LOC_LAST_COLUMN - 1); fprintf (stderr, ": ");]) fprintf (stderr, "%s\n", s); }])[ - -]AT_LOCATION_IF([ -static YYLTYPE last_yylloc; -])[ -static int -get_char (]AT_LEX_FORMALS[) -{ - int res = getc (input); - ]AT_USE_LEX_ARGS[; -]AT_LOCATION_IF([ - last_yylloc = AT_LOC; - if (res == '\n') - { - AT_LOC.last_line++; - AT_LOC.last_column = 1; - } - else - AT_LOC.last_column++; -])[ - return res; -} - - -static void -unget_char (]AT_LEX_PRE_FORMALS[ int c) -{ - ]AT_USE_LEX_ARGS[; -]AT_LOCATION_IF([ - /* Wrong when C == `\n'. */ - AT_LOC = last_yylloc; -])[ - ungetc (c, input); -} - -static int -read_signed_integer (]AT_LEX_FORMALS[) -{ - int c = get_char (]AT_LEX_ARGS[); - int sign = 1; - int n = 0; - - ]AT_USE_LEX_ARGS[; - if (c == '-') - { - c = get_char (]AT_LEX_ARGS[); - sign = -1; - } - - while (isdigit (c)) - { - n = 10 * n + (c - '0'); - c = get_char (]AT_LEX_ARGS[); - } - - unget_char (]AT_LEX_PRE_ARGS[ c); - - return sign * n; -} - - - -/*---------------------------------------------------------------. -| Lexical analyzer returns an integer on the stack and the token | -| NUM, or the ASCII character read if not a number. Skips all | -| blanks and tabs, returns 0 for EOF. | -`---------------------------------------------------------------*/ - -static int -yylex (]AT_LEX_FORMALS[) -{ - static int init = 1; - int c; - - if (init) - { - init = 0; -]AT_LOCATION_IF([ - AT_LOC.last_column = 1; - AT_LOC.last_line = 1; -])[ - } - -]AT_LOCATION_IF([ - AT_LOC.first_column = AT_LOC.last_column; - AT_LOC.first_line = AT_LOC.last_line; -])[ - - /* Skip white space. */ - while ((c = get_char (]AT_LEX_ARGS[)) == ' ' || c == '\t') - { -]AT_LOCATION_IF( -[ AT_LOC.first_column = AT_LOC.last_column; - AT_LOC.first_line = AT_LOC.last_line; -])[ - } - - /* process numbers */ - if (c == '.' || isdigit (c)) - { - unget_char (]AT_LEX_PRE_ARGS[ c); - ]AT_VAL[.ival = read_signed_integer (]AT_LEX_ARGS[); - return NUM; - } - - /* Return end-of-file. */ - if (c == EOF) - return CALC_EOF; - - /* Return single chars. */ - return c; -} +]AT_DEFINES_IF(, [AT_CALC_LEX])[ static int power (int base, int exponent) { int res = 1; - if (exponent < 0) - exit (3); + assert (0 <= exponent); for (/* Niente */; exponent; --exponent) res *= base; return res; } +/* A C main function. */ int main (int argc, const char **argv) { @@ -336,18 +381,9 @@ main (int argc, const char **argv) ]AT_SKEL_CC_IF([], [m4_bmatch([$4], [%debug], [ yydebug = 1;])])[ -]AT_PUSH_IF([ - { - struct yypstate *pstate = yypstate_init (); - YYSTYPE my_lval; - ]AT_LOCATION_IF([YYLTYPE my_lloc;])[ - do { - status = yypush_parse (pstate, yylex (&my_lval]AT_LOCATION_IF([[, &my_lloc]])[), &my_lval]AT_LOCATION_IF([[, &my_lloc]])[); - } while (status == YYPUSH_MORE); - free (pstate); - }],[ - status = yyparse (]AT_PARAM_IF([[&result, &count]])[);])[ - fclose (input); + status = yyparse (]AT_PARAM_IF([[&result, &count]])[); + if (fclose (input)) + perror ("fclose"); if (global_result != result) abort (); if (global_count != count) @@ -355,12 +391,18 @@ main (int argc, const char **argv) return status; } ]]) +AT_DEFINES_IF([AT_DATA_SOURCE([[calc-lex.c]AT_SKEL_CC_IF([[c]])], +[[#include "calc.h]AT_SKEL_CC_IF([[h]])[" + +]AT_CALC_LEX])]) +m4_popdef([AT_CALC_LEX]) ])# _AT_DATA_CALC_Y # AT_DATA_CALC_Y([BISON-OPTIONS]) # ------------------------------- -# Produce `calc.y'. +# Produce `calc.y' and, if %defines was specified, `calc-lex.c' or +# `calc-lex.cc'. m4_define([AT_DATA_CALC_Y], [_AT_DATA_CALC_Y($[1], $[2], $[3], [$1]) ]) @@ -465,12 +507,7 @@ m4_ifval([$2], [AT_CHECK([exit 77])]) AT_BISON_OPTION_PUSHDEFS([$1]) AT_DATA_CALC_Y([$1]) - -AT_SKEL_CC_IF( - [AT_CHECK([bison -o calc.cc calc.y]) - AT_COMPILE_CXX([calc])], - [AT_CHECK([bison -o calc.c calc.y]) - AT_COMPILE([calc])]) +AT_FULL_COMPILE([calc], [AT_DEFINES_IF([[lex]])]) # Test the priorities. _AT_CHECK_CALC([$1], @@ -541,6 +578,14 @@ _AT_CHECK_CALC_ERROR([$1], [0], [(- *) + (0 0) = 1], [113], [1.4: syntax error, unexpected '*', expecting number or '-' or '(' or '!' 1.12: syntax error, unexpected number calc: error: 2222 != 1]) + +# Check that yyerrok works properly: second error is not reported, +# third and fourth are. Parse status is succesfull. +_AT_CHECK_CALC_ERROR([$1], [0], [(* *) + (*) + (*)], [113], +[1.2: syntax error, unexpected '*', expecting number or '-' or '(' or '!' +1.10: syntax error, unexpected '*', expecting number or '-' or '(' or '!' +1.16: syntax error, unexpected '*', expecting number or '-' or '(' or '!']) + AT_BISON_OPTION_POPDEFS AT_CLEANUP @@ -566,13 +611,14 @@ AT_CHECK_CALC_LALR() AT_CHECK_CALC_LALR([%defines]) AT_CHECK_CALC_LALR([%locations]) + AT_CHECK_CALC_LALR([%name-prefix="calc"]) dnl test deprecated `=' AT_CHECK_CALC_LALR([%verbose]) AT_CHECK_CALC_LALR([%yacc]) AT_CHECK_CALC_LALR([%error-verbose]) -AT_CHECK_CALC_LALR([%pure-parser %locations]) -AT_CHECK_CALC_LALR([%push-parser %locations %skeleton "push.c"]) +AT_CHECK_CALC_LALR([%define api.pure %locations]) +AT_CHECK_CALC_LALR([%define api.push-pull both %define api.pure %locations]) AT_CHECK_CALC_LALR([%error-verbose %locations]) AT_CHECK_CALC_LALR([%error-verbose %locations %defines %name-prefix "calc" %verbose %yacc]) @@ -580,10 +626,10 @@ AT_CHECK_CALC_LALR([%error-verbose %locations %defines %name-prefix "calc" %verb AT_CHECK_CALC_LALR([%debug]) AT_CHECK_CALC_LALR([%error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc]) -AT_CHECK_CALC_LALR([%pure-parser %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc]) -AT_CHECK_CALC_LALR([%push-parser %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc %skeleton "push.c"]) +AT_CHECK_CALC_LALR([%define api.pure %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc]) +AT_CHECK_CALC_LALR([%define api.push-pull both %define api.pure %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc]) -AT_CHECK_CALC_LALR([%pure-parser %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}]) +AT_CHECK_CALC_LALR([%define api.pure %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}]) # ----------------------- # @@ -609,7 +655,7 @@ AT_CHECK_CALC_GLR([%verbose]) AT_CHECK_CALC_GLR([%yacc]) AT_CHECK_CALC_GLR([%error-verbose]) -AT_CHECK_CALC_GLR([%pure-parser %locations]) +AT_CHECK_CALC_GLR([%define api.pure %locations]) AT_CHECK_CALC_GLR([%error-verbose %locations]) AT_CHECK_CALC_GLR([%error-verbose %locations %defines %name-prefix "calc" %verbose %yacc]) @@ -617,9 +663,9 @@ AT_CHECK_CALC_GLR([%error-verbose %locations %defines %name-prefix "calc" %verbo AT_CHECK_CALC_GLR([%debug]) AT_CHECK_CALC_GLR([%error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc]) -AT_CHECK_CALC_GLR([%pure-parser %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc]) +AT_CHECK_CALC_GLR([%define api.pure %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc]) -AT_CHECK_CALC_GLR([%pure-parser %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}]) +AT_CHECK_CALC_GLR([%define api.pure %error-verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}]) # ----------------------------- # @@ -628,16 +674,19 @@ AT_CHECK_CALC_GLR([%pure-parser %error-verbose %debug %locations %defines %name- AT_BANNER([[Simple LALR(1) C++ Calculator.]]) +# First let's try using %skeleton +AT_CHECK_CALC([%skeleton "lalr1.cc" %defines %locations]) + # AT_CHECK_CALC_LALR1_CC([BISON-OPTIONS]) # --------------------------------------- # Start a testing chunk which compiles `calc' grammar with # the C++ skeleton, and performs several tests over the parser. m4_define([AT_CHECK_CALC_LALR1_CC], -[AT_CHECK_CALC([%skeleton "lalr1.cc" %defines %locations] $@)]) +[AT_CHECK_CALC([%language "C++" %defines %locations] $@)]) AT_CHECK_CALC_LALR1_CC([]) +AT_CHECK_CALC_LALR1_CC([%define location_type Span]) AT_CHECK_CALC_LALR1_CC([%error-verbose %name-prefix "calc" %verbose %yacc]) - AT_CHECK_CALC_LALR1_CC([%error-verbose %debug %name-prefix "calc" %verbose %yacc]) AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %name-prefix "calc" %verbose %yacc]) @@ -652,14 +701,18 @@ AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %name-prefix "calc" % AT_BANNER([[Simple GLR C++ Calculator.]]) +# Again, we try also using %skeleton. +AT_CHECK_CALC([%skeleton "glr.cc" %defines %locations]) + # AT_CHECK_CALC_GLR_CC([BISON-OPTIONS]) # ------------------------------------- # Start a testing chunk which compiles `calc' grammar with # the GLR C++ skeleton, and performs several tests over the parser. m4_define([AT_CHECK_CALC_GLR_CC], -[AT_CHECK_CALC([%skeleton "glr.cc" %defines %locations] $@)]) +[AT_CHECK_CALC([%language "C++" %glr-parser %defines %locations] $@)]) AT_CHECK_CALC_GLR_CC([]) +AT_CHECK_CALC_GLR_CC([%define location_type Span]) AT_CHECK_CALC_GLR_CC([%error-verbose %name-prefix "calc" %verbose %yacc]) AT_CHECK_CALC_GLR_CC([%debug])