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

Support %destructor and merge error locations in lalr1.cc.

Browse Source 
* data/lalr1.cc (b4_cxx_destruct_def): New macro.
(Parser::stos_): Define unconditionally.
(Parser::destruct_): New method.  Generate its body with
b4_yydestruct_generate.
(Parser::error_start_): New attribute.
(Parser::parse) <yyerrlab, yyerrlab1>: Call destruct_ on erroneous
token which are discarded.
(Parser::parse) <yyerrlab, yyerrorlab, yyerrlab1>: Update
error_start_ when erroneous token are discarded.
(Parser::parse) <yyerrlab1>: Compute the location of the error
token so that it covers all the discarded tokens.
* tests/actions.at (_AT_CHECK_PRINTER_AND_DESTRUCTOR): Adjust so
it can be called with `%skeleton "lalr1.cc"', and do that.
This commit is contained in:
Alexandre Duret-Lutz
2004-02-09 21:31:42 +00:00
parent 0b31edd3e1
commit c2729758f2
3 changed files with 106 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
tests/actions.at
View File

@@ -1,5 +1,5 @@
# Executing Actions. -*- Autotest -*-
# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
# Copyright (C) 2001, 2002, 2003 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
@@ -314,15 +314,16 @@ AT_SETUP([Printers and Destructors: $5])
# Make sure complex $n work.
AT_BISON_OPTION_PUSHDEFS([$5])
AT_DATA_GRAMMAR([[input.y]],
[[$5
%{
#include <stdio.h>
#include <stdlib.h>
#define RANGE(Location) (Location).first_line, (Location).last_line
static int yylex (void);
static void yyerror (const char *msg);
%}
]AT_LALR1_CC_IF(
[#define RANGE(Location) (Location).begin.line, (Location).end.line],
[#define RANGE(Location) (Location).first_line, (Location).last_line])
[%}
%error-verbose
%debug
%verbose
@@ -331,6 +332,13 @@ static void yyerror (const char *msg);
{
int ival;
}
%{
]AT_LALR1_CC_IF([typedef yy::Location YYLTYPE;])
[static int yylex (]AT_LEX_FORMALS[);
static void yyerror (const char *msg);
%}
%type <ival> 'x' ';' thing line input
%printer { fprintf (yyoutput, "%d@%d-%d", $$, RANGE (@$)); }
@@ -406,7 +414,7 @@ thing:
;
%%
static int
yylex (void)
yylex (]AT_LEX_FORMALS[)
{
static const unsigned int input[] =
{
@@ -424,13 +432,23 @@ yylex (void)
if (counter < (sizeof(input) / sizeof (input[0])))
{
yylval.ival = counter;
]AT_LALR1_CC_IF(
[ yylval->ival = counter;
/* As in BASIC, line numbers go from 10 to 10. */
yylloc->begin.line = yylloc->begin.column = 10 * counter;
yylloc->end.line = yylloc->end.column = yylloc->begin.line + 9;
printf ("sending: '%c' (%d@%d-%d)\n",
input[[counter]], yylval->ival, RANGE (*yylloc));
return (int) input[[counter++]];
],
[ yylval.ival = counter;
/* As in BASIC, line numbers go from 10 to 10. */
yylloc.first_line = yylloc.first_column = 10 * counter;
yylloc.last_line = yylloc.last_column = yylloc.first_line + 9;
printf ("sending: '%c' (%d@%d-%d)\n",
input[counter], yylval.ival, RANGE (yylloc));
return (int) input[counter++];
input[[counter]], yylval.ival, RANGE (yylloc));
return (int) input[[counter++]];
])[
}
else
{
@@ -439,11 +457,34 @@ yylex (void)
}
}
static void
]AT_LALR1_CC_IF(
[/* Currently, print_ is required in C++. */
void
yy::Parser::print_ ()
{
std::cerr << location;
}
/* A C++ error reporting function. */
void
yy::Parser::error_ ()
{
printf ("%d-%d: %s\n", RANGE (location), message.c_str());
}
static bool yydebug;
int
yyparse ()
{
yy::Parser parser (yydebug, yy::Location::Location ());
return parser.parse ();
}
],
[static void
yyerror (const char *msg)
{
printf ("%d-%d: %s\n", RANGE (yylloc), msg);
}
}])[
int
main (void)
@@ -460,7 +501,8 @@ main (void)
]])
AT_CHECK([bison -o input.c input.y])
AT_COMPILE([input])
AT_LALR1_CC_IF([AT_COMPILE_CXX([input])],
[AT_COMPILE([input])])
AT_PARSER_CHECK([./input], 1,
[[sending: 'x' (0@0-9)
thing (0@0-9): 'x' (0@0-9)
@@ -512,6 +554,7 @@ m4_define([AT_CHECK_PRINTER_AND_DESTRUCTOR],
AT_CHECK_PRINTER_AND_DESTRUCTOR()
AT_CHECK_PRINTER_AND_DESTRUCTOR([%locations %defines %skeleton "lalr1.cc"])
# FIXME. This test case fails.
#AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser])