fix for more recent bison

This commit is contained in:
David Rose 2009-03-08 00:09:19 +00:00
parent 8b407bb654
commit bc40be4775
3 changed files with 381 additions and 264 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
/* A Bison parser, made by GNU Bison 2.0. */
/* A Bison parser, made by GNU Bison 2.1. */
/* Skeleton parser for Yacc-like parsing with Bison,
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
Copyright (C) 1984, 1989, 1990, 2000, 2001, 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
@ -15,8 +15,8 @@
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., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
/* As a special exception, when this file is copied by Bison into a
Bison output file, you may use that output file without restriction.
@ -71,6 +71,7 @@
START_PARAMETER_DESCRIPTION = 297
};
#endif
/* Tokens. */
#define UNSIGNED_INTEGER 258
#define SIGNED_INTEGER 259
#define REAL 260

View File

@ -291,7 +291,6 @@ dclass_or_struct:
dclass:
KW_DCLASS optional_name
{
$$ = current_class;
current_class = new DCClass(dc_file, $2, false, false);
}
dclass_derivation '{' dclass_fields '}'
@ -396,7 +395,6 @@ dclass_field:
struct:
KW_STRUCT optional_name
{
$$ = current_class;
current_class = new DCClass(dc_file, $2, true, false);
}
struct_derivation '{' struct_fields '}'
@ -484,7 +482,6 @@ struct_field:
atomic_field:
optional_name '('
{
$$ = current_atomic;
if (current_class == (DCClass *)NULL) {
yyerror("Cannot define a method outside of a struct or class.");
DCClass *temp_class = new DCClass(dc_file, "temp", false, false); // memory leak.
@ -967,7 +964,6 @@ char_or_number:
parameter_value:
parameter_actual_value
{
$$ = $1;
}
| IDENTIFIER '='
{
@ -980,7 +976,6 @@ parameter_value:
}
parameter_actual_value
{
$$ = $4;
}
;
@ -1242,7 +1237,6 @@ optional_name:
switch:
KW_SWITCH optional_name '(' parameter_or_atomic ')' '{'
{
$$ = current_switch;
current_switch = new DCSwitch($2, $4);
}
switch_fields '}'