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

Alexandre Duret-Lutz <adl@gnu.org>

Browse Source 
Move the token type and YYSTYPE in the parser class.
* data/lalr1.cc (stack.hh, location.hh): Include earlier.
(parser::token): New, from the moved free definition of tokens.
(parser::semantic_value): Now a full definition instead of an
indirection to YYSTYPE.
(b4_post_prologue): No longer included in the header file, but
in the implementation file.
* doc/bison.texi (C+ Language Interface): Update.
* src/parse-gram.y: Support unary %define.
* tests/actions.at: Define global_tokens_and_yystype for backward
compatibility until we update the tests.
* tests/calc.at: Idem.
(first_line, first_column, last_line, last_column): Define for lalr1.cc
to simplify the code.
This commit is contained in:
Akim Demaille
2005-09-30 17:57:05 +00:00
parent 55f0c7b1f2
commit fb9712a962
10 changed files with 394 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/actions.at
View File

@@ -187,6 +187,7 @@ m4_ifval([$6], [%union
{
int ival;
}])
AT_LALR1_CC_IF([%define "global_tokens_and_yystype"])
[
%{
]AT_LALR1_CC_IF([typedef yy::location YYLTYPE;

44
tests/calc.at
View File

@@ -39,7 +39,9 @@ m4_define([_AT_DATA_CALC_Y],
[m4_fatal([$0: Invalid arguments: $@])])dnl
AT_DATA_GRAMMAR([calc.y],
[[/* Infix notation calculator--calc */
]$4[
]$4
AT_LALR1_CC_IF(
[%define "global_tokens_and_yystype"])[
%{
#include <stdio.h>
@@ -68,7 +70,13 @@ static int global_count = 0;
%{
static int power (int base, int exponent);
]AT_LALR1_CC_IF([typedef yy::location YYLTYPE;],
]AT_LALR1_CC_IF(
[typedef yy::location YYLTYPE;
#define first_line begin.line
#define first_column begin.column
#define last_line end.line
#define last_column end.column
],
[/* yyerror receives the location if:
- %location & %pure & %glr
- %location & %pure & %yacc & %parse-param. */
@@ -176,16 +184,11 @@ get_char (]AT_LEX_FORMALS[)
last_yylloc = AT_LOC;
if (res == '\n')
{
AT_LALR1_CC_IF(
[ AT_LOC.end.line++;
AT_LOC.end.column = 0;],
[ AT_LOC.last_line++;
AT_LOC.last_column = 0;])
AT_LOC.last_line++;
AT_LOC.last_column = 0;
}
else
AT_LALR1_CC_IF(
[ AT_LOC.end.column++;],
[ AT_LOC.last_column++;])
AT_LOC.last_column++;
])[
return res;
}
@@ -244,27 +247,24 @@ yylex (]AT_LEX_FORMALS[)
if (init)
{
init = 0;
]AT_LALR1_CC_IF([],
[AT_LOCATION_IF([
]AT_LOCATION_IF([
AT_LOC.last_column = 0;
AT_LOC.last_line = 1;
])])[
])[
}
]AT_LOCATION_IF([AT_LALR1_CC_IF(
[ AT_LOC.begin = AT_LOC.end;],
[ AT_LOC.first_column = AT_LOC.last_column;
]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_LALR1_CC_IF(
[ AT_LOC.begin = AT_LOC.end;],
]AT_LOCATION_IF(
[ AT_LOC.first_column = AT_LOC.last_column;
AT_LOC.first_line = AT_LOC.last_line;
])])[
])[
}
/* process numbers */
@@ -428,8 +428,8 @@ AT_CHECK([cat stderr], 0, [expout])
])
# AT_CHECK_CALC([BISON-OPTIONS [, EXPECTED-TO-FAIL]])
# ------------------------------
# AT_CHECK_CALC([BISON-OPTIONS, [EXPECTED-TO-FAIL]])
# --------------------------------------------------
# Start a testing chunk which compiles `calc' grammar with
# BISON-OPTIONS, and performs several tests over the parser.
# However, if EXPECTED-TO-FAIL is nonempty, this test is expected to fail.