add '^' to const expressions

This commit is contained in:
David Rose 2010-05-06 22:50:31 +00:00
parent 91e6231a3c
commit d3d778734d
3 changed files with 3583 additions and 2413 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,12 +1,15 @@
/* A Bison parser, made by GNU Bison 2.0. */
/* Skeleton parser for Yacc-like parsing with Bison,
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
/* A Bison parser, made by GNU Bison 2.4.1. */
This program is free software; you can redistribute it and/or modify
/* Skeleton interface for Bison's Yacc-like parsers in C
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
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.
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
@ -14,14 +17,21 @@
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., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
under terms of your choice, so long as that work isn't itself a
parser generator using the skeleton or a modified version thereof
as a parser skeleton. Alternatively, if you modify or redistribute
the parser skeleton itself, you may (at your option) remove this
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
/* As a special exception, when this file is copied by Bison into a
Bison output file, you may use that output file without restriction.
This special exception was added by the Free Software Foundation
in version 1.24 of Bison. */
/* Tokens. */
#ifndef YYTOKENTYPE
@ -131,6 +141,7 @@
START_TYPE = 357
};
#endif
/* Tokens. */
#define REAL 258
#define INTEGER 259
#define CHAR_TOK 260
@ -235,16 +246,15 @@
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
typedef int YYSTYPE;
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
#endif
#if ! defined (YYLTYPE) && ! defined (YYLTYPE_IS_DECLARED)
#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
typedef struct YYLTYPE
{
int first_line;
@ -259,4 +269,3 @@ typedef struct YYLTYPE

View File

@ -2191,6 +2191,10 @@ no_angle_bracket_const_expr:
| no_angle_bracket_const_expr '|' no_angle_bracket_const_expr
{
$$ = new CPPExpression('|', $1, $3);
}
| no_angle_bracket_const_expr '^' no_angle_bracket_const_expr
{
$$ = new CPPExpression('^', $1, $3);
}
| no_angle_bracket_const_expr '&' no_angle_bracket_const_expr
{
@ -2410,6 +2414,10 @@ const_expr:
| const_expr '|' const_expr
{
$$ = new CPPExpression('|', $1, $3);
}
| const_expr '^' const_expr
{
$$ = new CPPExpression('^', $1, $3);
}
| const_expr '&' const_expr
{
@ -2599,6 +2607,10 @@ formal_const_expr:
| formal_const_expr '|' const_expr
{
$$ = new CPPExpression('|', $1, $3);
}
| formal_const_expr '^' const_expr
{
$$ = new CPPExpression('^', $1, $3);
}
| formal_const_expr '&' const_expr
{