Fix a bunch of missing semicolon parse errors from bison.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33426 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jeff Cohen 2007-01-21 19:30:52 +00:00
parent 361c3efd9a
commit ac2dca9a6f
4 changed files with 1334 additions and 1552 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.1. */ /* A Bison parser, made from /usr/home/jeffc/llvm/tools/llvm-upgrade/UpgradeParser.y, by GNU bison 1.75. */
/* Skeleton parser for Yacc-like parsing with Bison, /* Skeleton parser for Yacc-like parsing with Bison,
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 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 it under the terms of the GNU General Public License as published by
@ -15,14 +15,17 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02110-1301, USA. */ Boston, MA 02111-1307, USA. */
/* As a special exception, when this file is copied by Bison into a /* As a special exception, when this file is copied by Bison into a
Bison output file, you may use that output file without restriction. Bison output file, you may use that output file without restriction.
This special exception was added by the Free Software Foundation This special exception was added by the Free Software Foundation
in version 1.24 of Bison. */ in version 1.24 of Bison. */
#ifndef BISON_UPGRADEPARSER_TAB_H
# define BISON_UPGRADEPARSER_TAB_H
/* Tokens. */ /* Tokens. */
#ifndef YYTOKENTYPE #ifndef YYTOKENTYPE
# define YYTOKENTYPE # define YYTOKENTYPE
@ -178,7 +181,6 @@
BITCAST = 404 BITCAST = 404
}; };
#endif #endif
/* Tokens. */
#define VOID 258 #define VOID 258
#define BOOL 259 #define BOOL 259
#define SBYTE 260 #define SBYTE 260
@ -330,24 +332,23 @@
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) #ifndef YYSTYPE
#line 971 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y" #line 971 "/usr/home/jeffc/llvm/tools/llvm-upgrade/UpgradeParser.y"
typedef union YYSTYPE { typedef union {
std::string* String; std::string* String;
const Type* Ty; const Type* Ty;
Value* Val; Value* Val;
Constant* Const; Constant* Const;
ValueList* ValList; ValueList* ValList;
TypeList* TypeVec; TypeList* TypeVec;
} YYSTYPE; } yystype;
/* Line 1447 of yacc.c. */ /* Line 1237 of /usr/local/share/bison/yacc.c. */
#line 345 "UpgradeParser.tab.h" #line 347 "UpgradeParser.tab.h"
# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE yystype
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
#endif #endif
extern YYSTYPE Upgradelval; extern YYSTYPE Upgradelval;
#endif /* not BISON_UPGRADEPARSER_TAB_H */

View File

@ -1483,8 +1483,9 @@ DefinitionList : DefinitionList Function {
$$ = 0; $$ = 0;
} }
| ConstPool { $$ = 0; } | ConstPool { $$ = 0; }
;
External : EXTERNAL | UNINITIALIZED { $$ = $1; *$$ = "external"; } External : EXTERNAL | UNINITIALIZED { $$ = $1; *$$ = "external"; } ;
// ConstPool - Constants with optional names assigned to them. // ConstPool - Constants with optional names assigned to them.
ConstPool : ConstPool OptAssign TYPE TypesV { ConstPool : ConstPool OptAssign TYPE TypesV {
@ -1564,7 +1565,7 @@ ConstPool : ConstPool OptAssign TYPE TypesV {
AsmBlock : STRINGCONSTANT ; AsmBlock : STRINGCONSTANT ;
BigOrLittle : BIG | LITTLE BigOrLittle : BIG | LITTLE ;
TargetDefinition TargetDefinition
: ENDIAN '=' BigOrLittle { : ENDIAN '=' BigOrLittle {
@ -1671,6 +1672,7 @@ FunctionHeaderH
BEGIN : BEGINTOK { $$ = new std::string("{"); delete $1; } BEGIN : BEGINTOK { $$ = new std::string("{"); delete $1; }
| '{' { $$ = new std::string ("{"); } | '{' { $$ = new std::string ("{"); }
;
FunctionHeader FunctionHeader
: OptLinkage FunctionHeaderH BEGIN { : OptLinkage FunctionHeaderH BEGIN {
@ -1796,7 +1798,7 @@ InstructionList : InstructionList Inst {
$$ = 0; $$ = 0;
}; };
Unwind : UNWIND | EXCEPT { $$ = $1; *$$ = "unwind"; } Unwind : UNWIND | EXCEPT { $$ = $1; *$$ = "unwind"; } ;
BBTerminatorInst : RET ResolvedVal { // Return with a result... BBTerminatorInst : RET ResolvedVal { // Return with a result...
*O << " " << *$1 << ' ' << *$2->val << '\n'; *O << " " << *$1 << ' ' << *$2->val << '\n';

View File

@ -1483,8 +1483,9 @@ DefinitionList : DefinitionList Function {
$$ = 0; $$ = 0;
} }
| ConstPool { $$ = 0; } | ConstPool { $$ = 0; }
;
External : EXTERNAL | UNINITIALIZED { $$ = $1; *$$ = "external"; } External : EXTERNAL | UNINITIALIZED { $$ = $1; *$$ = "external"; } ;
// ConstPool - Constants with optional names assigned to them. // ConstPool - Constants with optional names assigned to them.
ConstPool : ConstPool OptAssign TYPE TypesV { ConstPool : ConstPool OptAssign TYPE TypesV {
@ -1564,7 +1565,7 @@ ConstPool : ConstPool OptAssign TYPE TypesV {
AsmBlock : STRINGCONSTANT ; AsmBlock : STRINGCONSTANT ;
BigOrLittle : BIG | LITTLE BigOrLittle : BIG | LITTLE ;
TargetDefinition TargetDefinition
: ENDIAN '=' BigOrLittle { : ENDIAN '=' BigOrLittle {
@ -1671,6 +1672,7 @@ FunctionHeaderH
BEGIN : BEGINTOK { $$ = new std::string("{"); delete $1; } BEGIN : BEGINTOK { $$ = new std::string("{"); delete $1; }
| '{' { $$ = new std::string ("{"); } | '{' { $$ = new std::string ("{"); }
;
FunctionHeader FunctionHeader
: OptLinkage FunctionHeaderH BEGIN { : OptLinkage FunctionHeaderH BEGIN {
@ -1796,7 +1798,7 @@ InstructionList : InstructionList Inst {
$$ = 0; $$ = 0;
}; };
Unwind : UNWIND | EXCEPT { $$ = $1; *$$ = "unwind"; } Unwind : UNWIND | EXCEPT { $$ = $1; *$$ = "unwind"; } ;
BBTerminatorInst : RET ResolvedVal { // Return with a result... BBTerminatorInst : RET ResolvedVal { // Return with a result...
*O << " " << *$1 << ' ' << *$2->val << '\n'; *O << " " << *$1 << ' ' << *$2->val << '\n';