From 71d2ec9e6d20bd8701471bc6e6db620838ce3539 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Sun, 31 Dec 2006 06:02:26 +0000 Subject: [PATCH] For PR950: Convert signed integer types to signless. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32790 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/bugpoint/ExtractFunction.cpp | 2 +- tools/bugpoint/Miscompilation.cpp | 6 +- tools/lli/lli.cpp | 4 +- tools/llvm-upgrade/ParserInternals.h | 11 +- tools/llvm-upgrade/UpgradeLexer.cpp | 1593 +++++++-------- tools/llvm-upgrade/UpgradeLexer.cpp.cvs | 1593 +++++++-------- tools/llvm-upgrade/UpgradeLexer.l.cvs | 21 +- tools/llvm-upgrade/UpgradeParser.cpp | 2336 +++++++++++----------- tools/llvm-upgrade/UpgradeParser.cpp.cvs | 2336 +++++++++++----------- tools/llvm-upgrade/UpgradeParser.h | 470 +++-- tools/llvm-upgrade/UpgradeParser.h.cvs | 470 +++-- tools/llvm-upgrade/UpgradeParser.y.cvs | 38 +- tools/llvm-upgrade/llvm-upgrade.cpp | 8 +- tools/llvm2cpp/CppWriter.cpp | 36 +- 14 files changed, 4453 insertions(+), 4471 deletions(-) diff --git a/tools/bugpoint/ExtractFunction.cpp b/tools/bugpoint/ExtractFunction.cpp index 43e68404cb2..34fa727f0e7 100644 --- a/tools/bugpoint/ExtractFunction.cpp +++ b/tools/bugpoint/ExtractFunction.cpp @@ -180,7 +180,7 @@ static Constant *GetTorInit(std::vector > &TorList) { std::vector ArrayElts; for (unsigned i = 0, e = TorList.size(); i != e; ++i) { std::vector Elts; - Elts.push_back(ConstantInt::get(Type::IntTy, TorList[i].second)); + Elts.push_back(ConstantInt::get(Type::Int32Ty, TorList[i].second)); Elts.push_back(TorList[i].first); ArrayElts.push_back(ConstantStruct::get(Elts)); } diff --git a/tools/bugpoint/Miscompilation.cpp b/tools/bugpoint/Miscompilation.cpp index 344d350b29d..e3d52717d99 100644 --- a/tools/bugpoint/Miscompilation.cpp +++ b/tools/bugpoint/Miscompilation.cpp @@ -675,8 +675,8 @@ static void CleanupAndPrepareModules(BugDriver &BD, Module *&Test, // Prototype: void *getPointerToNamedFunction(const char* Name) Function *resolverFunc = Safe->getOrInsertFunction("getPointerToNamedFunction", - PointerType::get(Type::SByteTy), - PointerType::get(Type::SByteTy), (Type *)0); + PointerType::get(Type::Int8Ty), + PointerType::get(Type::Int8Ty), (Type *)0); // Use the function we just added to get addresses of functions we need. for (Module::iterator F = Safe->begin(), E = Safe->end(); F != E; ++F) { @@ -697,7 +697,7 @@ static void CleanupAndPrepareModules(BugDriver &BD, Module *&Test, // sbyte* so it matches the signature of the resolver function. // GetElementPtr *funcName, ulong 0, ulong 0 - std::vector GEPargs(2,Constant::getNullValue(Type::IntTy)); + std::vector GEPargs(2,Constant::getNullValue(Type::Int32Ty)); Value *GEP = ConstantExpr::getGetElementPtr(funcName, GEPargs); std::vector ResolverArgs; diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp index 149536af1b6..5b139bff1a2 100644 --- a/tools/lli/lli.cpp +++ b/tools/lli/lli.cpp @@ -121,12 +121,12 @@ int main(int argc, char **argv, char * const *envp) { // If the program didn't explicitly call exit, call exit now, for the // program. This ensures that any atexit handlers get called correctly. Function *Exit = MP->getModule()->getOrInsertFunction("exit", Type::VoidTy, - Type::IntTy, + Type::Int32Ty, (Type *)0); std::vector Args; GenericValue ResultGV; - ResultGV.IntVal = Result; + ResultGV.Int32Val = Result; Args.push_back(ResultGV); EE->runFunction(Exit, Args); diff --git a/tools/llvm-upgrade/ParserInternals.h b/tools/llvm-upgrade/ParserInternals.h index 7487a581601..85182c5dc19 100644 --- a/tools/llvm-upgrade/ParserInternals.h +++ b/tools/llvm-upgrade/ParserInternals.h @@ -28,7 +28,8 @@ extern std::istream* LexInput; void UpgradeAssembly( - const std::string & infile, std::istream& in, std::ostream &out, bool debug); + const std::string & infile, std::istream& in, std::ostream &out, bool debug, + bool addAttrs); // Globals exported by the parser... extern char* Upgradetext; @@ -42,8 +43,8 @@ int yyerror(const char *ErrorMsg) ; /// signed instructions with signless operands. enum Types { BoolTy, SByteTy, UByteTy, ShortTy, UShortTy, IntTy, UIntTy, LongTy, ULongTy, - FloatTy, DoubleTy, PointerTy, PackedTy, ArrayTy, StructTy, OpaqueTy, VoidTy, - LabelTy, FunctionTy, UnresolvedTy, NumericTy + FloatTy, DoubleTy, PointerTy, PackedTy, ArrayTy, StructTy, PackedStructTy, + OpaqueTy, VoidTy, LabelTy, FunctionTy, UnresolvedTy, NumericTy }; /// This type is used to keep track of the signedness of the obsolete @@ -91,6 +92,10 @@ struct TypeInfo { bool isOther() const { return !isPacked() && !isPointer() && !isFloatingPoint() && !isIntegral(); } + bool isAttributeCandidate() const { + return isIntegral() && getBitWidth() < 32; + } + unsigned getBitWidth() const { switch (oldTy) { case LabelTy: diff --git a/tools/llvm-upgrade/UpgradeLexer.cpp b/tools/llvm-upgrade/UpgradeLexer.cpp index 722ffc617f2..3894057d564 100644 --- a/tools/llvm-upgrade/UpgradeLexer.cpp +++ b/tools/llvm-upgrade/UpgradeLexer.cpp @@ -317,39 +317,39 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); *yy_cp = '\0'; \ yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 154 -#define YY_END_OF_BUFFER 155 -static yyconst short int yy_acclist[232] = +#define YY_NUM_RULES 157 +#define YY_END_OF_BUFFER 158 +static yyconst short int yy_acclist[235] = { 0, - 155, 153, 154, 152, 153, 154, 152, 154, 153, 154, - 153, 154, 153, 154, 153, 154, 153, 154, 153, 154, - 145, 153, 154, 145, 153, 154, 1, 153, 154, 153, - 154, 153, 154, 153, 154, 153, 154, 153, 154, 153, - 154, 153, 154, 153, 154, 153, 154, 153, 154, 153, - 154, 153, 154, 153, 154, 153, 154, 153, 154, 153, - 154, 153, 154, 153, 154, 153, 154, 153, 154, 153, - 154, 144, 142, 141, 141, 148, 146, 150, 145, 1, - 126, 40, 84, 85, 74, 24, 144, 141, 141, 149, - 150, 21, 150, 151, 62, 73, 38, 33, 41, 65, + 158, 156, 157, 155, 156, 157, 155, 157, 156, 157, + 156, 157, 156, 157, 156, 157, 156, 157, 156, 157, + 148, 156, 157, 148, 156, 157, 1, 156, 157, 156, + 157, 156, 157, 156, 157, 156, 157, 156, 157, 156, + 157, 156, 157, 156, 157, 156, 157, 156, 157, 156, + 157, 156, 157, 156, 157, 156, 157, 156, 157, 156, + 157, 156, 157, 156, 157, 156, 157, 156, 157, 156, + 157, 147, 145, 144, 144, 151, 149, 153, 148, 1, + 129, 39, 87, 56, 88, 77, 23, 147, 144, 144, + 152, 153, 20, 153, 154, 65, 76, 37, 32, 40, - 3, 53, 64, 90, 95, 93, 94, 92, 91, 96, - 104, 69, 125, 89, 87, 120, 121, 88, 86, 63, - 98, 103, 101, 102, 100, 99, 97, 75, 143, 150, - 150, 122, 48, 105, 106, 83, 68, 134, 72, 82, - 135, 55, 123, 23, 147, 67, 109, 71, 25, 4, - 61, 66, 54, 70, 47, 12, 108, 150, 35, 2, - 5, 57, 111, 59, 49, 77, 81, 79, 80, 78, - 76, 51, 136, 107, 50, 56, 22, 133, 44, 7, - 58, 29, 130, 43, 113, 112, 8, 128, 32, 132, - 37, 60, 119, 115, 127, 26, 27, 114, 129, 52, + 68, 3, 57, 58, 59, 52, 67, 93, 98, 96, + 97, 95, 94, 99, 107, 72, 128, 92, 90, 123, + 124, 91, 89, 66, 101, 106, 104, 105, 103, 102, + 100, 78, 146, 153, 153, 125, 47, 108, 109, 86, + 71, 137, 75, 85, 138, 54, 126, 22, 150, 70, + 112, 74, 24, 4, 64, 69, 53, 73, 46, 11, + 111, 153, 34, 2, 5, 60, 114, 62, 48, 80, + 84, 82, 83, 81, 79, 50, 139, 110, 49, 55, + 21, 136, 43, 61, 28, 133, 42, 116, 115, 7, + 131, 31, 135, 36, 63, 122, 118, 130, 25, 26, - 124, 118, 42, 6, 28, 110, 36, 9, 17, 10, - 117, 11, 116, 34, 13, 15, 14, 31, 39, 16, - 30, 131, 137, 139, 140, 18, 45, 138, 19, 46, - 20 + 117, 132, 51, 127, 121, 41, 6, 27, 113, 35, + 8, 16, 9, 120, 10, 119, 33, 12, 14, 13, + 30, 38, 15, 29, 134, 140, 142, 143, 17, 44, + 141, 18, 45, 19 } ; -static yyconst short int yy_accept[606] = +static yyconst short int yy_accept[609] = { 0, 1, 1, 1, 2, 4, 7, 9, 11, 13, 15, 17, 19, 21, 24, 27, 30, 32, 34, 36, 38, @@ -359,65 +359,65 @@ static yyconst short int yy_accept[606] = 81, 81, 81, 81, 81, 81, 81, 81, 81, 82, 82, 83, 83, 83, 83, 83, 83, 83, 83, 83, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, - 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, - 85, 85, 85, 85, 85, 85, 85, 86, 86, 86, + 84, 84, 84, 85, 85, 85, 85, 85, 85, 85, + 85, 85, 85, 85, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 88, 89, 91, 92, 93, 94, 94, - 95, 96, 96, 96, 97, 97, 97, 98, 98, 99, - 99, 99, 99, 99, 100, 100, 100, 100, 100, 100, - 100, 100, 101, 101, 101, 102, 102, 102, 102, 102, - 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, - 102, 103, 103, 103, 103, 103, 103, 103, 103, 103, - 103, 104, 104, 105, 106, 107, 108, 109, 110, 110, + 86, 87, 87, 87, 87, 87, 87, 87, 87, 87, + 87, 87, 87, 87, 87, 87, 87, 87, 87, 88, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 88, 89, 90, 92, + 93, 94, 95, 95, 96, 97, 97, 97, 98, 98, + 98, 99, 99, 100, 100, 100, 100, 100, 101, 101, + 101, 101, 101, 101, 101, 102, 102, 102, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 104, 105, 106, 106, 106, 106, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 108, 108, 109, - 111, 112, 112, 112, 113, 114, 114, 114, 114, 114, - 114, 114, 114, 115, 116, 117, 117, 118, 118, 118, - 118, 119, 120, 120, 120, 121, 121, 121, 121, 121, - 121, 121, 121, 121, 122, 123, 124, 124, 124, 125, - 125, 126, 126, 127, 127, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 129, 129, 129, 130, 131, - 131, 131, 131, 132, 132, 132, 132, 133, 133, 133, - 134, 135, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 137, - 138, 138, 138, 138, 138, 139, 140, 140, 140, 141, + 110, 111, 112, 113, 114, 114, 115, 116, 116, 116, + 117, 118, 118, 118, 118, 118, 118, 118, 118, 119, + 120, 121, 121, 122, 122, 122, 122, 123, 124, 124, + 124, 125, 125, 125, 125, 125, 125, 125, 125, 125, + 126, 127, 128, 128, 128, 129, 129, 130, 130, 131, + 131, 132, 132, 132, 132, 132, 132, 132, 132, 132, + 132, 133, 133, 133, 134, 135, 135, 135, 135, 136, + 136, 136, 136, 137, 137, 137, 138, 139, 140, 140, + 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, + 140, 140, 140, 140, 141, 142, 142, 142, 142, 142, - 141, 141, 141, 141, 141, 141, 141, 141, 142, 143, - 144, 144, 144, 145, 145, 145, 145, 146, 146, 147, - 147, 147, 147, 147, 147, 147, 148, 148, 148, 148, - 148, 149, 149, 149, 150, 150, 150, 151, 151, 152, - 152, 153, 154, 154, 154, 154, 154, 154, 154, 155, - 155, 155, 156, 156, 157, 157, 157, 158, 159, 160, - 160, 160, 161, 161, 161, 161, 161, 161, 161, 161, - 161, 161, 161, 161, 161, 161, 161, 161, 162, 162, - 163, 164, 164, 164, 164, 164, 164, 164, 164, 164, - 164, 164, 165, 165, 165, 165, 165, 165, 165, 165, + 143, 144, 144, 144, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 146, 147, 148, 148, 148, 149, 149, + 149, 149, 150, 150, 151, 151, 151, 151, 151, 151, + 151, 152, 152, 152, 152, 152, 153, 153, 153, 154, + 154, 154, 155, 155, 156, 156, 157, 158, 158, 158, + 158, 158, 158, 158, 159, 159, 159, 160, 160, 161, + 161, 161, 162, 163, 164, 164, 164, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 166, 166, 167, 168, 168, 168, 168, 168, + 168, 168, 168, 168, 168, 168, 169, 169, 169, 169, - 166, 166, 166, 167, 168, 169, 170, 171, 172, 173, - 173, 173, 173, 174, 174, 174, 174, 175, 176, 176, - 177, 178, 178, 178, 178, 178, 178, 178, 178, 178, - 178, 179, 179, 179, 180, 180, 180, 180, 180, 181, - 181, 181, 181, 182, 183, 184, 184, 184, 185, 186, - 187, 187, 187, 188, 188, 188, 188, 188, 189, 189, - 190, 191, 192, 193, 193, 193, 193, 194, 194, 194, - 195, 196, 197, 198, 199, 199, 199, 200, 201, 202, - 202, 202, 202, 202, 202, 203, 203, 204, 204, 205, - 206, 206, 206, 206, 206, 206, 207, 207, 207, 207, + 169, 169, 169, 169, 170, 170, 170, 171, 172, 173, + 174, 175, 176, 177, 177, 177, 177, 178, 178, 178, + 178, 179, 180, 180, 181, 182, 182, 182, 182, 182, + 182, 182, 182, 182, 182, 183, 183, 183, 184, 184, + 184, 184, 184, 184, 184, 184, 185, 186, 187, 187, + 187, 188, 189, 190, 190, 190, 191, 191, 191, 191, + 191, 192, 192, 193, 194, 195, 196, 196, 196, 196, + 197, 197, 197, 198, 199, 200, 201, 202, 202, 202, + 203, 204, 205, 205, 205, 205, 205, 205, 206, 206, + 207, 207, 208, 209, 209, 209, 209, 209, 209, 210, - 207, 207, 207, 207, 207, 208, 208, 208, 208, 208, - 208, 208, 208, 208, 208, 209, 209, 209, 209, 209, - 210, 210, 210, 210, 210, 211, 212, 213, 213, 214, - 214, 214, 214, 214, 215, 215, 215, 215, 216, 216, - 217, 218, 218, 218, 218, 218, 218, 218, 218, 218, - 218, 218, 218, 218, 218, 219, 219, 219, 219, 219, - 219, 219, 219, 220, 220, 220, 220, 220, 220, 221, - 221, 221, 221, 221, 222, 222, 222, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - 223, 224, 224, 225, 226, 227, 227, 228, 228, 229, + 210, 210, 210, 210, 210, 210, 210, 210, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 212, 212, + 212, 212, 212, 213, 213, 213, 213, 213, 214, 215, + 216, 216, 217, 217, 217, 217, 217, 218, 218, 218, + 218, 219, 219, 220, 221, 221, 221, 221, 221, 221, + 221, 221, 221, 221, 221, 221, 221, 221, 222, 222, + 222, 222, 222, 222, 222, 222, 223, 223, 223, 223, + 223, 223, 224, 224, 224, 224, 224, 225, 225, 225, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 227, 227, 228, 229, 230, 230, - 230, 231, 231, 232, 232 + 231, 231, 232, 233, 234, 234, 235, 235 } ; static yyconst int yy_ec[256] = @@ -426,16 +426,16 @@ static yyconst int yy_ec[256] = 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 4, 1, 5, 6, 1, 1, 1, - 1, 1, 7, 1, 8, 9, 1, 10, 11, 11, - 11, 11, 11, 12, 11, 13, 11, 14, 15, 1, - 1, 1, 1, 1, 16, 16, 16, 16, 17, 16, + 1, 1, 7, 1, 8, 9, 1, 10, 11, 12, + 13, 14, 15, 16, 15, 17, 15, 18, 19, 1, + 1, 1, 1, 1, 20, 20, 20, 20, 21, 20, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 1, 1, 1, 1, 18, 1, 19, 20, 21, 22, + 1, 1, 1, 1, 22, 1, 23, 24, 25, 26, - 23, 24, 25, 26, 27, 5, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 1, 1, 1, 1, 1, 1, 1, 1, + 27, 28, 29, 30, 31, 5, 32, 33, 34, 35, + 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, + 46, 47, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -452,288 +452,290 @@ static yyconst int yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst int yy_meta[44] = +static yyconst int yy_meta[48] = { 0, - 1, 1, 2, 1, 3, 1, 1, 3, 3, 3, - 3, 3, 3, 4, 1, 3, 3, 3, 3, 3, + 1, 1, 2, 1, 3, 1, 4, 5, 3, 6, + 6, 6, 6, 6, 6, 6, 6, 7, 1, 3, + 8, 3, 3, 3, 3, 3, 8, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3 + 3, 3, 3, 3, 3, 3, 3 } ; -static yyconst short int yy_base[610] = +static yyconst short int yy_base[617] = { 0, - 0, 0, 1298, 1299, 1299, 1299, 1293, 1282, 36, 40, - 44, 50, 56, 62, 0, 63, 66, 81, 89, 47, - 108, 91, 105, 96, 119, 68, 144, 128, 111, 170, - 136, 201, 130, 117, 132, 125, 1291, 1299, 1280, 1299, - 0, 175, 190, 207, 229, 70, 234, 249, 254, 0, - 139, 145, 167, 76, 168, 138, 255, 31, 1279, 177, - 90, 198, 48, 110, 258, 195, 221, 211, 200, 1278, - 267, 269, 270, 156, 271, 272, 273, 217, 275, 276, - 219, 279, 288, 280, 300, 287, 283, 306, 296, 1277, - 307, 73, 309, 310, 312, 308, 315, 316, 324, 320, + 0, 0, 1298, 1299, 1299, 1299, 1293, 1278, 40, 0, + 48, 58, 68, 1250, 0, 68, 71, 81, 91, 52, + 105, 93, 134, 117, 118, 73, 137, 143, 98, 175, + 144, 210, 159, 116, 56, 119, 1290, 1299, 1275, 1299, + 0, 241, 0, 1283, 1282, 140, 249, 1245, 267, 0, + 70, 163, 145, 31, 157, 160, 168, 57, 1271, 170, + 94, 180, 182, 54, 193, 189, 194, 114, 205, 1270, + 271, 207, 204, 211, 208, 279, 206, 228, 249, 53, + 121, 254, 1269, 268, 280, 281, 283, 290, 291, 285, + 286, 287, 300, 1268, 305, 292, 309, 310, 314, 293, - 326, 325, 162, 327, 328, 330, 344, 338, 347, 336, - 348, 354, 350, 358, 1276, 364, 357, 367, 369, 372, - 374, 373, 375, 399, 378, 389, 381, 391, 400, 241, - 394, 402, 1275, 0, 434, 438, 1274, 452, 469, 0, - 1273, 403, 409, 1272, 410, 418, 1271, 411, 1270, 421, - 438, 442, 422, 1269, 446, 456, 464, 470, 443, 413, - 444, 1268, 471, 380, 472, 474, 477, 460, 476, 481, - 479, 487, 488, 489, 493, 494, 490, 495, 491, 508, - 511, 501, 512, 513, 505, 516, 518, 522, 523, 416, - 1267, 525, 1266, 1265, 1264, 1263, 1262, 1261, 526, 1260, + 316, 217, 317, 321, 311, 147, 322, 325, 328, 331, + 341, 329, 344, 336, 339, 358, 347, 348, 1267, 363, + 349, 346, 366, 370, 371, 372, 373, 384, 377, 388, + 253, 398, 378, 401, 385, 403, 1266, 0, 0, 372, + 1265, 0, 442, 0, 1264, 404, 407, 1263, 408, 412, + 1262, 409, 1261, 414, 427, 428, 423, 1260, 418, 429, + 444, 445, 447, 448, 1259, 452, 449, 454, 457, 459, + 456, 458, 460, 464, 469, 255, 470, 476, 473, 471, + 1258, 1257, 1256, 475, 472, 484, 486, 483, 490, 496, + 497, 498, 500, 502, 503, 504, 1255, 507, 1254, 1253, - 1259, 530, 531, 1258, 1257, 559, 536, 535, 548, 532, - 563, 550, 1256, 1255, 1254, 549, 1253, 142, 533, 575, - 1252, 1251, 537, 576, 1250, 577, 579, 581, 582, 586, - 587, 583, 584, 1249, 1248, 1247, 585, 589, 1246, 588, - 1245, 590, 1244, 598, 1243, 602, 539, 604, 610, 612, - 613, 614, 616, 618, 1242, 623, 624, 1299, 635, 652, - 656, 660, 665, 625, 544, 626, 1241, 666, 635, 1240, - 1239, 1238, 629, 667, 668, 669, 670, 671, 672, 673, - 676, 674, 677, 678, 680, 681, 687, 695, 1237, 1236, - 693, 694, 698, 679, 1235, 1234, 699, 704, 1233, 706, + 1252, 1251, 1250, 1249, 505, 1248, 1247, 512, 508, 1246, + 1245, 540, 517, 516, 521, 515, 551, 530, 1244, 1243, + 1242, 552, 1241, 554, 556, 557, 1240, 1239, 555, 558, + 1238, 559, 561, 563, 567, 572, 569, 570, 577, 1237, + 1236, 1235, 580, 583, 1234, 587, 1233, 585, 1232, 588, + 1231, 590, 513, 584, 591, 514, 598, 592, 596, 416, + 1230, 595, 607, 1299, 605, 622, 626, 628, 630, 621, + 622, 623, 1229, 624, 626, 1228, 1227, 1226, 625, 627, + 628, 633, 634, 636, 635, 637, 642, 647, 644, 643, + 654, 646, 658, 1225, 1224, 645, 656, 660, 661, 1223, - 705, 707, 711, 710, 708, 712, 718, 1232, 1231, 1230, - 713, 719, 1229, 721, 725, 732, 0, 727, 1228, 738, - 735, 737, 740, 743, 744, 1227, 739, 627, 746, 754, - 1226, 747, 758, 1225, 759, 760, 1224, 767, 1223, 761, - 1222, 1221, 769, 771, 773, 772, 776, 777, 1220, 778, - 780, 1219, 784, 1218, 786, 787, 1217, 792, 1216, 792, - 795, 1215, 793, 798, 804, 806, 811, 802, 810, 812, - 814, 817, 820, 821, 822, 824, 825, 1214, 827, 1213, - 1212, 826, 830, 831, 828, 835, 840, 842, 844, 847, - 846, 1211, 851, 849, 852, 853, 854, 860, 857, 1210, + 1222, 666, 667, 1221, 669, 670, 671, 675, 673, 674, + 676, 680, 1220, 1219, 1218, 683, 688, 1217, 686, 677, + 690, 0, 696, 1216, 698, 697, 699, 706, 707, 709, + 1215, 702, 712, 714, 717, 1214, 724, 713, 1213, 726, + 721, 1212, 731, 1211, 728, 1210, 1209, 732, 734, 739, + 740, 741, 743, 1208, 744, 747, 1207, 748, 1206, 751, + 750, 1205, 0, 1204, 752, 754, 1203, 755, 759, 764, + 767, 770, 758, 772, 776, 780, 781, 783, 782, 784, + 785, 1202, 786, 1201, 1200, 789, 791, 794, 787, 788, + 797, 798, 806, 807, 808, 1199, 810, 809, 812, 815, - 864, 867, 1209, 1208, 1207, 1206, 1205, 1204, 1203, 871, - 873, 872, 1202, 875, 874, 876, 1201, 1200, 877, 1199, - 1198, 878, 881, 884, 879, 889, 880, 894, 895, 898, - 1197, 903, 904, 1196, 905, 906, 907, 908, 1195, 909, - 910, 911, 1194, 1193, 1192, 919, 914, 1191, 1190, 1189, - 925, 920, 1188, 912, 930, 933, 926, 1187, 934, 1186, - 1185, 1184, 1183, 940, 942, 943, 1182, 944, 945, 1181, - 1180, 1179, 1178, 1177, 950, 946, 1176, 1175, 1174, 947, - 948, 956, 952, 951, 1173, 954, 1172, 957, 1171, 1170, - 966, 967, 46, 969, 971, 1169, 972, 973, 974, 976, + 816, 820, 822, 1198, 814, 828, 1197, 1196, 1195, 1194, + 1193, 1192, 1191, 830, 831, 833, 1190, 834, 836, 838, + 1189, 1188, 837, 1187, 1186, 839, 842, 840, 843, 844, + 850, 853, 854, 857, 1185, 860, 861, 1184, 864, 865, + 867, 869, 868, 870, 871, 1183, 1182, 1181, 875, 876, + 1180, 1179, 1178, 885, 882, 1177, 887, 891, 897, 883, + 1176, 886, 1175, 1174, 1173, 1172, 894, 901, 903, 1171, + 904, 907, 1170, 1169, 1168, 1167, 1166, 908, 910, 1165, + 1164, 1163, 909, 905, 911, 912, 914, 1162, 916, 1161, + 923, 1160, 1159, 926, 928, 929, 930, 933, 1158, 934, - 978, 983, 979, 982, 1168, 985, 986, 993, 997, 994, - 996, 1000, 1004, 1006, 1167, 1008, 1011, 1012, 1009, 1166, - 1013, 1014, 1015, 1016, 1165, 1164, 1161, 1020, 1152, 1021, - 1022, 1024, 1036, 1150, 1037, 1040, 1041, 1149, 1023, 1148, - 1147, 1043, 1047, 1026, 1050, 1051, 1052, 1053, 1057, 1058, - 1059, 1061, 1062, 1063, 1145, 1064, 1069, 1065, 1070, 1073, - 1079, 1072, 1144, 1075, 1083, 1076, 1086, 1087, 1143, 1089, - 1090, 1094, 1097, 1140, 1099, 1096, 1139, 1100, 1103, 1106, - 1108, 1109, 1111, 1112, 1116, 1118, 1120, 1121, 1122, 1123, - 1136, 1124, 1134, 741, 639, 1131, 591, 1133, 545, 497, + 935, 936, 938, 937, 948, 932, 940, 1157, 944, 950, + 956, 960, 962, 964, 966, 967, 968, 1156, 946, 972, + 974, 975, 1155, 976, 977, 978, 980, 1150, 1147, 1144, + 983, 1136, 993, 981, 985, 986, 1133, 998, 999, 1003, + 1130, 1006, 1124, 1113, 1007, 1008, 1009, 1010, 1011, 1013, + 1014, 1018, 1020, 1019, 1023, 1022, 1025, 1111, 1024, 1031, + 1026, 1035, 1039, 1040, 1036, 1109, 1043, 1044, 1046, 1050, + 1051, 1108, 1054, 1052, 1055, 1056, 1106, 1060, 1062, 1104, + 1064, 1067, 1057, 1069, 1076, 1077, 1080, 1081, 1082, 1084, + 1085, 1083, 1087, 1101, 1088, 1100, 1099, 1094, 1089, 982, - 334, 1132, 331, 1299, 1167, 1169, 296, 1173, 253 + 1098, 756, 527, 419, 1093, 326, 1299, 1132, 1138, 1144, + 268, 1152, 1158, 123, 1161, 1166 } ; -static yyconst short int yy_def[610] = +static yyconst short int yy_def[617] = { 0, - 604, 1, 604, 604, 604, 604, 605, 606, 607, 604, - 606, 606, 606, 606, 608, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 605, 604, 606, 604, - 609, 609, 604, 604, 606, 606, 606, 606, 606, 608, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, + 607, 1, 607, 607, 607, 607, 608, 609, 610, 611, + 609, 609, 11, 13, 612, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 608, 607, 609, 607, + 613, 613, 614, 611, 11, 609, 11, 13, 11, 612, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 604, 609, 609, 604, 606, 606, 606, 49, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 607, 613, 42, 615, + 609, 47, 11, 49, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, - 606, 606, 606, 606, 606, 49, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 604, 604, 604, - 604, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 49, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 607, 615, 616, 616, 143, 143, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 206, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 604, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 212, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 267, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, - 606, 606, 606, 0, 604, 604, 604, 604, 604 + 609, 609, 609, 609, 609, 609, 0, 607, 607, 607, + 607, 607, 607, 607, 607, 607 } ; -static yyconst short int yy_nxt[1343] = +static yyconst short int yy_nxt[1347] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 14, 14, 4, 15, 8, 8, 8, 16, 17, - 18, 19, 20, 21, 22, 8, 23, 8, 24, 25, - 26, 27, 28, 8, 29, 30, 31, 32, 33, 34, - 35, 8, 36, 42, 40, 43, 43, 43, 43, 44, - 44, 44, 44, 45, 45, 45, 45, 40, 46, 40, - 40, 40, 151, 40, 47, 48, 48, 48, 48, 40, - 47, 48, 48, 48, 48, 40, 40, 69, 137, 40, - 70, 40, 157, 40, 51, 519, 40, 71, 56, 40, - 90, 52, 57, 53, 40, 54, 49, 58, 55, 60, + 14, 14, 14, 14, 14, 14, 14, 4, 15, 8, + 8, 8, 16, 17, 18, 19, 20, 21, 22, 8, + 23, 8, 24, 25, 26, 27, 28, 8, 29, 30, + 31, 32, 33, 34, 35, 8, 36, 42, 40, 43, + 43, 43, 43, 43, 43, 43, 43, 45, 45, 45, + 45, 45, 45, 45, 45, 40, 46, 149, 181, 40, + 40, 40, 134, 40, 40, 40, 47, 48, 48, 48, + 48, 48, 48, 48, 48, 40, 69, 40, 40, 70, + 40, 135, 155, 51, 162, 145, 71, 56, 40, 94, - 59, 61, 40, 40, 40, 91, 193, 64, 145, 40, - 154, 65, 62, 78, 83, 66, 63, 67, 40, 79, - 68, 40, 84, 40, 40, 80, 72, 85, 73, 74, - 40, 86, 40, 101, 81, 82, 75, 87, 40, 129, - 76, 40, 77, 40, 130, 40, 158, 132, 127, 40, - 88, 40, 40, 98, 114, 40, 89, 40, 40, 99, - 141, 128, 148, 131, 100, 328, 92, 115, 93, 40, - 116, 142, 94, 143, 95, 40, 96, 117, 97, 102, - 40, 40, 171, 40, 135, 135, 135, 135, 144, 103, - 40, 104, 105, 146, 106, 107, 108, 147, 109, 43, + 52, 57, 53, 60, 54, 61, 58, 55, 40, 59, + 40, 40, 49, 64, 95, 40, 62, 65, 158, 78, + 63, 66, 40, 67, 105, 79, 68, 72, 43, 73, + 74, 40, 182, 40, 40, 40, 40, 75, 40, 87, + 91, 76, 133, 77, 80, 136, 81, 88, 141, 82, + 83, 40, 89, 92, 40, 167, 90, 40, 84, 93, + 40, 40, 40, 96, 40, 97, 118, 85, 86, 98, + 148, 99, 102, 100, 40, 101, 40, 40, 103, 119, + 40, 131, 120, 104, 106, 40, 150, 40, 152, 121, + 151, 212, 40, 146, 132, 147, 153, 40, 107, 40, - 43, 43, 43, 207, 110, 152, 111, 112, 40, 113, - 102, 40, 153, 40, 40, 136, 44, 44, 44, 44, - 118, 165, 119, 120, 40, 121, 155, 122, 156, 123, - 40, 124, 40, 162, 40, 125, 126, 47, 45, 45, - 45, 45, 40, 138, 138, 138, 138, 40, 164, 163, - 139, 179, 254, 176, 40, 134, 139, 47, 48, 48, - 48, 48, 40, 140, 140, 140, 140, 40, 40, 140, - 140, 40, 140, 140, 140, 140, 140, 140, 159, 149, - 40, 160, 40, 40, 40, 40, 40, 166, 40, 40, - 161, 150, 40, 40, 173, 175, 40, 168, 41, 170, + 108, 109, 156, 110, 111, 112, 40, 113, 154, 157, + 40, 40, 159, 114, 160, 115, 116, 163, 117, 106, + 161, 40, 40, 40, 40, 40, 166, 40, 40, 164, + 168, 165, 178, 122, 40, 123, 124, 173, 125, 171, + 126, 174, 127, 175, 128, 40, 172, 207, 129, 130, + 139, 139, 139, 139, 139, 139, 139, 139, 142, 142, + 142, 142, 142, 142, 142, 142, 40, 183, 179, 143, + 40, 40, 40, 44, 256, 143, 144, 144, 144, 144, + 144, 144, 144, 144, 180, 40, 144, 144, 40, 144, + 144, 144, 144, 144, 144, 169, 40, 40, 40, 297, - 40, 40, 172, 167, 169, 178, 177, 183, 174, 40, - 184, 189, 188, 40, 180, 181, 185, 182, 186, 40, - 40, 40, 40, 40, 191, 40, 199, 190, 40, 40, - 187, 194, 196, 40, 198, 192, 200, 40, 40, 40, - 40, 40, 201, 40, 40, 195, 197, 40, 209, 40, - 202, 40, 213, 208, 203, 204, 210, 40, 223, 219, - 40, 40, 205, 40, 211, 206, 214, 40, 212, 221, - 40, 40, 215, 225, 220, 216, 226, 40, 217, 224, - 40, 218, 40, 222, 227, 40, 40, 40, 40, 231, - 229, 40, 228, 40, 40, 233, 235, 239, 250, 282, + 40, 184, 40, 40, 40, 176, 189, 40, 40, 40, + 40, 170, 196, 192, 194, 205, 185, 40, 195, 177, + 186, 187, 40, 188, 190, 193, 40, 40, 40, 199, + 191, 40, 197, 40, 40, 200, 202, 198, 40, 40, + 204, 206, 40, 40, 210, 40, 40, 208, 40, 201, + 203, 211, 215, 40, 225, 214, 40, 219, 40, 209, + 216, 40, 229, 40, 40, 40, 40, 213, 217, 226, + 227, 220, 218, 221, 230, 40, 222, 232, 233, 223, + 40, 231, 224, 40, 228, 237, 234, 40, 40, 40, + 40, 238, 266, 235, 40, 40, 239, 241, 266, 245, - 248, 230, 40, 237, 40, 234, 240, 40, 232, 238, - 236, 241, 40, 40, 249, 40, 40, 251, 253, 252, - 242, 243, 40, 40, 40, 244, 40, 264, 255, 40, - 245, 40, 266, 246, 40, 40, 256, 268, 247, 278, - 265, 269, 257, 135, 135, 135, 135, 259, 259, 259, - 259, 40, 267, 312, 260, 40, 40, 40, 272, 40, - 260, 138, 138, 138, 138, 40, 270, 273, 139, 40, - 271, 277, 279, 40, 139, 261, 262, 40, 263, 263, - 263, 263, 40, 40, 40, 40, 275, 40, 276, 40, - 40, 274, 40, 280, 40, 287, 284, 281, 283, 285, + 259, 40, 40, 254, 236, 40, 243, 240, 246, 248, + 249, 242, 244, 247, 250, 40, 260, 255, 40, 251, + 40, 40, 252, 261, 40, 40, 40, 253, 257, 40, + 258, 40, 270, 40, 272, 40, 40, 360, 275, 274, + 40, 262, 271, 279, 40, 40, 40, 263, 267, 268, + 273, 269, 269, 269, 269, 269, 269, 269, 269, 276, + 277, 40, 40, 278, 40, 40, 40, 282, 280, 40, + 281, 40, 287, 40, 40, 40, 40, 40, 285, 283, + 284, 40, 286, 289, 288, 290, 40, 40, 40, 40, + 40, 296, 40, 40, 303, 292, 294, 291, 293, 302, - 40, 40, 40, 40, 40, 291, 40, 40, 40, 298, - 40, 286, 288, 289, 40, 295, 297, 290, 40, 300, - 293, 40, 296, 294, 40, 40, 40, 299, 292, 40, - 301, 40, 304, 302, 305, 40, 40, 308, 40, 40, - 306, 307, 309, 40, 40, 40, 40, 303, 40, 40, - 40, 311, 40, 313, 321, 329, 310, 40, 40, 314, - 315, 40, 40, 40, 360, 348, 331, 316, 317, 317, - 317, 317, 318, 319, 317, 317, 40, 317, 317, 317, - 317, 317, 317, 327, 320, 322, 326, 323, 40, 40, - 40, 324, 40, 325, 40, 40, 40, 40, 40, 40, + 40, 40, 300, 40, 305, 298, 295, 40, 299, 301, + 306, 304, 307, 40, 40, 40, 310, 40, 309, 40, + 40, 40, 40, 313, 40, 40, 308, 311, 314, 40, + 40, 40, 40, 40, 40, 316, 356, 312, 40, 318, + 315, 326, 319, 353, 40, 317, 320, 40, 321, 322, + 322, 322, 322, 322, 322, 322, 322, 323, 324, 322, + 322, 325, 322, 322, 322, 322, 322, 322, 40, 40, + 331, 40, 40, 40, 40, 40, 40, 327, 40, 328, + 40, 333, 334, 329, 40, 330, 40, 40, 336, 40, + 332, 340, 335, 339, 40, 344, 337, 40, 342, 338, - 40, 40, 40, 40, 40, 335, 330, 334, 337, 339, - 332, 40, 345, 333, 336, 40, 338, 40, 344, 340, - 343, 342, 341, 40, 347, 40, 40, 40, 346, 40, - 351, 40, 353, 349, 352, 355, 40, 40, 40, 40, - 40, 350, 40, 354, 259, 259, 259, 259, 40, 364, - 410, 260, 40, 363, 356, 359, 361, 260, 261, 261, - 357, 358, 358, 358, 358, 358, 358, 358, 358, 263, - 263, 263, 263, 40, 263, 263, 263, 263, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 368, 40, - 40, 40, 40, 40, 40, 374, 362, 367, 370, 377, + 40, 40, 40, 341, 40, 40, 343, 40, 40, 40, + 345, 350, 40, 40, 358, 40, 352, 354, 348, 346, + 347, 349, 351, 357, 40, 266, 355, 359, 267, 267, + 361, 266, 607, 607, 607, 39, 607, 39, 40, 40, + 40, 40, 40, 40, 40, 40, 365, 362, 368, 369, + 40, 40, 40, 40, 40, 364, 373, 366, 367, 40, + 40, 40, 40, 40, 40, 372, 374, 370, 371, 378, + 376, 40, 382, 40, 377, 40, 381, 40, 40, 375, + 379, 380, 383, 40, 40, 384, 40, 40, 40, 390, + 40, 40, 40, 40, 40, 391, 385, 40, 389, 386, - 40, 369, 373, 365, 366, 372, 40, 40, 40, 378, - 375, 40, 40, 371, 376, 379, 384, 40, 40, 40, - 40, 40, 386, 40, 40, 40, 40, 385, 387, 380, - 381, 40, 40, 382, 40, 383, 392, 391, 40, 388, - 40, 389, 390, 393, 395, 40, 394, 396, 40, 400, - 40, 40, 40, 40, 40, 402, 40, 40, 397, 40, - 40, 398, 404, 399, 401, 406, 408, 40, 411, 413, - 403, 40, 40, 40, 40, 409, 405, 412, 414, 407, - 40, 415, 40, 418, 40, 40, 40, 417, 416, 40, - 40, 40, 419, 40, 423, 420, 421, 40, 422, 40, + 40, 387, 388, 40, 395, 40, 396, 40, 392, 393, + 394, 397, 398, 40, 40, 40, 40, 402, 399, 40, + 400, 406, 404, 40, 40, 403, 40, 401, 405, 40, + 40, 40, 408, 410, 40, 412, 407, 418, 40, 414, + 415, 40, 413, 40, 416, 40, 409, 411, 40, 40, + 417, 40, 419, 420, 422, 421, 40, 40, 40, 423, + 40, 40, 424, 427, 40, 40, 425, 40, 40, 40, + 426, 40, 40, 40, 435, 40, 40, 428, 432, 436, + 434, 40, 429, 438, 40, 430, 439, 40, 431, 40, + 433, 440, 441, 40, 437, 443, 442, 40, 40, 40, - 40, 358, 358, 358, 358, 40, 40, 424, 40, 428, - 431, 40, 425, 430, 426, 40, 432, 40, 434, 40, - 427, 429, 435, 40, 40, 40, 436, 40, 433, 437, - 40, 440, 439, 40, 40, 40, 438, 40, 40, 40, - 40, 40, 443, 40, 40, 447, 441, 448, 40, 442, - 452, 444, 449, 40, 446, 40, 450, 40, 445, 40, - 40, 451, 40, 453, 40, 40, 40, 40, 458, 454, - 40, 460, 461, 40, 456, 462, 463, 40, 455, 457, - 40, 459, 464, 465, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 466, 469, 40, 473, 468, + 40, 40, 40, 40, 40, 40, 40, 446, 40, 450, + 451, 40, 444, 455, 40, 40, 445, 447, 449, 452, + 456, 453, 448, 40, 40, 40, 40, 40, 454, 40, + 457, 40, 40, 40, 461, 463, 464, 40, 458, 40, + 459, 465, 466, 460, 462, 40, 467, 40, 40, 469, + 40, 40, 468, 40, 40, 40, 40, 40, 472, 40, + 40, 40, 471, 474, 476, 480, 479, 40, 470, 473, + 40, 40, 482, 477, 40, 484, 475, 40, 40, 478, + 483, 40, 40, 481, 40, 40, 40, 40, 40, 490, + 487, 486, 40, 40, 485, 492, 496, 497, 489, 40, - 471, 476, 40, 467, 470, 477, 480, 40, 40, 474, - 472, 40, 481, 479, 475, 478, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 487, 40, 483, 484, - 489, 482, 40, 40, 498, 486, 493, 494, 40, 40, - 485, 491, 492, 40, 490, 496, 40, 40, 488, 497, - 495, 500, 499, 40, 502, 40, 40, 40, 40, 40, - 40, 40, 501, 40, 40, 40, 506, 40, 507, 40, - 40, 509, 504, 505, 503, 510, 508, 512, 513, 40, - 40, 514, 40, 511, 40, 40, 40, 40, 516, 40, - 515, 40, 40, 521, 522, 40, 40, 520, 40, 40, + 40, 488, 40, 40, 40, 494, 495, 493, 40, 499, + 505, 40, 491, 501, 40, 500, 498, 502, 40, 503, + 40, 40, 40, 504, 40, 40, 40, 40, 40, 40, + 509, 40, 506, 40, 510, 507, 515, 508, 511, 512, + 40, 513, 516, 40, 514, 40, 40, 40, 517, 40, + 40, 40, 40, 40, 40, 40, 518, 40, 519, 524, + 525, 40, 523, 40, 520, 40, 521, 40, 527, 526, + 528, 531, 522, 40, 530, 529, 534, 40, 535, 40, + 532, 40, 536, 40, 40, 40, 533, 542, 537, 40, + 539, 40, 40, 40, 40, 40, 541, 40, 40, 40, - 517, 518, 524, 523, 525, 527, 40, 40, 531, 40, - 40, 532, 526, 40, 528, 533, 534, 40, 529, 40, - 536, 40, 40, 530, 40, 40, 40, 40, 40, 40, - 538, 542, 535, 40, 40, 40, 40, 40, 546, 40, - 537, 543, 549, 548, 544, 539, 547, 540, 541, 40, - 40, 545, 550, 40, 40, 551, 40, 552, 553, 555, - 40, 556, 558, 40, 40, 40, 40, 554, 559, 557, - 40, 40, 40, 562, 40, 40, 40, 40, 40, 566, - 560, 568, 40, 40, 564, 40, 40, 565, 40, 40, - 567, 569, 40, 563, 561, 573, 40, 571, 570, 40, + 40, 545, 40, 40, 538, 552, 549, 540, 546, 554, + 40, 547, 543, 550, 544, 40, 40, 553, 548, 551, + 40, 556, 555, 40, 40, 40, 40, 40, 40, 559, + 40, 40, 562, 557, 560, 40, 40, 40, 565, 40, + 40, 40, 40, 40, 563, 569, 558, 571, 40, 561, + 567, 568, 40, 40, 570, 572, 40, 40, 566, 564, + 40, 40, 574, 40, 573, 576, 577, 40, 40, 40, + 580, 40, 40, 40, 40, 575, 578, 40, 581, 40, + 584, 40, 582, 583, 40, 586, 40, 592, 589, 579, + 587, 591, 585, 40, 40, 588, 590, 40, 40, 40, - 40, 574, 40, 40, 578, 577, 572, 40, 575, 40, - 40, 581, 40, 40, 579, 580, 40, 576, 586, 40, - 583, 40, 40, 588, 40, 40, 582, 584, 587, 40, - 585, 40, 589, 40, 40, 40, 40, 40, 590, 595, - 596, 597, 592, 591, 40, 40, 40, 40, 593, 40, - 594, 601, 40, 40, 600, 602, 40, 40, 40, 599, - 40, 40, 40, 40, 598, 40, 603, 37, 37, 37, - 37, 39, 39, 50, 40, 50, 50, 40, 40, 40, + 40, 40, 40, 593, 40, 40, 40, 598, 599, 600, + 40, 40, 595, 604, 594, 40, 40, 40, 40, 597, + 596, 40, 603, 40, 605, 40, 40, 602, 40, 601, + 40, 606, 37, 37, 37, 37, 37, 37, 37, 37, + 39, 40, 39, 39, 39, 39, 41, 40, 41, 41, + 40, 41, 50, 40, 50, 50, 50, 50, 50, 50, + 138, 40, 138, 138, 40, 138, 265, 40, 265, 363, + 363, 363, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, @@ -745,166 +747,166 @@ static yyconst short int yy_nxt[1343] = 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 258, 40, - 40, 40, 40, 40, 133, 40, 38, 604, 3, 604, + 40, 40, 40, 264, 40, 40, 40, 40, 40, 39, + 47, 140, 40, 137, 39, 40, 38, 607, 3, 607, - 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, - 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, - 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, - 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, - 604, 604 + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607 } ; -static yyconst short int yy_chk[1343] = +static yyconst short int yy_chk[1347] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 9, 58, 9, 9, 9, 9, 10, - 10, 10, 10, 11, 11, 11, 11, 11, 12, 493, - 20, 63, 58, 12, 13, 13, 13, 13, 13, 13, - 14, 14, 14, 14, 14, 14, 16, 20, 46, 17, - 20, 26, 63, 46, 16, 493, 92, 20, 17, 54, - 26, 16, 17, 16, 18, 16, 13, 17, 16, 18, + 1, 1, 1, 1, 1, 1, 1, 9, 54, 9, + 9, 9, 9, 9, 9, 9, 9, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 12, 54, 80, 20, + 80, 64, 35, 35, 58, 12, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 16, 20, 51, 17, 20, + 26, 35, 58, 16, 64, 51, 20, 17, 18, 26, - 17, 18, 19, 61, 22, 26, 92, 19, 54, 24, - 61, 19, 18, 22, 24, 19, 18, 19, 23, 22, - 19, 21, 24, 64, 29, 23, 21, 24, 21, 21, - 34, 24, 25, 29, 23, 23, 21, 25, 36, 34, - 21, 28, 21, 33, 35, 35, 64, 36, 33, 31, - 25, 56, 51, 28, 31, 218, 25, 27, 52, 28, - 51, 33, 56, 35, 28, 218, 27, 31, 27, 74, - 31, 52, 27, 52, 27, 103, 27, 31, 27, 30, - 53, 55, 74, 30, 42, 42, 42, 42, 53, 30, - 60, 30, 30, 55, 30, 30, 30, 55, 30, 43, + 16, 17, 16, 18, 16, 18, 17, 16, 19, 17, + 22, 61, 13, 19, 26, 29, 18, 19, 61, 22, + 18, 19, 21, 19, 29, 22, 19, 21, 614, 21, + 21, 68, 81, 34, 24, 25, 36, 21, 81, 24, + 25, 21, 34, 21, 23, 36, 23, 24, 46, 23, + 23, 23, 24, 25, 27, 68, 24, 46, 23, 25, + 28, 31, 53, 27, 106, 27, 31, 23, 23, 27, + 53, 27, 28, 27, 55, 27, 33, 56, 28, 31, + 52, 33, 31, 28, 30, 57, 55, 60, 56, 31, + 55, 106, 30, 52, 33, 52, 57, 62, 30, 63, - 43, 43, 43, 103, 30, 60, 30, 30, 66, 30, - 32, 62, 60, 69, 32, 44, 44, 44, 44, 44, - 32, 69, 32, 32, 68, 32, 62, 32, 62, 32, - 78, 32, 81, 66, 67, 32, 32, 45, 45, 45, - 45, 45, 45, 47, 47, 47, 47, 47, 68, 67, - 47, 81, 130, 78, 130, 609, 47, 48, 48, 48, - 48, 48, 48, 49, 49, 49, 49, 49, 57, 49, - 49, 65, 49, 49, 49, 49, 49, 49, 65, 57, - 71, 65, 72, 73, 75, 76, 77, 71, 79, 80, - 65, 57, 82, 84, 76, 77, 87, 72, 607, 73, + 30, 30, 60, 30, 30, 30, 66, 30, 57, 60, + 65, 67, 62, 30, 62, 30, 30, 65, 30, 32, + 63, 73, 69, 77, 72, 75, 67, 32, 74, 65, + 69, 66, 77, 32, 102, 32, 32, 73, 32, 72, + 32, 74, 32, 75, 32, 78, 72, 102, 32, 32, + 42, 42, 42, 42, 42, 42, 42, 42, 47, 47, + 47, 47, 47, 47, 47, 47, 79, 82, 78, 47, + 131, 82, 176, 611, 131, 47, 49, 49, 49, 49, + 49, 49, 49, 49, 79, 84, 49, 49, 71, 49, + 49, 49, 49, 49, 49, 71, 76, 85, 86, 176, - 86, 83, 75, 71, 72, 80, 79, 83, 76, 89, - 84, 87, 86, 85, 82, 82, 84, 82, 85, 88, - 91, 96, 93, 94, 89, 95, 96, 88, 97, 98, - 85, 93, 94, 100, 95, 91, 97, 99, 102, 101, - 104, 105, 98, 106, 603, 93, 94, 601, 105, 110, - 99, 108, 106, 104, 100, 101, 105, 107, 110, 108, - 109, 111, 101, 113, 105, 102, 106, 112, 105, 109, - 117, 114, 107, 112, 108, 107, 113, 116, 107, 111, - 118, 107, 119, 109, 114, 120, 122, 121, 123, 117, - 116, 125, 114, 164, 127, 119, 121, 123, 127, 164, + 87, 84, 90, 91, 92, 76, 87, 88, 89, 96, + 100, 71, 92, 89, 90, 100, 85, 93, 91, 76, + 86, 86, 95, 86, 88, 89, 97, 98, 105, 96, + 88, 99, 93, 101, 103, 97, 98, 95, 104, 107, + 99, 101, 108, 606, 105, 109, 112, 103, 110, 97, + 98, 105, 109, 114, 112, 108, 115, 110, 111, 104, + 109, 113, 114, 122, 117, 118, 121, 107, 109, 112, + 113, 110, 109, 111, 115, 116, 111, 117, 118, 111, + 120, 116, 111, 123, 113, 121, 118, 124, 125, 126, + 127, 122, 140, 120, 129, 133, 123, 125, 140, 127, - 125, 116, 126, 122, 128, 120, 123, 131, 118, 122, - 121, 123, 124, 129, 126, 132, 142, 128, 129, 128, - 124, 124, 143, 145, 148, 124, 160, 142, 131, 190, - 124, 146, 145, 124, 150, 153, 132, 148, 124, 160, - 143, 150, 132, 135, 135, 135, 135, 136, 136, 136, - 136, 151, 146, 190, 136, 152, 159, 161, 153, 155, - 136, 138, 138, 138, 138, 138, 151, 155, 138, 156, - 152, 159, 161, 168, 138, 139, 139, 157, 139, 139, - 139, 139, 139, 158, 163, 165, 157, 166, 158, 169, - 167, 156, 171, 163, 170, 168, 166, 163, 165, 167, + 133, 128, 135, 129, 120, 130, 126, 124, 127, 128, + 128, 125, 126, 127, 128, 132, 134, 130, 134, 128, + 136, 146, 128, 135, 147, 149, 152, 128, 132, 150, + 132, 154, 146, 260, 149, 159, 604, 260, 154, 152, + 157, 136, 147, 159, 155, 156, 160, 136, 143, 143, + 150, 143, 143, 143, 143, 143, 143, 143, 143, 155, + 156, 161, 162, 157, 163, 164, 167, 162, 160, 166, + 161, 168, 167, 171, 169, 172, 170, 173, 166, 163, + 164, 174, 166, 169, 168, 170, 175, 177, 180, 185, + 179, 175, 184, 178, 180, 171, 173, 170, 172, 179, - 172, 173, 174, 177, 179, 172, 175, 176, 178, 177, - 600, 167, 169, 170, 182, 175, 176, 171, 185, 179, - 174, 180, 175, 174, 181, 183, 184, 178, 173, 186, - 180, 187, 182, 181, 183, 188, 189, 186, 192, 199, - 184, 185, 187, 202, 203, 210, 219, 181, 208, 207, - 223, 189, 247, 192, 210, 219, 188, 265, 599, 199, - 202, 209, 216, 212, 265, 247, 223, 203, 206, 206, - 206, 206, 207, 208, 206, 206, 211, 206, 206, 206, - 206, 206, 206, 216, 209, 211, 212, 211, 220, 224, - 226, 211, 227, 211, 228, 229, 232, 233, 237, 230, + 188, 186, 178, 187, 185, 177, 174, 189, 177, 178, + 186, 184, 187, 190, 191, 192, 189, 193, 188, 194, + 195, 196, 205, 192, 198, 209, 187, 190, 193, 208, + 253, 256, 216, 214, 213, 195, 256, 191, 215, 198, + 194, 216, 205, 253, 603, 196, 208, 218, 209, 212, + 212, 212, 212, 212, 212, 212, 212, 213, 214, 212, + 212, 215, 212, 212, 212, 212, 212, 212, 217, 222, + 218, 224, 229, 225, 226, 230, 232, 217, 233, 217, + 234, 224, 225, 217, 235, 217, 237, 238, 229, 236, + 222, 234, 226, 233, 239, 237, 230, 243, 236, 232, - 231, 240, 238, 242, 597, 228, 220, 227, 230, 231, - 224, 244, 242, 226, 229, 246, 230, 248, 240, 232, - 238, 237, 233, 249, 246, 250, 251, 252, 244, 253, - 250, 254, 252, 248, 251, 254, 256, 257, 264, 266, - 328, 249, 273, 253, 259, 259, 259, 259, 269, 273, - 328, 259, 595, 269, 256, 264, 266, 259, 260, 260, - 257, 260, 260, 260, 260, 261, 261, 261, 261, 262, - 262, 262, 262, 262, 263, 263, 263, 263, 263, 268, - 274, 275, 276, 277, 278, 279, 280, 282, 277, 281, - 283, 284, 294, 285, 286, 283, 268, 276, 279, 286, + 244, 254, 248, 235, 246, 250, 236, 252, 255, 258, + 238, 248, 262, 259, 258, 257, 252, 254, 244, 239, + 243, 246, 250, 257, 263, 265, 255, 259, 266, 266, + 262, 265, 267, 267, 268, 268, 269, 269, 270, 271, + 272, 274, 279, 275, 280, 281, 271, 263, 275, 279, + 282, 283, 285, 284, 286, 270, 283, 272, 274, 287, + 290, 289, 296, 292, 288, 282, 284, 280, 281, 288, + 286, 291, 292, 297, 287, 293, 291, 298, 299, 285, + 289, 290, 293, 302, 303, 296, 305, 306, 307, 303, + 309, 310, 308, 311, 320, 305, 297, 312, 302, 298, - 287, 278, 282, 274, 275, 281, 291, 292, 288, 287, - 284, 293, 297, 280, 285, 288, 294, 298, 301, 300, - 302, 305, 298, 304, 303, 306, 311, 297, 300, 291, - 292, 307, 312, 293, 314, 293, 305, 304, 315, 301, - 318, 302, 303, 306, 311, 316, 307, 312, 321, 318, - 322, 320, 327, 323, 594, 321, 324, 325, 314, 329, - 332, 315, 323, 316, 320, 324, 325, 330, 329, 332, - 322, 333, 335, 336, 340, 327, 323, 330, 333, 324, - 338, 335, 343, 340, 344, 346, 345, 338, 336, 347, - 348, 350, 343, 351, 347, 344, 345, 353, 346, 355, + 316, 298, 299, 319, 309, 317, 310, 321, 306, 307, + 308, 311, 312, 323, 326, 325, 327, 320, 316, 332, + 317, 326, 323, 328, 329, 321, 330, 319, 325, 333, + 338, 334, 328, 329, 335, 330, 327, 338, 341, 333, + 334, 337, 332, 340, 335, 345, 328, 329, 343, 348, + 337, 349, 340, 341, 345, 343, 350, 351, 352, 348, + 353, 355, 349, 352, 356, 358, 350, 361, 360, 365, + 351, 366, 368, 602, 365, 373, 369, 353, 360, 366, + 361, 370, 355, 369, 371, 356, 370, 372, 358, 374, + 360, 371, 372, 375, 368, 374, 373, 376, 377, 379, - 356, 358, 358, 358, 358, 360, 363, 348, 361, 355, - 360, 364, 350, 356, 351, 368, 361, 365, 364, 366, - 353, 355, 365, 369, 367, 370, 366, 371, 363, 367, - 372, 370, 369, 373, 374, 375, 368, 376, 377, 382, - 379, 385, 373, 383, 384, 377, 371, 379, 386, 372, - 385, 374, 382, 387, 376, 388, 383, 389, 375, 391, - 390, 384, 394, 386, 393, 395, 396, 397, 391, 387, - 399, 394, 395, 398, 389, 396, 397, 401, 388, 390, - 402, 393, 398, 399, 410, 412, 411, 415, 414, 416, - 419, 422, 425, 427, 423, 401, 411, 424, 416, 410, + 378, 380, 381, 383, 389, 390, 386, 377, 387, 381, + 383, 388, 375, 389, 391, 392, 376, 378, 380, 386, + 390, 387, 379, 393, 394, 395, 398, 397, 388, 399, + 391, 405, 400, 401, 395, 398, 399, 402, 392, 403, + 393, 400, 401, 394, 397, 406, 402, 414, 415, 405, + 416, 418, 403, 419, 423, 420, 426, 428, 415, 427, + 429, 430, 414, 418, 420, 428, 427, 431, 406, 416, + 432, 433, 430, 423, 434, 432, 419, 436, 437, 426, + 431, 439, 440, 429, 441, 443, 442, 444, 445, 440, + 436, 434, 449, 450, 433, 442, 449, 449, 439, 455, - 414, 423, 426, 402, 412, 424, 427, 428, 429, 419, - 415, 430, 428, 426, 422, 425, 432, 433, 435, 436, - 437, 438, 440, 441, 442, 454, 436, 447, 430, 432, - 438, 429, 446, 452, 454, 435, 446, 446, 451, 457, - 433, 441, 442, 455, 440, 451, 456, 459, 437, 452, - 447, 456, 455, 464, 459, 465, 466, 468, 469, 476, - 480, 481, 457, 475, 484, 483, 468, 486, 469, 482, - 488, 476, 465, 466, 464, 480, 475, 482, 483, 491, - 492, 484, 494, 481, 495, 497, 498, 499, 488, 500, - 486, 501, 503, 495, 497, 504, 502, 494, 506, 507, + 460, 437, 454, 462, 457, 444, 445, 443, 458, 454, + 462, 467, 441, 457, 459, 455, 450, 458, 468, 459, + 469, 471, 484, 460, 472, 478, 483, 479, 485, 486, + 471, 487, 467, 489, 472, 468, 485, 469, 478, 479, + 491, 483, 486, 494, 484, 495, 496, 497, 487, 506, + 498, 500, 501, 502, 504, 503, 489, 507, 491, 498, + 500, 509, 497, 519, 494, 505, 495, 510, 502, 501, + 503, 506, 496, 511, 505, 504, 510, 512, 511, 513, + 507, 514, 512, 515, 516, 517, 509, 519, 513, 520, + 515, 521, 522, 524, 525, 526, 517, 527, 534, 600, - 491, 492, 499, 498, 500, 502, 508, 510, 507, 511, - 509, 508, 501, 512, 503, 509, 510, 513, 504, 514, - 512, 516, 519, 506, 517, 518, 521, 522, 523, 524, - 514, 519, 511, 528, 530, 531, 539, 532, 524, 544, - 513, 521, 531, 530, 522, 516, 528, 517, 518, 533, - 535, 523, 532, 536, 537, 533, 542, 535, 536, 539, - 543, 542, 544, 545, 546, 547, 548, 537, 545, 543, - 549, 550, 551, 548, 552, 553, 554, 556, 558, 552, - 546, 554, 557, 559, 550, 562, 560, 551, 564, 566, - 553, 556, 561, 549, 547, 560, 565, 558, 557, 567, + 531, 522, 535, 536, 514, 534, 527, 516, 524, 536, + 533, 525, 520, 531, 521, 538, 539, 535, 526, 533, + 540, 539, 538, 542, 545, 546, 547, 548, 549, 545, + 550, 551, 548, 540, 546, 552, 554, 553, 551, 556, + 555, 559, 557, 561, 549, 555, 542, 557, 560, 547, + 553, 554, 562, 565, 556, 559, 563, 564, 552, 550, + 567, 568, 561, 569, 560, 563, 564, 570, 571, 574, + 568, 573, 575, 576, 583, 562, 565, 578, 569, 579, + 573, 581, 570, 571, 582, 575, 584, 583, 579, 567, + 576, 582, 574, 585, 586, 578, 581, 587, 588, 589, - 568, 561, 570, 571, 566, 565, 559, 572, 562, 576, - 573, 570, 575, 578, 567, 568, 579, 564, 576, 580, - 572, 581, 582, 579, 583, 584, 571, 573, 578, 585, - 575, 586, 580, 587, 588, 589, 590, 592, 581, 586, - 587, 588, 583, 582, 596, 602, 598, 593, 584, 591, - 585, 596, 577, 574, 592, 598, 569, 563, 555, 590, - 541, 540, 538, 534, 589, 529, 602, 605, 605, 605, - 605, 606, 606, 608, 527, 608, 608, 526, 525, 520, - 515, 505, 496, 490, 489, 487, 485, 479, 478, 477, - 474, 473, 472, 471, 470, 467, 463, 462, 461, 460, + 592, 590, 591, 584, 593, 595, 599, 589, 590, 591, + 605, 598, 586, 599, 585, 601, 597, 596, 594, 588, + 587, 580, 595, 577, 601, 572, 566, 593, 558, 592, + 544, 605, 608, 608, 608, 608, 608, 608, 608, 608, + 609, 543, 609, 609, 609, 609, 610, 541, 610, 610, + 537, 610, 612, 532, 612, 612, 612, 612, 612, 612, + 613, 530, 613, 613, 529, 613, 615, 528, 615, 616, + 616, 616, 523, 518, 508, 499, 493, 492, 490, 488, + 482, 481, 480, 477, 476, 475, 474, 473, 470, 466, + 465, 464, 463, 461, 456, 453, 452, 451, 448, 447, - 458, 453, 450, 449, 448, 445, 444, 443, 439, 434, - 431, 421, 420, 418, 417, 413, 409, 408, 407, 406, - 405, 404, 403, 400, 392, 381, 380, 378, 362, 359, - 357, 354, 352, 349, 342, 341, 339, 337, 334, 331, - 326, 319, 313, 310, 309, 308, 299, 296, 295, 290, - 289, 272, 271, 270, 267, 255, 245, 243, 241, 239, - 236, 235, 234, 225, 222, 221, 217, 215, 214, 213, - 205, 204, 201, 200, 198, 197, 196, 195, 194, 193, - 191, 162, 154, 149, 147, 144, 141, 137, 133, 115, - 90, 70, 59, 39, 37, 8, 7, 3, 604, 604, + 446, 438, 435, 425, 424, 422, 421, 417, 413, 412, + 411, 410, 409, 408, 407, 404, 396, 385, 384, 382, + 367, 364, 362, 359, 357, 354, 347, 346, 344, 342, + 339, 336, 331, 324, 318, 315, 314, 313, 304, 301, + 300, 295, 294, 278, 277, 276, 273, 261, 251, 249, + 247, 245, 242, 241, 240, 231, 228, 227, 223, 221, + 220, 219, 211, 210, 207, 206, 204, 203, 202, 201, + 200, 199, 197, 183, 182, 181, 165, 158, 153, 151, + 148, 145, 141, 137, 119, 94, 83, 70, 59, 48, + 45, 44, 39, 37, 14, 8, 7, 3, 607, 607, - 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, - 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, - 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, - 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, - 604, 604 + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607 } ; static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr; @@ -921,7 +923,7 @@ goto find_rule; \ #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 1 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" #define INITIAL 0 /*===-- UpgradeLexer.l - Scanner for 1.9 assembly files --------*- C++ -*--===// // @@ -936,7 +938,7 @@ char *yytext; // //===----------------------------------------------------------------------===*/ #define YY_NEVER_INTERACTIVE 1 -#line 28 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 28 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" #include "ParserInternals.h" #include "UpgradeParser.h" @@ -982,7 +984,7 @@ char *yytext; /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing * it to deal with 64 bit numbers. */ -#line 986 "UpgradeLexer.cpp" +#line 988 "UpgradeLexer.cpp" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1133,10 +1135,10 @@ YY_DECL register char *yy_cp = NULL, *yy_bp = NULL; register int yy_act; -#line 99 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 99 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" -#line 1140 "UpgradeLexer.cpp" +#line 1142 "UpgradeLexer.cpp" if ( yy_init ) { @@ -1184,14 +1186,14 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 605 ) + if ( yy_current_state >= 608 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; *yy_state_ptr++ = yy_current_state; ++yy_cp; } - while ( yy_current_state != 604 ); + while ( yy_current_state != 607 ); yy_find_action: yy_current_state = *--yy_state_ptr; @@ -1229,761 +1231,776 @@ do_action: /* This label is used only to access EOF actions. */ { /* beginning of action switch */ case 1: YY_RULE_SETUP -#line 101 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 101 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { /* Ignore comments for now */ } YY_BREAK case 2: YY_RULE_SETUP -#line 103 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 103 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( BEGINTOK); } YY_BREAK case 3: YY_RULE_SETUP -#line 104 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 104 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( ENDTOK); } YY_BREAK case 4: YY_RULE_SETUP -#line 105 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 105 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( TRUETOK); } YY_BREAK case 5: YY_RULE_SETUP -#line 106 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 106 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( FALSETOK); } YY_BREAK case 6: YY_RULE_SETUP -#line 107 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 107 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( DECLARE); } YY_BREAK case 7: YY_RULE_SETUP -#line 108 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DEFINE); } +#line 108 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( GLOBAL); } YY_BREAK case 8: YY_RULE_SETUP -#line 109 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( GLOBAL); } +#line 109 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CONSTANT); } YY_BREAK case 9: YY_RULE_SETUP -#line 110 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CONSTANT); } +#line 110 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( INTERNAL); } YY_BREAK case 10: YY_RULE_SETUP -#line 111 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( INTERNAL); } +#line 111 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LINKONCE); } YY_BREAK case 11: YY_RULE_SETUP -#line 112 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LINKONCE); } +#line 112 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( WEAK); } YY_BREAK case 12: YY_RULE_SETUP -#line 113 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( WEAK); } +#line 113 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( APPENDING); } YY_BREAK case 13: YY_RULE_SETUP -#line 114 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( APPENDING); } +#line 114 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DLLIMPORT); } YY_BREAK case 14: YY_RULE_SETUP -#line 115 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DLLIMPORT); } +#line 115 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DLLEXPORT); } YY_BREAK case 15: YY_RULE_SETUP -#line 116 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DLLEXPORT); } +#line 116 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( EXTERN_WEAK); } YY_BREAK case 16: YY_RULE_SETUP -#line 117 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( EXTERN_WEAK); } +#line 117 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( EXTERNAL); } YY_BREAK case 17: YY_RULE_SETUP -#line 118 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( EXTERNAL); } +#line 118 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UNINITIALIZED); } // alias for external YY_BREAK case 18: YY_RULE_SETUP -#line 119 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UNINITIALIZED); } // alias for external +#line 119 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( IMPLEMENTATION); } YY_BREAK case 19: YY_RULE_SETUP -#line 120 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( IMPLEMENTATION); } +#line 120 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ZEROINITIALIZER); } YY_BREAK case 20: YY_RULE_SETUP -#line 121 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ZEROINITIALIZER); } +#line 121 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DOTDOTDOT); } YY_BREAK case 21: YY_RULE_SETUP -#line 122 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DOTDOTDOT); } +#line 122 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UNDEF); } YY_BREAK case 22: YY_RULE_SETUP -#line 123 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UNDEF); } +#line 123 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( NULL_TOK); } YY_BREAK case 23: YY_RULE_SETUP -#line 124 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( NULL_TOK); } +#line 124 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TO); } YY_BREAK case 24: YY_RULE_SETUP -#line 125 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TO); } +#line 125 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TAIL); } YY_BREAK case 25: YY_RULE_SETUP -#line 126 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TAIL); } +#line 126 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TARGET); } YY_BREAK case 26: YY_RULE_SETUP -#line 127 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TARGET); } +#line 127 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TRIPLE); } YY_BREAK case 27: YY_RULE_SETUP -#line 128 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TRIPLE); } +#line 128 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DEPLIBS); } YY_BREAK case 28: YY_RULE_SETUP -#line 129 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DEPLIBS); } +#line 129 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ENDIAN); } YY_BREAK case 29: YY_RULE_SETUP -#line 130 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ENDIAN); } +#line 130 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( POINTERSIZE); } YY_BREAK case 30: YY_RULE_SETUP -#line 131 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( POINTERSIZE); } +#line 131 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DATALAYOUT); } YY_BREAK case 31: YY_RULE_SETUP -#line 132 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DATALAYOUT); } +#line 132 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LITTLE); } YY_BREAK case 32: YY_RULE_SETUP -#line 133 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LITTLE); } +#line 133 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( BIG); } YY_BREAK case 33: YY_RULE_SETUP -#line 134 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( BIG); } +#line 134 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( VOLATILE); } YY_BREAK case 34: YY_RULE_SETUP -#line 135 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( VOLATILE); } +#line 135 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ALIGN); } YY_BREAK case 35: YY_RULE_SETUP -#line 136 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ALIGN); } +#line 136 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SECTION); } YY_BREAK case 36: YY_RULE_SETUP -#line 137 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SECTION); } +#line 137 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( MODULE); } YY_BREAK case 37: YY_RULE_SETUP -#line 138 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( MODULE); } +#line 138 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ASM_TOK); } YY_BREAK case 38: YY_RULE_SETUP -#line 139 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ASM_TOK); } +#line 139 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SIDEEFFECT); } YY_BREAK case 39: YY_RULE_SETUP -#line 140 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SIDEEFFECT); } +#line 141 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CC_TOK); } YY_BREAK case 40: YY_RULE_SETUP -#line 142 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CC_TOK); } +#line 142 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CCC_TOK); } YY_BREAK case 41: YY_RULE_SETUP -#line 143 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CCC_TOK); } +#line 143 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CSRETCC_TOK); } YY_BREAK case 42: YY_RULE_SETUP -#line 144 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CSRETCC_TOK); } +#line 144 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FASTCC_TOK); } YY_BREAK case 43: YY_RULE_SETUP -#line 145 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FASTCC_TOK); } +#line 145 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( COLDCC_TOK); } YY_BREAK case 44: YY_RULE_SETUP -#line 146 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( COLDCC_TOK); } +#line 146 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( X86_STDCALLCC_TOK); } YY_BREAK case 45: YY_RULE_SETUP -#line 147 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( X86_STDCALLCC_TOK); } +#line 147 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( X86_FASTCALLCC_TOK); } YY_BREAK case 46: YY_RULE_SETUP -#line 148 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( X86_FASTCALLCC_TOK); } +#line 149 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(VOID,VoidTy,"void",false); } YY_BREAK case 47: YY_RULE_SETUP -#line 150 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(VOID,VoidTy,"void",false); } +#line 150 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(BOOL,BoolTy,"bool",false); } YY_BREAK case 48: YY_RULE_SETUP -#line 151 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(BOOL,BoolTy,"bool",false); } +#line 151 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(SBYTE,SByteTy,"i8",true); } YY_BREAK case 49: YY_RULE_SETUP -#line 152 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(SBYTE,SByteTy,"sbyte",true); } +#line 152 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(UBYTE,UByteTy,"i8",false); } YY_BREAK case 50: YY_RULE_SETUP -#line 153 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(UBYTE,UByteTy,"ubyte",false); } +#line 153 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(SHORT,ShortTy,"i16",true); } YY_BREAK case 51: YY_RULE_SETUP -#line 154 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(SHORT,ShortTy,"short",true); } +#line 154 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(USHORT,UShortTy,"i16",false); } YY_BREAK case 52: YY_RULE_SETUP -#line 155 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(USHORT,UShortTy,"ushort",false); } +#line 155 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(INT,IntTy,"i32",true); } YY_BREAK case 53: YY_RULE_SETUP -#line 156 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(INT,IntTy,"int",true); } +#line 156 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(UINT,UIntTy,"i32",false); } YY_BREAK case 54: YY_RULE_SETUP -#line 157 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(UINT,UIntTy,"uint",false); } +#line 157 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(LONG,LongTy,"i64",true); } YY_BREAK case 55: YY_RULE_SETUP -#line 158 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(LONG,LongTy,"long",true); } +#line 158 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(ULONG,ULongTy,"i64",false); } YY_BREAK case 56: YY_RULE_SETUP -#line 159 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(ULONG,ULongTy,"ulong",false); } +#line 159 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(UBYTE,UByteTy,"i8",false); } YY_BREAK case 57: YY_RULE_SETUP -#line 160 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(FLOAT,FloatTy,"float",false); } +#line 160 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(USHORT,UShortTy,"i16",false); } YY_BREAK case 58: YY_RULE_SETUP -#line 161 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(DOUBLE,DoubleTy,"double",false); } +#line 161 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(UINT,UIntTy,"i32",false); } YY_BREAK case 59: YY_RULE_SETUP -#line 162 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(LABEL,LabelTy,"label",false); } +#line 162 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(ULONG,ULongTy,"i64",false); } YY_BREAK case 60: YY_RULE_SETUP -#line 163 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(OPAQUE); } +#line 163 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(FLOAT,FloatTy,"float",false); } YY_BREAK case 61: YY_RULE_SETUP -#line 164 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(TYPE); } +#line 164 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(DOUBLE,DoubleTy,"double",false); } YY_BREAK case 62: YY_RULE_SETUP -#line 166 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ADD); } +#line 165 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(LABEL,LabelTy,"label",false); } YY_BREAK case 63: YY_RULE_SETUP -#line 167 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SUB); } +#line 166 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(OPAQUE); } YY_BREAK case 64: YY_RULE_SETUP -#line 168 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( MUL); } +#line 167 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(TYPE); } YY_BREAK case 65: YY_RULE_SETUP -#line 169 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DIV); } +#line 169 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ADD); } YY_BREAK case 66: YY_RULE_SETUP -#line 170 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UDIV); } +#line 170 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SUB); } YY_BREAK case 67: YY_RULE_SETUP -#line 171 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SDIV); } +#line 171 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( MUL); } YY_BREAK case 68: YY_RULE_SETUP -#line 172 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FDIV); } +#line 172 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DIV); } YY_BREAK case 69: YY_RULE_SETUP -#line 173 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( REM); } +#line 173 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UDIV); } YY_BREAK case 70: YY_RULE_SETUP -#line 174 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UREM); } +#line 174 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SDIV); } YY_BREAK case 71: YY_RULE_SETUP -#line 175 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SREM); } +#line 175 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FDIV); } YY_BREAK case 72: YY_RULE_SETUP -#line 176 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FREM); } +#line 176 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( REM); } YY_BREAK case 73: YY_RULE_SETUP -#line 177 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( AND); } +#line 177 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UREM); } YY_BREAK case 74: YY_RULE_SETUP -#line 178 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( OR); } +#line 178 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SREM); } YY_BREAK case 75: YY_RULE_SETUP -#line 179 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( XOR); } +#line 179 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FREM); } YY_BREAK case 76: YY_RULE_SETUP -#line 180 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETNE); } +#line 180 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( AND); } YY_BREAK case 77: YY_RULE_SETUP -#line 181 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETEQ); } +#line 181 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( OR); } YY_BREAK case 78: YY_RULE_SETUP -#line 182 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETLT); } +#line 182 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( XOR); } YY_BREAK case 79: YY_RULE_SETUP -#line 183 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETGT); } +#line 183 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETNE); } YY_BREAK case 80: YY_RULE_SETUP -#line 184 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETLE); } +#line 184 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETEQ); } YY_BREAK case 81: YY_RULE_SETUP -#line 185 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETGE); } +#line 185 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETLT); } YY_BREAK case 82: YY_RULE_SETUP -#line 186 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(ICMP); } +#line 186 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETGT); } YY_BREAK case 83: YY_RULE_SETUP -#line 187 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(FCMP); } +#line 187 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETLE); } YY_BREAK case 84: YY_RULE_SETUP -#line 188 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(EQ); } +#line 188 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETGE); } YY_BREAK case 85: YY_RULE_SETUP -#line 189 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(NE); } +#line 189 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(ICMP); } YY_BREAK case 86: YY_RULE_SETUP -#line 190 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(SLT); } +#line 190 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(FCMP); } YY_BREAK case 87: YY_RULE_SETUP -#line 191 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(SGT); } +#line 191 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(EQ); } YY_BREAK case 88: YY_RULE_SETUP -#line 192 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(SLE); } +#line 192 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(NE); } YY_BREAK case 89: YY_RULE_SETUP -#line 193 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(SGE); } +#line 193 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(SLT); } YY_BREAK case 90: YY_RULE_SETUP -#line 194 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(OEQ); } +#line 194 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(SGT); } YY_BREAK case 91: YY_RULE_SETUP -#line 195 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(ONE); } +#line 195 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(SLE); } YY_BREAK case 92: YY_RULE_SETUP -#line 196 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(OLT); } +#line 196 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(SGE); } YY_BREAK case 93: YY_RULE_SETUP -#line 197 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(OGT); } +#line 197 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(OEQ); } YY_BREAK case 94: YY_RULE_SETUP -#line 198 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(OLE); } +#line 198 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(ONE); } YY_BREAK case 95: YY_RULE_SETUP -#line 199 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(OGE); } +#line 199 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(OLT); } YY_BREAK case 96: YY_RULE_SETUP -#line 200 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(ORD); } +#line 200 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(OGT); } YY_BREAK case 97: YY_RULE_SETUP -#line 201 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(UNO); } +#line 201 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(OLE); } YY_BREAK case 98: YY_RULE_SETUP -#line 202 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(UEQ); } +#line 202 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(OGE); } YY_BREAK case 99: YY_RULE_SETUP -#line 203 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(UNE); } +#line 203 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(ORD); } YY_BREAK case 100: YY_RULE_SETUP -#line 204 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(ULT); } +#line 204 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(UNO); } YY_BREAK case 101: YY_RULE_SETUP -#line 205 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(UGT); } +#line 205 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(UEQ); } YY_BREAK case 102: YY_RULE_SETUP -#line 206 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(ULE); } +#line 206 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(UNE); } YY_BREAK case 103: YY_RULE_SETUP -#line 207 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(UGE); } +#line 207 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(ULT); } YY_BREAK case 104: YY_RULE_SETUP -#line 209 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( PHI_TOK); } +#line 208 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(UGT); } YY_BREAK case 105: YY_RULE_SETUP -#line 210 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CALL); } +#line 209 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(ULE); } YY_BREAK case 106: YY_RULE_SETUP -#line 211 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CAST); } +#line 210 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(UGE); } YY_BREAK case 107: YY_RULE_SETUP -#line 212 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TRUNC); } +#line 212 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( PHI_TOK); } YY_BREAK case 108: YY_RULE_SETUP -#line 213 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ZEXT); } +#line 213 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CALL); } YY_BREAK case 109: YY_RULE_SETUP -#line 214 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SEXT); } +#line 214 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CAST); } YY_BREAK case 110: YY_RULE_SETUP -#line 215 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPTRUNC); } +#line 215 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TRUNC); } YY_BREAK case 111: YY_RULE_SETUP -#line 216 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPEXT); } +#line 216 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ZEXT); } YY_BREAK case 112: YY_RULE_SETUP -#line 217 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPTOUI); } +#line 217 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SEXT); } YY_BREAK case 113: YY_RULE_SETUP -#line 218 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPTOSI); } +#line 218 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPTRUNC); } YY_BREAK case 114: YY_RULE_SETUP -#line 219 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UITOFP); } +#line 219 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPEXT); } YY_BREAK case 115: YY_RULE_SETUP -#line 220 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SITOFP); } +#line 220 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPTOUI); } YY_BREAK case 116: YY_RULE_SETUP -#line 221 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( PTRTOINT); } +#line 221 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPTOSI); } YY_BREAK case 117: YY_RULE_SETUP -#line 222 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( INTTOPTR); } +#line 222 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UITOFP); } YY_BREAK case 118: YY_RULE_SETUP -#line 223 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( BITCAST); } +#line 223 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SITOFP); } YY_BREAK case 119: YY_RULE_SETUP -#line 224 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SELECT); } +#line 224 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( PTRTOINT); } YY_BREAK case 120: YY_RULE_SETUP -#line 225 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SHL); } +#line 225 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( INTTOPTR); } YY_BREAK case 121: YY_RULE_SETUP -#line 226 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SHR); } +#line 226 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( BITCAST); } YY_BREAK case 122: YY_RULE_SETUP -#line 227 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ASHR); } +#line 227 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SELECT); } YY_BREAK case 123: YY_RULE_SETUP -#line 228 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LSHR); } +#line 228 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SHL); } YY_BREAK case 124: YY_RULE_SETUP -#line 229 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( VAARG); } +#line 229 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SHR); } YY_BREAK case 125: YY_RULE_SETUP -#line 230 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( RET); } +#line 230 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ASHR); } YY_BREAK case 126: YY_RULE_SETUP -#line 231 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( BR); } +#line 231 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LSHR); } YY_BREAK case 127: YY_RULE_SETUP -#line 232 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SWITCH); } +#line 232 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( VAARG); } YY_BREAK case 128: YY_RULE_SETUP -#line 233 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( INVOKE); } +#line 233 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( RET); } YY_BREAK case 129: YY_RULE_SETUP -#line 234 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UNWIND); } +#line 234 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( BR); } YY_BREAK case 130: YY_RULE_SETUP -#line 235 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( EXCEPT); } // alias for unwind +#line 235 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SWITCH); } YY_BREAK case 131: YY_RULE_SETUP -#line 236 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UNREACHABLE); } +#line 236 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( INVOKE); } YY_BREAK case 132: YY_RULE_SETUP -#line 238 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( MALLOC); } +#line 237 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UNWIND); } YY_BREAK case 133: YY_RULE_SETUP -#line 239 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ALLOCA); } +#line 238 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( EXCEPT); } // alias for unwind YY_BREAK case 134: YY_RULE_SETUP -#line 240 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FREE); } +#line 239 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UNREACHABLE); } YY_BREAK case 135: YY_RULE_SETUP -#line 241 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LOAD); } +#line 241 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( MALLOC); } YY_BREAK case 136: YY_RULE_SETUP -#line 242 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( STORE); } +#line 242 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ALLOCA); } YY_BREAK case 137: YY_RULE_SETUP -#line 243 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( GETELEMENTPTR); } +#line 243 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FREE); } YY_BREAK case 138: YY_RULE_SETUP -#line 245 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( EXTRACTELEMENT); } +#line 244 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LOAD); } YY_BREAK case 139: YY_RULE_SETUP -#line 246 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( INSERTELEMENT); } +#line 245 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( STORE); } YY_BREAK case 140: YY_RULE_SETUP -#line 247 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SHUFFLEVECTOR); } +#line 246 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( GETELEMENTPTR); } YY_BREAK case 141: YY_RULE_SETUP -#line 250 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( VAR_ID); } +#line 248 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( EXTRACTELEMENT); } YY_BREAK case 142: YY_RULE_SETUP -#line 251 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LABELSTR); } +#line 249 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( INSERTELEMENT); } YY_BREAK case 143: YY_RULE_SETUP -#line 252 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LABELSTR); } +#line 250 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SHUFFLEVECTOR); } YY_BREAK case 144: YY_RULE_SETUP -#line 253 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( STRINGCONSTANT ); } +#line 253 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( VAR_ID); } YY_BREAK case 145: YY_RULE_SETUP -#line 254 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( EUINT64VAL ); } +#line 254 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LABELSTR); } YY_BREAK case 146: YY_RULE_SETUP -#line 255 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ESINT64VAL ); } +#line 255 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LABELSTR); } YY_BREAK case 147: YY_RULE_SETUP -#line 256 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); } +#line 256 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( STRINGCONSTANT ); } YY_BREAK case 148: YY_RULE_SETUP -#line 257 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UINTVAL); } +#line 257 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( EUINT64VAL ); } YY_BREAK case 149: YY_RULE_SETUP -#line 258 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SINTVAL); } +#line 258 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ESINT64VAL ); } YY_BREAK case 150: YY_RULE_SETUP -#line 259 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPVAL); } +#line 259 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); } YY_BREAK case 151: YY_RULE_SETUP -#line 260 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 260 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UINTVAL); } + YY_BREAK +case 152: +YY_RULE_SETUP +#line 261 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SINTVAL); } + YY_BREAK +case 153: +YY_RULE_SETUP +#line 262 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPVAL); } + YY_BREAK +case 154: +YY_RULE_SETUP +#line 263 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( FPVAL); } YY_BREAK case YY_STATE_EOF(INITIAL): -#line 261 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 264 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { /* Make sure to free the internal buffers for flex when we are * done reading our input! @@ -1992,22 +2009,22 @@ case YY_STATE_EOF(INITIAL): return EOF; } YY_BREAK -case 152: +case 155: YY_RULE_SETUP -#line 269 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 272 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { /* Ignore whitespace */ } YY_BREAK -case 153: +case 156: YY_RULE_SETUP -#line 270 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 273 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { return yytext[0]; } YY_BREAK -case 154: +case 157: YY_RULE_SETUP -#line 272 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 275 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 2011 "UpgradeLexer.cpp" +#line 2028 "UpgradeLexer.cpp" case YY_END_OF_BUFFER: { @@ -2294,7 +2311,7 @@ static yy_state_type yy_get_previous_state() while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 605 ) + if ( yy_current_state >= 608 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2324,11 +2341,11 @@ yy_state_type yy_current_state; while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 605 ) + if ( yy_current_state >= 608 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 604); + yy_is_jam = (yy_current_state == 607); if ( ! yy_is_jam ) *yy_state_ptr++ = yy_current_state; @@ -2885,5 +2902,5 @@ int main() return 0; } #endif -#line 272 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 275 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" diff --git a/tools/llvm-upgrade/UpgradeLexer.cpp.cvs b/tools/llvm-upgrade/UpgradeLexer.cpp.cvs index 722ffc617f2..3894057d564 100644 --- a/tools/llvm-upgrade/UpgradeLexer.cpp.cvs +++ b/tools/llvm-upgrade/UpgradeLexer.cpp.cvs @@ -317,39 +317,39 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); *yy_cp = '\0'; \ yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 154 -#define YY_END_OF_BUFFER 155 -static yyconst short int yy_acclist[232] = +#define YY_NUM_RULES 157 +#define YY_END_OF_BUFFER 158 +static yyconst short int yy_acclist[235] = { 0, - 155, 153, 154, 152, 153, 154, 152, 154, 153, 154, - 153, 154, 153, 154, 153, 154, 153, 154, 153, 154, - 145, 153, 154, 145, 153, 154, 1, 153, 154, 153, - 154, 153, 154, 153, 154, 153, 154, 153, 154, 153, - 154, 153, 154, 153, 154, 153, 154, 153, 154, 153, - 154, 153, 154, 153, 154, 153, 154, 153, 154, 153, - 154, 153, 154, 153, 154, 153, 154, 153, 154, 153, - 154, 144, 142, 141, 141, 148, 146, 150, 145, 1, - 126, 40, 84, 85, 74, 24, 144, 141, 141, 149, - 150, 21, 150, 151, 62, 73, 38, 33, 41, 65, + 158, 156, 157, 155, 156, 157, 155, 157, 156, 157, + 156, 157, 156, 157, 156, 157, 156, 157, 156, 157, + 148, 156, 157, 148, 156, 157, 1, 156, 157, 156, + 157, 156, 157, 156, 157, 156, 157, 156, 157, 156, + 157, 156, 157, 156, 157, 156, 157, 156, 157, 156, + 157, 156, 157, 156, 157, 156, 157, 156, 157, 156, + 157, 156, 157, 156, 157, 156, 157, 156, 157, 156, + 157, 147, 145, 144, 144, 151, 149, 153, 148, 1, + 129, 39, 87, 56, 88, 77, 23, 147, 144, 144, + 152, 153, 20, 153, 154, 65, 76, 37, 32, 40, - 3, 53, 64, 90, 95, 93, 94, 92, 91, 96, - 104, 69, 125, 89, 87, 120, 121, 88, 86, 63, - 98, 103, 101, 102, 100, 99, 97, 75, 143, 150, - 150, 122, 48, 105, 106, 83, 68, 134, 72, 82, - 135, 55, 123, 23, 147, 67, 109, 71, 25, 4, - 61, 66, 54, 70, 47, 12, 108, 150, 35, 2, - 5, 57, 111, 59, 49, 77, 81, 79, 80, 78, - 76, 51, 136, 107, 50, 56, 22, 133, 44, 7, - 58, 29, 130, 43, 113, 112, 8, 128, 32, 132, - 37, 60, 119, 115, 127, 26, 27, 114, 129, 52, + 68, 3, 57, 58, 59, 52, 67, 93, 98, 96, + 97, 95, 94, 99, 107, 72, 128, 92, 90, 123, + 124, 91, 89, 66, 101, 106, 104, 105, 103, 102, + 100, 78, 146, 153, 153, 125, 47, 108, 109, 86, + 71, 137, 75, 85, 138, 54, 126, 22, 150, 70, + 112, 74, 24, 4, 64, 69, 53, 73, 46, 11, + 111, 153, 34, 2, 5, 60, 114, 62, 48, 80, + 84, 82, 83, 81, 79, 50, 139, 110, 49, 55, + 21, 136, 43, 61, 28, 133, 42, 116, 115, 7, + 131, 31, 135, 36, 63, 122, 118, 130, 25, 26, - 124, 118, 42, 6, 28, 110, 36, 9, 17, 10, - 117, 11, 116, 34, 13, 15, 14, 31, 39, 16, - 30, 131, 137, 139, 140, 18, 45, 138, 19, 46, - 20 + 117, 132, 51, 127, 121, 41, 6, 27, 113, 35, + 8, 16, 9, 120, 10, 119, 33, 12, 14, 13, + 30, 38, 15, 29, 134, 140, 142, 143, 17, 44, + 141, 18, 45, 19 } ; -static yyconst short int yy_accept[606] = +static yyconst short int yy_accept[609] = { 0, 1, 1, 1, 2, 4, 7, 9, 11, 13, 15, 17, 19, 21, 24, 27, 30, 32, 34, 36, 38, @@ -359,65 +359,65 @@ static yyconst short int yy_accept[606] = 81, 81, 81, 81, 81, 81, 81, 81, 81, 82, 82, 83, 83, 83, 83, 83, 83, 83, 83, 83, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, - 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, - 85, 85, 85, 85, 85, 85, 85, 86, 86, 86, + 84, 84, 84, 85, 85, 85, 85, 85, 85, 85, + 85, 85, 85, 85, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 86, 86, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 88, 89, 91, 92, 93, 94, 94, - 95, 96, 96, 96, 97, 97, 97, 98, 98, 99, - 99, 99, 99, 99, 100, 100, 100, 100, 100, 100, - 100, 100, 101, 101, 101, 102, 102, 102, 102, 102, - 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, - 102, 103, 103, 103, 103, 103, 103, 103, 103, 103, - 103, 104, 104, 105, 106, 107, 108, 109, 110, 110, + 86, 87, 87, 87, 87, 87, 87, 87, 87, 87, + 87, 87, 87, 87, 87, 87, 87, 87, 87, 88, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 88, 89, 90, 92, + 93, 94, 95, 95, 96, 97, 97, 97, 98, 98, + 98, 99, 99, 100, 100, 100, 100, 100, 101, 101, + 101, 101, 101, 101, 101, 102, 102, 102, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 104, 105, 106, 106, 106, 106, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 108, 108, 109, - 111, 112, 112, 112, 113, 114, 114, 114, 114, 114, - 114, 114, 114, 115, 116, 117, 117, 118, 118, 118, - 118, 119, 120, 120, 120, 121, 121, 121, 121, 121, - 121, 121, 121, 121, 122, 123, 124, 124, 124, 125, - 125, 126, 126, 127, 127, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 129, 129, 129, 130, 131, - 131, 131, 131, 132, 132, 132, 132, 133, 133, 133, - 134, 135, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 137, - 138, 138, 138, 138, 138, 139, 140, 140, 140, 141, + 110, 111, 112, 113, 114, 114, 115, 116, 116, 116, + 117, 118, 118, 118, 118, 118, 118, 118, 118, 119, + 120, 121, 121, 122, 122, 122, 122, 123, 124, 124, + 124, 125, 125, 125, 125, 125, 125, 125, 125, 125, + 126, 127, 128, 128, 128, 129, 129, 130, 130, 131, + 131, 132, 132, 132, 132, 132, 132, 132, 132, 132, + 132, 133, 133, 133, 134, 135, 135, 135, 135, 136, + 136, 136, 136, 137, 137, 137, 138, 139, 140, 140, + 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, + 140, 140, 140, 140, 141, 142, 142, 142, 142, 142, - 141, 141, 141, 141, 141, 141, 141, 141, 142, 143, - 144, 144, 144, 145, 145, 145, 145, 146, 146, 147, - 147, 147, 147, 147, 147, 147, 148, 148, 148, 148, - 148, 149, 149, 149, 150, 150, 150, 151, 151, 152, - 152, 153, 154, 154, 154, 154, 154, 154, 154, 155, - 155, 155, 156, 156, 157, 157, 157, 158, 159, 160, - 160, 160, 161, 161, 161, 161, 161, 161, 161, 161, - 161, 161, 161, 161, 161, 161, 161, 161, 162, 162, - 163, 164, 164, 164, 164, 164, 164, 164, 164, 164, - 164, 164, 165, 165, 165, 165, 165, 165, 165, 165, + 143, 144, 144, 144, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 146, 147, 148, 148, 148, 149, 149, + 149, 149, 150, 150, 151, 151, 151, 151, 151, 151, + 151, 152, 152, 152, 152, 152, 153, 153, 153, 154, + 154, 154, 155, 155, 156, 156, 157, 158, 158, 158, + 158, 158, 158, 158, 159, 159, 159, 160, 160, 161, + 161, 161, 162, 163, 164, 164, 164, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 166, 166, 167, 168, 168, 168, 168, 168, + 168, 168, 168, 168, 168, 168, 169, 169, 169, 169, - 166, 166, 166, 167, 168, 169, 170, 171, 172, 173, - 173, 173, 173, 174, 174, 174, 174, 175, 176, 176, - 177, 178, 178, 178, 178, 178, 178, 178, 178, 178, - 178, 179, 179, 179, 180, 180, 180, 180, 180, 181, - 181, 181, 181, 182, 183, 184, 184, 184, 185, 186, - 187, 187, 187, 188, 188, 188, 188, 188, 189, 189, - 190, 191, 192, 193, 193, 193, 193, 194, 194, 194, - 195, 196, 197, 198, 199, 199, 199, 200, 201, 202, - 202, 202, 202, 202, 202, 203, 203, 204, 204, 205, - 206, 206, 206, 206, 206, 206, 207, 207, 207, 207, + 169, 169, 169, 169, 170, 170, 170, 171, 172, 173, + 174, 175, 176, 177, 177, 177, 177, 178, 178, 178, + 178, 179, 180, 180, 181, 182, 182, 182, 182, 182, + 182, 182, 182, 182, 182, 183, 183, 183, 184, 184, + 184, 184, 184, 184, 184, 184, 185, 186, 187, 187, + 187, 188, 189, 190, 190, 190, 191, 191, 191, 191, + 191, 192, 192, 193, 194, 195, 196, 196, 196, 196, + 197, 197, 197, 198, 199, 200, 201, 202, 202, 202, + 203, 204, 205, 205, 205, 205, 205, 205, 206, 206, + 207, 207, 208, 209, 209, 209, 209, 209, 209, 210, - 207, 207, 207, 207, 207, 208, 208, 208, 208, 208, - 208, 208, 208, 208, 208, 209, 209, 209, 209, 209, - 210, 210, 210, 210, 210, 211, 212, 213, 213, 214, - 214, 214, 214, 214, 215, 215, 215, 215, 216, 216, - 217, 218, 218, 218, 218, 218, 218, 218, 218, 218, - 218, 218, 218, 218, 218, 219, 219, 219, 219, 219, - 219, 219, 219, 220, 220, 220, 220, 220, 220, 221, - 221, 221, 221, 221, 222, 222, 222, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - 223, 224, 224, 225, 226, 227, 227, 228, 228, 229, + 210, 210, 210, 210, 210, 210, 210, 210, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 212, 212, + 212, 212, 212, 213, 213, 213, 213, 213, 214, 215, + 216, 216, 217, 217, 217, 217, 217, 218, 218, 218, + 218, 219, 219, 220, 221, 221, 221, 221, 221, 221, + 221, 221, 221, 221, 221, 221, 221, 221, 222, 222, + 222, 222, 222, 222, 222, 222, 223, 223, 223, 223, + 223, 223, 224, 224, 224, 224, 224, 225, 225, 225, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 227, 227, 228, 229, 230, 230, - 230, 231, 231, 232, 232 + 231, 231, 232, 233, 234, 234, 235, 235 } ; static yyconst int yy_ec[256] = @@ -426,16 +426,16 @@ static yyconst int yy_ec[256] = 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 4, 1, 5, 6, 1, 1, 1, - 1, 1, 7, 1, 8, 9, 1, 10, 11, 11, - 11, 11, 11, 12, 11, 13, 11, 14, 15, 1, - 1, 1, 1, 1, 16, 16, 16, 16, 17, 16, + 1, 1, 7, 1, 8, 9, 1, 10, 11, 12, + 13, 14, 15, 16, 15, 17, 15, 18, 19, 1, + 1, 1, 1, 1, 20, 20, 20, 20, 21, 20, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 1, 1, 1, 1, 18, 1, 19, 20, 21, 22, + 1, 1, 1, 1, 22, 1, 23, 24, 25, 26, - 23, 24, 25, 26, 27, 5, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 1, 1, 1, 1, 1, 1, 1, 1, + 27, 28, 29, 30, 31, 5, 32, 33, 34, 35, + 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, + 46, 47, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -452,288 +452,290 @@ static yyconst int yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst int yy_meta[44] = +static yyconst int yy_meta[48] = { 0, - 1, 1, 2, 1, 3, 1, 1, 3, 3, 3, - 3, 3, 3, 4, 1, 3, 3, 3, 3, 3, + 1, 1, 2, 1, 3, 1, 4, 5, 3, 6, + 6, 6, 6, 6, 6, 6, 6, 7, 1, 3, + 8, 3, 3, 3, 3, 3, 8, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3 + 3, 3, 3, 3, 3, 3, 3 } ; -static yyconst short int yy_base[610] = +static yyconst short int yy_base[617] = { 0, - 0, 0, 1298, 1299, 1299, 1299, 1293, 1282, 36, 40, - 44, 50, 56, 62, 0, 63, 66, 81, 89, 47, - 108, 91, 105, 96, 119, 68, 144, 128, 111, 170, - 136, 201, 130, 117, 132, 125, 1291, 1299, 1280, 1299, - 0, 175, 190, 207, 229, 70, 234, 249, 254, 0, - 139, 145, 167, 76, 168, 138, 255, 31, 1279, 177, - 90, 198, 48, 110, 258, 195, 221, 211, 200, 1278, - 267, 269, 270, 156, 271, 272, 273, 217, 275, 276, - 219, 279, 288, 280, 300, 287, 283, 306, 296, 1277, - 307, 73, 309, 310, 312, 308, 315, 316, 324, 320, + 0, 0, 1298, 1299, 1299, 1299, 1293, 1278, 40, 0, + 48, 58, 68, 1250, 0, 68, 71, 81, 91, 52, + 105, 93, 134, 117, 118, 73, 137, 143, 98, 175, + 144, 210, 159, 116, 56, 119, 1290, 1299, 1275, 1299, + 0, 241, 0, 1283, 1282, 140, 249, 1245, 267, 0, + 70, 163, 145, 31, 157, 160, 168, 57, 1271, 170, + 94, 180, 182, 54, 193, 189, 194, 114, 205, 1270, + 271, 207, 204, 211, 208, 279, 206, 228, 249, 53, + 121, 254, 1269, 268, 280, 281, 283, 290, 291, 285, + 286, 287, 300, 1268, 305, 292, 309, 310, 314, 293, - 326, 325, 162, 327, 328, 330, 344, 338, 347, 336, - 348, 354, 350, 358, 1276, 364, 357, 367, 369, 372, - 374, 373, 375, 399, 378, 389, 381, 391, 400, 241, - 394, 402, 1275, 0, 434, 438, 1274, 452, 469, 0, - 1273, 403, 409, 1272, 410, 418, 1271, 411, 1270, 421, - 438, 442, 422, 1269, 446, 456, 464, 470, 443, 413, - 444, 1268, 471, 380, 472, 474, 477, 460, 476, 481, - 479, 487, 488, 489, 493, 494, 490, 495, 491, 508, - 511, 501, 512, 513, 505, 516, 518, 522, 523, 416, - 1267, 525, 1266, 1265, 1264, 1263, 1262, 1261, 526, 1260, + 316, 217, 317, 321, 311, 147, 322, 325, 328, 331, + 341, 329, 344, 336, 339, 358, 347, 348, 1267, 363, + 349, 346, 366, 370, 371, 372, 373, 384, 377, 388, + 253, 398, 378, 401, 385, 403, 1266, 0, 0, 372, + 1265, 0, 442, 0, 1264, 404, 407, 1263, 408, 412, + 1262, 409, 1261, 414, 427, 428, 423, 1260, 418, 429, + 444, 445, 447, 448, 1259, 452, 449, 454, 457, 459, + 456, 458, 460, 464, 469, 255, 470, 476, 473, 471, + 1258, 1257, 1256, 475, 472, 484, 486, 483, 490, 496, + 497, 498, 500, 502, 503, 504, 1255, 507, 1254, 1253, - 1259, 530, 531, 1258, 1257, 559, 536, 535, 548, 532, - 563, 550, 1256, 1255, 1254, 549, 1253, 142, 533, 575, - 1252, 1251, 537, 576, 1250, 577, 579, 581, 582, 586, - 587, 583, 584, 1249, 1248, 1247, 585, 589, 1246, 588, - 1245, 590, 1244, 598, 1243, 602, 539, 604, 610, 612, - 613, 614, 616, 618, 1242, 623, 624, 1299, 635, 652, - 656, 660, 665, 625, 544, 626, 1241, 666, 635, 1240, - 1239, 1238, 629, 667, 668, 669, 670, 671, 672, 673, - 676, 674, 677, 678, 680, 681, 687, 695, 1237, 1236, - 693, 694, 698, 679, 1235, 1234, 699, 704, 1233, 706, + 1252, 1251, 1250, 1249, 505, 1248, 1247, 512, 508, 1246, + 1245, 540, 517, 516, 521, 515, 551, 530, 1244, 1243, + 1242, 552, 1241, 554, 556, 557, 1240, 1239, 555, 558, + 1238, 559, 561, 563, 567, 572, 569, 570, 577, 1237, + 1236, 1235, 580, 583, 1234, 587, 1233, 585, 1232, 588, + 1231, 590, 513, 584, 591, 514, 598, 592, 596, 416, + 1230, 595, 607, 1299, 605, 622, 626, 628, 630, 621, + 622, 623, 1229, 624, 626, 1228, 1227, 1226, 625, 627, + 628, 633, 634, 636, 635, 637, 642, 647, 644, 643, + 654, 646, 658, 1225, 1224, 645, 656, 660, 661, 1223, - 705, 707, 711, 710, 708, 712, 718, 1232, 1231, 1230, - 713, 719, 1229, 721, 725, 732, 0, 727, 1228, 738, - 735, 737, 740, 743, 744, 1227, 739, 627, 746, 754, - 1226, 747, 758, 1225, 759, 760, 1224, 767, 1223, 761, - 1222, 1221, 769, 771, 773, 772, 776, 777, 1220, 778, - 780, 1219, 784, 1218, 786, 787, 1217, 792, 1216, 792, - 795, 1215, 793, 798, 804, 806, 811, 802, 810, 812, - 814, 817, 820, 821, 822, 824, 825, 1214, 827, 1213, - 1212, 826, 830, 831, 828, 835, 840, 842, 844, 847, - 846, 1211, 851, 849, 852, 853, 854, 860, 857, 1210, + 1222, 666, 667, 1221, 669, 670, 671, 675, 673, 674, + 676, 680, 1220, 1219, 1218, 683, 688, 1217, 686, 677, + 690, 0, 696, 1216, 698, 697, 699, 706, 707, 709, + 1215, 702, 712, 714, 717, 1214, 724, 713, 1213, 726, + 721, 1212, 731, 1211, 728, 1210, 1209, 732, 734, 739, + 740, 741, 743, 1208, 744, 747, 1207, 748, 1206, 751, + 750, 1205, 0, 1204, 752, 754, 1203, 755, 759, 764, + 767, 770, 758, 772, 776, 780, 781, 783, 782, 784, + 785, 1202, 786, 1201, 1200, 789, 791, 794, 787, 788, + 797, 798, 806, 807, 808, 1199, 810, 809, 812, 815, - 864, 867, 1209, 1208, 1207, 1206, 1205, 1204, 1203, 871, - 873, 872, 1202, 875, 874, 876, 1201, 1200, 877, 1199, - 1198, 878, 881, 884, 879, 889, 880, 894, 895, 898, - 1197, 903, 904, 1196, 905, 906, 907, 908, 1195, 909, - 910, 911, 1194, 1193, 1192, 919, 914, 1191, 1190, 1189, - 925, 920, 1188, 912, 930, 933, 926, 1187, 934, 1186, - 1185, 1184, 1183, 940, 942, 943, 1182, 944, 945, 1181, - 1180, 1179, 1178, 1177, 950, 946, 1176, 1175, 1174, 947, - 948, 956, 952, 951, 1173, 954, 1172, 957, 1171, 1170, - 966, 967, 46, 969, 971, 1169, 972, 973, 974, 976, + 816, 820, 822, 1198, 814, 828, 1197, 1196, 1195, 1194, + 1193, 1192, 1191, 830, 831, 833, 1190, 834, 836, 838, + 1189, 1188, 837, 1187, 1186, 839, 842, 840, 843, 844, + 850, 853, 854, 857, 1185, 860, 861, 1184, 864, 865, + 867, 869, 868, 870, 871, 1183, 1182, 1181, 875, 876, + 1180, 1179, 1178, 885, 882, 1177, 887, 891, 897, 883, + 1176, 886, 1175, 1174, 1173, 1172, 894, 901, 903, 1171, + 904, 907, 1170, 1169, 1168, 1167, 1166, 908, 910, 1165, + 1164, 1163, 909, 905, 911, 912, 914, 1162, 916, 1161, + 923, 1160, 1159, 926, 928, 929, 930, 933, 1158, 934, - 978, 983, 979, 982, 1168, 985, 986, 993, 997, 994, - 996, 1000, 1004, 1006, 1167, 1008, 1011, 1012, 1009, 1166, - 1013, 1014, 1015, 1016, 1165, 1164, 1161, 1020, 1152, 1021, - 1022, 1024, 1036, 1150, 1037, 1040, 1041, 1149, 1023, 1148, - 1147, 1043, 1047, 1026, 1050, 1051, 1052, 1053, 1057, 1058, - 1059, 1061, 1062, 1063, 1145, 1064, 1069, 1065, 1070, 1073, - 1079, 1072, 1144, 1075, 1083, 1076, 1086, 1087, 1143, 1089, - 1090, 1094, 1097, 1140, 1099, 1096, 1139, 1100, 1103, 1106, - 1108, 1109, 1111, 1112, 1116, 1118, 1120, 1121, 1122, 1123, - 1136, 1124, 1134, 741, 639, 1131, 591, 1133, 545, 497, + 935, 936, 938, 937, 948, 932, 940, 1157, 944, 950, + 956, 960, 962, 964, 966, 967, 968, 1156, 946, 972, + 974, 975, 1155, 976, 977, 978, 980, 1150, 1147, 1144, + 983, 1136, 993, 981, 985, 986, 1133, 998, 999, 1003, + 1130, 1006, 1124, 1113, 1007, 1008, 1009, 1010, 1011, 1013, + 1014, 1018, 1020, 1019, 1023, 1022, 1025, 1111, 1024, 1031, + 1026, 1035, 1039, 1040, 1036, 1109, 1043, 1044, 1046, 1050, + 1051, 1108, 1054, 1052, 1055, 1056, 1106, 1060, 1062, 1104, + 1064, 1067, 1057, 1069, 1076, 1077, 1080, 1081, 1082, 1084, + 1085, 1083, 1087, 1101, 1088, 1100, 1099, 1094, 1089, 982, - 334, 1132, 331, 1299, 1167, 1169, 296, 1173, 253 + 1098, 756, 527, 419, 1093, 326, 1299, 1132, 1138, 1144, + 268, 1152, 1158, 123, 1161, 1166 } ; -static yyconst short int yy_def[610] = +static yyconst short int yy_def[617] = { 0, - 604, 1, 604, 604, 604, 604, 605, 606, 607, 604, - 606, 606, 606, 606, 608, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 605, 604, 606, 604, - 609, 609, 604, 604, 606, 606, 606, 606, 606, 608, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, + 607, 1, 607, 607, 607, 607, 608, 609, 610, 611, + 609, 609, 11, 13, 612, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 608, 607, 609, 607, + 613, 613, 614, 611, 11, 609, 11, 13, 11, 612, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 604, 609, 609, 604, 606, 606, 606, 49, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 607, 613, 42, 615, + 609, 47, 11, 49, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, - 606, 606, 606, 606, 606, 49, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 604, 604, 604, - 604, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 49, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 607, 615, 616, 616, 143, 143, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 206, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 604, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 212, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 267, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, - 606, 606, 606, 0, 604, 604, 604, 604, 604 + 609, 609, 609, 609, 609, 609, 0, 607, 607, 607, + 607, 607, 607, 607, 607, 607 } ; -static yyconst short int yy_nxt[1343] = +static yyconst short int yy_nxt[1347] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 14, 14, 4, 15, 8, 8, 8, 16, 17, - 18, 19, 20, 21, 22, 8, 23, 8, 24, 25, - 26, 27, 28, 8, 29, 30, 31, 32, 33, 34, - 35, 8, 36, 42, 40, 43, 43, 43, 43, 44, - 44, 44, 44, 45, 45, 45, 45, 40, 46, 40, - 40, 40, 151, 40, 47, 48, 48, 48, 48, 40, - 47, 48, 48, 48, 48, 40, 40, 69, 137, 40, - 70, 40, 157, 40, 51, 519, 40, 71, 56, 40, - 90, 52, 57, 53, 40, 54, 49, 58, 55, 60, + 14, 14, 14, 14, 14, 14, 14, 4, 15, 8, + 8, 8, 16, 17, 18, 19, 20, 21, 22, 8, + 23, 8, 24, 25, 26, 27, 28, 8, 29, 30, + 31, 32, 33, 34, 35, 8, 36, 42, 40, 43, + 43, 43, 43, 43, 43, 43, 43, 45, 45, 45, + 45, 45, 45, 45, 45, 40, 46, 149, 181, 40, + 40, 40, 134, 40, 40, 40, 47, 48, 48, 48, + 48, 48, 48, 48, 48, 40, 69, 40, 40, 70, + 40, 135, 155, 51, 162, 145, 71, 56, 40, 94, - 59, 61, 40, 40, 40, 91, 193, 64, 145, 40, - 154, 65, 62, 78, 83, 66, 63, 67, 40, 79, - 68, 40, 84, 40, 40, 80, 72, 85, 73, 74, - 40, 86, 40, 101, 81, 82, 75, 87, 40, 129, - 76, 40, 77, 40, 130, 40, 158, 132, 127, 40, - 88, 40, 40, 98, 114, 40, 89, 40, 40, 99, - 141, 128, 148, 131, 100, 328, 92, 115, 93, 40, - 116, 142, 94, 143, 95, 40, 96, 117, 97, 102, - 40, 40, 171, 40, 135, 135, 135, 135, 144, 103, - 40, 104, 105, 146, 106, 107, 108, 147, 109, 43, + 52, 57, 53, 60, 54, 61, 58, 55, 40, 59, + 40, 40, 49, 64, 95, 40, 62, 65, 158, 78, + 63, 66, 40, 67, 105, 79, 68, 72, 43, 73, + 74, 40, 182, 40, 40, 40, 40, 75, 40, 87, + 91, 76, 133, 77, 80, 136, 81, 88, 141, 82, + 83, 40, 89, 92, 40, 167, 90, 40, 84, 93, + 40, 40, 40, 96, 40, 97, 118, 85, 86, 98, + 148, 99, 102, 100, 40, 101, 40, 40, 103, 119, + 40, 131, 120, 104, 106, 40, 150, 40, 152, 121, + 151, 212, 40, 146, 132, 147, 153, 40, 107, 40, - 43, 43, 43, 207, 110, 152, 111, 112, 40, 113, - 102, 40, 153, 40, 40, 136, 44, 44, 44, 44, - 118, 165, 119, 120, 40, 121, 155, 122, 156, 123, - 40, 124, 40, 162, 40, 125, 126, 47, 45, 45, - 45, 45, 40, 138, 138, 138, 138, 40, 164, 163, - 139, 179, 254, 176, 40, 134, 139, 47, 48, 48, - 48, 48, 40, 140, 140, 140, 140, 40, 40, 140, - 140, 40, 140, 140, 140, 140, 140, 140, 159, 149, - 40, 160, 40, 40, 40, 40, 40, 166, 40, 40, - 161, 150, 40, 40, 173, 175, 40, 168, 41, 170, + 108, 109, 156, 110, 111, 112, 40, 113, 154, 157, + 40, 40, 159, 114, 160, 115, 116, 163, 117, 106, + 161, 40, 40, 40, 40, 40, 166, 40, 40, 164, + 168, 165, 178, 122, 40, 123, 124, 173, 125, 171, + 126, 174, 127, 175, 128, 40, 172, 207, 129, 130, + 139, 139, 139, 139, 139, 139, 139, 139, 142, 142, + 142, 142, 142, 142, 142, 142, 40, 183, 179, 143, + 40, 40, 40, 44, 256, 143, 144, 144, 144, 144, + 144, 144, 144, 144, 180, 40, 144, 144, 40, 144, + 144, 144, 144, 144, 144, 169, 40, 40, 40, 297, - 40, 40, 172, 167, 169, 178, 177, 183, 174, 40, - 184, 189, 188, 40, 180, 181, 185, 182, 186, 40, - 40, 40, 40, 40, 191, 40, 199, 190, 40, 40, - 187, 194, 196, 40, 198, 192, 200, 40, 40, 40, - 40, 40, 201, 40, 40, 195, 197, 40, 209, 40, - 202, 40, 213, 208, 203, 204, 210, 40, 223, 219, - 40, 40, 205, 40, 211, 206, 214, 40, 212, 221, - 40, 40, 215, 225, 220, 216, 226, 40, 217, 224, - 40, 218, 40, 222, 227, 40, 40, 40, 40, 231, - 229, 40, 228, 40, 40, 233, 235, 239, 250, 282, + 40, 184, 40, 40, 40, 176, 189, 40, 40, 40, + 40, 170, 196, 192, 194, 205, 185, 40, 195, 177, + 186, 187, 40, 188, 190, 193, 40, 40, 40, 199, + 191, 40, 197, 40, 40, 200, 202, 198, 40, 40, + 204, 206, 40, 40, 210, 40, 40, 208, 40, 201, + 203, 211, 215, 40, 225, 214, 40, 219, 40, 209, + 216, 40, 229, 40, 40, 40, 40, 213, 217, 226, + 227, 220, 218, 221, 230, 40, 222, 232, 233, 223, + 40, 231, 224, 40, 228, 237, 234, 40, 40, 40, + 40, 238, 266, 235, 40, 40, 239, 241, 266, 245, - 248, 230, 40, 237, 40, 234, 240, 40, 232, 238, - 236, 241, 40, 40, 249, 40, 40, 251, 253, 252, - 242, 243, 40, 40, 40, 244, 40, 264, 255, 40, - 245, 40, 266, 246, 40, 40, 256, 268, 247, 278, - 265, 269, 257, 135, 135, 135, 135, 259, 259, 259, - 259, 40, 267, 312, 260, 40, 40, 40, 272, 40, - 260, 138, 138, 138, 138, 40, 270, 273, 139, 40, - 271, 277, 279, 40, 139, 261, 262, 40, 263, 263, - 263, 263, 40, 40, 40, 40, 275, 40, 276, 40, - 40, 274, 40, 280, 40, 287, 284, 281, 283, 285, + 259, 40, 40, 254, 236, 40, 243, 240, 246, 248, + 249, 242, 244, 247, 250, 40, 260, 255, 40, 251, + 40, 40, 252, 261, 40, 40, 40, 253, 257, 40, + 258, 40, 270, 40, 272, 40, 40, 360, 275, 274, + 40, 262, 271, 279, 40, 40, 40, 263, 267, 268, + 273, 269, 269, 269, 269, 269, 269, 269, 269, 276, + 277, 40, 40, 278, 40, 40, 40, 282, 280, 40, + 281, 40, 287, 40, 40, 40, 40, 40, 285, 283, + 284, 40, 286, 289, 288, 290, 40, 40, 40, 40, + 40, 296, 40, 40, 303, 292, 294, 291, 293, 302, - 40, 40, 40, 40, 40, 291, 40, 40, 40, 298, - 40, 286, 288, 289, 40, 295, 297, 290, 40, 300, - 293, 40, 296, 294, 40, 40, 40, 299, 292, 40, - 301, 40, 304, 302, 305, 40, 40, 308, 40, 40, - 306, 307, 309, 40, 40, 40, 40, 303, 40, 40, - 40, 311, 40, 313, 321, 329, 310, 40, 40, 314, - 315, 40, 40, 40, 360, 348, 331, 316, 317, 317, - 317, 317, 318, 319, 317, 317, 40, 317, 317, 317, - 317, 317, 317, 327, 320, 322, 326, 323, 40, 40, - 40, 324, 40, 325, 40, 40, 40, 40, 40, 40, + 40, 40, 300, 40, 305, 298, 295, 40, 299, 301, + 306, 304, 307, 40, 40, 40, 310, 40, 309, 40, + 40, 40, 40, 313, 40, 40, 308, 311, 314, 40, + 40, 40, 40, 40, 40, 316, 356, 312, 40, 318, + 315, 326, 319, 353, 40, 317, 320, 40, 321, 322, + 322, 322, 322, 322, 322, 322, 322, 323, 324, 322, + 322, 325, 322, 322, 322, 322, 322, 322, 40, 40, + 331, 40, 40, 40, 40, 40, 40, 327, 40, 328, + 40, 333, 334, 329, 40, 330, 40, 40, 336, 40, + 332, 340, 335, 339, 40, 344, 337, 40, 342, 338, - 40, 40, 40, 40, 40, 335, 330, 334, 337, 339, - 332, 40, 345, 333, 336, 40, 338, 40, 344, 340, - 343, 342, 341, 40, 347, 40, 40, 40, 346, 40, - 351, 40, 353, 349, 352, 355, 40, 40, 40, 40, - 40, 350, 40, 354, 259, 259, 259, 259, 40, 364, - 410, 260, 40, 363, 356, 359, 361, 260, 261, 261, - 357, 358, 358, 358, 358, 358, 358, 358, 358, 263, - 263, 263, 263, 40, 263, 263, 263, 263, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 368, 40, - 40, 40, 40, 40, 40, 374, 362, 367, 370, 377, + 40, 40, 40, 341, 40, 40, 343, 40, 40, 40, + 345, 350, 40, 40, 358, 40, 352, 354, 348, 346, + 347, 349, 351, 357, 40, 266, 355, 359, 267, 267, + 361, 266, 607, 607, 607, 39, 607, 39, 40, 40, + 40, 40, 40, 40, 40, 40, 365, 362, 368, 369, + 40, 40, 40, 40, 40, 364, 373, 366, 367, 40, + 40, 40, 40, 40, 40, 372, 374, 370, 371, 378, + 376, 40, 382, 40, 377, 40, 381, 40, 40, 375, + 379, 380, 383, 40, 40, 384, 40, 40, 40, 390, + 40, 40, 40, 40, 40, 391, 385, 40, 389, 386, - 40, 369, 373, 365, 366, 372, 40, 40, 40, 378, - 375, 40, 40, 371, 376, 379, 384, 40, 40, 40, - 40, 40, 386, 40, 40, 40, 40, 385, 387, 380, - 381, 40, 40, 382, 40, 383, 392, 391, 40, 388, - 40, 389, 390, 393, 395, 40, 394, 396, 40, 400, - 40, 40, 40, 40, 40, 402, 40, 40, 397, 40, - 40, 398, 404, 399, 401, 406, 408, 40, 411, 413, - 403, 40, 40, 40, 40, 409, 405, 412, 414, 407, - 40, 415, 40, 418, 40, 40, 40, 417, 416, 40, - 40, 40, 419, 40, 423, 420, 421, 40, 422, 40, + 40, 387, 388, 40, 395, 40, 396, 40, 392, 393, + 394, 397, 398, 40, 40, 40, 40, 402, 399, 40, + 400, 406, 404, 40, 40, 403, 40, 401, 405, 40, + 40, 40, 408, 410, 40, 412, 407, 418, 40, 414, + 415, 40, 413, 40, 416, 40, 409, 411, 40, 40, + 417, 40, 419, 420, 422, 421, 40, 40, 40, 423, + 40, 40, 424, 427, 40, 40, 425, 40, 40, 40, + 426, 40, 40, 40, 435, 40, 40, 428, 432, 436, + 434, 40, 429, 438, 40, 430, 439, 40, 431, 40, + 433, 440, 441, 40, 437, 443, 442, 40, 40, 40, - 40, 358, 358, 358, 358, 40, 40, 424, 40, 428, - 431, 40, 425, 430, 426, 40, 432, 40, 434, 40, - 427, 429, 435, 40, 40, 40, 436, 40, 433, 437, - 40, 440, 439, 40, 40, 40, 438, 40, 40, 40, - 40, 40, 443, 40, 40, 447, 441, 448, 40, 442, - 452, 444, 449, 40, 446, 40, 450, 40, 445, 40, - 40, 451, 40, 453, 40, 40, 40, 40, 458, 454, - 40, 460, 461, 40, 456, 462, 463, 40, 455, 457, - 40, 459, 464, 465, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 466, 469, 40, 473, 468, + 40, 40, 40, 40, 40, 40, 40, 446, 40, 450, + 451, 40, 444, 455, 40, 40, 445, 447, 449, 452, + 456, 453, 448, 40, 40, 40, 40, 40, 454, 40, + 457, 40, 40, 40, 461, 463, 464, 40, 458, 40, + 459, 465, 466, 460, 462, 40, 467, 40, 40, 469, + 40, 40, 468, 40, 40, 40, 40, 40, 472, 40, + 40, 40, 471, 474, 476, 480, 479, 40, 470, 473, + 40, 40, 482, 477, 40, 484, 475, 40, 40, 478, + 483, 40, 40, 481, 40, 40, 40, 40, 40, 490, + 487, 486, 40, 40, 485, 492, 496, 497, 489, 40, - 471, 476, 40, 467, 470, 477, 480, 40, 40, 474, - 472, 40, 481, 479, 475, 478, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 487, 40, 483, 484, - 489, 482, 40, 40, 498, 486, 493, 494, 40, 40, - 485, 491, 492, 40, 490, 496, 40, 40, 488, 497, - 495, 500, 499, 40, 502, 40, 40, 40, 40, 40, - 40, 40, 501, 40, 40, 40, 506, 40, 507, 40, - 40, 509, 504, 505, 503, 510, 508, 512, 513, 40, - 40, 514, 40, 511, 40, 40, 40, 40, 516, 40, - 515, 40, 40, 521, 522, 40, 40, 520, 40, 40, + 40, 488, 40, 40, 40, 494, 495, 493, 40, 499, + 505, 40, 491, 501, 40, 500, 498, 502, 40, 503, + 40, 40, 40, 504, 40, 40, 40, 40, 40, 40, + 509, 40, 506, 40, 510, 507, 515, 508, 511, 512, + 40, 513, 516, 40, 514, 40, 40, 40, 517, 40, + 40, 40, 40, 40, 40, 40, 518, 40, 519, 524, + 525, 40, 523, 40, 520, 40, 521, 40, 527, 526, + 528, 531, 522, 40, 530, 529, 534, 40, 535, 40, + 532, 40, 536, 40, 40, 40, 533, 542, 537, 40, + 539, 40, 40, 40, 40, 40, 541, 40, 40, 40, - 517, 518, 524, 523, 525, 527, 40, 40, 531, 40, - 40, 532, 526, 40, 528, 533, 534, 40, 529, 40, - 536, 40, 40, 530, 40, 40, 40, 40, 40, 40, - 538, 542, 535, 40, 40, 40, 40, 40, 546, 40, - 537, 543, 549, 548, 544, 539, 547, 540, 541, 40, - 40, 545, 550, 40, 40, 551, 40, 552, 553, 555, - 40, 556, 558, 40, 40, 40, 40, 554, 559, 557, - 40, 40, 40, 562, 40, 40, 40, 40, 40, 566, - 560, 568, 40, 40, 564, 40, 40, 565, 40, 40, - 567, 569, 40, 563, 561, 573, 40, 571, 570, 40, + 40, 545, 40, 40, 538, 552, 549, 540, 546, 554, + 40, 547, 543, 550, 544, 40, 40, 553, 548, 551, + 40, 556, 555, 40, 40, 40, 40, 40, 40, 559, + 40, 40, 562, 557, 560, 40, 40, 40, 565, 40, + 40, 40, 40, 40, 563, 569, 558, 571, 40, 561, + 567, 568, 40, 40, 570, 572, 40, 40, 566, 564, + 40, 40, 574, 40, 573, 576, 577, 40, 40, 40, + 580, 40, 40, 40, 40, 575, 578, 40, 581, 40, + 584, 40, 582, 583, 40, 586, 40, 592, 589, 579, + 587, 591, 585, 40, 40, 588, 590, 40, 40, 40, - 40, 574, 40, 40, 578, 577, 572, 40, 575, 40, - 40, 581, 40, 40, 579, 580, 40, 576, 586, 40, - 583, 40, 40, 588, 40, 40, 582, 584, 587, 40, - 585, 40, 589, 40, 40, 40, 40, 40, 590, 595, - 596, 597, 592, 591, 40, 40, 40, 40, 593, 40, - 594, 601, 40, 40, 600, 602, 40, 40, 40, 599, - 40, 40, 40, 40, 598, 40, 603, 37, 37, 37, - 37, 39, 39, 50, 40, 50, 50, 40, 40, 40, + 40, 40, 40, 593, 40, 40, 40, 598, 599, 600, + 40, 40, 595, 604, 594, 40, 40, 40, 40, 597, + 596, 40, 603, 40, 605, 40, 40, 602, 40, 601, + 40, 606, 37, 37, 37, 37, 37, 37, 37, 37, + 39, 40, 39, 39, 39, 39, 41, 40, 41, 41, + 40, 41, 50, 40, 50, 50, 50, 50, 50, 50, + 138, 40, 138, 138, 40, 138, 265, 40, 265, 363, + 363, 363, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, @@ -745,166 +747,166 @@ static yyconst short int yy_nxt[1343] = 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 258, 40, - 40, 40, 40, 40, 133, 40, 38, 604, 3, 604, + 40, 40, 40, 264, 40, 40, 40, 40, 40, 39, + 47, 140, 40, 137, 39, 40, 38, 607, 3, 607, - 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, - 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, - 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, - 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, - 604, 604 + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607 } ; -static yyconst short int yy_chk[1343] = +static yyconst short int yy_chk[1347] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 9, 58, 9, 9, 9, 9, 10, - 10, 10, 10, 11, 11, 11, 11, 11, 12, 493, - 20, 63, 58, 12, 13, 13, 13, 13, 13, 13, - 14, 14, 14, 14, 14, 14, 16, 20, 46, 17, - 20, 26, 63, 46, 16, 493, 92, 20, 17, 54, - 26, 16, 17, 16, 18, 16, 13, 17, 16, 18, + 1, 1, 1, 1, 1, 1, 1, 9, 54, 9, + 9, 9, 9, 9, 9, 9, 9, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 12, 54, 80, 20, + 80, 64, 35, 35, 58, 12, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 16, 20, 51, 17, 20, + 26, 35, 58, 16, 64, 51, 20, 17, 18, 26, - 17, 18, 19, 61, 22, 26, 92, 19, 54, 24, - 61, 19, 18, 22, 24, 19, 18, 19, 23, 22, - 19, 21, 24, 64, 29, 23, 21, 24, 21, 21, - 34, 24, 25, 29, 23, 23, 21, 25, 36, 34, - 21, 28, 21, 33, 35, 35, 64, 36, 33, 31, - 25, 56, 51, 28, 31, 218, 25, 27, 52, 28, - 51, 33, 56, 35, 28, 218, 27, 31, 27, 74, - 31, 52, 27, 52, 27, 103, 27, 31, 27, 30, - 53, 55, 74, 30, 42, 42, 42, 42, 53, 30, - 60, 30, 30, 55, 30, 30, 30, 55, 30, 43, + 16, 17, 16, 18, 16, 18, 17, 16, 19, 17, + 22, 61, 13, 19, 26, 29, 18, 19, 61, 22, + 18, 19, 21, 19, 29, 22, 19, 21, 614, 21, + 21, 68, 81, 34, 24, 25, 36, 21, 81, 24, + 25, 21, 34, 21, 23, 36, 23, 24, 46, 23, + 23, 23, 24, 25, 27, 68, 24, 46, 23, 25, + 28, 31, 53, 27, 106, 27, 31, 23, 23, 27, + 53, 27, 28, 27, 55, 27, 33, 56, 28, 31, + 52, 33, 31, 28, 30, 57, 55, 60, 56, 31, + 55, 106, 30, 52, 33, 52, 57, 62, 30, 63, - 43, 43, 43, 103, 30, 60, 30, 30, 66, 30, - 32, 62, 60, 69, 32, 44, 44, 44, 44, 44, - 32, 69, 32, 32, 68, 32, 62, 32, 62, 32, - 78, 32, 81, 66, 67, 32, 32, 45, 45, 45, - 45, 45, 45, 47, 47, 47, 47, 47, 68, 67, - 47, 81, 130, 78, 130, 609, 47, 48, 48, 48, - 48, 48, 48, 49, 49, 49, 49, 49, 57, 49, - 49, 65, 49, 49, 49, 49, 49, 49, 65, 57, - 71, 65, 72, 73, 75, 76, 77, 71, 79, 80, - 65, 57, 82, 84, 76, 77, 87, 72, 607, 73, + 30, 30, 60, 30, 30, 30, 66, 30, 57, 60, + 65, 67, 62, 30, 62, 30, 30, 65, 30, 32, + 63, 73, 69, 77, 72, 75, 67, 32, 74, 65, + 69, 66, 77, 32, 102, 32, 32, 73, 32, 72, + 32, 74, 32, 75, 32, 78, 72, 102, 32, 32, + 42, 42, 42, 42, 42, 42, 42, 42, 47, 47, + 47, 47, 47, 47, 47, 47, 79, 82, 78, 47, + 131, 82, 176, 611, 131, 47, 49, 49, 49, 49, + 49, 49, 49, 49, 79, 84, 49, 49, 71, 49, + 49, 49, 49, 49, 49, 71, 76, 85, 86, 176, - 86, 83, 75, 71, 72, 80, 79, 83, 76, 89, - 84, 87, 86, 85, 82, 82, 84, 82, 85, 88, - 91, 96, 93, 94, 89, 95, 96, 88, 97, 98, - 85, 93, 94, 100, 95, 91, 97, 99, 102, 101, - 104, 105, 98, 106, 603, 93, 94, 601, 105, 110, - 99, 108, 106, 104, 100, 101, 105, 107, 110, 108, - 109, 111, 101, 113, 105, 102, 106, 112, 105, 109, - 117, 114, 107, 112, 108, 107, 113, 116, 107, 111, - 118, 107, 119, 109, 114, 120, 122, 121, 123, 117, - 116, 125, 114, 164, 127, 119, 121, 123, 127, 164, + 87, 84, 90, 91, 92, 76, 87, 88, 89, 96, + 100, 71, 92, 89, 90, 100, 85, 93, 91, 76, + 86, 86, 95, 86, 88, 89, 97, 98, 105, 96, + 88, 99, 93, 101, 103, 97, 98, 95, 104, 107, + 99, 101, 108, 606, 105, 109, 112, 103, 110, 97, + 98, 105, 109, 114, 112, 108, 115, 110, 111, 104, + 109, 113, 114, 122, 117, 118, 121, 107, 109, 112, + 113, 110, 109, 111, 115, 116, 111, 117, 118, 111, + 120, 116, 111, 123, 113, 121, 118, 124, 125, 126, + 127, 122, 140, 120, 129, 133, 123, 125, 140, 127, - 125, 116, 126, 122, 128, 120, 123, 131, 118, 122, - 121, 123, 124, 129, 126, 132, 142, 128, 129, 128, - 124, 124, 143, 145, 148, 124, 160, 142, 131, 190, - 124, 146, 145, 124, 150, 153, 132, 148, 124, 160, - 143, 150, 132, 135, 135, 135, 135, 136, 136, 136, - 136, 151, 146, 190, 136, 152, 159, 161, 153, 155, - 136, 138, 138, 138, 138, 138, 151, 155, 138, 156, - 152, 159, 161, 168, 138, 139, 139, 157, 139, 139, - 139, 139, 139, 158, 163, 165, 157, 166, 158, 169, - 167, 156, 171, 163, 170, 168, 166, 163, 165, 167, + 133, 128, 135, 129, 120, 130, 126, 124, 127, 128, + 128, 125, 126, 127, 128, 132, 134, 130, 134, 128, + 136, 146, 128, 135, 147, 149, 152, 128, 132, 150, + 132, 154, 146, 260, 149, 159, 604, 260, 154, 152, + 157, 136, 147, 159, 155, 156, 160, 136, 143, 143, + 150, 143, 143, 143, 143, 143, 143, 143, 143, 155, + 156, 161, 162, 157, 163, 164, 167, 162, 160, 166, + 161, 168, 167, 171, 169, 172, 170, 173, 166, 163, + 164, 174, 166, 169, 168, 170, 175, 177, 180, 185, + 179, 175, 184, 178, 180, 171, 173, 170, 172, 179, - 172, 173, 174, 177, 179, 172, 175, 176, 178, 177, - 600, 167, 169, 170, 182, 175, 176, 171, 185, 179, - 174, 180, 175, 174, 181, 183, 184, 178, 173, 186, - 180, 187, 182, 181, 183, 188, 189, 186, 192, 199, - 184, 185, 187, 202, 203, 210, 219, 181, 208, 207, - 223, 189, 247, 192, 210, 219, 188, 265, 599, 199, - 202, 209, 216, 212, 265, 247, 223, 203, 206, 206, - 206, 206, 207, 208, 206, 206, 211, 206, 206, 206, - 206, 206, 206, 216, 209, 211, 212, 211, 220, 224, - 226, 211, 227, 211, 228, 229, 232, 233, 237, 230, + 188, 186, 178, 187, 185, 177, 174, 189, 177, 178, + 186, 184, 187, 190, 191, 192, 189, 193, 188, 194, + 195, 196, 205, 192, 198, 209, 187, 190, 193, 208, + 253, 256, 216, 214, 213, 195, 256, 191, 215, 198, + 194, 216, 205, 253, 603, 196, 208, 218, 209, 212, + 212, 212, 212, 212, 212, 212, 212, 213, 214, 212, + 212, 215, 212, 212, 212, 212, 212, 212, 217, 222, + 218, 224, 229, 225, 226, 230, 232, 217, 233, 217, + 234, 224, 225, 217, 235, 217, 237, 238, 229, 236, + 222, 234, 226, 233, 239, 237, 230, 243, 236, 232, - 231, 240, 238, 242, 597, 228, 220, 227, 230, 231, - 224, 244, 242, 226, 229, 246, 230, 248, 240, 232, - 238, 237, 233, 249, 246, 250, 251, 252, 244, 253, - 250, 254, 252, 248, 251, 254, 256, 257, 264, 266, - 328, 249, 273, 253, 259, 259, 259, 259, 269, 273, - 328, 259, 595, 269, 256, 264, 266, 259, 260, 260, - 257, 260, 260, 260, 260, 261, 261, 261, 261, 262, - 262, 262, 262, 262, 263, 263, 263, 263, 263, 268, - 274, 275, 276, 277, 278, 279, 280, 282, 277, 281, - 283, 284, 294, 285, 286, 283, 268, 276, 279, 286, + 244, 254, 248, 235, 246, 250, 236, 252, 255, 258, + 238, 248, 262, 259, 258, 257, 252, 254, 244, 239, + 243, 246, 250, 257, 263, 265, 255, 259, 266, 266, + 262, 265, 267, 267, 268, 268, 269, 269, 270, 271, + 272, 274, 279, 275, 280, 281, 271, 263, 275, 279, + 282, 283, 285, 284, 286, 270, 283, 272, 274, 287, + 290, 289, 296, 292, 288, 282, 284, 280, 281, 288, + 286, 291, 292, 297, 287, 293, 291, 298, 299, 285, + 289, 290, 293, 302, 303, 296, 305, 306, 307, 303, + 309, 310, 308, 311, 320, 305, 297, 312, 302, 298, - 287, 278, 282, 274, 275, 281, 291, 292, 288, 287, - 284, 293, 297, 280, 285, 288, 294, 298, 301, 300, - 302, 305, 298, 304, 303, 306, 311, 297, 300, 291, - 292, 307, 312, 293, 314, 293, 305, 304, 315, 301, - 318, 302, 303, 306, 311, 316, 307, 312, 321, 318, - 322, 320, 327, 323, 594, 321, 324, 325, 314, 329, - 332, 315, 323, 316, 320, 324, 325, 330, 329, 332, - 322, 333, 335, 336, 340, 327, 323, 330, 333, 324, - 338, 335, 343, 340, 344, 346, 345, 338, 336, 347, - 348, 350, 343, 351, 347, 344, 345, 353, 346, 355, + 316, 298, 299, 319, 309, 317, 310, 321, 306, 307, + 308, 311, 312, 323, 326, 325, 327, 320, 316, 332, + 317, 326, 323, 328, 329, 321, 330, 319, 325, 333, + 338, 334, 328, 329, 335, 330, 327, 338, 341, 333, + 334, 337, 332, 340, 335, 345, 328, 329, 343, 348, + 337, 349, 340, 341, 345, 343, 350, 351, 352, 348, + 353, 355, 349, 352, 356, 358, 350, 361, 360, 365, + 351, 366, 368, 602, 365, 373, 369, 353, 360, 366, + 361, 370, 355, 369, 371, 356, 370, 372, 358, 374, + 360, 371, 372, 375, 368, 374, 373, 376, 377, 379, - 356, 358, 358, 358, 358, 360, 363, 348, 361, 355, - 360, 364, 350, 356, 351, 368, 361, 365, 364, 366, - 353, 355, 365, 369, 367, 370, 366, 371, 363, 367, - 372, 370, 369, 373, 374, 375, 368, 376, 377, 382, - 379, 385, 373, 383, 384, 377, 371, 379, 386, 372, - 385, 374, 382, 387, 376, 388, 383, 389, 375, 391, - 390, 384, 394, 386, 393, 395, 396, 397, 391, 387, - 399, 394, 395, 398, 389, 396, 397, 401, 388, 390, - 402, 393, 398, 399, 410, 412, 411, 415, 414, 416, - 419, 422, 425, 427, 423, 401, 411, 424, 416, 410, + 378, 380, 381, 383, 389, 390, 386, 377, 387, 381, + 383, 388, 375, 389, 391, 392, 376, 378, 380, 386, + 390, 387, 379, 393, 394, 395, 398, 397, 388, 399, + 391, 405, 400, 401, 395, 398, 399, 402, 392, 403, + 393, 400, 401, 394, 397, 406, 402, 414, 415, 405, + 416, 418, 403, 419, 423, 420, 426, 428, 415, 427, + 429, 430, 414, 418, 420, 428, 427, 431, 406, 416, + 432, 433, 430, 423, 434, 432, 419, 436, 437, 426, + 431, 439, 440, 429, 441, 443, 442, 444, 445, 440, + 436, 434, 449, 450, 433, 442, 449, 449, 439, 455, - 414, 423, 426, 402, 412, 424, 427, 428, 429, 419, - 415, 430, 428, 426, 422, 425, 432, 433, 435, 436, - 437, 438, 440, 441, 442, 454, 436, 447, 430, 432, - 438, 429, 446, 452, 454, 435, 446, 446, 451, 457, - 433, 441, 442, 455, 440, 451, 456, 459, 437, 452, - 447, 456, 455, 464, 459, 465, 466, 468, 469, 476, - 480, 481, 457, 475, 484, 483, 468, 486, 469, 482, - 488, 476, 465, 466, 464, 480, 475, 482, 483, 491, - 492, 484, 494, 481, 495, 497, 498, 499, 488, 500, - 486, 501, 503, 495, 497, 504, 502, 494, 506, 507, + 460, 437, 454, 462, 457, 444, 445, 443, 458, 454, + 462, 467, 441, 457, 459, 455, 450, 458, 468, 459, + 469, 471, 484, 460, 472, 478, 483, 479, 485, 486, + 471, 487, 467, 489, 472, 468, 485, 469, 478, 479, + 491, 483, 486, 494, 484, 495, 496, 497, 487, 506, + 498, 500, 501, 502, 504, 503, 489, 507, 491, 498, + 500, 509, 497, 519, 494, 505, 495, 510, 502, 501, + 503, 506, 496, 511, 505, 504, 510, 512, 511, 513, + 507, 514, 512, 515, 516, 517, 509, 519, 513, 520, + 515, 521, 522, 524, 525, 526, 517, 527, 534, 600, - 491, 492, 499, 498, 500, 502, 508, 510, 507, 511, - 509, 508, 501, 512, 503, 509, 510, 513, 504, 514, - 512, 516, 519, 506, 517, 518, 521, 522, 523, 524, - 514, 519, 511, 528, 530, 531, 539, 532, 524, 544, - 513, 521, 531, 530, 522, 516, 528, 517, 518, 533, - 535, 523, 532, 536, 537, 533, 542, 535, 536, 539, - 543, 542, 544, 545, 546, 547, 548, 537, 545, 543, - 549, 550, 551, 548, 552, 553, 554, 556, 558, 552, - 546, 554, 557, 559, 550, 562, 560, 551, 564, 566, - 553, 556, 561, 549, 547, 560, 565, 558, 557, 567, + 531, 522, 535, 536, 514, 534, 527, 516, 524, 536, + 533, 525, 520, 531, 521, 538, 539, 535, 526, 533, + 540, 539, 538, 542, 545, 546, 547, 548, 549, 545, + 550, 551, 548, 540, 546, 552, 554, 553, 551, 556, + 555, 559, 557, 561, 549, 555, 542, 557, 560, 547, + 553, 554, 562, 565, 556, 559, 563, 564, 552, 550, + 567, 568, 561, 569, 560, 563, 564, 570, 571, 574, + 568, 573, 575, 576, 583, 562, 565, 578, 569, 579, + 573, 581, 570, 571, 582, 575, 584, 583, 579, 567, + 576, 582, 574, 585, 586, 578, 581, 587, 588, 589, - 568, 561, 570, 571, 566, 565, 559, 572, 562, 576, - 573, 570, 575, 578, 567, 568, 579, 564, 576, 580, - 572, 581, 582, 579, 583, 584, 571, 573, 578, 585, - 575, 586, 580, 587, 588, 589, 590, 592, 581, 586, - 587, 588, 583, 582, 596, 602, 598, 593, 584, 591, - 585, 596, 577, 574, 592, 598, 569, 563, 555, 590, - 541, 540, 538, 534, 589, 529, 602, 605, 605, 605, - 605, 606, 606, 608, 527, 608, 608, 526, 525, 520, - 515, 505, 496, 490, 489, 487, 485, 479, 478, 477, - 474, 473, 472, 471, 470, 467, 463, 462, 461, 460, + 592, 590, 591, 584, 593, 595, 599, 589, 590, 591, + 605, 598, 586, 599, 585, 601, 597, 596, 594, 588, + 587, 580, 595, 577, 601, 572, 566, 593, 558, 592, + 544, 605, 608, 608, 608, 608, 608, 608, 608, 608, + 609, 543, 609, 609, 609, 609, 610, 541, 610, 610, + 537, 610, 612, 532, 612, 612, 612, 612, 612, 612, + 613, 530, 613, 613, 529, 613, 615, 528, 615, 616, + 616, 616, 523, 518, 508, 499, 493, 492, 490, 488, + 482, 481, 480, 477, 476, 475, 474, 473, 470, 466, + 465, 464, 463, 461, 456, 453, 452, 451, 448, 447, - 458, 453, 450, 449, 448, 445, 444, 443, 439, 434, - 431, 421, 420, 418, 417, 413, 409, 408, 407, 406, - 405, 404, 403, 400, 392, 381, 380, 378, 362, 359, - 357, 354, 352, 349, 342, 341, 339, 337, 334, 331, - 326, 319, 313, 310, 309, 308, 299, 296, 295, 290, - 289, 272, 271, 270, 267, 255, 245, 243, 241, 239, - 236, 235, 234, 225, 222, 221, 217, 215, 214, 213, - 205, 204, 201, 200, 198, 197, 196, 195, 194, 193, - 191, 162, 154, 149, 147, 144, 141, 137, 133, 115, - 90, 70, 59, 39, 37, 8, 7, 3, 604, 604, + 446, 438, 435, 425, 424, 422, 421, 417, 413, 412, + 411, 410, 409, 408, 407, 404, 396, 385, 384, 382, + 367, 364, 362, 359, 357, 354, 347, 346, 344, 342, + 339, 336, 331, 324, 318, 315, 314, 313, 304, 301, + 300, 295, 294, 278, 277, 276, 273, 261, 251, 249, + 247, 245, 242, 241, 240, 231, 228, 227, 223, 221, + 220, 219, 211, 210, 207, 206, 204, 203, 202, 201, + 200, 199, 197, 183, 182, 181, 165, 158, 153, 151, + 148, 145, 141, 137, 119, 94, 83, 70, 59, 48, + 45, 44, 39, 37, 14, 8, 7, 3, 607, 607, - 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, - 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, - 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, - 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, - 604, 604 + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607 } ; static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr; @@ -921,7 +923,7 @@ goto find_rule; \ #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 1 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" #define INITIAL 0 /*===-- UpgradeLexer.l - Scanner for 1.9 assembly files --------*- C++ -*--===// // @@ -936,7 +938,7 @@ char *yytext; // //===----------------------------------------------------------------------===*/ #define YY_NEVER_INTERACTIVE 1 -#line 28 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 28 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" #include "ParserInternals.h" #include "UpgradeParser.h" @@ -982,7 +984,7 @@ char *yytext; /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing * it to deal with 64 bit numbers. */ -#line 986 "UpgradeLexer.cpp" +#line 988 "UpgradeLexer.cpp" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1133,10 +1135,10 @@ YY_DECL register char *yy_cp = NULL, *yy_bp = NULL; register int yy_act; -#line 99 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 99 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" -#line 1140 "UpgradeLexer.cpp" +#line 1142 "UpgradeLexer.cpp" if ( yy_init ) { @@ -1184,14 +1186,14 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 605 ) + if ( yy_current_state >= 608 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; *yy_state_ptr++ = yy_current_state; ++yy_cp; } - while ( yy_current_state != 604 ); + while ( yy_current_state != 607 ); yy_find_action: yy_current_state = *--yy_state_ptr; @@ -1229,761 +1231,776 @@ do_action: /* This label is used only to access EOF actions. */ { /* beginning of action switch */ case 1: YY_RULE_SETUP -#line 101 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 101 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { /* Ignore comments for now */ } YY_BREAK case 2: YY_RULE_SETUP -#line 103 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 103 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( BEGINTOK); } YY_BREAK case 3: YY_RULE_SETUP -#line 104 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 104 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( ENDTOK); } YY_BREAK case 4: YY_RULE_SETUP -#line 105 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 105 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( TRUETOK); } YY_BREAK case 5: YY_RULE_SETUP -#line 106 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 106 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( FALSETOK); } YY_BREAK case 6: YY_RULE_SETUP -#line 107 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 107 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( DECLARE); } YY_BREAK case 7: YY_RULE_SETUP -#line 108 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DEFINE); } +#line 108 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( GLOBAL); } YY_BREAK case 8: YY_RULE_SETUP -#line 109 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( GLOBAL); } +#line 109 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CONSTANT); } YY_BREAK case 9: YY_RULE_SETUP -#line 110 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CONSTANT); } +#line 110 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( INTERNAL); } YY_BREAK case 10: YY_RULE_SETUP -#line 111 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( INTERNAL); } +#line 111 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LINKONCE); } YY_BREAK case 11: YY_RULE_SETUP -#line 112 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LINKONCE); } +#line 112 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( WEAK); } YY_BREAK case 12: YY_RULE_SETUP -#line 113 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( WEAK); } +#line 113 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( APPENDING); } YY_BREAK case 13: YY_RULE_SETUP -#line 114 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( APPENDING); } +#line 114 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DLLIMPORT); } YY_BREAK case 14: YY_RULE_SETUP -#line 115 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DLLIMPORT); } +#line 115 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DLLEXPORT); } YY_BREAK case 15: YY_RULE_SETUP -#line 116 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DLLEXPORT); } +#line 116 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( EXTERN_WEAK); } YY_BREAK case 16: YY_RULE_SETUP -#line 117 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( EXTERN_WEAK); } +#line 117 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( EXTERNAL); } YY_BREAK case 17: YY_RULE_SETUP -#line 118 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( EXTERNAL); } +#line 118 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UNINITIALIZED); } // alias for external YY_BREAK case 18: YY_RULE_SETUP -#line 119 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UNINITIALIZED); } // alias for external +#line 119 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( IMPLEMENTATION); } YY_BREAK case 19: YY_RULE_SETUP -#line 120 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( IMPLEMENTATION); } +#line 120 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ZEROINITIALIZER); } YY_BREAK case 20: YY_RULE_SETUP -#line 121 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ZEROINITIALIZER); } +#line 121 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DOTDOTDOT); } YY_BREAK case 21: YY_RULE_SETUP -#line 122 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DOTDOTDOT); } +#line 122 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UNDEF); } YY_BREAK case 22: YY_RULE_SETUP -#line 123 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UNDEF); } +#line 123 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( NULL_TOK); } YY_BREAK case 23: YY_RULE_SETUP -#line 124 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( NULL_TOK); } +#line 124 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TO); } YY_BREAK case 24: YY_RULE_SETUP -#line 125 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TO); } +#line 125 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TAIL); } YY_BREAK case 25: YY_RULE_SETUP -#line 126 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TAIL); } +#line 126 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TARGET); } YY_BREAK case 26: YY_RULE_SETUP -#line 127 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TARGET); } +#line 127 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TRIPLE); } YY_BREAK case 27: YY_RULE_SETUP -#line 128 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TRIPLE); } +#line 128 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DEPLIBS); } YY_BREAK case 28: YY_RULE_SETUP -#line 129 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DEPLIBS); } +#line 129 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ENDIAN); } YY_BREAK case 29: YY_RULE_SETUP -#line 130 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ENDIAN); } +#line 130 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( POINTERSIZE); } YY_BREAK case 30: YY_RULE_SETUP -#line 131 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( POINTERSIZE); } +#line 131 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DATALAYOUT); } YY_BREAK case 31: YY_RULE_SETUP -#line 132 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DATALAYOUT); } +#line 132 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LITTLE); } YY_BREAK case 32: YY_RULE_SETUP -#line 133 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LITTLE); } +#line 133 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( BIG); } YY_BREAK case 33: YY_RULE_SETUP -#line 134 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( BIG); } +#line 134 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( VOLATILE); } YY_BREAK case 34: YY_RULE_SETUP -#line 135 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( VOLATILE); } +#line 135 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ALIGN); } YY_BREAK case 35: YY_RULE_SETUP -#line 136 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ALIGN); } +#line 136 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SECTION); } YY_BREAK case 36: YY_RULE_SETUP -#line 137 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SECTION); } +#line 137 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( MODULE); } YY_BREAK case 37: YY_RULE_SETUP -#line 138 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( MODULE); } +#line 138 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ASM_TOK); } YY_BREAK case 38: YY_RULE_SETUP -#line 139 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ASM_TOK); } +#line 139 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SIDEEFFECT); } YY_BREAK case 39: YY_RULE_SETUP -#line 140 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SIDEEFFECT); } +#line 141 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CC_TOK); } YY_BREAK case 40: YY_RULE_SETUP -#line 142 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CC_TOK); } +#line 142 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CCC_TOK); } YY_BREAK case 41: YY_RULE_SETUP -#line 143 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CCC_TOK); } +#line 143 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CSRETCC_TOK); } YY_BREAK case 42: YY_RULE_SETUP -#line 144 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CSRETCC_TOK); } +#line 144 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FASTCC_TOK); } YY_BREAK case 43: YY_RULE_SETUP -#line 145 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FASTCC_TOK); } +#line 145 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( COLDCC_TOK); } YY_BREAK case 44: YY_RULE_SETUP -#line 146 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( COLDCC_TOK); } +#line 146 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( X86_STDCALLCC_TOK); } YY_BREAK case 45: YY_RULE_SETUP -#line 147 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( X86_STDCALLCC_TOK); } +#line 147 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( X86_FASTCALLCC_TOK); } YY_BREAK case 46: YY_RULE_SETUP -#line 148 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( X86_FASTCALLCC_TOK); } +#line 149 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(VOID,VoidTy,"void",false); } YY_BREAK case 47: YY_RULE_SETUP -#line 150 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(VOID,VoidTy,"void",false); } +#line 150 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(BOOL,BoolTy,"bool",false); } YY_BREAK case 48: YY_RULE_SETUP -#line 151 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(BOOL,BoolTy,"bool",false); } +#line 151 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(SBYTE,SByteTy,"i8",true); } YY_BREAK case 49: YY_RULE_SETUP -#line 152 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(SBYTE,SByteTy,"sbyte",true); } +#line 152 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(UBYTE,UByteTy,"i8",false); } YY_BREAK case 50: YY_RULE_SETUP -#line 153 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(UBYTE,UByteTy,"ubyte",false); } +#line 153 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(SHORT,ShortTy,"i16",true); } YY_BREAK case 51: YY_RULE_SETUP -#line 154 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(SHORT,ShortTy,"short",true); } +#line 154 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(USHORT,UShortTy,"i16",false); } YY_BREAK case 52: YY_RULE_SETUP -#line 155 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(USHORT,UShortTy,"ushort",false); } +#line 155 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(INT,IntTy,"i32",true); } YY_BREAK case 53: YY_RULE_SETUP -#line 156 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(INT,IntTy,"int",true); } +#line 156 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(UINT,UIntTy,"i32",false); } YY_BREAK case 54: YY_RULE_SETUP -#line 157 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(UINT,UIntTy,"uint",false); } +#line 157 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(LONG,LongTy,"i64",true); } YY_BREAK case 55: YY_RULE_SETUP -#line 158 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(LONG,LongTy,"long",true); } +#line 158 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(ULONG,ULongTy,"i64",false); } YY_BREAK case 56: YY_RULE_SETUP -#line 159 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(ULONG,ULongTy,"ulong",false); } +#line 159 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(UBYTE,UByteTy,"i8",false); } YY_BREAK case 57: YY_RULE_SETUP -#line 160 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(FLOAT,FloatTy,"float",false); } +#line 160 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(USHORT,UShortTy,"i16",false); } YY_BREAK case 58: YY_RULE_SETUP -#line 161 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(DOUBLE,DoubleTy,"double",false); } +#line 161 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(UINT,UIntTy,"i32",false); } YY_BREAK case 59: YY_RULE_SETUP -#line 162 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(LABEL,LabelTy,"label",false); } +#line 162 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(ULONG,ULongTy,"i64",false); } YY_BREAK case 60: YY_RULE_SETUP -#line 163 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(OPAQUE); } +#line 163 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(FLOAT,FloatTy,"float",false); } YY_BREAK case 61: YY_RULE_SETUP -#line 164 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(TYPE); } +#line 164 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(DOUBLE,DoubleTy,"double",false); } YY_BREAK case 62: YY_RULE_SETUP -#line 166 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ADD); } +#line 165 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(LABEL,LabelTy,"label",false); } YY_BREAK case 63: YY_RULE_SETUP -#line 167 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SUB); } +#line 166 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(OPAQUE); } YY_BREAK case 64: YY_RULE_SETUP -#line 168 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( MUL); } +#line 167 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(TYPE); } YY_BREAK case 65: YY_RULE_SETUP -#line 169 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DIV); } +#line 169 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ADD); } YY_BREAK case 66: YY_RULE_SETUP -#line 170 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UDIV); } +#line 170 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SUB); } YY_BREAK case 67: YY_RULE_SETUP -#line 171 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SDIV); } +#line 171 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( MUL); } YY_BREAK case 68: YY_RULE_SETUP -#line 172 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FDIV); } +#line 172 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DIV); } YY_BREAK case 69: YY_RULE_SETUP -#line 173 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( REM); } +#line 173 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UDIV); } YY_BREAK case 70: YY_RULE_SETUP -#line 174 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UREM); } +#line 174 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SDIV); } YY_BREAK case 71: YY_RULE_SETUP -#line 175 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SREM); } +#line 175 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FDIV); } YY_BREAK case 72: YY_RULE_SETUP -#line 176 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FREM); } +#line 176 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( REM); } YY_BREAK case 73: YY_RULE_SETUP -#line 177 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( AND); } +#line 177 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UREM); } YY_BREAK case 74: YY_RULE_SETUP -#line 178 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( OR); } +#line 178 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SREM); } YY_BREAK case 75: YY_RULE_SETUP -#line 179 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( XOR); } +#line 179 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FREM); } YY_BREAK case 76: YY_RULE_SETUP -#line 180 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETNE); } +#line 180 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( AND); } YY_BREAK case 77: YY_RULE_SETUP -#line 181 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETEQ); } +#line 181 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( OR); } YY_BREAK case 78: YY_RULE_SETUP -#line 182 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETLT); } +#line 182 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( XOR); } YY_BREAK case 79: YY_RULE_SETUP -#line 183 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETGT); } +#line 183 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETNE); } YY_BREAK case 80: YY_RULE_SETUP -#line 184 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETLE); } +#line 184 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETEQ); } YY_BREAK case 81: YY_RULE_SETUP -#line 185 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETGE); } +#line 185 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETLT); } YY_BREAK case 82: YY_RULE_SETUP -#line 186 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(ICMP); } +#line 186 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETGT); } YY_BREAK case 83: YY_RULE_SETUP -#line 187 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(FCMP); } +#line 187 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETLE); } YY_BREAK case 84: YY_RULE_SETUP -#line 188 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(EQ); } +#line 188 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETGE); } YY_BREAK case 85: YY_RULE_SETUP -#line 189 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(NE); } +#line 189 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(ICMP); } YY_BREAK case 86: YY_RULE_SETUP -#line 190 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(SLT); } +#line 190 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(FCMP); } YY_BREAK case 87: YY_RULE_SETUP -#line 191 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(SGT); } +#line 191 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(EQ); } YY_BREAK case 88: YY_RULE_SETUP -#line 192 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(SLE); } +#line 192 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(NE); } YY_BREAK case 89: YY_RULE_SETUP -#line 193 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(SGE); } +#line 193 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(SLT); } YY_BREAK case 90: YY_RULE_SETUP -#line 194 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(OEQ); } +#line 194 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(SGT); } YY_BREAK case 91: YY_RULE_SETUP -#line 195 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(ONE); } +#line 195 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(SLE); } YY_BREAK case 92: YY_RULE_SETUP -#line 196 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(OLT); } +#line 196 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(SGE); } YY_BREAK case 93: YY_RULE_SETUP -#line 197 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(OGT); } +#line 197 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(OEQ); } YY_BREAK case 94: YY_RULE_SETUP -#line 198 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(OLE); } +#line 198 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(ONE); } YY_BREAK case 95: YY_RULE_SETUP -#line 199 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(OGE); } +#line 199 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(OLT); } YY_BREAK case 96: YY_RULE_SETUP -#line 200 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(ORD); } +#line 200 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(OGT); } YY_BREAK case 97: YY_RULE_SETUP -#line 201 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(UNO); } +#line 201 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(OLE); } YY_BREAK case 98: YY_RULE_SETUP -#line 202 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(UEQ); } +#line 202 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(OGE); } YY_BREAK case 99: YY_RULE_SETUP -#line 203 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(UNE); } +#line 203 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(ORD); } YY_BREAK case 100: YY_RULE_SETUP -#line 204 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(ULT); } +#line 204 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(UNO); } YY_BREAK case 101: YY_RULE_SETUP -#line 205 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(UGT); } +#line 205 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(UEQ); } YY_BREAK case 102: YY_RULE_SETUP -#line 206 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(ULE); } +#line 206 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(UNE); } YY_BREAK case 103: YY_RULE_SETUP -#line 207 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(UGE); } +#line 207 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(ULT); } YY_BREAK case 104: YY_RULE_SETUP -#line 209 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( PHI_TOK); } +#line 208 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(UGT); } YY_BREAK case 105: YY_RULE_SETUP -#line 210 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CALL); } +#line 209 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(ULE); } YY_BREAK case 106: YY_RULE_SETUP -#line 211 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CAST); } +#line 210 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(UGE); } YY_BREAK case 107: YY_RULE_SETUP -#line 212 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TRUNC); } +#line 212 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( PHI_TOK); } YY_BREAK case 108: YY_RULE_SETUP -#line 213 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ZEXT); } +#line 213 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CALL); } YY_BREAK case 109: YY_RULE_SETUP -#line 214 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SEXT); } +#line 214 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CAST); } YY_BREAK case 110: YY_RULE_SETUP -#line 215 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPTRUNC); } +#line 215 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TRUNC); } YY_BREAK case 111: YY_RULE_SETUP -#line 216 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPEXT); } +#line 216 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ZEXT); } YY_BREAK case 112: YY_RULE_SETUP -#line 217 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPTOUI); } +#line 217 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SEXT); } YY_BREAK case 113: YY_RULE_SETUP -#line 218 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPTOSI); } +#line 218 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPTRUNC); } YY_BREAK case 114: YY_RULE_SETUP -#line 219 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UITOFP); } +#line 219 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPEXT); } YY_BREAK case 115: YY_RULE_SETUP -#line 220 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SITOFP); } +#line 220 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPTOUI); } YY_BREAK case 116: YY_RULE_SETUP -#line 221 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( PTRTOINT); } +#line 221 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPTOSI); } YY_BREAK case 117: YY_RULE_SETUP -#line 222 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( INTTOPTR); } +#line 222 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UITOFP); } YY_BREAK case 118: YY_RULE_SETUP -#line 223 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( BITCAST); } +#line 223 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SITOFP); } YY_BREAK case 119: YY_RULE_SETUP -#line 224 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SELECT); } +#line 224 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( PTRTOINT); } YY_BREAK case 120: YY_RULE_SETUP -#line 225 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SHL); } +#line 225 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( INTTOPTR); } YY_BREAK case 121: YY_RULE_SETUP -#line 226 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SHR); } +#line 226 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( BITCAST); } YY_BREAK case 122: YY_RULE_SETUP -#line 227 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ASHR); } +#line 227 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SELECT); } YY_BREAK case 123: YY_RULE_SETUP -#line 228 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LSHR); } +#line 228 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SHL); } YY_BREAK case 124: YY_RULE_SETUP -#line 229 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( VAARG); } +#line 229 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SHR); } YY_BREAK case 125: YY_RULE_SETUP -#line 230 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( RET); } +#line 230 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ASHR); } YY_BREAK case 126: YY_RULE_SETUP -#line 231 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( BR); } +#line 231 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LSHR); } YY_BREAK case 127: YY_RULE_SETUP -#line 232 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SWITCH); } +#line 232 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( VAARG); } YY_BREAK case 128: YY_RULE_SETUP -#line 233 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( INVOKE); } +#line 233 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( RET); } YY_BREAK case 129: YY_RULE_SETUP -#line 234 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UNWIND); } +#line 234 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( BR); } YY_BREAK case 130: YY_RULE_SETUP -#line 235 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( EXCEPT); } // alias for unwind +#line 235 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SWITCH); } YY_BREAK case 131: YY_RULE_SETUP -#line 236 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UNREACHABLE); } +#line 236 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( INVOKE); } YY_BREAK case 132: YY_RULE_SETUP -#line 238 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( MALLOC); } +#line 237 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UNWIND); } YY_BREAK case 133: YY_RULE_SETUP -#line 239 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ALLOCA); } +#line 238 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( EXCEPT); } // alias for unwind YY_BREAK case 134: YY_RULE_SETUP -#line 240 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FREE); } +#line 239 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UNREACHABLE); } YY_BREAK case 135: YY_RULE_SETUP -#line 241 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LOAD); } +#line 241 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( MALLOC); } YY_BREAK case 136: YY_RULE_SETUP -#line 242 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( STORE); } +#line 242 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ALLOCA); } YY_BREAK case 137: YY_RULE_SETUP -#line 243 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( GETELEMENTPTR); } +#line 243 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FREE); } YY_BREAK case 138: YY_RULE_SETUP -#line 245 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( EXTRACTELEMENT); } +#line 244 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LOAD); } YY_BREAK case 139: YY_RULE_SETUP -#line 246 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( INSERTELEMENT); } +#line 245 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( STORE); } YY_BREAK case 140: YY_RULE_SETUP -#line 247 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SHUFFLEVECTOR); } +#line 246 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( GETELEMENTPTR); } YY_BREAK case 141: YY_RULE_SETUP -#line 250 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( VAR_ID); } +#line 248 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( EXTRACTELEMENT); } YY_BREAK case 142: YY_RULE_SETUP -#line 251 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LABELSTR); } +#line 249 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( INSERTELEMENT); } YY_BREAK case 143: YY_RULE_SETUP -#line 252 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LABELSTR); } +#line 250 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SHUFFLEVECTOR); } YY_BREAK case 144: YY_RULE_SETUP -#line 253 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( STRINGCONSTANT ); } +#line 253 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( VAR_ID); } YY_BREAK case 145: YY_RULE_SETUP -#line 254 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( EUINT64VAL ); } +#line 254 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LABELSTR); } YY_BREAK case 146: YY_RULE_SETUP -#line 255 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ESINT64VAL ); } +#line 255 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LABELSTR); } YY_BREAK case 147: YY_RULE_SETUP -#line 256 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); } +#line 256 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( STRINGCONSTANT ); } YY_BREAK case 148: YY_RULE_SETUP -#line 257 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UINTVAL); } +#line 257 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( EUINT64VAL ); } YY_BREAK case 149: YY_RULE_SETUP -#line 258 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SINTVAL); } +#line 258 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ESINT64VAL ); } YY_BREAK case 150: YY_RULE_SETUP -#line 259 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPVAL); } +#line 259 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); } YY_BREAK case 151: YY_RULE_SETUP -#line 260 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 260 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UINTVAL); } + YY_BREAK +case 152: +YY_RULE_SETUP +#line 261 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SINTVAL); } + YY_BREAK +case 153: +YY_RULE_SETUP +#line 262 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPVAL); } + YY_BREAK +case 154: +YY_RULE_SETUP +#line 263 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( FPVAL); } YY_BREAK case YY_STATE_EOF(INITIAL): -#line 261 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 264 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { /* Make sure to free the internal buffers for flex when we are * done reading our input! @@ -1992,22 +2009,22 @@ case YY_STATE_EOF(INITIAL): return EOF; } YY_BREAK -case 152: +case 155: YY_RULE_SETUP -#line 269 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 272 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { /* Ignore whitespace */ } YY_BREAK -case 153: +case 156: YY_RULE_SETUP -#line 270 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 273 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" { return yytext[0]; } YY_BREAK -case 154: +case 157: YY_RULE_SETUP -#line 272 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 275 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 2011 "UpgradeLexer.cpp" +#line 2028 "UpgradeLexer.cpp" case YY_END_OF_BUFFER: { @@ -2294,7 +2311,7 @@ static yy_state_type yy_get_previous_state() while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 605 ) + if ( yy_current_state >= 608 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2324,11 +2341,11 @@ yy_state_type yy_current_state; while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 605 ) + if ( yy_current_state >= 608 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 604); + yy_is_jam = (yy_current_state == 607); if ( ! yy_is_jam ) *yy_state_ptr++ = yy_current_state; @@ -2885,5 +2902,5 @@ int main() return 0; } #endif -#line 272 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l" +#line 275 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeLexer.l" diff --git a/tools/llvm-upgrade/UpgradeLexer.l.cvs b/tools/llvm-upgrade/UpgradeLexer.l.cvs index aea7ec27d1b..8ffca760fde 100644 --- a/tools/llvm-upgrade/UpgradeLexer.l.cvs +++ b/tools/llvm-upgrade/UpgradeLexer.l.cvs @@ -105,7 +105,6 @@ end { RET_TOK( ENDTOK); } true { RET_TOK( TRUETOK); } false { RET_TOK( FALSETOK); } declare { RET_TOK( DECLARE); } -define { RET_TOK( DEFINE); } global { RET_TOK( GLOBAL); } constant { RET_TOK( CONSTANT); } internal { RET_TOK( INTERNAL); } @@ -149,14 +148,18 @@ x86_fastcallcc { RET_TOK( X86_FASTCALLCC_TOK); } void { RET_TY(VOID,VoidTy,"void",false); } bool { RET_TY(BOOL,BoolTy,"bool",false); } -sbyte { RET_TY(SBYTE,SByteTy,"sbyte",true); } -ubyte { RET_TY(UBYTE,UByteTy,"ubyte",false); } -short { RET_TY(SHORT,ShortTy,"short",true); } -ushort { RET_TY(USHORT,UShortTy,"ushort",false); } -int { RET_TY(INT,IntTy,"int",true); } -uint { RET_TY(UINT,UIntTy,"uint",false); } -long { RET_TY(LONG,LongTy,"long",true); } -ulong { RET_TY(ULONG,ULongTy,"ulong",false); } +sbyte { RET_TY(SBYTE,SByteTy,"i8",true); } +ubyte { RET_TY(UBYTE,UByteTy,"i8",false); } +short { RET_TY(SHORT,ShortTy,"i16",true); } +ushort { RET_TY(USHORT,UShortTy,"i16",false); } +int { RET_TY(INT,IntTy,"i32",true); } +uint { RET_TY(UINT,UIntTy,"i32",false); } +long { RET_TY(LONG,LongTy,"i64",true); } +ulong { RET_TY(ULONG,ULongTy,"i64",false); } +i8 { RET_TY(UBYTE,UByteTy,"i8",false); } +i16 { RET_TY(USHORT,UShortTy,"i16",false); } +i32 { RET_TY(UINT,UIntTy,"i32",false); } +i64 { RET_TY(ULONG,ULongTy,"i64",false); } float { RET_TY(FLOAT,FloatTy,"float",false); } double { RET_TY(DOUBLE,DoubleTy,"double",false); } label { RET_TY(LABEL,LabelTy,"label",false); } diff --git a/tools/llvm-upgrade/UpgradeParser.cpp b/tools/llvm-upgrade/UpgradeParser.cpp index 702bb09b427..a65dd09454d 100644 --- a/tools/llvm-upgrade/UpgradeParser.cpp +++ b/tools/llvm-upgrade/UpgradeParser.cpp @@ -96,123 +96,122 @@ BEGINTOK = 287, ENDTOK = 288, DECLARE = 289, - DEFINE = 290, - GLOBAL = 291, - CONSTANT = 292, - SECTION = 293, - VOLATILE = 294, - TO = 295, - DOTDOTDOT = 296, - CONST = 297, - INTERNAL = 298, - LINKONCE = 299, - WEAK = 300, - DLLIMPORT = 301, - DLLEXPORT = 302, - EXTERN_WEAK = 303, - APPENDING = 304, - NOT = 305, - EXTERNAL = 306, - TARGET = 307, - TRIPLE = 308, - ENDIAN = 309, - POINTERSIZE = 310, - LITTLE = 311, - BIG = 312, - ALIGN = 313, - UNINITIALIZED = 314, - DEPLIBS = 315, - CALL = 316, - TAIL = 317, - ASM_TOK = 318, - MODULE = 319, - SIDEEFFECT = 320, - CC_TOK = 321, - CCC_TOK = 322, - CSRETCC_TOK = 323, - FASTCC_TOK = 324, - COLDCC_TOK = 325, - X86_STDCALLCC_TOK = 326, - X86_FASTCALLCC_TOK = 327, - DATALAYOUT = 328, - RET = 329, - BR = 330, - SWITCH = 331, - INVOKE = 332, - EXCEPT = 333, - UNWIND = 334, - UNREACHABLE = 335, - ADD = 336, - SUB = 337, - MUL = 338, - DIV = 339, - UDIV = 340, - SDIV = 341, - FDIV = 342, - REM = 343, - UREM = 344, - SREM = 345, - FREM = 346, - AND = 347, - OR = 348, - XOR = 349, - SETLE = 350, - SETGE = 351, - SETLT = 352, - SETGT = 353, - SETEQ = 354, - SETNE = 355, - ICMP = 356, - FCMP = 357, - EQ = 358, - NE = 359, - SLT = 360, - SGT = 361, - SLE = 362, - SGE = 363, - OEQ = 364, - ONE = 365, - OLT = 366, - OGT = 367, - OLE = 368, - OGE = 369, - ORD = 370, - UNO = 371, - UEQ = 372, - UNE = 373, - ULT = 374, - UGT = 375, - ULE = 376, - UGE = 377, - MALLOC = 378, - ALLOCA = 379, - FREE = 380, - LOAD = 381, - STORE = 382, - GETELEMENTPTR = 383, - PHI_TOK = 384, - SELECT = 385, - SHL = 386, - SHR = 387, - ASHR = 388, - LSHR = 389, - VAARG = 390, - EXTRACTELEMENT = 391, - INSERTELEMENT = 392, - SHUFFLEVECTOR = 393, - CAST = 394, - TRUNC = 395, - ZEXT = 396, - SEXT = 397, - FPTRUNC = 398, - FPEXT = 399, - FPTOUI = 400, - FPTOSI = 401, - UITOFP = 402, - SITOFP = 403, - PTRTOINT = 404, - INTTOPTR = 405, - BITCAST = 406 + GLOBAL = 290, + CONSTANT = 291, + SECTION = 292, + VOLATILE = 293, + TO = 294, + DOTDOTDOT = 295, + CONST = 296, + INTERNAL = 297, + LINKONCE = 298, + WEAK = 299, + DLLIMPORT = 300, + DLLEXPORT = 301, + EXTERN_WEAK = 302, + APPENDING = 303, + NOT = 304, + EXTERNAL = 305, + TARGET = 306, + TRIPLE = 307, + ENDIAN = 308, + POINTERSIZE = 309, + LITTLE = 310, + BIG = 311, + ALIGN = 312, + UNINITIALIZED = 313, + DEPLIBS = 314, + CALL = 315, + TAIL = 316, + ASM_TOK = 317, + MODULE = 318, + SIDEEFFECT = 319, + CC_TOK = 320, + CCC_TOK = 321, + CSRETCC_TOK = 322, + FASTCC_TOK = 323, + COLDCC_TOK = 324, + X86_STDCALLCC_TOK = 325, + X86_FASTCALLCC_TOK = 326, + DATALAYOUT = 327, + RET = 328, + BR = 329, + SWITCH = 330, + INVOKE = 331, + EXCEPT = 332, + UNWIND = 333, + UNREACHABLE = 334, + ADD = 335, + SUB = 336, + MUL = 337, + DIV = 338, + UDIV = 339, + SDIV = 340, + FDIV = 341, + REM = 342, + UREM = 343, + SREM = 344, + FREM = 345, + AND = 346, + OR = 347, + XOR = 348, + SETLE = 349, + SETGE = 350, + SETLT = 351, + SETGT = 352, + SETEQ = 353, + SETNE = 354, + ICMP = 355, + FCMP = 356, + EQ = 357, + NE = 358, + SLT = 359, + SGT = 360, + SLE = 361, + SGE = 362, + OEQ = 363, + ONE = 364, + OLT = 365, + OGT = 366, + OLE = 367, + OGE = 368, + ORD = 369, + UNO = 370, + UEQ = 371, + UNE = 372, + ULT = 373, + UGT = 374, + ULE = 375, + UGE = 376, + MALLOC = 377, + ALLOCA = 378, + FREE = 379, + LOAD = 380, + STORE = 381, + GETELEMENTPTR = 382, + PHI_TOK = 383, + SELECT = 384, + SHL = 385, + SHR = 386, + ASHR = 387, + LSHR = 388, + VAARG = 389, + EXTRACTELEMENT = 390, + INSERTELEMENT = 391, + SHUFFLEVECTOR = 392, + CAST = 393, + TRUNC = 394, + ZEXT = 395, + SEXT = 396, + FPTRUNC = 397, + FPEXT = 398, + FPTOUI = 399, + FPTOSI = 400, + UITOFP = 401, + SITOFP = 402, + PTRTOINT = 403, + INTTOPTR = 404, + BITCAST = 405 }; #endif /* Tokens. */ @@ -248,129 +247,128 @@ #define BEGINTOK 287 #define ENDTOK 288 #define DECLARE 289 -#define DEFINE 290 -#define GLOBAL 291 -#define CONSTANT 292 -#define SECTION 293 -#define VOLATILE 294 -#define TO 295 -#define DOTDOTDOT 296 -#define CONST 297 -#define INTERNAL 298 -#define LINKONCE 299 -#define WEAK 300 -#define DLLIMPORT 301 -#define DLLEXPORT 302 -#define EXTERN_WEAK 303 -#define APPENDING 304 -#define NOT 305 -#define EXTERNAL 306 -#define TARGET 307 -#define TRIPLE 308 -#define ENDIAN 309 -#define POINTERSIZE 310 -#define LITTLE 311 -#define BIG 312 -#define ALIGN 313 -#define UNINITIALIZED 314 -#define DEPLIBS 315 -#define CALL 316 -#define TAIL 317 -#define ASM_TOK 318 -#define MODULE 319 -#define SIDEEFFECT 320 -#define CC_TOK 321 -#define CCC_TOK 322 -#define CSRETCC_TOK 323 -#define FASTCC_TOK 324 -#define COLDCC_TOK 325 -#define X86_STDCALLCC_TOK 326 -#define X86_FASTCALLCC_TOK 327 -#define DATALAYOUT 328 -#define RET 329 -#define BR 330 -#define SWITCH 331 -#define INVOKE 332 -#define EXCEPT 333 -#define UNWIND 334 -#define UNREACHABLE 335 -#define ADD 336 -#define SUB 337 -#define MUL 338 -#define DIV 339 -#define UDIV 340 -#define SDIV 341 -#define FDIV 342 -#define REM 343 -#define UREM 344 -#define SREM 345 -#define FREM 346 -#define AND 347 -#define OR 348 -#define XOR 349 -#define SETLE 350 -#define SETGE 351 -#define SETLT 352 -#define SETGT 353 -#define SETEQ 354 -#define SETNE 355 -#define ICMP 356 -#define FCMP 357 -#define EQ 358 -#define NE 359 -#define SLT 360 -#define SGT 361 -#define SLE 362 -#define SGE 363 -#define OEQ 364 -#define ONE 365 -#define OLT 366 -#define OGT 367 -#define OLE 368 -#define OGE 369 -#define ORD 370 -#define UNO 371 -#define UEQ 372 -#define UNE 373 -#define ULT 374 -#define UGT 375 -#define ULE 376 -#define UGE 377 -#define MALLOC 378 -#define ALLOCA 379 -#define FREE 380 -#define LOAD 381 -#define STORE 382 -#define GETELEMENTPTR 383 -#define PHI_TOK 384 -#define SELECT 385 -#define SHL 386 -#define SHR 387 -#define ASHR 388 -#define LSHR 389 -#define VAARG 390 -#define EXTRACTELEMENT 391 -#define INSERTELEMENT 392 -#define SHUFFLEVECTOR 393 -#define CAST 394 -#define TRUNC 395 -#define ZEXT 396 -#define SEXT 397 -#define FPTRUNC 398 -#define FPEXT 399 -#define FPTOUI 400 -#define FPTOSI 401 -#define UITOFP 402 -#define SITOFP 403 -#define PTRTOINT 404 -#define INTTOPTR 405 -#define BITCAST 406 +#define GLOBAL 290 +#define CONSTANT 291 +#define SECTION 292 +#define VOLATILE 293 +#define TO 294 +#define DOTDOTDOT 295 +#define CONST 296 +#define INTERNAL 297 +#define LINKONCE 298 +#define WEAK 299 +#define DLLIMPORT 300 +#define DLLEXPORT 301 +#define EXTERN_WEAK 302 +#define APPENDING 303 +#define NOT 304 +#define EXTERNAL 305 +#define TARGET 306 +#define TRIPLE 307 +#define ENDIAN 308 +#define POINTERSIZE 309 +#define LITTLE 310 +#define BIG 311 +#define ALIGN 312 +#define UNINITIALIZED 313 +#define DEPLIBS 314 +#define CALL 315 +#define TAIL 316 +#define ASM_TOK 317 +#define MODULE 318 +#define SIDEEFFECT 319 +#define CC_TOK 320 +#define CCC_TOK 321 +#define CSRETCC_TOK 322 +#define FASTCC_TOK 323 +#define COLDCC_TOK 324 +#define X86_STDCALLCC_TOK 325 +#define X86_FASTCALLCC_TOK 326 +#define DATALAYOUT 327 +#define RET 328 +#define BR 329 +#define SWITCH 330 +#define INVOKE 331 +#define EXCEPT 332 +#define UNWIND 333 +#define UNREACHABLE 334 +#define ADD 335 +#define SUB 336 +#define MUL 337 +#define DIV 338 +#define UDIV 339 +#define SDIV 340 +#define FDIV 341 +#define REM 342 +#define UREM 343 +#define SREM 344 +#define FREM 345 +#define AND 346 +#define OR 347 +#define XOR 348 +#define SETLE 349 +#define SETGE 350 +#define SETLT 351 +#define SETGT 352 +#define SETEQ 353 +#define SETNE 354 +#define ICMP 355 +#define FCMP 356 +#define EQ 357 +#define NE 358 +#define SLT 359 +#define SGT 360 +#define SLE 361 +#define SGE 362 +#define OEQ 363 +#define ONE 364 +#define OLT 365 +#define OGT 366 +#define OLE 367 +#define OGE 368 +#define ORD 369 +#define UNO 370 +#define UEQ 371 +#define UNE 372 +#define ULT 373 +#define UGT 374 +#define ULE 375 +#define UGE 376 +#define MALLOC 377 +#define ALLOCA 378 +#define FREE 379 +#define LOAD 380 +#define STORE 381 +#define GETELEMENTPTR 382 +#define PHI_TOK 383 +#define SELECT 384 +#define SHL 385 +#define SHR 386 +#define ASHR 387 +#define LSHR 388 +#define VAARG 389 +#define EXTRACTELEMENT 390 +#define INSERTELEMENT 391 +#define SHUFFLEVECTOR 392 +#define CAST 393 +#define TRUNC 394 +#define ZEXT 395 +#define SEXT 396 +#define FPTRUNC 397 +#define FPEXT 398 +#define FPTOUI 399 +#define FPTOSI 400 +#define UITOFP 401 +#define SITOFP 402 +#define PTRTOINT 403 +#define INTTOPTR 404 +#define BITCAST 405 /* Copy the first part of user declarations. */ -#line 14 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 14 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" #include "ParserInternals.h" #include @@ -394,6 +392,10 @@ std::istream* LexInput = 0; unsigned SizeOfPointer = 32; static uint64_t unique = 1; +// This bool controls whether attributes are ever added to function declarations +// definitions and calls. +static bool AddAttributes = false; + typedef std::vector TypeVector; static TypeVector EnumeratedTypes; typedef std::map TypeMap; @@ -410,12 +412,13 @@ void destroy(ValueList* VL) { } void UpgradeAssembly(const std::string &infile, std::istream& in, - std::ostream &out, bool debug) + std::ostream &out, bool debug, bool addAttrs) { Upgradelineno = 1; CurFilename = infile; LexInput = ∈ yydebug = debug; + AddAttributes = addAttrs; O = &out; if (yyparse()) { @@ -536,15 +539,15 @@ static std::string getCastUpgrade( // fp -> ptr cast is no longer supported but we must upgrade this // by doing a double cast: fp -> int -> ptr if (isConst) - Source = "ulong fptoui(" + Source + " to ulong)"; + Source = "i64 fptoui(" + Source + " to i64)"; else { *O << " %cast_upgrade" << unique << " = fptoui " << Source - << " to ulong\n"; - Source = "ulong %cast_upgrade" + llvm::utostr(unique); + << " to i64\n"; + Source = "i64 %cast_upgrade" + llvm::utostr(unique); } // Update the SrcTy for the getCastOpcode call below SrcTy.destroy(); - SrcTy.newTy = new std::string("ulong"); + SrcTy.newTy = new std::string("i64"); SrcTy.oldTy = ULongTy; } else if (DstTy.oldTy == BoolTy && SrcTy.oldTy != BoolTy) { // cast ptr %x to bool was previously defined as setne ptr %x, null @@ -649,7 +652,7 @@ getCompareOp(const std::string& setcc, const TypeInfo& TI) { #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 275 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 280 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" typedef union YYSTYPE { std::string* String; TypeInfo Type; @@ -658,7 +661,7 @@ typedef union YYSTYPE { ValueList* ValList; } YYSTYPE; /* Line 196 of yacc.c. */ -#line 662 "UpgradeParser.tab.c" +#line 665 "UpgradeParser.tab.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -670,7 +673,7 @@ typedef union YYSTYPE { /* Line 219 of yacc.c. */ -#line 674 "UpgradeParser.tab.c" +#line 677 "UpgradeParser.tab.c" #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) # define YYSIZE_T __SIZE_TYPE__ @@ -821,20 +824,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 4 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1554 +#define YYLAST 1486 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 166 +#define YYNTOKENS 165 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 75 /* YYNRULES -- Number of rules. */ -#define YYNRULES 302 +#define YYNRULES 301 /* YYNRULES -- Number of states. */ -#define YYNSTATES 590 +#define YYNSTATES 586 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 406 +#define YYMAXUTOK 405 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -846,15 +849,15 @@ static const unsigned char yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 155, 156, 164, 2, 153, 2, 2, 2, 2, 2, + 154, 155, 163, 2, 152, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 160, 152, 161, 2, 2, 2, 2, 2, 2, 2, + 159, 151, 160, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 157, 154, 159, 2, 2, 2, 2, 2, 165, + 2, 156, 153, 158, 2, 2, 2, 2, 2, 164, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 158, 2, 2, 162, 2, 163, 2, 2, 2, 2, + 157, 2, 2, 161, 2, 162, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -882,7 +885,7 @@ static const unsigned char yytranslate[] = 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, - 145, 146, 147, 148, 149, 150, 151 + 145, 146, 147, 148, 149, 150 }; #if YYDEBUG @@ -912,151 +915,151 @@ static const unsigned short int yyprhs[] = 524, 531, 538, 542, 547, 548, 550, 552, 554, 558, 562, 566, 570, 574, 578, 580, 581, 583, 585, 587, 588, 591, 595, 597, 599, 603, 605, 606, 615, 617, - 619, 623, 628, 630, 632, 636, 637, 639, 641, 645, - 646, 648, 650, 652, 654, 656, 658, 660, 662, 664, - 668, 670, 676, 678, 680, 682, 684, 687, 690, 692, - 695, 698, 699, 701, 703, 705, 708, 711, 715, 725, - 735, 744, 759, 761, 763, 770, 776, 779, 786, 794, - 796, 800, 802, 803, 806, 808, 814, 820, 826, 833, - 840, 843, 848, 853, 860, 865, 870, 877, 884, 887, - 895, 897, 900, 901, 903, 904, 908, 915, 919, 926, - 929, 934, 941 + 619, 623, 625, 627, 631, 632, 634, 636, 640, 641, + 643, 645, 647, 649, 651, 653, 655, 657, 659, 663, + 665, 671, 673, 675, 677, 679, 682, 685, 687, 690, + 693, 694, 696, 698, 700, 703, 706, 710, 720, 730, + 739, 754, 756, 758, 765, 771, 774, 781, 789, 791, + 795, 797, 798, 801, 803, 809, 815, 821, 828, 835, + 838, 843, 848, 855, 860, 865, 872, 879, 882, 890, + 892, 895, 896, 898, 899, 903, 910, 914, 921, 924, + 929, 936 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const short int yyrhs[] = { - 200, 0, -1, 19, -1, 20, -1, 17, -1, 18, - -1, 81, -1, 82, -1, 83, -1, 84, -1, 85, - -1, 86, -1, 87, -1, 88, -1, 89, -1, 90, - -1, 91, -1, 92, -1, 93, -1, 94, -1, 95, - -1, 96, -1, 97, -1, 98, -1, 99, -1, 100, - -1, 103, -1, 104, -1, 105, -1, 106, -1, 107, - -1, 108, -1, 119, -1, 120, -1, 121, -1, 122, - -1, 109, -1, 110, -1, 111, -1, 112, -1, 113, - -1, 114, -1, 115, -1, 116, -1, 117, -1, 118, - -1, 119, -1, 120, -1, 121, -1, 122, -1, 25, - -1, 26, -1, 131, -1, 132, -1, 133, -1, 134, - -1, 140, -1, 141, -1, 142, -1, 143, -1, 144, - -1, 145, -1, 146, -1, 147, -1, 148, -1, 149, - -1, 150, -1, 151, -1, 139, -1, 11, -1, 9, + 199, 0, -1, 19, -1, 20, -1, 17, -1, 18, + -1, 80, -1, 81, -1, 82, -1, 83, -1, 84, + -1, 85, -1, 86, -1, 87, -1, 88, -1, 89, + -1, 90, -1, 91, -1, 92, -1, 93, -1, 94, + -1, 95, -1, 96, -1, 97, -1, 98, -1, 99, + -1, 102, -1, 103, -1, 104, -1, 105, -1, 106, + -1, 107, -1, 118, -1, 119, -1, 120, -1, 121, + -1, 108, -1, 109, -1, 110, -1, 111, -1, 112, + -1, 113, -1, 114, -1, 115, -1, 116, -1, 117, + -1, 118, -1, 119, -1, 120, -1, 121, -1, 25, + -1, 26, -1, 130, -1, 131, -1, 132, -1, 133, + -1, 139, -1, 140, -1, 141, -1, 142, -1, 143, + -1, 144, -1, 145, -1, 146, -1, 147, -1, 148, + -1, 149, -1, 150, -1, 138, -1, 11, -1, 9, -1, 7, -1, 5, -1, 12, -1, 10, -1, 8, - -1, 6, -1, 176, -1, 177, -1, 13, -1, 14, - -1, 209, 152, -1, -1, 43, -1, 44, -1, 45, - -1, 49, -1, 46, -1, 47, -1, 48, -1, -1, - 67, -1, 68, -1, 69, -1, 70, -1, 71, -1, - 72, -1, 66, 18, -1, -1, -1, 58, 18, -1, - -1, 153, 58, 18, -1, 38, 30, -1, -1, 185, - -1, -1, 153, 188, 187, -1, 185, -1, 58, 18, - -1, 191, -1, 3, -1, 193, -1, 3, -1, 193, + -1, 6, -1, 175, -1, 176, -1, 13, -1, 14, + -1, 208, 151, -1, -1, 42, -1, 43, -1, 44, + -1, 48, -1, 45, -1, 46, -1, 47, -1, -1, + 66, -1, 67, -1, 68, -1, 69, -1, 70, -1, + 71, -1, 65, 18, -1, -1, -1, 57, 18, -1, + -1, 152, 57, 18, -1, 37, 30, -1, -1, 184, + -1, -1, 152, 187, 186, -1, 184, -1, 57, 18, + -1, 190, -1, 3, -1, 192, -1, 3, -1, 192, -1, 4, -1, 5, -1, 6, -1, 7, -1, 8, -1, 9, -1, 10, -1, 11, -1, 12, -1, 13, - -1, 14, -1, 15, -1, 16, -1, 223, -1, 192, - -1, 154, 18, -1, 190, 155, 195, 156, -1, 157, - 18, 158, 193, 159, -1, 160, 18, 158, 193, 161, - -1, 162, 194, 163, -1, 162, 163, -1, 160, 162, - 194, 163, 161, -1, 160, 162, 163, 161, -1, 193, - 164, -1, 193, -1, 194, 153, 193, -1, 194, -1, - 194, 153, 41, -1, 41, -1, -1, 191, 157, 198, - 159, -1, 191, 157, 159, -1, 191, 165, 30, -1, - 191, 160, 198, 161, -1, 191, 162, 198, 163, -1, - 191, 162, 163, -1, 191, 22, -1, 191, 23, -1, - 191, 223, -1, 191, 197, -1, 191, 24, -1, 176, - 168, -1, 177, 18, -1, 4, 25, -1, 4, 26, - -1, 179, 21, -1, 175, 155, 196, 40, 191, 156, - -1, 128, 155, 196, 238, 156, -1, 130, 155, 196, - 153, 196, 153, 196, 156, -1, 169, 155, 196, 153, - 196, 156, -1, 170, 155, 196, 153, 196, 156, -1, - 171, 155, 196, 153, 196, 156, -1, 101, 172, 155, - 196, 153, 196, 156, -1, 102, 173, 155, 196, 153, - 196, 156, -1, 174, 155, 196, 153, 196, 156, -1, - 136, 155, 196, 153, 196, 156, -1, 137, 155, 196, - 153, 196, 153, 196, 156, -1, 138, 155, 196, 153, - 196, 153, 196, 156, -1, 198, 153, 196, -1, 196, - -1, 36, -1, 37, -1, 201, -1, 201, 218, -1, - 201, 220, -1, 201, 64, 63, 204, -1, 201, 31, - -1, 203, -1, 51, -1, 59, -1, 203, 180, 27, - 189, -1, 203, 220, -1, 203, 64, 63, 204, -1, - 203, 180, 181, 199, 196, 187, -1, 203, 180, 202, - 199, 191, 187, -1, 203, 180, 46, 199, 191, 187, - -1, 203, 180, 48, 199, 191, 187, -1, 203, 52, - 206, -1, 203, 60, 152, 207, -1, -1, 30, -1, - 57, -1, 56, -1, 54, 152, 205, -1, 55, 152, - 18, -1, 53, 152, 30, -1, 73, 152, 30, -1, - 157, 208, 159, -1, 208, 153, 30, -1, 30, -1, - -1, 28, -1, 30, -1, 209, -1, -1, 191, 210, - -1, 212, 153, 211, -1, 211, -1, 212, -1, 212, - 153, 41, -1, 41, -1, -1, 182, 189, 209, 155, - 213, 156, 186, 183, -1, 32, -1, 162, -1, 181, - 214, 215, -1, 35, 181, 214, 215, -1, 33, -1, - 163, -1, 216, 226, 217, -1, -1, 46, -1, 48, - -1, 34, 219, 214, -1, -1, 65, -1, 17, -1, - 18, -1, 21, -1, 25, -1, 26, -1, 22, -1, - 23, -1, 24, -1, 160, 198, 161, -1, 197, -1, - 63, 221, 30, 153, 30, -1, 167, -1, 209, -1, - 223, -1, 222, -1, 191, 224, -1, 226, 227, -1, - 227, -1, 228, 230, -1, 228, 232, -1, -1, 29, - -1, 79, -1, 78, -1, 74, 225, -1, 74, 3, - -1, 75, 15, 224, -1, 75, 4, 224, 153, 15, - 224, 153, 15, 224, -1, 76, 178, 224, 153, 15, - 224, 157, 231, 159, -1, 76, 178, 224, 153, 15, - 224, 157, 159, -1, 180, 77, 182, 189, 224, 155, - 235, 156, 40, 15, 224, 229, 15, 224, -1, 229, - -1, 80, -1, 231, 178, 222, 153, 15, 224, -1, - 178, 222, 153, 15, 224, -1, 180, 237, -1, 191, - 157, 224, 153, 224, 159, -1, 233, 153, 157, 224, - 153, 224, 159, -1, 225, -1, 234, 153, 225, -1, - 234, -1, -1, 62, 61, -1, 61, -1, 169, 191, - 224, 153, 224, -1, 170, 191, 224, 153, 224, -1, - 171, 191, 224, 153, 224, -1, 101, 172, 191, 224, - 153, 224, -1, 102, 173, 191, 224, 153, 224, -1, - 50, 225, -1, 174, 225, 153, 225, -1, 175, 225, - 40, 191, -1, 130, 225, 153, 225, 153, 225, -1, - 135, 225, 153, 191, -1, 136, 225, 153, 225, -1, - 137, 225, 153, 225, 153, 225, -1, 138, 225, 153, - 225, 153, 225, -1, 129, 233, -1, 236, 182, 189, - 224, 155, 235, 156, -1, 240, -1, 153, 234, -1, - -1, 39, -1, -1, 123, 191, 184, -1, 123, 191, - 153, 10, 224, 184, -1, 124, 191, 184, -1, 124, - 191, 153, 10, 224, 184, -1, 125, 225, -1, 239, - 126, 191, 224, -1, 239, 127, 225, 153, 191, 224, - -1, 128, 191, 224, 238, -1 + -1, 14, -1, 15, -1, 16, -1, 222, -1, 191, + -1, 153, 18, -1, 189, 154, 194, 155, -1, 156, + 18, 157, 192, 158, -1, 159, 18, 157, 192, 160, + -1, 161, 193, 162, -1, 161, 162, -1, 159, 161, + 193, 162, 160, -1, 159, 161, 162, 160, -1, 192, + 163, -1, 192, -1, 193, 152, 192, -1, 193, -1, + 193, 152, 40, -1, 40, -1, -1, 190, 156, 197, + 158, -1, 190, 156, 158, -1, 190, 164, 30, -1, + 190, 159, 197, 160, -1, 190, 161, 197, 162, -1, + 190, 161, 162, -1, 190, 22, -1, 190, 23, -1, + 190, 222, -1, 190, 196, -1, 190, 24, -1, 175, + 167, -1, 176, 18, -1, 4, 25, -1, 4, 26, + -1, 178, 21, -1, 174, 154, 195, 39, 190, 155, + -1, 127, 154, 195, 237, 155, -1, 129, 154, 195, + 152, 195, 152, 195, 155, -1, 168, 154, 195, 152, + 195, 155, -1, 169, 154, 195, 152, 195, 155, -1, + 170, 154, 195, 152, 195, 155, -1, 100, 171, 154, + 195, 152, 195, 155, -1, 101, 172, 154, 195, 152, + 195, 155, -1, 173, 154, 195, 152, 195, 155, -1, + 135, 154, 195, 152, 195, 155, -1, 136, 154, 195, + 152, 195, 152, 195, 155, -1, 137, 154, 195, 152, + 195, 152, 195, 155, -1, 197, 152, 195, -1, 195, + -1, 35, -1, 36, -1, 200, -1, 200, 217, -1, + 200, 219, -1, 200, 63, 62, 203, -1, 200, 31, + -1, 202, -1, 50, -1, 58, -1, 202, 179, 27, + 188, -1, 202, 219, -1, 202, 63, 62, 203, -1, + 202, 179, 180, 198, 195, 186, -1, 202, 179, 201, + 198, 190, 186, -1, 202, 179, 45, 198, 190, 186, + -1, 202, 179, 47, 198, 190, 186, -1, 202, 51, + 205, -1, 202, 59, 151, 206, -1, -1, 30, -1, + 56, -1, 55, -1, 53, 151, 204, -1, 54, 151, + 18, -1, 52, 151, 30, -1, 72, 151, 30, -1, + 156, 207, 158, -1, 207, 152, 30, -1, 30, -1, + -1, 28, -1, 30, -1, 208, -1, -1, 190, 209, + -1, 211, 152, 210, -1, 210, -1, 211, -1, 211, + 152, 40, -1, 40, -1, -1, 181, 188, 208, 154, + 212, 155, 185, 182, -1, 32, -1, 161, -1, 180, + 213, 214, -1, 33, -1, 162, -1, 215, 225, 216, + -1, -1, 45, -1, 47, -1, 34, 218, 213, -1, + -1, 64, -1, 17, -1, 18, -1, 21, -1, 25, + -1, 26, -1, 22, -1, 23, -1, 24, -1, 159, + 197, 160, -1, 196, -1, 62, 220, 30, 152, 30, + -1, 166, -1, 208, -1, 222, -1, 221, -1, 190, + 223, -1, 225, 226, -1, 226, -1, 227, 229, -1, + 227, 231, -1, -1, 29, -1, 78, -1, 77, -1, + 73, 224, -1, 73, 3, -1, 74, 15, 223, -1, + 74, 4, 223, 152, 15, 223, 152, 15, 223, -1, + 75, 177, 223, 152, 15, 223, 156, 230, 158, -1, + 75, 177, 223, 152, 15, 223, 156, 158, -1, 179, + 76, 181, 188, 223, 154, 234, 155, 39, 15, 223, + 228, 15, 223, -1, 228, -1, 79, -1, 230, 177, + 221, 152, 15, 223, -1, 177, 221, 152, 15, 223, + -1, 179, 236, -1, 190, 156, 223, 152, 223, 158, + -1, 232, 152, 156, 223, 152, 223, 158, -1, 224, + -1, 233, 152, 224, -1, 233, -1, -1, 61, 60, + -1, 60, -1, 168, 190, 223, 152, 223, -1, 169, + 190, 223, 152, 223, -1, 170, 190, 223, 152, 223, + -1, 100, 171, 190, 223, 152, 223, -1, 101, 172, + 190, 223, 152, 223, -1, 49, 224, -1, 173, 224, + 152, 224, -1, 174, 224, 39, 190, -1, 129, 224, + 152, 224, 152, 224, -1, 134, 224, 152, 190, -1, + 135, 224, 152, 224, -1, 136, 224, 152, 224, 152, + 224, -1, 137, 224, 152, 224, 152, 224, -1, 128, + 232, -1, 235, 181, 188, 223, 154, 234, 155, -1, + 239, -1, 152, 233, -1, -1, 38, -1, -1, 122, + 190, 183, -1, 122, 190, 152, 10, 223, 183, -1, + 123, 190, 183, -1, 123, 190, 152, 10, 223, 183, + -1, 124, 224, -1, 238, 125, 190, 223, -1, 238, + 126, 224, 152, 190, 223, -1, 127, 190, 223, 237, + -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned short int yyrline[] = { - 0, 338, 338, 338, 339, 339, 343, 343, 343, 343, - 343, 343, 343, 344, 344, 344, 344, 345, 345, 345, - 346, 346, 346, 346, 346, 346, 347, 347, 347, 347, - 347, 347, 347, 347, 347, 347, 348, 348, 348, 348, - 348, 348, 348, 348, 348, 348, 349, 349, 349, 349, - 349, 349, 350, 350, 350, 350, 351, 351, 351, 351, - 351, 351, 351, 352, 352, 352, 352, 352, 352, 357, - 357, 357, 357, 358, 358, 358, 358, 359, 359, 360, - 360, 363, 366, 371, 371, 371, 371, 371, 371, 372, - 373, 376, 376, 376, 376, 376, 377, 378, 383, 388, - 389, 392, 393, 401, 407, 408, 411, 412, 421, 422, - 435, 435, 436, 436, 437, 441, 441, 441, 441, 441, - 441, 441, 442, 442, 442, 442, 442, 444, 448, 452, - 455, 460, 466, 474, 482, 488, 492, 498, 502, 513, - 516, 524, 525, 530, 533, 543, 549, 554, 560, 566, - 572, 577, 583, 589, 595, 601, 607, 613, 619, 625, - 631, 639, 653, 665, 670, 676, 681, 687, 692, 697, - 705, 710, 715, 725, 730, 735, 735, 745, 750, 753, - 758, 762, 766, 768, 768, 771, 783, 788, 793, 802, - 811, 820, 829, 834, 839, 844, 846, 846, 849, 854, - 861, 866, 873, 880, 885, 886, 894, 894, 895, 895, - 897, 904, 908, 912, 915, 920, 923, 925, 945, 946, - 949, 958, 969, 970, 972, 980, 981, 982, 986, 999, - 1000, 1003, 1003, 1003, 1003, 1003, 1003, 1003, 1004, 1005, - 1010, 1011, 1020, 1020, 1024, 1030, 1041, 1047, 1050, 1058, - 1062, 1067, 1070, 1076, 1076, 1078, 1083, 1088, 1093, 1101, - 1108, 1114, 1134, 1139, 1145, 1150, 1158, 1167, 1174, 1182, - 1186, 1193, 1194, 1198, 1203, 1206, 1212, 1217, 1223, 1228, - 1233, 1238, 1246, 1260, 1265, 1270, 1275, 1280, 1285, 1290, - 1307, 1312, 1313, 1317, 1318, 1321, 1328, 1335, 1342, 1349, - 1354, 1361, 1368 + 0, 343, 343, 343, 344, 344, 348, 348, 348, 348, + 348, 348, 348, 349, 349, 349, 349, 350, 350, 350, + 351, 351, 351, 351, 351, 351, 352, 352, 352, 352, + 352, 352, 352, 352, 352, 352, 353, 353, 353, 353, + 353, 353, 353, 353, 353, 353, 354, 354, 354, 354, + 354, 354, 355, 355, 355, 355, 356, 356, 356, 356, + 356, 356, 356, 357, 357, 357, 357, 357, 357, 362, + 362, 362, 362, 363, 363, 363, 363, 364, 364, 365, + 365, 368, 371, 376, 376, 376, 376, 376, 376, 377, + 378, 381, 381, 381, 381, 381, 382, 383, 388, 393, + 394, 397, 398, 406, 412, 413, 416, 417, 426, 427, + 440, 440, 441, 441, 442, 446, 446, 446, 446, 446, + 446, 446, 447, 447, 447, 447, 447, 449, 453, 457, + 460, 465, 471, 479, 487, 493, 497, 503, 507, 518, + 521, 529, 530, 535, 538, 548, 554, 559, 565, 571, + 577, 582, 588, 594, 600, 606, 612, 618, 624, 630, + 636, 644, 658, 670, 675, 681, 686, 692, 697, 702, + 710, 715, 720, 730, 735, 740, 740, 750, 755, 758, + 763, 767, 771, 773, 773, 776, 788, 793, 798, 807, + 816, 825, 834, 839, 844, 849, 851, 851, 854, 859, + 866, 871, 878, 885, 890, 891, 899, 899, 900, 900, + 902, 909, 913, 917, 920, 925, 928, 931, 950, 951, + 954, 965, 966, 968, 976, 977, 978, 982, 995, 996, + 999, 999, 999, 999, 999, 999, 999, 1000, 1001, 1006, + 1007, 1016, 1016, 1020, 1026, 1037, 1043, 1046, 1054, 1058, + 1063, 1066, 1072, 1072, 1074, 1079, 1084, 1089, 1097, 1104, + 1110, 1130, 1135, 1141, 1146, 1154, 1163, 1170, 1178, 1182, + 1189, 1190, 1194, 1199, 1202, 1208, 1213, 1219, 1224, 1229, + 1234, 1242, 1256, 1261, 1266, 1271, 1276, 1281, 1286, 1303, + 1308, 1309, 1313, 1314, 1317, 1324, 1331, 1338, 1345, 1350, + 1357, 1364 }; #endif @@ -1070,12 +1073,12 @@ static const char *const yytname[] = "LABEL", "OPAQUE", "ESINT64VAL", "EUINT64VAL", "SINTVAL", "UINTVAL", "FPVAL", "NULL_TOK", "UNDEF", "ZEROINITIALIZER", "TRUETOK", "FALSETOK", "TYPE", "VAR_ID", "LABELSTR", "STRINGCONSTANT", "IMPLEMENTATION", - "BEGINTOK", "ENDTOK", "DECLARE", "DEFINE", "GLOBAL", "CONSTANT", - "SECTION", "VOLATILE", "TO", "DOTDOTDOT", "CONST", "INTERNAL", - "LINKONCE", "WEAK", "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "APPENDING", - "NOT", "EXTERNAL", "TARGET", "TRIPLE", "ENDIAN", "POINTERSIZE", "LITTLE", - "BIG", "ALIGN", "UNINITIALIZED", "DEPLIBS", "CALL", "TAIL", "ASM_TOK", - "MODULE", "SIDEEFFECT", "CC_TOK", "CCC_TOK", "CSRETCC_TOK", "FASTCC_TOK", + "BEGINTOK", "ENDTOK", "DECLARE", "GLOBAL", "CONSTANT", "SECTION", + "VOLATILE", "TO", "DOTDOTDOT", "CONST", "INTERNAL", "LINKONCE", "WEAK", + "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "APPENDING", "NOT", "EXTERNAL", + "TARGET", "TRIPLE", "ENDIAN", "POINTERSIZE", "LITTLE", "BIG", "ALIGN", + "UNINITIALIZED", "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE", + "SIDEEFFECT", "CC_TOK", "CCC_TOK", "CSRETCC_TOK", "FASTCC_TOK", "COLDCC_TOK", "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", "DATALAYOUT", "RET", "BR", "SWITCH", "INVOKE", "EXCEPT", "UNWIND", "UNREACHABLE", "ADD", "SUB", "MUL", "DIV", "UDIV", "SDIV", "FDIV", "REM", "UREM", @@ -1127,45 +1130,45 @@ static const unsigned short int yytoknum[] = 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, - 405, 406, 61, 44, 92, 40, 41, 91, 120, 93, - 60, 62, 123, 125, 42, 99 + 405, 61, 44, 92, 40, 41, 91, 120, 93, 60, + 62, 123, 125, 42, 99 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const unsigned char yyr1[] = { - 0, 166, 167, 167, 168, 168, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 170, 170, 170, + 0, 165, 166, 166, 167, 167, 168, 168, 168, 168, + 168, 168, 168, 168, 168, 168, 168, 169, 169, 169, + 170, 170, 170, 170, 170, 170, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 172, 172, 172, 172, - 172, 172, 172, 172, 172, 172, 173, 173, 173, 173, - 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, - 173, 173, 174, 174, 174, 174, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 176, - 176, 176, 176, 177, 177, 177, 177, 178, 178, 179, - 179, 180, 180, 181, 181, 181, 181, 181, 181, 181, - 181, 182, 182, 182, 182, 182, 182, 182, 182, 183, - 183, 184, 184, 185, 186, 186, 187, 187, 188, 188, - 189, 189, 190, 190, 191, 192, 192, 192, 192, 192, - 192, 192, 192, 192, 192, 192, 192, 193, 193, 193, - 193, 193, 193, 193, 193, 193, 193, 193, 193, 194, - 194, 195, 195, 195, 195, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 197, 197, 197, 197, 197, 197, 197, 197, 197, - 197, 197, 197, 198, 198, 199, 199, 200, 201, 201, - 201, 201, 201, 202, 202, 203, 203, 203, 203, 203, - 203, 203, 203, 203, 203, 204, 205, 205, 206, 206, - 206, 206, 207, 208, 208, 208, 209, 209, 210, 210, - 211, 212, 212, 213, 213, 213, 213, 214, 215, 215, - 216, 216, 217, 217, 218, 219, 219, 219, 220, 221, - 221, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 223, 223, 224, 224, 225, 226, 226, 227, - 228, 228, 228, 229, 229, 230, 230, 230, 230, 230, - 230, 230, 230, 230, 231, 231, 232, 233, 233, 234, - 234, 235, 235, 236, 236, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 238, 238, 239, 239, 240, 240, 240, 240, 240, - 240, 240, 240 + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 173, 173, 173, 173, 174, 174, 174, 174, + 174, 174, 174, 174, 174, 174, 174, 174, 174, 175, + 175, 175, 175, 176, 176, 176, 176, 177, 177, 178, + 178, 179, 179, 180, 180, 180, 180, 180, 180, 180, + 180, 181, 181, 181, 181, 181, 181, 181, 181, 182, + 182, 183, 183, 184, 185, 185, 186, 186, 187, 187, + 188, 188, 189, 189, 190, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 191, 191, 191, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, 192, 193, + 193, 194, 194, 194, 194, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 196, 196, 196, 196, 196, 196, 196, 196, 196, + 196, 196, 196, 197, 197, 198, 198, 199, 200, 200, + 200, 200, 200, 201, 201, 202, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 203, 204, 204, 205, 205, + 205, 205, 206, 207, 207, 207, 208, 208, 209, 209, + 210, 211, 211, 212, 212, 212, 212, 213, 214, 214, + 215, 216, 216, 217, 218, 218, 218, 219, 220, 220, + 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, + 221, 222, 222, 223, 223, 224, 225, 225, 226, 227, + 227, 227, 228, 228, 229, 229, 229, 229, 229, 229, + 229, 229, 229, 230, 230, 231, 232, 232, 233, 233, + 234, 234, 235, 235, 236, 236, 236, 236, 236, 236, + 236, 236, 236, 236, 236, 236, 236, 236, 236, 236, + 237, 237, 238, 238, 239, 239, 239, 239, 239, 239, + 239, 239 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1193,15 +1196,15 @@ static const unsigned char yyr2[] = 6, 6, 3, 4, 0, 1, 1, 1, 3, 3, 3, 3, 3, 3, 1, 0, 1, 1, 1, 0, 2, 3, 1, 1, 3, 1, 0, 8, 1, 1, - 3, 4, 1, 1, 3, 0, 1, 1, 3, 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, - 1, 5, 1, 1, 1, 1, 2, 2, 1, 2, - 2, 0, 1, 1, 1, 2, 2, 3, 9, 9, - 8, 14, 1, 1, 6, 5, 2, 6, 7, 1, - 3, 1, 0, 2, 1, 5, 5, 5, 6, 6, - 2, 4, 4, 6, 4, 4, 6, 6, 2, 7, - 1, 2, 0, 1, 0, 3, 6, 3, 6, 2, - 4, 6, 4 + 3, 1, 1, 3, 0, 1, 1, 3, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, + 5, 1, 1, 1, 1, 2, 2, 1, 2, 2, + 0, 1, 1, 1, 2, 2, 3, 9, 9, 8, + 14, 1, 1, 6, 5, 2, 6, 7, 1, 3, + 1, 0, 2, 1, 5, 5, 5, 6, 6, 2, + 4, 4, 6, 4, 4, 6, 6, 2, 7, 1, + 2, 0, 1, 0, 3, 6, 3, 6, 2, 4, + 6, 4 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -1209,157 +1212,157 @@ static const unsigned char yyr2[] = means the default is an error. */ static const unsigned short int yydefact[] = { - 194, 0, 90, 182, 1, 181, 225, 90, 83, 84, - 85, 87, 88, 89, 86, 0, 98, 251, 178, 179, - 206, 207, 0, 0, 0, 90, 0, 186, 226, 227, - 98, 98, 0, 0, 91, 92, 93, 94, 95, 96, - 0, 0, 252, 251, 248, 82, 0, 0, 0, 0, - 192, 0, 0, 0, 0, 0, 183, 184, 0, 0, - 81, 228, 0, 195, 180, 97, 111, 115, 116, 117, - 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, - 2, 3, 0, 0, 0, 0, 242, 0, 0, 110, - 129, 114, 243, 128, 218, 219, 220, 222, 223, 224, - 247, 0, 0, 0, 254, 253, 263, 294, 262, 249, - 250, 0, 0, 0, 0, 205, 193, 187, 185, 175, - 176, 0, 0, 0, 0, 221, 130, 0, 0, 0, - 113, 135, 139, 0, 0, 144, 138, 256, 0, 255, - 0, 0, 72, 76, 71, 75, 70, 74, 69, 73, - 77, 78, 0, 293, 0, 274, 0, 98, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 0, 0, - 0, 0, 0, 0, 0, 0, 52, 53, 54, 55, - 0, 0, 0, 0, 68, 56, 57, 58, 59, 60, - 61, 62, 63, 64, 65, 66, 67, 0, 0, 0, - 0, 0, 98, 266, 0, 290, 200, 197, 196, 198, - 199, 201, 204, 0, 106, 106, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 124, 125, 0, 0, 0, - 0, 106, 106, 0, 0, 0, 0, 0, 134, 216, - 143, 141, 0, 231, 232, 233, 236, 237, 238, 234, - 235, 229, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 240, 245, 244, 246, 0, - 257, 0, 280, 273, 0, 26, 27, 28, 29, 30, - 31, 32, 33, 34, 35, 0, 50, 51, 36, 37, - 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 0, 101, 101, 299, 0, 0, 288, 0, + 194, 0, 90, 182, 1, 181, 224, 83, 84, 85, + 87, 88, 89, 86, 0, 98, 250, 178, 179, 206, + 207, 0, 0, 0, 90, 0, 186, 225, 226, 98, + 0, 0, 91, 92, 93, 94, 95, 96, 0, 0, + 251, 250, 247, 82, 0, 0, 0, 0, 192, 0, + 0, 0, 0, 0, 183, 184, 0, 0, 81, 227, + 195, 180, 97, 111, 115, 116, 117, 118, 119, 120, + 121, 122, 123, 124, 125, 126, 127, 2, 3, 0, + 0, 0, 0, 241, 0, 0, 110, 129, 114, 242, + 128, 218, 219, 220, 221, 222, 223, 246, 0, 0, + 0, 253, 252, 262, 293, 261, 248, 249, 0, 0, + 0, 0, 205, 193, 187, 185, 175, 176, 0, 0, + 0, 0, 130, 0, 0, 0, 113, 135, 139, 0, + 0, 144, 138, 255, 0, 254, 0, 0, 72, 76, + 71, 75, 70, 74, 69, 73, 77, 78, 0, 292, + 0, 273, 0, 98, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 0, 0, 0, 0, 0, 0, + 0, 0, 52, 53, 54, 55, 0, 0, 0, 0, + 68, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 0, 0, 0, 0, 0, 98, 265, + 0, 289, 200, 197, 196, 198, 199, 201, 204, 0, + 106, 106, 115, 116, 117, 118, 119, 120, 121, 122, + 123, 124, 125, 0, 0, 0, 0, 106, 106, 0, + 0, 0, 0, 0, 134, 216, 143, 141, 0, 230, + 231, 232, 235, 236, 237, 233, 234, 228, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 202, 0, 190, 191, 158, 159, 4, - 5, 156, 157, 160, 151, 152, 155, 0, 0, 0, - 0, 154, 153, 188, 189, 112, 112, 137, 0, 140, - 215, 209, 212, 213, 0, 0, 131, 230, 0, 0, - 0, 0, 0, 0, 0, 0, 174, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 295, - 0, 297, 292, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 203, 0, - 0, 108, 106, 146, 0, 0, 150, 0, 147, 132, - 133, 136, 208, 210, 0, 104, 142, 0, 0, 0, - 292, 0, 0, 0, 0, 0, 239, 0, 0, 0, + 0, 239, 244, 243, 245, 0, 256, 0, 279, 272, + 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, + 35, 0, 50, 51, 36, 37, 38, 39, 40, 41, + 42, 43, 44, 45, 46, 47, 48, 49, 0, 101, + 101, 298, 0, 0, 287, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 202, + 0, 190, 191, 158, 159, 4, 5, 156, 157, 160, + 151, 152, 155, 0, 0, 0, 0, 154, 153, 188, + 189, 112, 112, 137, 0, 140, 215, 209, 212, 213, + 0, 0, 131, 229, 0, 0, 0, 0, 0, 0, + 0, 0, 174, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 294, 0, 296, 291, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 302, 0, 0, 0, 284, 285, 0, 0, 0, - 0, 0, 281, 282, 0, 300, 0, 103, 109, 107, - 145, 148, 149, 214, 211, 105, 99, 0, 0, 0, - 0, 0, 0, 0, 0, 173, 0, 0, 0, 0, - 0, 0, 0, 272, 0, 0, 101, 102, 101, 269, - 291, 0, 0, 0, 0, 0, 275, 276, 277, 272, - 0, 0, 217, 241, 0, 0, 162, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 271, 0, - 278, 279, 0, 296, 298, 0, 0, 0, 283, 286, - 287, 0, 301, 100, 0, 0, 0, 170, 0, 0, - 164, 165, 166, 169, 161, 0, 260, 0, 0, 0, - 270, 267, 0, 289, 167, 168, 0, 0, 0, 258, - 0, 259, 0, 0, 268, 163, 171, 172, 0, 0, - 0, 0, 0, 0, 265, 0, 0, 264, 0, 261 + 0, 0, 0, 0, 203, 0, 0, 108, 106, 146, + 0, 0, 150, 0, 147, 132, 133, 136, 208, 210, + 0, 104, 142, 0, 0, 0, 291, 0, 0, 0, + 0, 0, 238, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 301, 0, 0, + 0, 283, 284, 0, 0, 0, 0, 0, 280, 281, + 0, 299, 0, 103, 109, 107, 145, 148, 149, 214, + 211, 105, 99, 0, 0, 0, 0, 0, 0, 0, + 0, 173, 0, 0, 0, 0, 0, 0, 0, 271, + 0, 0, 101, 102, 101, 268, 290, 0, 0, 0, + 0, 0, 274, 275, 276, 271, 0, 0, 217, 240, + 0, 0, 162, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 270, 0, 277, 278, 0, 295, + 297, 0, 0, 0, 282, 285, 286, 0, 300, 100, + 0, 0, 0, 170, 0, 0, 164, 165, 166, 169, + 161, 0, 259, 0, 0, 0, 269, 266, 0, 288, + 167, 168, 0, 0, 0, 257, 0, 258, 0, 0, + 267, 163, 171, 172, 0, 0, 0, 0, 0, 0, + 264, 0, 0, 263, 0, 260 }; /* YYDEFGOTO[NTERM-NUM]. */ static const short int yydefgoto[] = { - -1, 86, 341, 270, 271, 272, 295, 312, 273, 274, - 237, 238, 152, 239, 25, 16, 40, 512, 389, 411, - 476, 335, 412, 87, 88, 240, 90, 91, 133, 252, - 376, 275, 377, 121, 1, 2, 59, 3, 64, 219, - 50, 116, 223, 92, 423, 362, 363, 364, 41, 96, - 17, 99, 18, 30, 19, 368, 276, 93, 278, 499, - 43, 44, 45, 108, 109, 558, 110, 318, 528, 529, - 212, 213, 451, 214, 215 + -1, 83, 337, 266, 267, 268, 291, 308, 269, 270, + 233, 234, 148, 235, 24, 15, 38, 508, 385, 407, + 472, 331, 408, 84, 85, 236, 87, 88, 129, 248, + 372, 271, 373, 118, 1, 2, 57, 3, 61, 215, + 48, 113, 219, 89, 419, 358, 359, 360, 39, 93, + 16, 96, 17, 29, 18, 364, 272, 90, 274, 495, + 41, 42, 43, 105, 106, 554, 107, 314, 524, 525, + 208, 209, 447, 210, 211 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -543 +#define YYPACT_NINF -513 static const short int yypact[] = { - -543, 41, 25, 215, -543, -543, 82, 277, -543, -543, - -543, -543, -543, -543, -543, -10, 300, 62, -543, -543, - -543, -543, 22, -95, 57, 78, 30, -543, -543, -543, - 300, 300, 156, 170, -543, -543, -543, -543, -543, -543, - 887, -26, -543, -17, -543, 37, 39, 42, 46, 48, - -543, 77, 156, 887, 43, 43, -543, -543, 43, 43, - -543, -543, -26, -543, -543, -543, 53, -543, -543, -543, - -543, -543, -543, -543, -543, -543, -543, -543, -543, -543, - -543, -543, 188, 196, -8, 561, -543, 153, 81, -543, - -543, -70, -543, -543, -543, -543, -543, -543, -543, -543, - -543, 924, 13, 307, -543, -543, -543, 1403, -543, -543, - -543, 207, 101, 220, 210, 211, -543, -543, -543, -543, - -543, 969, 969, 1008, 969, -543, -543, 88, 89, 603, - -543, -543, -70, -75, 93, 676, -543, 53, 1201, -543, - 1201, 1201, -543, -543, -543, -543, -543, -543, -543, -543, - -543, -543, 1201, -543, 969, -543, 189, 300, -543, -543, - -543, -543, -543, -543, -543, -543, -543, -543, -543, -543, - -543, -543, -543, -543, -543, -543, -543, -543, 58, 109, - 969, 969, 969, 969, 969, 969, -543, -543, -543, -543, - 969, 969, 969, 969, -543, -543, -543, -543, -543, -543, - -543, -543, -543, -543, -543, -543, -543, 969, 969, 969, - 969, 969, 300, -543, -19, -543, -543, -543, -543, -543, - -543, -543, -543, -133, 100, 100, 149, 167, 236, 179, - 238, 185, 239, 187, 247, 248, 249, 193, 250, 252, - 1052, 100, 100, 969, 969, 110, -66, 969, -543, 723, - -543, 128, 127, -543, -543, -543, -543, -543, -543, -543, - -543, 221, 58, 109, 130, 132, 133, 137, 138, 1008, - 140, 143, 144, 145, 146, -543, -543, -543, -543, 151, - -543, 155, -543, -543, 887, -543, -543, -543, -543, -543, - -543, -543, -543, -543, -543, 969, -543, -543, -543, -543, - -543, -543, -543, -543, -543, -543, -543, -543, -543, -543, - -543, -543, 969, 157, 174, -543, 1201, 152, 175, 176, - 177, 178, 182, 183, 1201, 1201, 1201, 184, 262, 887, - 969, 969, 302, -543, 45, -543, -543, -543, -543, -543, - -543, -543, -543, -543, -543, -543, -543, 764, 1008, 647, - 309, -543, -543, -543, -543, -4, -5, -543, 180, -70, - -543, 153, -543, 190, 186, 809, -543, -543, 315, 191, - 192, 1008, 1008, 1008, 1008, 1008, -543, -134, 1008, 1008, - 1008, 1008, 1008, 333, 334, 1201, 1201, 1201, -3, -543, - 8, -543, 200, 1201, 197, 969, 969, 969, 969, 969, - 208, 209, 223, 969, 969, 1201, 1201, 224, -543, 348, - 361, -543, 100, -543, -21, -57, -543, -61, -543, -543, - -543, -543, -543, -543, 848, 342, -543, 228, 1008, 1008, - 200, 229, 230, 234, 235, 1008, -543, 237, 240, 241, - 242, 349, 1201, 1201, 243, 244, 246, 1201, 373, 1201, - 969, -543, 251, 1201, 253, -543, -543, 254, 255, 1201, - 1201, 1201, -543, -543, 245, -543, 969, -543, -543, -543, - -543, -543, -543, -543, -543, -543, 338, 372, 256, 261, - 259, 1008, 1008, 1008, 1008, -543, 1008, 1008, 1008, 1008, - 969, 263, 260, 969, 1201, 1201, 265, -543, 265, -543, - 266, 1201, 267, 969, 969, 969, -543, -543, -543, 969, - 1201, 385, -543, -543, 1008, 1008, -543, 268, 273, 269, - 270, 274, 275, 276, 281, 282, 390, 28, 266, 283, - -543, -543, 366, -543, -543, 969, 285, 1201, -543, -543, - -543, 284, -543, -543, 289, 291, 1008, -543, 1008, 1008, - -543, -543, -543, -543, -543, 1201, -543, 1290, 40, 393, - -543, -543, 290, -543, -543, -543, 292, 295, 296, -543, - 288, -543, 1290, 442, -543, -543, -543, -543, 444, 308, - 1201, 1201, 445, 134, -543, 1201, 447, -543, 1201, -543 + -513, 46, 217, 541, -513, -513, 82, -513, -513, -513, + -513, -513, -513, -513, 16, 111, 25, -513, -513, -513, + -513, 34, -55, 61, 26, -23, -513, -513, -513, 111, + 132, 146, -513, -513, -513, -513, -513, -513, 873, -26, + -513, -18, -513, 47, 19, 23, 39, 67, -513, 77, + 132, 873, 81, 81, -513, -513, 81, 81, -513, -513, + -513, -513, -513, 86, -513, -513, -513, -513, -513, -513, + -513, -513, -513, -513, -513, -513, -513, -513, -513, 223, + 225, -9, 506, -513, 133, 91, -513, -513, -111, -513, + -513, -513, -513, -513, -513, -513, -513, -513, 901, 36, + 148, -513, -513, -513, 1336, -513, -513, -513, 219, 76, + 229, 222, 224, -513, -513, -513, -513, -513, 933, 933, + 963, 933, -513, 98, 100, 614, -513, -513, -111, -104, + 104, 216, -513, 86, 1134, -513, 1134, 1134, -513, -513, + -513, -513, -513, -513, -513, -513, -513, -513, 1134, -513, + 933, -513, 206, 111, -513, -513, -513, -513, -513, -513, + -513, -513, -513, -513, -513, -513, -513, -513, -513, -513, + -513, -513, -513, -513, 195, 84, 933, 933, 933, 933, + 933, 933, -513, -513, -513, -513, 933, 933, 933, 933, + -513, -513, -513, -513, -513, -513, -513, -513, -513, -513, + -513, -513, -513, 933, 933, 933, 933, 933, 111, -513, + 11, -513, -513, -513, -513, -513, -513, -513, -513, -93, + 115, 115, 121, 166, 250, 169, 251, 191, 253, 193, + 254, 252, 257, 220, 256, 260, 1045, 115, 115, 933, + 933, 122, -73, 933, -513, 701, -513, 134, 129, -513, + -513, -513, -513, -513, -513, -513, -513, 221, 195, 84, + 136, 137, 138, 140, 150, 963, 154, 156, 158, 167, + 168, -513, -513, -513, -513, 171, -513, 172, -513, -513, + 873, -513, -513, -513, -513, -513, -513, -513, -513, -513, + -513, 933, -513, -513, -513, -513, -513, -513, -513, -513, + -513, -513, -513, -513, -513, -513, -513, -513, 933, 173, + 174, -513, 1134, 164, 175, 176, 177, 178, 179, 182, + 1134, 1134, 1134, 183, 297, 873, 933, 933, 308, -513, + -8, -513, -513, -513, -513, -513, -513, -513, -513, -513, + -513, -513, -513, 741, 963, 673, 310, -513, -513, -513, + -513, -113, -99, -513, 181, -111, -513, 133, -513, 190, + 189, 774, -513, -513, 315, 192, 194, 963, 963, 963, + 963, 963, -513, -58, 963, 963, 963, 963, 963, 332, + 337, 1134, 1134, 1134, -2, -513, 9, -513, 207, 1134, + 204, 933, 933, 933, 933, 933, 211, 212, 213, 933, + 933, 1134, 1134, 214, -513, 338, 349, -513, 115, -513, + -61, -57, -513, -70, -513, -513, -513, -513, -513, -513, + 833, 333, -513, 231, 963, 963, 207, 235, 236, 237, + 238, 963, -513, 240, 241, 242, 243, 334, 1134, 1134, + 227, 244, 245, 1134, 353, 1134, 933, -513, 249, 1134, + 255, -513, -513, 258, 262, 1134, 1134, 1134, -513, -513, + 248, -513, 933, -513, -513, -513, -513, -513, -513, -513, + -513, -513, 317, 346, 263, 264, 265, 963, 963, 963, + 963, -513, 963, 963, 963, 963, 933, 266, 247, 933, + 1134, 1134, 267, -513, 267, -513, 269, 1134, 270, 933, + 933, 933, -513, -513, -513, 933, 1134, 386, -513, -513, + 963, 963, -513, 271, 273, 277, 278, 276, 279, 282, + 283, 284, 390, 15, 269, 286, -513, -513, 352, -513, + -513, 933, 259, 1134, -513, -513, -513, 289, -513, -513, + 292, 294, 963, -513, 963, 963, -513, -513, -513, -513, + -513, 1134, -513, 1223, 27, 367, -513, -513, 274, -513, + -513, -513, 295, 300, 303, -513, 281, -513, 1223, 444, + -513, -513, -513, -513, 445, 312, 1134, 1134, 450, 135, + -513, 1134, 451, -513, 1134, -513 }; /* YYPGOTO[NTERM-NUM]. */ static const short int yypgoto[] = { - -543, -543, -543, 359, 360, 363, 206, 212, 367, 370, - -102, -100, -504, -543, 428, 17, -149, -543, -303, 55, - -543, -220, -543, -49, -543, -40, -543, -71, 4, -543, - 159, 257, -200, 51, -543, -543, -543, -543, 426, -543, - -543, -543, -543, -1, -543, 59, -543, -543, 202, 419, - -543, -543, -543, -543, 479, -543, -542, -109, 49, -92, - -543, 441, -543, -98, -543, -543, -543, -543, 36, -22, - -543, -543, 60, -543, -543 + -513, -513, -513, 364, 365, 368, 215, 218, 370, 372, + -98, -97, -507, -513, 436, 456, -141, -513, -303, 60, + -513, -220, -513, -46, -513, -38, -513, -68, -20, -513, + 130, 246, -230, 51, -513, -513, -513, -513, 433, -513, + -513, -513, -513, 1, -513, 64, -513, -513, 457, -513, + -513, -513, -513, -513, 482, -513, -512, -106, -3, -88, + -513, 448, -513, -89, -513, -513, -513, -513, 45, -13, + -513, -513, 69, -513, -513 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1369,387 +1372,373 @@ static const short int yypgoto[] = #define YYTABLE_NINF -178 static const short int yytable[] = { - 89, 150, 26, 151, 118, 336, 94, 447, 284, 139, - 128, 391, 42, 89, 132, 570, 97, 140, 449, 435, - 332, 353, 354, 557, 31, -177, 333, 436, 141, 277, - 579, 277, 277, 142, 143, 144, 145, 146, 147, 148, - 149, 4, 58, 277, 26, 142, 143, 144, 145, 146, - 147, 148, 149, 32, 572, 448, 5, 51, 132, 6, - 7, 138, 282, 329, 132, 20, 448, 21, 8, 9, - 10, 11, 12, 13, 14, 46, 47, 48, 247, 119, - 120, 224, 225, 409, 242, -112, 134, 247, 248, 15, - 315, 42, 435, 319, 136, 49, 435, 358, 320, 321, - 322, 323, 472, 410, 471, 53, 122, 330, 331, 123, - 124, 101, 102, 103, 138, 104, 105, 106, 327, 328, - 52, 8, 9, 10, 54, 12, 55, 14, 28, 56, - 29, 352, 435, 246, 296, 297, 95, 57, 470, 251, - 313, 314, 138, 316, 317, 138, 98, 414, 415, 417, - 138, 138, 138, 138, 129, 419, 420, 217, 218, 136, - 136, 285, 286, 287, 288, 289, 290, 324, 325, 326, - 138, 138, 355, 356, 337, 338, 359, 291, 292, 293, - 294, 20, 60, 21, -72, -72, 63, 556, 65, 279, - 280, 111, 469, 533, 112, 534, -71, -71, 113, 571, - 114, 281, -70, -70, -69, -69, 126, 277, -113, 361, - 339, 340, 104, 105, 127, 277, 277, 277, 298, 299, - 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, - 310, 311, 61, 62, 115, 385, 135, 216, 220, 407, - 221, 222, -82, 20, 89, 21, 243, 244, 249, 6, - 283, -82, -82, 334, -76, 386, -75, -74, -82, -82, - -82, -82, -82, -82, -82, -73, -82, 22, 342, -79, - -80, 357, 387, 343, -82, 23, 277, 277, 277, 24, - 405, 365, 241, 366, 277, 371, 367, 372, 373, 89, - 406, 138, 374, 375, 359, 378, 277, 277, 379, 380, - 381, 382, 404, 454, 383, 456, 457, 458, 384, 393, - 388, 462, 142, 143, 144, 145, 146, 147, 148, 149, - 8, 9, 10, 11, 12, 13, 14, 390, 394, 395, - 396, 397, 408, 277, 277, 398, 399, 403, 277, 418, - 277, 421, 425, 424, 277, 427, 428, 429, 442, 443, - 277, 277, 277, 450, 453, 138, 455, 138, 138, 138, - 422, 459, 460, 138, 463, 392, 33, 34, 35, 36, - 37, 38, 39, 400, 401, 402, 461, 466, 467, 468, - 409, 477, 481, 482, 361, 277, 277, 483, 484, 490, - 486, 497, 277, 487, 488, 489, 511, 494, 493, 495, - 509, 277, 513, 543, 501, 555, 503, 504, 505, 514, - 138, 538, 539, 540, 515, 516, 526, 527, 532, 535, - 537, 546, 548, 549, 448, 150, 510, 151, 277, 547, - 550, 551, 552, 573, 444, 445, 446, 553, 554, 559, - 563, 578, 452, 560, 561, 564, 277, 565, 575, 574, - 525, 576, 577, 138, 464, 465, 150, 580, 151, 581, - 585, 582, 588, 138, 138, 138, 207, 208, 369, 138, - 209, 277, 277, 107, 210, 370, 277, 211, 117, 277, - 475, 125, 27, 474, 100, 586, 500, 541, 0, 0, - 480, 491, 492, 0, 0, 138, 496, 351, 498, 0, - 0, 0, 502, 0, 0, 0, 0, 0, 506, 507, - 508, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 430, 431, 432, 433, 434, 0, 0, 437, 438, 439, - 440, 441, 0, 530, 531, 0, 0, 0, 0, 0, - 536, 0, 0, 0, 0, 0, 0, 0, 0, 542, - 0, 0, 0, 0, 130, 67, 68, 69, 70, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 0, 0, - 80, 81, 0, 0, 0, 0, 562, 478, 479, 20, - 0, 21, 0, 0, 485, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 569, 0, 130, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 0, 0, 80, 81, 0, 0, 0, 0, 0, 583, - 584, 20, 0, 21, 587, 0, 0, 589, 0, 0, - 517, 518, 519, 520, 0, 521, 522, 523, 524, 0, - 130, 226, 227, 228, 229, 230, 231, 232, 233, 234, - 235, 236, 78, 79, 0, 0, 80, 81, 0, 0, - 0, 0, 0, 544, 545, 20, 0, 21, 0, 130, - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 77, 78, 79, 0, 0, 80, 81, 0, 0, 0, - 0, 0, 0, 0, 20, 566, 21, 567, 568, 0, - 0, 0, 0, 0, 0, 82, 0, 250, 83, 0, - 0, 84, 0, 85, 131, 0, 130, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 0, 0, 80, 81, 0, 0, 0, 0, 0, 0, - 0, 20, 0, 21, 0, 0, 0, 82, 0, 0, - 83, 0, 0, 84, 360, 85, 245, 130, 226, 227, - 228, 229, 230, 231, 232, 233, 234, 235, 236, 78, - 79, 0, 0, 80, 81, 0, 0, 0, 0, 0, - 0, 0, 20, 0, 21, 0, 0, 0, 0, 0, - 0, 82, 0, 0, 83, 0, 0, 84, 0, 85, - 416, 0, 130, 67, 68, 69, 70, 71, 72, 73, - 74, 75, 76, 77, 78, 79, 0, 0, 80, 81, - 82, 0, 0, 83, 0, 0, 84, 20, 85, 21, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 426, 130, 67, 68, 69, 70, 71, 72, 73, 74, - 75, 76, 77, 78, 79, 0, 0, 80, 81, 0, - 0, 0, 0, 0, 0, 0, 20, 82, 21, 0, - 83, 0, 0, 84, 0, 85, 0, 0, 0, 473, + 86, 332, 146, 147, 25, 115, 91, 387, 443, 124, + 135, 40, 280, 86, 128, 94, 553, 349, 350, 445, + 138, 139, 140, 141, 142, 143, 144, 145, 273, 405, + 273, 273, 138, 139, 140, 141, 142, 143, 144, 145, + 136, 566, 273, -112, 25, 415, 4, 568, 243, 406, + 132, 137, 132, 51, 40, 444, 575, 128, 244, 328, + 134, 416, 278, 128, 132, 329, 444, 325, 7, 8, + 9, 52, 11, 53, 13, 19, 54, 20, 30, 243, + 220, 221, 431, 238, 55, 130, 44, 45, 46, 354, + 311, 431, 468, 315, 431, 431, 49, 466, 316, 317, + 318, 319, 432, 467, 119, 242, 47, 120, 121, 292, + 293, 247, 134, 410, 411, 413, 116, 117, 323, 324, + 98, 99, 100, 50, 101, 102, 103, 27, 58, 28, + 348, 213, 214, 275, 276, 92, 326, 327, 309, 310, + 134, 312, 313, 134, 95, 277, 333, 334, 134, 134, + 134, 134, 125, 138, 139, 140, 141, 142, 143, 144, + 145, 19, 60, 20, 62, 320, 321, 322, 134, 134, + 108, 351, 352, 552, 109, 355, 31, 32, 33, 34, + 35, 36, 37, -72, -72, 567, -71, -71, 465, 529, + 110, 530, 294, 295, 296, 297, 298, 299, 300, 301, + 302, 303, 304, 305, 306, 307, 273, 357, -70, -70, + -69, -69, 101, 102, 273, 273, 273, -177, 111, 126, + 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, + 74, 75, 76, 112, 381, 77, 78, 335, 336, 403, + -113, 122, 86, 123, 19, 131, 20, 216, 5, 212, + 237, 6, 217, 382, 218, 239, 246, 240, 245, 7, + 8, 9, 10, 11, 12, 13, 279, 330, -76, -75, + 383, -74, -73, -79, 338, 273, 273, 273, -80, 401, + 14, 339, 353, 273, 362, 363, 361, 86, 402, 134, + 367, 368, 369, 355, 370, 273, 273, 281, 282, 283, + 284, 285, 286, 450, 371, 452, 453, 454, 374, 388, + 375, 458, 376, 287, 288, 289, 290, 396, 397, 398, + 389, 377, 378, 379, 380, 384, 386, 390, 391, 392, + 393, 394, 273, 273, 395, 399, 400, 273, 404, 273, + 414, 417, 420, 273, 421, 423, 424, 438, 425, 273, + 273, 273, 439, 134, 451, 134, 134, 134, 418, 446, + 449, 134, 459, 455, 456, 457, 462, 464, 463, 79, + 405, 493, 80, 486, 507, 81, 509, 82, 440, 441, + 442, 489, 357, 473, 273, 273, 448, 477, 478, 479, + 480, 273, 482, 483, 484, 485, 490, 491, 460, 461, + 273, 497, 505, 523, 539, 551, 569, 499, 134, 444, + 500, 534, 535, 536, 501, 510, 511, 557, 522, 528, + 512, 531, 533, 542, 506, 146, 147, 273, 543, 544, + 545, 546, 570, 574, 547, 487, 488, 548, 549, 550, + 492, 555, 494, 556, 559, 273, 498, 560, 521, 561, + 571, 134, 502, 503, 504, 572, 146, 147, 573, 576, + 577, 134, 134, 134, 578, 581, 584, 134, 203, 204, + 273, 273, 205, 365, 206, 273, 207, 366, 273, 104, + 56, 471, 347, 114, 470, 26, 59, 526, 527, 97, + 582, 496, 537, 134, 532, 476, 0, 426, 427, 428, + 429, 430, 0, 538, 433, 434, 435, 436, 437, 126, + 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, + 74, 75, 76, 0, 0, 77, 78, 0, 0, 0, + 558, 0, 0, 0, 19, 0, 20, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 565, 0, + 0, 0, 0, 0, 474, 475, 0, 0, 0, 0, + 0, 481, 0, 0, 0, 0, 0, 0, -82, 19, + 0, 20, 0, 579, 580, 6, -82, -82, 583, 0, + 0, 585, 0, -82, -82, -82, -82, -82, -82, -82, + 0, -82, 21, 0, 0, 0, 0, 0, 0, -82, + 22, 0, 0, 0, 23, 0, 0, 513, 514, 515, + 516, 0, 517, 518, 519, 520, 0, 126, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 0, 0, 80, 81, 0, 0, - 0, 0, 0, 0, 0, 20, 0, 21, 82, 0, - 0, 83, 0, 413, 84, 0, 85, 137, 67, 68, - 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 0, 0, 80, 81, 0, 0, 0, 0, 0, - 0, 0, 20, 0, 21, 0, 0, 0, 0, 0, - 0, 0, 0, 82, 0, 0, 83, 0, 0, 84, - 0, 85, 130, 67, 68, 69, 70, 71, 72, 73, - 74, 75, 76, 77, 78, 79, 0, 0, 80, 81, - 0, 0, 0, 0, 0, 0, 0, 20, 0, 21, - 0, 0, 82, 0, 0, 83, 0, 0, 84, 0, - 85, 130, 226, 227, 228, 229, 230, 231, 232, 233, - 234, 235, 236, 78, 79, 0, 0, 80, 81, 0, - 0, 0, 0, 0, 0, 0, 20, 0, 21, 0, - 0, 82, 0, 0, 83, 0, 0, 84, 0, 85, + 76, 0, 0, 77, 78, 0, 0, 0, 0, 0, + 540, 541, 19, 0, 20, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 79, + 0, 0, 80, 0, 0, 81, 0, 82, 127, 0, + 0, 0, 562, 0, 563, 564, 126, 222, 223, 224, + 225, 226, 227, 228, 229, 230, 231, 232, 75, 76, + 0, 0, 77, 78, 0, 0, 0, 0, 0, 0, + 0, 19, 0, 20, 126, 64, 65, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 0, 0, + 77, 78, 0, 0, 0, 0, 0, 0, 0, 19, + 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 356, 0, 0, 126, 222, 223, 224, 225, 226, + 227, 228, 229, 230, 231, 232, 75, 76, 0, 0, + 77, 78, 0, 0, 0, 0, 0, 79, 0, 19, + 80, 20, 0, 81, 0, 82, 241, 126, 64, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 0, 0, 77, 78, 0, 0, 0, 0, 0, + 0, 0, 19, 0, 20, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 422, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 79, 0, 0, 80, + 0, 0, 81, 0, 82, 412, 126, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 0, 0, 77, 78, 79, 0, 0, 80, 0, 0, + 81, 19, 82, 20, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 469, 0, 0, 63, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 0, 0, 77, 78, 79, 0, 0, 80, 0, 409, + 81, 19, 82, 20, 133, 64, 65, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 0, 0, + 77, 78, 0, 0, 0, 0, 0, 79, 0, 19, + 80, 20, 0, 81, 0, 82, 126, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 0, 0, 77, 78, 0, 0, 0, 0, 0, 0, + 0, 19, 0, 20, 0, 0, 126, 222, 223, 224, + 225, 226, 227, 228, 229, 230, 231, 232, 75, 76, + 0, 0, 77, 78, 0, 0, 79, 0, 0, 80, + 0, 19, 81, 20, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 80, 81, 0, 344, 345, 346, 0, 82, 0, - 20, 83, 21, 0, 84, 0, 85, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 79, 0, 0, 80, + 0, 0, 81, 0, 82, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 79, 0, 0, 80, 0, 0, + 81, 0, 82, 0, 77, 78, 0, 340, 341, 342, + 0, 0, 0, 19, 0, 20, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 79, 0, 0, 80, + 0, 0, 81, 0, 82, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 79, 0, 0, 80, + 0, 0, 81, 0, 82, 154, 155, 156, 157, 158, + 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, + 169, 170, 171, 172, 173, 258, 259, 0, 0, 0, + 0, 249, 250, 77, 78, 251, 252, 253, 254, 255, + 256, 0, 19, 0, 20, 0, 0, 0, 0, 0, + 0, 0, 260, 0, 261, 182, 183, 184, 185, 0, + 262, 263, 264, 190, 191, 192, 193, 194, 195, 196, + 197, 198, 199, 200, 201, 202, 257, 0, 0, 0, + 0, 343, 0, 0, 344, 0, 345, 0, 0, 346, + 0, 0, 0, 0, 154, 155, 156, 157, 158, 159, + 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, + 170, 171, 172, 173, 258, 259, 0, 0, 0, 0, + 249, 250, 0, 0, 251, 252, 253, 254, 255, 256, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 260, 0, 261, 182, 183, 184, 185, 0, 262, + 263, 264, 190, 191, 192, 193, 194, 195, 196, 197, + 198, 199, 200, 201, 202, 257, 0, 0, 0, 0, + 0, 0, 0, 265, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 154, 155, 156, 157, 158, 159, 160, + 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, + 171, 172, 173, 258, 259, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 260, 0, 261, 182, 183, 184, 185, 0, 262, 263, + 264, 190, 191, 192, 193, 194, 195, 196, 197, 198, + 199, 200, 201, 202, 149, 0, 0, 0, 0, 0, + 0, 0, 265, 0, 0, 150, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 151, 152, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 82, 0, 0, 83, 0, 0, 84, - 0, 85, 0, 158, 159, 160, 161, 162, 163, 164, - 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 262, 263, 0, 0, 0, 0, 0, - 0, 0, 82, 0, 0, 83, 0, 0, 84, 0, - 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 264, 0, 265, 186, 187, 188, 189, 0, 266, 267, - 268, 194, 195, 196, 197, 198, 199, 200, 201, 202, - 203, 204, 205, 206, 0, 0, 0, 0, 0, 347, - 0, 0, 348, 0, 349, 0, 0, 350, 253, 254, - 80, 81, 255, 256, 257, 258, 259, 260, 0, 20, - 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 153, 0, 0, 0, 154, 155, 156, 157, + 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, + 168, 169, 170, 171, 172, 173, 174, 175, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 261, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 158, 159, 160, 161, 162, 163, 164, 165, - 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, - 176, 177, 262, 263, 0, 0, 0, 253, 254, 0, - 0, 255, 256, 257, 258, 259, 260, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 264, - 0, 265, 186, 187, 188, 189, 0, 266, 267, 268, - 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, - 204, 205, 206, 261, 0, 0, 0, 0, 0, 0, - 0, 269, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 158, 159, 160, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 177, 262, 263, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 264, 0, - 265, 186, 187, 188, 189, 0, 266, 267, 268, 194, - 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, - 205, 206, 153, 0, 0, 0, 0, 0, 0, 0, - 269, 0, 0, 154, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 155, 156, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 157, 0, 0, 0, 158, 159, 160, 161, 162, 163, - 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, - 174, 175, 176, 177, 178, 179, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 180, 181, 182, 0, - 0, 183, 184, 185, 186, 187, 188, 189, 190, 191, - 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, - 202, 203, 204, 205, 206 + 0, 0, 0, 0, 0, 0, 0, 0, 176, 177, + 178, 0, 0, 179, 180, 181, 182, 183, 184, 185, + 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, + 196, 197, 198, 199, 200, 201, 202 }; static const short int yycheck[] = { - 40, 103, 3, 103, 53, 225, 32, 10, 157, 101, - 18, 314, 29, 53, 85, 557, 33, 4, 10, 153, - 153, 241, 242, 527, 7, 0, 159, 161, 15, 138, - 572, 140, 141, 5, 6, 7, 8, 9, 10, 11, - 12, 0, 25, 152, 45, 5, 6, 7, 8, 9, - 10, 11, 12, 63, 558, 58, 31, 152, 129, 34, - 35, 101, 154, 212, 135, 28, 58, 30, 43, 44, - 45, 46, 47, 48, 49, 53, 54, 55, 153, 36, - 37, 121, 122, 38, 124, 155, 87, 153, 163, 64, - 182, 29, 153, 185, 164, 73, 153, 163, 190, 191, - 192, 193, 163, 58, 161, 27, 55, 126, 127, 58, - 59, 74, 75, 76, 154, 78, 79, 80, 210, 211, - 63, 43, 44, 45, 46, 47, 48, 49, 46, 51, - 48, 240, 153, 129, 25, 26, 162, 59, 159, 135, - 180, 181, 182, 183, 184, 185, 163, 347, 348, 349, - 190, 191, 192, 193, 162, 159, 161, 56, 57, 164, - 164, 103, 104, 105, 106, 107, 108, 207, 208, 209, - 210, 211, 243, 244, 25, 26, 247, 119, 120, 121, - 122, 28, 152, 30, 17, 18, 30, 159, 18, 140, - 141, 152, 412, 496, 152, 498, 17, 18, 152, 159, - 152, 152, 17, 18, 17, 18, 18, 316, 155, 249, - 17, 18, 78, 79, 18, 324, 325, 326, 109, 110, - 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 30, 31, 157, 284, 155, 30, 18, 331, - 30, 30, 27, 28, 284, 30, 158, 158, 155, 34, - 61, 36, 37, 153, 18, 295, 18, 18, 43, 44, - 45, 46, 47, 48, 49, 18, 51, 52, 18, 21, - 21, 161, 312, 21, 59, 60, 385, 386, 387, 64, - 329, 153, 123, 156, 393, 155, 65, 155, 155, 329, - 330, 331, 155, 155, 365, 155, 405, 406, 155, 155, - 155, 155, 40, 395, 153, 397, 398, 399, 153, 157, - 153, 403, 5, 6, 7, 8, 9, 10, 11, 12, - 43, 44, 45, 46, 47, 48, 49, 153, 153, 153, - 153, 153, 30, 442, 443, 153, 153, 153, 447, 30, - 449, 161, 156, 153, 453, 30, 155, 155, 15, 15, - 459, 460, 461, 153, 157, 395, 396, 397, 398, 399, - 361, 153, 153, 403, 404, 316, 66, 67, 68, 69, - 70, 71, 72, 324, 325, 326, 153, 153, 30, 18, - 38, 153, 153, 153, 424, 494, 495, 153, 153, 40, - 153, 18, 501, 153, 153, 153, 58, 153, 155, 153, - 155, 510, 30, 18, 153, 15, 153, 153, 153, 153, - 450, 503, 504, 505, 153, 156, 153, 157, 153, 153, - 153, 153, 153, 153, 58, 527, 466, 527, 537, 156, - 156, 156, 156, 40, 385, 386, 387, 156, 156, 156, - 156, 153, 393, 535, 159, 156, 555, 156, 156, 159, - 490, 156, 156, 493, 405, 406, 558, 15, 558, 15, - 15, 153, 15, 503, 504, 505, 107, 107, 262, 509, - 107, 580, 581, 45, 107, 263, 585, 107, 52, 588, - 425, 62, 3, 424, 43, 583, 450, 509, -1, -1, - 430, 442, 443, -1, -1, 535, 447, 240, 449, -1, - -1, -1, 453, -1, -1, -1, -1, -1, 459, 460, - 461, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 371, 372, 373, 374, 375, -1, -1, 378, 379, 380, - 381, 382, -1, 494, 495, -1, -1, -1, -1, -1, - 501, -1, -1, -1, -1, -1, -1, -1, -1, 510, - -1, -1, -1, -1, 3, 4, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, - 19, 20, -1, -1, -1, -1, 537, 428, 429, 28, - -1, 30, -1, -1, 435, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 555, -1, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, -1, 19, 20, -1, -1, -1, -1, -1, 580, - 581, 28, -1, 30, 585, -1, -1, 588, -1, -1, - 481, 482, 483, 484, -1, 486, 487, 488, 489, -1, - 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, 19, 20, -1, -1, - -1, -1, -1, 514, 515, 28, -1, 30, -1, 3, + 38, 221, 100, 100, 3, 51, 32, 310, 10, 18, + 98, 29, 153, 51, 82, 33, 523, 237, 238, 10, + 5, 6, 7, 8, 9, 10, 11, 12, 134, 37, + 136, 137, 5, 6, 7, 8, 9, 10, 11, 12, + 4, 553, 148, 154, 43, 158, 0, 554, 152, 57, + 163, 15, 163, 27, 29, 57, 568, 125, 162, 152, + 98, 160, 150, 131, 163, 158, 57, 208, 42, 43, + 44, 45, 46, 47, 48, 28, 50, 30, 62, 152, + 118, 119, 152, 121, 58, 84, 52, 53, 54, 162, + 178, 152, 162, 181, 152, 152, 151, 158, 186, 187, + 188, 189, 160, 160, 53, 125, 72, 56, 57, 25, + 26, 131, 150, 343, 344, 345, 35, 36, 206, 207, + 73, 74, 75, 62, 77, 78, 79, 45, 151, 47, + 236, 55, 56, 136, 137, 161, 125, 126, 176, 177, + 178, 179, 180, 181, 162, 148, 25, 26, 186, 187, + 188, 189, 161, 5, 6, 7, 8, 9, 10, 11, + 12, 28, 30, 30, 18, 203, 204, 205, 206, 207, + 151, 239, 240, 158, 151, 243, 65, 66, 67, 68, + 69, 70, 71, 17, 18, 158, 17, 18, 408, 492, + 151, 494, 108, 109, 110, 111, 112, 113, 114, 115, + 116, 117, 118, 119, 120, 121, 312, 245, 17, 18, + 17, 18, 77, 78, 320, 321, 322, 0, 151, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 156, 280, 19, 20, 17, 18, 327, + 154, 18, 280, 18, 28, 154, 30, 18, 31, 30, + 120, 34, 30, 291, 30, 157, 40, 157, 154, 42, + 43, 44, 45, 46, 47, 48, 60, 152, 18, 18, + 308, 18, 18, 21, 18, 381, 382, 383, 21, 325, + 63, 21, 160, 389, 155, 64, 152, 325, 326, 327, + 154, 154, 154, 361, 154, 401, 402, 102, 103, 104, + 105, 106, 107, 391, 154, 393, 394, 395, 154, 312, + 154, 399, 154, 118, 119, 120, 121, 320, 321, 322, + 156, 154, 154, 152, 152, 152, 152, 152, 152, 152, + 152, 152, 438, 439, 152, 152, 39, 443, 30, 445, + 30, 160, 152, 449, 155, 30, 154, 15, 154, 455, + 456, 457, 15, 391, 392, 393, 394, 395, 357, 152, + 156, 399, 400, 152, 152, 152, 152, 18, 30, 153, + 37, 18, 156, 39, 57, 159, 30, 161, 381, 382, + 383, 154, 420, 152, 490, 491, 389, 152, 152, 152, + 152, 497, 152, 152, 152, 152, 152, 152, 401, 402, + 506, 152, 154, 156, 18, 15, 39, 152, 446, 57, + 152, 499, 500, 501, 152, 152, 152, 158, 152, 152, + 155, 152, 152, 152, 462, 523, 523, 533, 155, 152, + 152, 155, 158, 152, 155, 438, 439, 155, 155, 155, + 443, 155, 445, 531, 155, 551, 449, 155, 486, 155, + 155, 489, 455, 456, 457, 155, 554, 554, 155, 15, + 15, 499, 500, 501, 152, 15, 15, 505, 104, 104, + 576, 577, 104, 258, 104, 581, 104, 259, 584, 43, + 24, 421, 236, 50, 420, 3, 29, 490, 491, 41, + 579, 446, 505, 531, 497, 426, -1, 367, 368, 369, + 370, 371, -1, 506, 374, 375, 376, 377, 378, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, 19, 20, -1, -1, -1, - -1, -1, -1, -1, 28, 546, 30, 548, 549, -1, - -1, -1, -1, -1, -1, 154, -1, 41, 157, -1, - -1, 160, -1, 162, 163, -1, 3, 4, 5, 6, + 533, -1, -1, -1, 28, -1, 30, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 551, -1, + -1, -1, -1, -1, 424, 425, -1, -1, -1, -1, + -1, 431, -1, -1, -1, -1, -1, -1, 27, 28, + -1, 30, -1, 576, 577, 34, 35, 36, 581, -1, + -1, 584, -1, 42, 43, 44, 45, 46, 47, 48, + -1, 50, 51, -1, -1, -1, -1, -1, -1, 58, + 59, -1, -1, -1, 63, -1, -1, 477, 478, 479, + 480, -1, 482, 483, 484, 485, -1, 3, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, 19, 20, -1, -1, -1, -1, -1, + 510, 511, 28, -1, 30, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 153, + -1, -1, 156, -1, -1, 159, -1, 161, 162, -1, + -1, -1, 542, -1, 544, 545, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, 19, 20, -1, -1, -1, -1, -1, -1, - -1, 28, -1, 30, -1, -1, -1, 154, -1, -1, - 157, -1, -1, 160, 41, 162, 163, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, 19, 20, -1, -1, -1, -1, -1, - -1, -1, 28, -1, 30, -1, -1, -1, -1, -1, - -1, 154, -1, -1, 157, -1, -1, 160, -1, 162, - 163, -1, 3, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, -1, -1, 19, 20, - 154, -1, -1, 157, -1, -1, 160, 28, 162, 30, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 41, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, -1, -1, 19, 20, -1, - -1, -1, -1, -1, -1, -1, 28, 154, 30, -1, - 157, -1, -1, 160, -1, 162, -1, -1, -1, 41, - 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, 19, 20, -1, -1, - -1, -1, -1, -1, -1, 28, -1, 30, 154, -1, - -1, 157, -1, 159, 160, -1, 162, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, 19, 20, -1, -1, -1, -1, -1, - -1, -1, 28, -1, 30, -1, -1, -1, -1, -1, - -1, -1, -1, 154, -1, -1, 157, -1, -1, 160, - -1, 162, 3, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, -1, -1, 19, 20, - -1, -1, -1, -1, -1, -1, -1, 28, -1, 30, - -1, -1, 154, -1, -1, 157, -1, -1, 160, -1, - 162, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, -1, -1, 19, 20, -1, - -1, -1, -1, -1, -1, -1, 28, -1, 30, -1, - -1, 154, -1, -1, 157, -1, -1, 160, -1, 162, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 19, 20, -1, 22, 23, 24, -1, 154, -1, - 28, 157, 30, -1, 160, -1, 162, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 154, -1, -1, 157, -1, -1, 160, - -1, 162, -1, 81, 82, 83, 84, 85, 86, 87, - 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, -1, -1, -1, -1, -1, - -1, -1, 154, -1, -1, 157, -1, -1, 160, -1, - 162, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 128, -1, 130, 131, 132, 133, 134, -1, 136, 137, - 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 151, -1, -1, -1, -1, -1, 157, - -1, -1, 160, -1, 162, -1, -1, 165, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 26, -1, 28, + -1, 28, -1, 30, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, + 19, 20, -1, -1, -1, -1, -1, -1, -1, 28, -1, 30, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 40, -1, -1, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, + 19, 20, -1, -1, -1, -1, -1, 153, -1, 28, + 156, 30, -1, 159, -1, 161, 162, 3, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, 19, 20, -1, -1, -1, -1, -1, + -1, -1, 28, -1, 30, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 40, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 153, -1, -1, 156, + -1, -1, 159, -1, 161, 162, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + -1, -1, 19, 20, 153, -1, -1, 156, -1, -1, + 159, 28, 161, 30, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 40, -1, -1, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + -1, -1, 19, 20, 153, -1, -1, 156, -1, 158, + 159, 28, 161, 30, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, + 19, 20, -1, -1, -1, -1, -1, 153, -1, 28, + 156, 30, -1, 159, -1, 161, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + -1, -1, 19, 20, -1, -1, -1, -1, -1, -1, + -1, 28, -1, 30, -1, -1, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + -1, -1, 19, 20, -1, -1, 153, -1, -1, 156, + -1, 28, 159, 30, 161, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 63, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 153, -1, -1, 156, + -1, -1, 159, -1, 161, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 81, 82, 83, 84, 85, 86, 87, 88, - 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, - 99, 100, 101, 102, -1, -1, -1, 17, 18, -1, - -1, 21, 22, 23, 24, 25, 26, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 128, - -1, 130, 131, 132, 133, 134, -1, 136, 137, 138, - 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, - 149, 150, 151, 63, -1, -1, -1, -1, -1, -1, - -1, 160, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, - 100, 101, 102, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 153, -1, -1, 156, -1, -1, + 159, -1, 161, -1, 19, 20, -1, 22, 23, 24, + -1, -1, -1, 28, -1, 30, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 153, -1, -1, 156, + -1, -1, 159, -1, 161, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 128, -1, - 130, 131, 132, 133, 134, -1, 136, 137, 138, 139, - 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, - 150, 151, 39, -1, -1, -1, -1, -1, -1, -1, - 160, -1, -1, 50, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 61, 62, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 153, -1, -1, 156, + -1, -1, 159, -1, 161, 80, 81, 82, 83, 84, + 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, + 95, 96, 97, 98, 99, 100, 101, -1, -1, -1, + -1, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, -1, 28, -1, 30, -1, -1, -1, -1, -1, + -1, -1, 127, -1, 129, 130, 131, 132, 133, -1, + 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, + 145, 146, 147, 148, 149, 150, 62, -1, -1, -1, + -1, 156, -1, -1, 159, -1, 161, -1, -1, 164, + -1, -1, -1, -1, 80, 81, 82, 83, 84, 85, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 101, -1, -1, -1, -1, + 17, 18, -1, -1, 21, 22, 23, 24, 25, 26, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 77, -1, -1, -1, 81, 82, 83, 84, 85, 86, + -1, 127, -1, 129, 130, 131, 132, 133, -1, 135, + 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, + 146, 147, 148, 149, 150, 62, -1, -1, -1, -1, + -1, -1, -1, 159, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, - 97, 98, 99, 100, 101, 102, -1, -1, -1, -1, + 97, 98, 99, 100, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 123, 124, 125, -1, - -1, 128, 129, 130, 131, 132, 133, 134, 135, 136, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 127, -1, 129, 130, 131, 132, 133, -1, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, - 147, 148, 149, 150, 151 + 147, 148, 149, 150, 38, -1, -1, -1, -1, -1, + -1, -1, 159, -1, -1, 49, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 60, 61, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 76, -1, -1, -1, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 122, 123, + 124, -1, -1, 127, 128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, + 144, 145, 146, 147, 148, 149, 150 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const unsigned char yystos[] = { - 0, 200, 201, 203, 0, 31, 34, 35, 43, 44, - 45, 46, 47, 48, 49, 64, 181, 216, 218, 220, - 28, 30, 52, 60, 64, 180, 209, 220, 46, 48, - 219, 181, 63, 66, 67, 68, 69, 70, 71, 72, - 182, 214, 29, 226, 227, 228, 53, 54, 55, 73, - 206, 152, 63, 27, 46, 48, 51, 59, 181, 202, - 152, 214, 214, 30, 204, 18, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 19, 20, 154, 157, 160, 162, 167, 189, 190, 191, - 192, 193, 209, 223, 32, 162, 215, 33, 163, 217, - 227, 74, 75, 76, 78, 79, 80, 180, 229, 230, - 232, 152, 152, 152, 152, 157, 207, 204, 189, 36, - 37, 199, 199, 199, 199, 215, 18, 18, 18, 162, - 3, 163, 193, 194, 209, 155, 164, 3, 191, 225, - 4, 15, 5, 6, 7, 8, 9, 10, 11, 12, - 176, 177, 178, 39, 50, 61, 62, 77, 81, 82, - 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, - 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, - 123, 124, 125, 128, 129, 130, 131, 132, 133, 134, - 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, - 145, 146, 147, 148, 149, 150, 151, 169, 170, 171, - 174, 175, 236, 237, 239, 240, 30, 56, 57, 205, - 18, 30, 30, 208, 191, 191, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 176, 177, 179, - 191, 196, 191, 158, 158, 163, 194, 153, 163, 155, - 41, 194, 195, 17, 18, 21, 22, 23, 24, 25, - 26, 63, 101, 102, 128, 130, 136, 137, 138, 160, - 169, 170, 171, 174, 175, 197, 222, 223, 224, 224, - 224, 224, 225, 61, 182, 103, 104, 105, 106, 107, - 108, 119, 120, 121, 122, 172, 25, 26, 109, 110, - 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 173, 191, 191, 225, 191, 191, 233, 225, - 225, 225, 225, 225, 191, 191, 191, 225, 225, 182, - 126, 127, 153, 159, 153, 187, 187, 25, 26, 17, - 18, 168, 18, 21, 22, 23, 24, 157, 160, 162, - 165, 197, 223, 187, 187, 193, 193, 161, 163, 193, - 41, 191, 211, 212, 213, 153, 156, 65, 221, 172, - 173, 155, 155, 155, 155, 155, 196, 198, 155, 155, - 155, 155, 155, 153, 153, 189, 191, 191, 153, 184, - 153, 184, 224, 157, 153, 153, 153, 153, 153, 153, - 224, 224, 224, 153, 40, 189, 191, 225, 30, 38, - 58, 185, 188, 159, 198, 198, 163, 198, 30, 159, - 161, 161, 209, 210, 153, 156, 41, 30, 155, 155, - 196, 196, 196, 196, 196, 153, 161, 196, 196, 196, - 196, 196, 15, 15, 224, 224, 224, 10, 58, 10, - 153, 238, 224, 157, 225, 191, 225, 225, 225, 153, - 153, 153, 225, 191, 224, 224, 153, 30, 18, 187, - 159, 161, 163, 41, 211, 185, 186, 153, 196, 196, - 238, 153, 153, 153, 153, 196, 153, 153, 153, 153, - 40, 224, 224, 155, 153, 153, 224, 18, 224, 225, - 234, 153, 224, 153, 153, 153, 224, 224, 224, 155, - 191, 58, 183, 30, 153, 153, 156, 196, 196, 196, - 196, 196, 196, 196, 196, 191, 153, 157, 234, 235, - 224, 224, 153, 184, 184, 153, 224, 153, 225, 225, - 225, 235, 224, 18, 196, 196, 153, 156, 153, 153, - 156, 156, 156, 156, 156, 15, 159, 178, 231, 156, - 225, 159, 224, 156, 156, 156, 196, 196, 196, 224, - 222, 159, 178, 40, 159, 156, 156, 156, 153, 222, - 15, 15, 153, 224, 224, 15, 229, 224, 15, 224 + 0, 199, 200, 202, 0, 31, 34, 42, 43, 44, + 45, 46, 47, 48, 63, 180, 215, 217, 219, 28, + 30, 51, 59, 63, 179, 208, 219, 45, 47, 218, + 62, 65, 66, 67, 68, 69, 70, 71, 181, 213, + 29, 225, 226, 227, 52, 53, 54, 72, 205, 151, + 62, 27, 45, 47, 50, 58, 180, 201, 151, 213, + 30, 203, 18, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 19, 20, 153, + 156, 159, 161, 166, 188, 189, 190, 191, 192, 208, + 222, 32, 161, 214, 33, 162, 216, 226, 73, 74, + 75, 77, 78, 79, 179, 228, 229, 231, 151, 151, + 151, 151, 156, 206, 203, 188, 35, 36, 198, 198, + 198, 198, 18, 18, 18, 161, 3, 162, 192, 193, + 208, 154, 163, 3, 190, 224, 4, 15, 5, 6, + 7, 8, 9, 10, 11, 12, 175, 176, 177, 38, + 49, 60, 61, 76, 80, 81, 82, 83, 84, 85, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 101, 122, 123, 124, 127, + 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, + 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, + 148, 149, 150, 168, 169, 170, 173, 174, 235, 236, + 238, 239, 30, 55, 56, 204, 18, 30, 30, 207, + 190, 190, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 175, 176, 178, 190, 195, 190, 157, + 157, 162, 193, 152, 162, 154, 40, 193, 194, 17, + 18, 21, 22, 23, 24, 25, 26, 62, 100, 101, + 127, 129, 135, 136, 137, 159, 168, 169, 170, 173, + 174, 196, 221, 222, 223, 223, 223, 223, 224, 60, + 181, 102, 103, 104, 105, 106, 107, 118, 119, 120, + 121, 171, 25, 26, 108, 109, 110, 111, 112, 113, + 114, 115, 116, 117, 118, 119, 120, 121, 172, 190, + 190, 224, 190, 190, 232, 224, 224, 224, 224, 224, + 190, 190, 190, 224, 224, 181, 125, 126, 152, 158, + 152, 186, 186, 25, 26, 17, 18, 167, 18, 21, + 22, 23, 24, 156, 159, 161, 164, 196, 222, 186, + 186, 192, 192, 160, 162, 192, 40, 190, 210, 211, + 212, 152, 155, 64, 220, 171, 172, 154, 154, 154, + 154, 154, 195, 197, 154, 154, 154, 154, 154, 152, + 152, 188, 190, 190, 152, 183, 152, 183, 223, 156, + 152, 152, 152, 152, 152, 152, 223, 223, 223, 152, + 39, 188, 190, 224, 30, 37, 57, 184, 187, 158, + 197, 197, 162, 197, 30, 158, 160, 160, 208, 209, + 152, 155, 40, 30, 154, 154, 195, 195, 195, 195, + 195, 152, 160, 195, 195, 195, 195, 195, 15, 15, + 223, 223, 223, 10, 57, 10, 152, 237, 223, 156, + 224, 190, 224, 224, 224, 152, 152, 152, 224, 190, + 223, 223, 152, 30, 18, 186, 158, 160, 162, 40, + 210, 184, 185, 152, 195, 195, 237, 152, 152, 152, + 152, 195, 152, 152, 152, 152, 39, 223, 223, 154, + 152, 152, 223, 18, 223, 224, 233, 152, 223, 152, + 152, 152, 223, 223, 223, 154, 190, 57, 182, 30, + 152, 152, 155, 195, 195, 195, 195, 195, 195, 195, + 195, 190, 152, 156, 233, 234, 223, 223, 152, 183, + 183, 152, 223, 152, 224, 224, 224, 234, 223, 18, + 195, 195, 152, 155, 152, 152, 155, 155, 155, 155, + 155, 15, 158, 177, 230, 155, 224, 158, 223, 155, + 155, 155, 195, 195, 195, 223, 221, 158, 177, 39, + 158, 155, 155, 155, 152, 221, 15, 15, 152, 223, + 223, 15, 228, 223, 15, 223 }; #define yyerrok (yyerrstatus = 0) @@ -2419,26 +2408,26 @@ yyreduce: switch (yyn) { case 81: -#line 363 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 368 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[-1].String); ;} break; case 82: -#line 366 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 371 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(""); ;} break; case 90: -#line 373 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 378 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(""); ;} break; case 97: -#line 378 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 383 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2447,27 +2436,27 @@ yyreduce: break; case 98: -#line 383 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 388 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(""); ;} break; case 99: -#line 388 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 393 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 100: -#line 389 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 394 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); (yyval.String) = (yyvsp[-1].String); ;} break; case 101: -#line 392 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 397 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 102: -#line 393 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 398 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, ", "); *(yyvsp[-1].String) += " " + *(yyvsp[0].String); @@ -2477,7 +2466,7 @@ yyreduce: break; case 103: -#line 401 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 406 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2486,17 +2475,17 @@ yyreduce: break; case 104: -#line 407 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 412 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 106: -#line 411 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 416 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 107: -#line 412 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 417 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, ", "); if (!(yyvsp[0].String)->empty()) @@ -2507,7 +2496,7 @@ yyreduce: break; case 109: -#line 422 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 427 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2516,7 +2505,7 @@ yyreduce: break; case 127: -#line 444 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 449 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Type).newTy = (yyvsp[0].String); (yyval.Type).oldTy = OpaqueTy; @@ -2524,7 +2513,7 @@ yyreduce: break; case 128: -#line 448 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 453 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Type).newTy = (yyvsp[0].String); (yyval.Type).oldTy = UnresolvedTy; @@ -2532,14 +2521,14 @@ yyreduce: break; case 129: -#line 452 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 457 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Type) = (yyvsp[0].Type); ;} break; case 130: -#line 455 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 460 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Type UpReference (yyvsp[0].String)->insert(0, "\\"); (yyval.Type).newTy = (yyvsp[0].String); @@ -2548,7 +2537,7 @@ yyreduce: break; case 131: -#line 460 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 465 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Function derived type? *(yyvsp[-3].Type).newTy += "( " + *(yyvsp[-1].String) + " )"; delete (yyvsp[-1].String); @@ -2558,7 +2547,7 @@ yyreduce: break; case 132: -#line 466 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 471 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Sized array type? (yyvsp[-3].String)->insert(0,"[ "); *(yyvsp[-3].String) += " x " + *(yyvsp[-1].Type).newTy + " ]"; @@ -2570,7 +2559,7 @@ yyreduce: break; case 133: -#line 474 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 479 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Packed array type? (yyvsp[-3].String)->insert(0,"< "); *(yyvsp[-3].String) += " x " + *(yyvsp[-1].Type).newTy + " >"; @@ -2582,7 +2571,7 @@ yyreduce: break; case 134: -#line 482 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 487 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Structure type? (yyvsp[-1].String)->insert(0, "{ "); *(yyvsp[-1].String) += " }"; @@ -2592,7 +2581,7 @@ yyreduce: break; case 135: -#line 488 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 493 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Empty structure type? (yyval.Type).newTy = new std::string("{}"); (yyval.Type).oldTy = StructTy; @@ -2600,7 +2589,7 @@ yyreduce: break; case 136: -#line 492 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 497 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Packed Structure type? (yyvsp[-2].String)->insert(0, "<{ "); *(yyvsp[-2].String) += " }>"; @@ -2610,7 +2599,7 @@ yyreduce: break; case 137: -#line 498 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 503 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Empty packed structure type? (yyval.Type).newTy = new std::string("<{}>"); (yyval.Type).oldTy = StructTy; @@ -2618,7 +2607,7 @@ yyreduce: break; case 138: -#line 502 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 507 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Pointer type? *(yyvsp[-1].Type).newTy += '*'; (yyval.Type).elemTy = (yyvsp[-1].Type).oldTy; @@ -2628,14 +2617,14 @@ yyreduce: break; case 139: -#line 513 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 518 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].Type).newTy; ;} break; case 140: -#line 516 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 521 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].Type).newTy; delete (yyvsp[0].Type).newTy; @@ -2644,7 +2633,7 @@ yyreduce: break; case 142: -#line 525 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 530 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", ..."; delete (yyvsp[0].String); @@ -2653,21 +2642,21 @@ yyreduce: break; case 143: -#line 530 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 535 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; case 144: -#line 533 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 538 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 145: -#line 543 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 548 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Nonempty unsized arr (yyval.Const).type = (yyvsp[-3].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy); @@ -2677,7 +2666,7 @@ yyreduce: break; case 146: -#line 549 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 554 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-2].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy); @@ -2686,7 +2675,7 @@ yyreduce: break; case 147: -#line 554 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 559 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-2].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy); @@ -2696,7 +2685,7 @@ yyreduce: break; case 148: -#line 560 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 565 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Nonempty unsized arr (yyval.Const).type = (yyvsp[-3].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy); @@ -2706,7 +2695,7 @@ yyreduce: break; case 149: -#line 566 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 571 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-3].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy); @@ -2716,7 +2705,7 @@ yyreduce: break; case 150: -#line 572 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 577 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-2].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy); @@ -2725,7 +2714,7 @@ yyreduce: break; case 151: -#line 577 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 582 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2735,7 +2724,7 @@ yyreduce: break; case 152: -#line 583 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 588 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2745,7 +2734,7 @@ yyreduce: break; case 153: -#line 589 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 594 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2755,7 +2744,7 @@ yyreduce: break; case 154: -#line 595 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 600 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2765,7 +2754,7 @@ yyreduce: break; case 155: -#line 601 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 606 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2775,7 +2764,7 @@ yyreduce: break; case 156: -#line 607 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 612 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // integral constants (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2785,7 +2774,7 @@ yyreduce: break; case 157: -#line 613 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 618 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // integral constants (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2795,7 +2784,7 @@ yyreduce: break; case 158: -#line 619 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 624 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Boolean constants (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2805,7 +2794,7 @@ yyreduce: break; case 159: -#line 625 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 630 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Boolean constants (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2815,7 +2804,7 @@ yyreduce: break; case 160: -#line 631 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 636 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Float & Double constants (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2825,7 +2814,7 @@ yyreduce: break; case 161: -#line 639 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 644 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { std::string source = *(yyvsp[-3].Const).cnst; TypeInfo DstTy = (yyvsp[-1].Type); @@ -2843,7 +2832,7 @@ yyreduce: break; case 162: -#line 653 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 658 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-4].String) += "(" + *(yyvsp[-2].Const).cnst; for (unsigned i = 0; i < (yyvsp[-1].ValList)->size(); ++i) { @@ -2859,7 +2848,7 @@ yyreduce: break; case 163: -#line 665 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 670 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -2868,7 +2857,7 @@ yyreduce: break; case 164: -#line 670 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 675 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { const char* op = getDivRemOpcode(*(yyvsp[-5].String), (yyvsp[-3].Const).type); (yyval.String) = new std::string(op); @@ -2878,7 +2867,7 @@ yyreduce: break; case 165: -#line 676 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 681 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -2887,7 +2876,7 @@ yyreduce: break; case 166: -#line 681 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 686 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) = getCompareOp(*(yyvsp[-5].String), (yyvsp[-3].Const).type); *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; @@ -2897,7 +2886,7 @@ yyreduce: break; case 167: -#line 687 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 692 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-6].String) += "(" + *(yyvsp[-5].String) + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -2906,7 +2895,7 @@ yyreduce: break; case 168: -#line 692 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 697 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-6].String) += "(" + *(yyvsp[-5].String) + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -2915,7 +2904,7 @@ yyreduce: break; case 169: -#line 697 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 702 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { const char* shiftop = (yyvsp[-5].String)->c_str(); if (*(yyvsp[-5].String) == "shr") @@ -2927,7 +2916,7 @@ yyreduce: break; case 170: -#line 705 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 710 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -2936,7 +2925,7 @@ yyreduce: break; case 171: -#line 710 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 715 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -2945,7 +2934,7 @@ yyreduce: break; case 172: -#line 715 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 720 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -2954,7 +2943,7 @@ yyreduce: break; case 173: -#line 725 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 730 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].Const).cnst; (yyvsp[0].Const).destroy(); @@ -2963,25 +2952,25 @@ yyreduce: break; case 174: -#line 730 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 735 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(*(yyvsp[0].Const).cnst); (yyvsp[0].Const).destroy(); ;} break; case 177: -#line 745 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 750 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { ;} break; case 178: -#line 750 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 755 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; case 179: -#line 753 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 758 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << *(yyvsp[0].String) << '\n'; delete (yyvsp[0].String); @@ -2990,7 +2979,7 @@ yyreduce: break; case 180: -#line 758 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 763 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << "module asm " << ' ' << *(yyvsp[0].String) << '\n'; (yyval.String) = 0; @@ -2998,7 +2987,7 @@ yyreduce: break; case 181: -#line 762 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 767 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << "implementation\n"; (yyval.String) = 0; @@ -3006,17 +2995,17 @@ yyreduce: break; case 182: -#line 766 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 771 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; case 184: -#line 768 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 773 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); *(yyval.String) = "external"; ;} break; case 185: -#line 771 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 776 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { EnumeratedTypes.push_back((yyvsp[0].Type)); if (!(yyvsp[-2].String)->empty()) { @@ -3032,7 +3021,7 @@ yyreduce: break; case 186: -#line 783 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 788 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Function prototypes can be in const pool *O << *(yyvsp[0].String) << '\n'; delete (yyvsp[0].String); @@ -3041,7 +3030,7 @@ yyreduce: break; case 187: -#line 788 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 793 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Asm blocks can be in the const pool *O << *(yyvsp[-2].String) << ' ' << *(yyvsp[-1].String) << ' ' << *(yyvsp[0].String) << '\n'; delete (yyvsp[-2].String); delete (yyvsp[-1].String); delete (yyvsp[0].String); @@ -3050,7 +3039,7 @@ yyreduce: break; case 188: -#line 793 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 798 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) { *O << *(yyvsp[-4].String) << " = "; @@ -3063,7 +3052,7 @@ yyreduce: break; case 189: -#line 802 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 807 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) { *O << *(yyvsp[-4].String) << " = "; @@ -3076,7 +3065,7 @@ yyreduce: break; case 190: -#line 811 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 816 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) { *O << *(yyvsp[-4].String) << " = "; @@ -3089,7 +3078,7 @@ yyreduce: break; case 191: -#line 820 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 825 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) { *O << *(yyvsp[-4].String) << " = "; @@ -3102,7 +3091,7 @@ yyreduce: break; case 192: -#line 829 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 834 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << *(yyvsp[-1].String) << ' ' << *(yyvsp[0].String) << '\n'; delete (yyvsp[-1].String); delete (yyvsp[0].String); @@ -3111,7 +3100,7 @@ yyreduce: break; case 193: -#line 834 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 839 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << *(yyvsp[-2].String) << " = " << *(yyvsp[0].String) << '\n'; delete (yyvsp[-2].String); delete (yyvsp[0].String); @@ -3120,14 +3109,14 @@ yyreduce: break; case 194: -#line 839 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 844 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; case 198: -#line 849 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 854 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3136,7 +3125,7 @@ yyreduce: break; case 199: -#line 854 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 859 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); if (*(yyvsp[0].String) == "64") @@ -3147,7 +3136,7 @@ yyreduce: break; case 200: -#line 861 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 866 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3156,7 +3145,7 @@ yyreduce: break; case 201: -#line 866 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 871 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3165,7 +3154,7 @@ yyreduce: break; case 202: -#line 873 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 878 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, "[ "); *(yyvsp[-1].String) += " ]"; @@ -3174,7 +3163,7 @@ yyreduce: break; case 203: -#line 880 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 885 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3183,19 +3172,19 @@ yyreduce: break; case 205: -#line 886 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 891 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 209: -#line 895 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 900 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 210: -#line 897 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 902 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[-1].Type).newTy; if (!(yyvsp[0].String)->empty()) @@ -3205,7 +3194,7 @@ yyreduce: break; case 211: -#line 904 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 909 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3213,21 +3202,21 @@ yyreduce: break; case 212: -#line 908 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 913 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; case 213: -#line 912 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 917 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; case 214: -#line 915 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 920 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", ..."; (yyval.String) = (yyvsp[-2].String); @@ -3236,19 +3225,19 @@ yyreduce: break; case 215: -#line 920 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 925 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; case 216: -#line 923 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 928 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 217: -#line 926 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 931 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-7].String)->empty()) { *(yyvsp[-7].String) += " "; @@ -3270,17 +3259,17 @@ yyreduce: break; case 218: -#line 945 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 950 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string("{"); delete (yyvsp[0].String); ;} break; case 219: -#line 946 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 951 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string ("{"); ;} break; case 220: -#line 949 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 954 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << "define "; if (!(yyvsp[-2].String)->empty()) { @@ -3293,45 +3282,32 @@ yyreduce: break; case 221: -#line 958 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" - { - *O << *(yyvsp[-3].String) << ' '; - if (!(yyvsp[-2].String)->empty()) { - *O << *(yyvsp[-2].String) << ' '; - } - *O << *(yyvsp[-1].String) << ' ' << *(yyvsp[0].String) << '\n'; - delete (yyvsp[-3].String); delete (yyvsp[-2].String); delete (yyvsp[-1].String); delete (yyvsp[0].String); - (yyval.String) = 0; - ;} - break; - - case 222: -#line 969 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 965 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string("}"); delete (yyvsp[0].String); ;} break; - case 223: -#line 970 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 222: +#line 966 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string("}"); ;} break; - case 224: -#line 972 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 223: +#line 968 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if ((yyvsp[-1].String)) *O << *(yyvsp[-1].String); - *O << '\n' << *(yyvsp[0].String) << '\n'; + *O << *(yyvsp[0].String) << "\n\n"; (yyval.String) = 0; ;} break; - case 225: -#line 980 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 224: +#line 976 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 228: -#line 986 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 227: +#line 982 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-1].String)->empty()) *(yyvsp[-2].String) += " " + *(yyvsp[-1].String); @@ -3342,13 +3318,13 @@ yyreduce: ;} break; - case 229: -#line 999 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 228: +#line 995 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 239: -#line 1005 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 238: +#line 1001 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, "<"); *(yyvsp[-1].String) += ">"; @@ -3356,8 +3332,8 @@ yyreduce: ;} break; - case 241: -#line 1011 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 240: +#line 1007 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-3].String)->empty()) { *(yyvsp[-4].String) += " " + *(yyvsp[-3].String); @@ -3368,8 +3344,8 @@ yyreduce: ;} break; - case 244: -#line 1024 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 243: +#line 1020 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Value).val = (yyvsp[0].String); (yyval.Value).constant = false; @@ -3378,8 +3354,8 @@ yyreduce: ;} break; - case 245: -#line 1030 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 244: +#line 1026 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Value).val = (yyvsp[0].String); (yyval.Value).constant = true; @@ -3388,8 +3364,8 @@ yyreduce: ;} break; - case 246: -#line 1041 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 245: +#line 1037 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Value) = (yyvsp[0].Value); (yyval.Value).type = (yyvsp[-1].Type); @@ -3397,29 +3373,29 @@ yyreduce: ;} break; - case 247: -#line 1047 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 246: +#line 1043 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; - case 248: -#line 1050 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 247: +#line 1046 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Do not allow functions with 0 basic blocks (yyval.String) = 0; ;} break; - case 249: -#line 1058 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 248: +#line 1054 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; - case 250: -#line 1062 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 249: +#line 1058 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[0].String) << '\n'; delete (yyvsp[0].String); @@ -3427,15 +3403,15 @@ yyreduce: ;} break; - case 251: -#line 1067 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 250: +#line 1063 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; - case 252: -#line 1070 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 251: +#line 1066 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << *(yyvsp[0].String) << '\n'; delete (yyvsp[0].String); @@ -3443,13 +3419,13 @@ yyreduce: ;} break; - case 254: -#line 1076 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 253: +#line 1072 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); *(yyval.String) = "unwind"; ;} break; - case 255: -#line 1078 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 254: +#line 1074 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Return with a result... *O << " " << *(yyvsp[-1].String) << ' ' << *(yyvsp[0].Value).val << '\n'; delete (yyvsp[-1].String); (yyvsp[0].Value).destroy(); @@ -3457,8 +3433,8 @@ yyreduce: ;} break; - case 256: -#line 1083 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 255: +#line 1079 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Return with no result... *O << " " << *(yyvsp[-1].String) << ' ' << *(yyvsp[0].Type).newTy << '\n'; delete (yyvsp[-1].String); (yyvsp[0].Type).destroy(); @@ -3466,8 +3442,8 @@ yyreduce: ;} break; - case 257: -#line 1088 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 256: +#line 1084 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Unconditional Branch... *O << " " << *(yyvsp[-2].String) << ' ' << *(yyvsp[-1].Type).newTy << ' ' << *(yyvsp[0].Value).val << '\n'; delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); (yyvsp[0].Value).destroy(); @@ -3475,8 +3451,8 @@ yyreduce: ;} break; - case 258: -#line 1093 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 257: +#line 1089 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[-8].String) << ' ' << *(yyvsp[-7].Type).newTy << ' ' << *(yyvsp[-6].Value).val << ", " << *(yyvsp[-4].Type).newTy << ' ' << *(yyvsp[-3].Value).val << ", " << *(yyvsp[-1].Type).newTy << ' ' @@ -3487,8 +3463,8 @@ yyreduce: ;} break; - case 259: -#line 1101 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 258: +#line 1097 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[-8].String) << ' ' << *(yyvsp[-7].Type).newTy << ' ' << *(yyvsp[-6].Value).val << ", " << *(yyvsp[-4].Type).newTy << ' ' << *(yyvsp[-3].Value).val << " [" << *(yyvsp[-1].String) << " ]\n"; @@ -3498,8 +3474,8 @@ yyreduce: ;} break; - case 260: -#line 1108 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 259: +#line 1104 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[-7].String) << ' ' << *(yyvsp[-6].Type).newTy << ' ' << *(yyvsp[-5].Value).val << ", " << *(yyvsp[-3].Type).newTy << ' ' << *(yyvsp[-2].Value).val << "[]\n"; @@ -3508,8 +3484,8 @@ yyreduce: ;} break; - case 261: -#line 1115 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 260: +#line 1111 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << " "; if (!(yyvsp[-13].String)->empty()) @@ -3531,8 +3507,17 @@ yyreduce: ;} break; + case 261: +#line 1130 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + { + *O << " " << *(yyvsp[0].String) << '\n'; + delete (yyvsp[0].String); + (yyval.String) = 0; + ;} + break; + case 262: -#line 1134 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1135 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[0].String) << '\n'; delete (yyvsp[0].String); @@ -3541,16 +3526,7 @@ yyreduce: break; case 263: -#line 1139 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" - { - *O << " " << *(yyvsp[0].String) << '\n'; - delete (yyvsp[0].String); - (yyval.String) = 0; - ;} - break; - - case 264: -#line 1145 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1141 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + " " + *(yyvsp[-3].String) + ", " + *(yyvsp[-1].Type).newTy + " " + *(yyvsp[0].Value).val; (yyvsp[-4].Type).destroy(); delete (yyvsp[-3].String); (yyvsp[-1].Type).destroy(); (yyvsp[0].Value).destroy(); @@ -3558,8 +3534,8 @@ yyreduce: ;} break; - case 265: -#line 1150 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 264: +#line 1146 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-3].String)->insert(0, *(yyvsp[-4].Type).newTy + " " ); *(yyvsp[-3].String) += ", " + *(yyvsp[-1].Type).newTy + " " + *(yyvsp[0].Value).val; @@ -3568,8 +3544,8 @@ yyreduce: ;} break; - case 266: -#line 1158 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 265: +#line 1154 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-1].String)->empty()) *(yyvsp[-1].String) += " = "; @@ -3579,8 +3555,8 @@ yyreduce: ;} break; - case 267: -#line 1167 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 266: +#line 1163 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Used for PHI nodes (yyvsp[-3].Value).val->insert(0, *(yyvsp[-5].Type).newTy + "["); *(yyvsp[-3].Value).val += "," + *(yyvsp[-1].Value).val + "]"; @@ -3590,8 +3566,8 @@ yyreduce: ;} break; - case 268: -#line 1174 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 267: +#line 1170 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-6].String) += ", [" + *(yyvsp[-3].Value).val + "," + *(yyvsp[-1].Value).val + "]"; (yyvsp[-3].Value).destroy(); (yyvsp[-1].Value).destroy(); @@ -3599,34 +3575,34 @@ yyreduce: ;} break; - case 269: -#line 1182 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 268: +#line 1178 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = new ValueList(); (yyval.ValList)->push_back((yyvsp[0].Value)); ;} break; - case 270: -#line 1186 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 269: +#line 1182 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-2].ValList)->push_back((yyvsp[0].Value)); (yyval.ValList) = (yyvsp[-2].ValList); ;} break; - case 271: -#line 1193 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 270: +#line 1189 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = (yyvsp[0].ValList); ;} break; - case 272: -#line 1194 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 271: +#line 1190 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = new ValueList(); ;} break; - case 273: -#line 1198 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 272: +#line 1194 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3634,8 +3610,8 @@ yyreduce: ;} break; - case 275: -#line 1206 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 274: +#line 1202 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { const char* op = getDivRemOpcode(*(yyvsp[-4].String), (yyvsp[-3].Type)); (yyval.String) = new std::string(op); @@ -3644,8 +3620,8 @@ yyreduce: ;} break; - case 276: -#line 1212 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 275: +#line 1208 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-3].Type).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3653,8 +3629,8 @@ yyreduce: ;} break; - case 277: -#line 1217 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 276: +#line 1213 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-4].String) = getCompareOp(*(yyvsp[-4].String), (yyvsp[-3].Type)); *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; @@ -3663,8 +3639,17 @@ yyreduce: ;} break; + case 277: +#line 1219 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + { + *(yyvsp[-5].String) += " " + *(yyvsp[-4].String) + " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + "," + *(yyvsp[0].Value).val; + delete (yyvsp[-4].String); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); + (yyval.String) = (yyvsp[-5].String); + ;} + break; + case 278: -#line 1223 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1224 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].String) + " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + "," + *(yyvsp[0].Value).val; delete (yyvsp[-4].String); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3673,16 +3658,7 @@ yyreduce: break; case 279: -#line 1228 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" - { - *(yyvsp[-5].String) += " " + *(yyvsp[-4].String) + " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + "," + *(yyvsp[0].Value).val; - delete (yyvsp[-4].String); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); - (yyval.String) = (yyvsp[-5].String); - ;} - break; - - case 280: -#line 1233 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1229 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val; (yyvsp[0].Value).destroy(); @@ -3690,8 +3666,8 @@ yyreduce: ;} break; - case 281: -#line 1238 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 280: +#line 1234 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { const char* shiftop = (yyvsp[-3].String)->c_str(); if (*(yyvsp[-3].String) == "shr") @@ -3702,8 +3678,8 @@ yyreduce: ;} break; - case 282: -#line 1246 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 281: +#line 1242 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { std::string source = *(yyvsp[-2].Value).val; TypeInfo SrcTy = (yyvsp[-2].Value).type; @@ -3720,8 +3696,8 @@ yyreduce: ;} break; - case 283: -#line 1260 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 282: +#line 1256 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3729,8 +3705,8 @@ yyreduce: ;} break; - case 284: -#line 1265 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 283: +#line 1261 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Type).newTy; (yyvsp[-2].Value).destroy(); (yyvsp[0].Type).destroy(); @@ -3738,8 +3714,8 @@ yyreduce: ;} break; - case 285: -#line 1270 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 284: +#line 1266 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3747,8 +3723,17 @@ yyreduce: ;} break; + case 285: +#line 1271 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + { + *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; + (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); + (yyval.String) = (yyvsp[-5].String); + ;} + break; + case 286: -#line 1275 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1276 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3757,16 +3742,7 @@ yyreduce: break; case 287: -#line 1280 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" - { - *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; - (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); - (yyval.String) = (yyvsp[-5].String); - ;} - break; - - case 288: -#line 1285 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1281 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3774,8 +3750,8 @@ yyreduce: ;} break; - case 289: -#line 1290 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 288: +#line 1286 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-5].String)->empty()) *(yyvsp[-6].String) += " " + *(yyvsp[-5].String); @@ -3795,23 +3771,23 @@ yyreduce: ;} break; - case 291: -#line 1312 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 290: +#line 1308 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = (yyvsp[0].ValList); ;} break; - case 292: -#line 1313 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 291: +#line 1309 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = new ValueList(); ;} break; - case 294: -#line 1318 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 293: +#line 1314 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 295: -#line 1321 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 294: +#line 1317 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy; if (!(yyvsp[0].String)->empty()) @@ -3821,19 +3797,19 @@ yyreduce: ;} break; + case 295: +#line 1324 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + { + *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].Value).val; + if (!(yyvsp[0].String)->empty()) + *(yyvsp[-5].String) += " " + *(yyvsp[0].String); + (yyvsp[-4].Type).destroy(); (yyvsp[-2].Type).destroy(); (yyvsp[-1].Value).destroy(); delete (yyvsp[0].String); + (yyval.String) = (yyvsp[-5].String); + ;} + break; + case 296: -#line 1328 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" - { - *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].Value).val; - if (!(yyvsp[0].String)->empty()) - *(yyvsp[-5].String) += " " + *(yyvsp[0].String); - (yyvsp[-4].Type).destroy(); (yyvsp[-2].Type).destroy(); (yyvsp[-1].Value).destroy(); delete (yyvsp[0].String); - (yyval.String) = (yyvsp[-5].String); - ;} - break; - - case 297: -#line 1335 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1331 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy; if (!(yyvsp[0].String)->empty()) @@ -3843,8 +3819,8 @@ yyreduce: ;} break; - case 298: -#line 1342 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 297: +#line 1338 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].Value).val; if (!(yyvsp[0].String)->empty()) @@ -3854,8 +3830,8 @@ yyreduce: ;} break; - case 299: -#line 1349 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 298: +#line 1345 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val; (yyvsp[0].Value).destroy(); @@ -3863,8 +3839,8 @@ yyreduce: ;} break; - case 300: -#line 1354 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 299: +#line 1350 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-3].String)->empty()) *(yyvsp[-3].String) += " "; @@ -3874,8 +3850,8 @@ yyreduce: ;} break; - case 301: -#line 1361 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 300: +#line 1357 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-5].String)->empty()) *(yyvsp[-5].String) += " "; @@ -3885,8 +3861,8 @@ yyreduce: ;} break; - case 302: -#line 1368 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 301: +#line 1364 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Upgrade the indices for (unsigned i = 0; i < (yyvsp[0].ValList)->size(); ++i) { @@ -3895,8 +3871,8 @@ yyreduce: VI.type.getBitWidth() < 64) { std::string* old = VI.val; *O << " %gep_upgrade" << unique << " = zext " << *old - << " to ulong\n"; - VI.val = new std::string("ulong %gep_upgrade" + llvm::utostr(unique++)); + << " to i64\n"; + VI.val = new std::string("i64 %gep_upgrade" + llvm::utostr(unique++)); VI.type.oldTy = ULongTy; delete old; } @@ -3917,7 +3893,7 @@ yyreduce: } /* Line 1126 of yacc.c. */ -#line 3921 "UpgradeParser.tab.c" +#line 3897 "UpgradeParser.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -4185,7 +4161,7 @@ yyreturn: } -#line 1392 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1388 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" int yyerror(const char *ErrorMsg) { @@ -4197,7 +4173,7 @@ int yyerror(const char *ErrorMsg) { errMsg += "end-of-file."; else errMsg += "token: '" + std::string(Upgradetext, Upgradeleng) + "'"; - std::cerr << errMsg << '\n'; + std::cerr << "llvm-upgrade: " << errMsg << '\n'; exit(1); } diff --git a/tools/llvm-upgrade/UpgradeParser.cpp.cvs b/tools/llvm-upgrade/UpgradeParser.cpp.cvs index 702bb09b427..a65dd09454d 100644 --- a/tools/llvm-upgrade/UpgradeParser.cpp.cvs +++ b/tools/llvm-upgrade/UpgradeParser.cpp.cvs @@ -96,123 +96,122 @@ BEGINTOK = 287, ENDTOK = 288, DECLARE = 289, - DEFINE = 290, - GLOBAL = 291, - CONSTANT = 292, - SECTION = 293, - VOLATILE = 294, - TO = 295, - DOTDOTDOT = 296, - CONST = 297, - INTERNAL = 298, - LINKONCE = 299, - WEAK = 300, - DLLIMPORT = 301, - DLLEXPORT = 302, - EXTERN_WEAK = 303, - APPENDING = 304, - NOT = 305, - EXTERNAL = 306, - TARGET = 307, - TRIPLE = 308, - ENDIAN = 309, - POINTERSIZE = 310, - LITTLE = 311, - BIG = 312, - ALIGN = 313, - UNINITIALIZED = 314, - DEPLIBS = 315, - CALL = 316, - TAIL = 317, - ASM_TOK = 318, - MODULE = 319, - SIDEEFFECT = 320, - CC_TOK = 321, - CCC_TOK = 322, - CSRETCC_TOK = 323, - FASTCC_TOK = 324, - COLDCC_TOK = 325, - X86_STDCALLCC_TOK = 326, - X86_FASTCALLCC_TOK = 327, - DATALAYOUT = 328, - RET = 329, - BR = 330, - SWITCH = 331, - INVOKE = 332, - EXCEPT = 333, - UNWIND = 334, - UNREACHABLE = 335, - ADD = 336, - SUB = 337, - MUL = 338, - DIV = 339, - UDIV = 340, - SDIV = 341, - FDIV = 342, - REM = 343, - UREM = 344, - SREM = 345, - FREM = 346, - AND = 347, - OR = 348, - XOR = 349, - SETLE = 350, - SETGE = 351, - SETLT = 352, - SETGT = 353, - SETEQ = 354, - SETNE = 355, - ICMP = 356, - FCMP = 357, - EQ = 358, - NE = 359, - SLT = 360, - SGT = 361, - SLE = 362, - SGE = 363, - OEQ = 364, - ONE = 365, - OLT = 366, - OGT = 367, - OLE = 368, - OGE = 369, - ORD = 370, - UNO = 371, - UEQ = 372, - UNE = 373, - ULT = 374, - UGT = 375, - ULE = 376, - UGE = 377, - MALLOC = 378, - ALLOCA = 379, - FREE = 380, - LOAD = 381, - STORE = 382, - GETELEMENTPTR = 383, - PHI_TOK = 384, - SELECT = 385, - SHL = 386, - SHR = 387, - ASHR = 388, - LSHR = 389, - VAARG = 390, - EXTRACTELEMENT = 391, - INSERTELEMENT = 392, - SHUFFLEVECTOR = 393, - CAST = 394, - TRUNC = 395, - ZEXT = 396, - SEXT = 397, - FPTRUNC = 398, - FPEXT = 399, - FPTOUI = 400, - FPTOSI = 401, - UITOFP = 402, - SITOFP = 403, - PTRTOINT = 404, - INTTOPTR = 405, - BITCAST = 406 + GLOBAL = 290, + CONSTANT = 291, + SECTION = 292, + VOLATILE = 293, + TO = 294, + DOTDOTDOT = 295, + CONST = 296, + INTERNAL = 297, + LINKONCE = 298, + WEAK = 299, + DLLIMPORT = 300, + DLLEXPORT = 301, + EXTERN_WEAK = 302, + APPENDING = 303, + NOT = 304, + EXTERNAL = 305, + TARGET = 306, + TRIPLE = 307, + ENDIAN = 308, + POINTERSIZE = 309, + LITTLE = 310, + BIG = 311, + ALIGN = 312, + UNINITIALIZED = 313, + DEPLIBS = 314, + CALL = 315, + TAIL = 316, + ASM_TOK = 317, + MODULE = 318, + SIDEEFFECT = 319, + CC_TOK = 320, + CCC_TOK = 321, + CSRETCC_TOK = 322, + FASTCC_TOK = 323, + COLDCC_TOK = 324, + X86_STDCALLCC_TOK = 325, + X86_FASTCALLCC_TOK = 326, + DATALAYOUT = 327, + RET = 328, + BR = 329, + SWITCH = 330, + INVOKE = 331, + EXCEPT = 332, + UNWIND = 333, + UNREACHABLE = 334, + ADD = 335, + SUB = 336, + MUL = 337, + DIV = 338, + UDIV = 339, + SDIV = 340, + FDIV = 341, + REM = 342, + UREM = 343, + SREM = 344, + FREM = 345, + AND = 346, + OR = 347, + XOR = 348, + SETLE = 349, + SETGE = 350, + SETLT = 351, + SETGT = 352, + SETEQ = 353, + SETNE = 354, + ICMP = 355, + FCMP = 356, + EQ = 357, + NE = 358, + SLT = 359, + SGT = 360, + SLE = 361, + SGE = 362, + OEQ = 363, + ONE = 364, + OLT = 365, + OGT = 366, + OLE = 367, + OGE = 368, + ORD = 369, + UNO = 370, + UEQ = 371, + UNE = 372, + ULT = 373, + UGT = 374, + ULE = 375, + UGE = 376, + MALLOC = 377, + ALLOCA = 378, + FREE = 379, + LOAD = 380, + STORE = 381, + GETELEMENTPTR = 382, + PHI_TOK = 383, + SELECT = 384, + SHL = 385, + SHR = 386, + ASHR = 387, + LSHR = 388, + VAARG = 389, + EXTRACTELEMENT = 390, + INSERTELEMENT = 391, + SHUFFLEVECTOR = 392, + CAST = 393, + TRUNC = 394, + ZEXT = 395, + SEXT = 396, + FPTRUNC = 397, + FPEXT = 398, + FPTOUI = 399, + FPTOSI = 400, + UITOFP = 401, + SITOFP = 402, + PTRTOINT = 403, + INTTOPTR = 404, + BITCAST = 405 }; #endif /* Tokens. */ @@ -248,129 +247,128 @@ #define BEGINTOK 287 #define ENDTOK 288 #define DECLARE 289 -#define DEFINE 290 -#define GLOBAL 291 -#define CONSTANT 292 -#define SECTION 293 -#define VOLATILE 294 -#define TO 295 -#define DOTDOTDOT 296 -#define CONST 297 -#define INTERNAL 298 -#define LINKONCE 299 -#define WEAK 300 -#define DLLIMPORT 301 -#define DLLEXPORT 302 -#define EXTERN_WEAK 303 -#define APPENDING 304 -#define NOT 305 -#define EXTERNAL 306 -#define TARGET 307 -#define TRIPLE 308 -#define ENDIAN 309 -#define POINTERSIZE 310 -#define LITTLE 311 -#define BIG 312 -#define ALIGN 313 -#define UNINITIALIZED 314 -#define DEPLIBS 315 -#define CALL 316 -#define TAIL 317 -#define ASM_TOK 318 -#define MODULE 319 -#define SIDEEFFECT 320 -#define CC_TOK 321 -#define CCC_TOK 322 -#define CSRETCC_TOK 323 -#define FASTCC_TOK 324 -#define COLDCC_TOK 325 -#define X86_STDCALLCC_TOK 326 -#define X86_FASTCALLCC_TOK 327 -#define DATALAYOUT 328 -#define RET 329 -#define BR 330 -#define SWITCH 331 -#define INVOKE 332 -#define EXCEPT 333 -#define UNWIND 334 -#define UNREACHABLE 335 -#define ADD 336 -#define SUB 337 -#define MUL 338 -#define DIV 339 -#define UDIV 340 -#define SDIV 341 -#define FDIV 342 -#define REM 343 -#define UREM 344 -#define SREM 345 -#define FREM 346 -#define AND 347 -#define OR 348 -#define XOR 349 -#define SETLE 350 -#define SETGE 351 -#define SETLT 352 -#define SETGT 353 -#define SETEQ 354 -#define SETNE 355 -#define ICMP 356 -#define FCMP 357 -#define EQ 358 -#define NE 359 -#define SLT 360 -#define SGT 361 -#define SLE 362 -#define SGE 363 -#define OEQ 364 -#define ONE 365 -#define OLT 366 -#define OGT 367 -#define OLE 368 -#define OGE 369 -#define ORD 370 -#define UNO 371 -#define UEQ 372 -#define UNE 373 -#define ULT 374 -#define UGT 375 -#define ULE 376 -#define UGE 377 -#define MALLOC 378 -#define ALLOCA 379 -#define FREE 380 -#define LOAD 381 -#define STORE 382 -#define GETELEMENTPTR 383 -#define PHI_TOK 384 -#define SELECT 385 -#define SHL 386 -#define SHR 387 -#define ASHR 388 -#define LSHR 389 -#define VAARG 390 -#define EXTRACTELEMENT 391 -#define INSERTELEMENT 392 -#define SHUFFLEVECTOR 393 -#define CAST 394 -#define TRUNC 395 -#define ZEXT 396 -#define SEXT 397 -#define FPTRUNC 398 -#define FPEXT 399 -#define FPTOUI 400 -#define FPTOSI 401 -#define UITOFP 402 -#define SITOFP 403 -#define PTRTOINT 404 -#define INTTOPTR 405 -#define BITCAST 406 +#define GLOBAL 290 +#define CONSTANT 291 +#define SECTION 292 +#define VOLATILE 293 +#define TO 294 +#define DOTDOTDOT 295 +#define CONST 296 +#define INTERNAL 297 +#define LINKONCE 298 +#define WEAK 299 +#define DLLIMPORT 300 +#define DLLEXPORT 301 +#define EXTERN_WEAK 302 +#define APPENDING 303 +#define NOT 304 +#define EXTERNAL 305 +#define TARGET 306 +#define TRIPLE 307 +#define ENDIAN 308 +#define POINTERSIZE 309 +#define LITTLE 310 +#define BIG 311 +#define ALIGN 312 +#define UNINITIALIZED 313 +#define DEPLIBS 314 +#define CALL 315 +#define TAIL 316 +#define ASM_TOK 317 +#define MODULE 318 +#define SIDEEFFECT 319 +#define CC_TOK 320 +#define CCC_TOK 321 +#define CSRETCC_TOK 322 +#define FASTCC_TOK 323 +#define COLDCC_TOK 324 +#define X86_STDCALLCC_TOK 325 +#define X86_FASTCALLCC_TOK 326 +#define DATALAYOUT 327 +#define RET 328 +#define BR 329 +#define SWITCH 330 +#define INVOKE 331 +#define EXCEPT 332 +#define UNWIND 333 +#define UNREACHABLE 334 +#define ADD 335 +#define SUB 336 +#define MUL 337 +#define DIV 338 +#define UDIV 339 +#define SDIV 340 +#define FDIV 341 +#define REM 342 +#define UREM 343 +#define SREM 344 +#define FREM 345 +#define AND 346 +#define OR 347 +#define XOR 348 +#define SETLE 349 +#define SETGE 350 +#define SETLT 351 +#define SETGT 352 +#define SETEQ 353 +#define SETNE 354 +#define ICMP 355 +#define FCMP 356 +#define EQ 357 +#define NE 358 +#define SLT 359 +#define SGT 360 +#define SLE 361 +#define SGE 362 +#define OEQ 363 +#define ONE 364 +#define OLT 365 +#define OGT 366 +#define OLE 367 +#define OGE 368 +#define ORD 369 +#define UNO 370 +#define UEQ 371 +#define UNE 372 +#define ULT 373 +#define UGT 374 +#define ULE 375 +#define UGE 376 +#define MALLOC 377 +#define ALLOCA 378 +#define FREE 379 +#define LOAD 380 +#define STORE 381 +#define GETELEMENTPTR 382 +#define PHI_TOK 383 +#define SELECT 384 +#define SHL 385 +#define SHR 386 +#define ASHR 387 +#define LSHR 388 +#define VAARG 389 +#define EXTRACTELEMENT 390 +#define INSERTELEMENT 391 +#define SHUFFLEVECTOR 392 +#define CAST 393 +#define TRUNC 394 +#define ZEXT 395 +#define SEXT 396 +#define FPTRUNC 397 +#define FPEXT 398 +#define FPTOUI 399 +#define FPTOSI 400 +#define UITOFP 401 +#define SITOFP 402 +#define PTRTOINT 403 +#define INTTOPTR 404 +#define BITCAST 405 /* Copy the first part of user declarations. */ -#line 14 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 14 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" #include "ParserInternals.h" #include @@ -394,6 +392,10 @@ std::istream* LexInput = 0; unsigned SizeOfPointer = 32; static uint64_t unique = 1; +// This bool controls whether attributes are ever added to function declarations +// definitions and calls. +static bool AddAttributes = false; + typedef std::vector TypeVector; static TypeVector EnumeratedTypes; typedef std::map TypeMap; @@ -410,12 +412,13 @@ void destroy(ValueList* VL) { } void UpgradeAssembly(const std::string &infile, std::istream& in, - std::ostream &out, bool debug) + std::ostream &out, bool debug, bool addAttrs) { Upgradelineno = 1; CurFilename = infile; LexInput = ∈ yydebug = debug; + AddAttributes = addAttrs; O = &out; if (yyparse()) { @@ -536,15 +539,15 @@ static std::string getCastUpgrade( // fp -> ptr cast is no longer supported but we must upgrade this // by doing a double cast: fp -> int -> ptr if (isConst) - Source = "ulong fptoui(" + Source + " to ulong)"; + Source = "i64 fptoui(" + Source + " to i64)"; else { *O << " %cast_upgrade" << unique << " = fptoui " << Source - << " to ulong\n"; - Source = "ulong %cast_upgrade" + llvm::utostr(unique); + << " to i64\n"; + Source = "i64 %cast_upgrade" + llvm::utostr(unique); } // Update the SrcTy for the getCastOpcode call below SrcTy.destroy(); - SrcTy.newTy = new std::string("ulong"); + SrcTy.newTy = new std::string("i64"); SrcTy.oldTy = ULongTy; } else if (DstTy.oldTy == BoolTy && SrcTy.oldTy != BoolTy) { // cast ptr %x to bool was previously defined as setne ptr %x, null @@ -649,7 +652,7 @@ getCompareOp(const std::string& setcc, const TypeInfo& TI) { #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 275 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 280 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" typedef union YYSTYPE { std::string* String; TypeInfo Type; @@ -658,7 +661,7 @@ typedef union YYSTYPE { ValueList* ValList; } YYSTYPE; /* Line 196 of yacc.c. */ -#line 662 "UpgradeParser.tab.c" +#line 665 "UpgradeParser.tab.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -670,7 +673,7 @@ typedef union YYSTYPE { /* Line 219 of yacc.c. */ -#line 674 "UpgradeParser.tab.c" +#line 677 "UpgradeParser.tab.c" #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) # define YYSIZE_T __SIZE_TYPE__ @@ -821,20 +824,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 4 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1554 +#define YYLAST 1486 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 166 +#define YYNTOKENS 165 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 75 /* YYNRULES -- Number of rules. */ -#define YYNRULES 302 +#define YYNRULES 301 /* YYNRULES -- Number of states. */ -#define YYNSTATES 590 +#define YYNSTATES 586 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 406 +#define YYMAXUTOK 405 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -846,15 +849,15 @@ static const unsigned char yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 155, 156, 164, 2, 153, 2, 2, 2, 2, 2, + 154, 155, 163, 2, 152, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 160, 152, 161, 2, 2, 2, 2, 2, 2, 2, + 159, 151, 160, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 157, 154, 159, 2, 2, 2, 2, 2, 165, + 2, 156, 153, 158, 2, 2, 2, 2, 2, 164, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 158, 2, 2, 162, 2, 163, 2, 2, 2, 2, + 157, 2, 2, 161, 2, 162, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -882,7 +885,7 @@ static const unsigned char yytranslate[] = 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, - 145, 146, 147, 148, 149, 150, 151 + 145, 146, 147, 148, 149, 150 }; #if YYDEBUG @@ -912,151 +915,151 @@ static const unsigned short int yyprhs[] = 524, 531, 538, 542, 547, 548, 550, 552, 554, 558, 562, 566, 570, 574, 578, 580, 581, 583, 585, 587, 588, 591, 595, 597, 599, 603, 605, 606, 615, 617, - 619, 623, 628, 630, 632, 636, 637, 639, 641, 645, - 646, 648, 650, 652, 654, 656, 658, 660, 662, 664, - 668, 670, 676, 678, 680, 682, 684, 687, 690, 692, - 695, 698, 699, 701, 703, 705, 708, 711, 715, 725, - 735, 744, 759, 761, 763, 770, 776, 779, 786, 794, - 796, 800, 802, 803, 806, 808, 814, 820, 826, 833, - 840, 843, 848, 853, 860, 865, 870, 877, 884, 887, - 895, 897, 900, 901, 903, 904, 908, 915, 919, 926, - 929, 934, 941 + 619, 623, 625, 627, 631, 632, 634, 636, 640, 641, + 643, 645, 647, 649, 651, 653, 655, 657, 659, 663, + 665, 671, 673, 675, 677, 679, 682, 685, 687, 690, + 693, 694, 696, 698, 700, 703, 706, 710, 720, 730, + 739, 754, 756, 758, 765, 771, 774, 781, 789, 791, + 795, 797, 798, 801, 803, 809, 815, 821, 828, 835, + 838, 843, 848, 855, 860, 865, 872, 879, 882, 890, + 892, 895, 896, 898, 899, 903, 910, 914, 921, 924, + 929, 936 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const short int yyrhs[] = { - 200, 0, -1, 19, -1, 20, -1, 17, -1, 18, - -1, 81, -1, 82, -1, 83, -1, 84, -1, 85, - -1, 86, -1, 87, -1, 88, -1, 89, -1, 90, - -1, 91, -1, 92, -1, 93, -1, 94, -1, 95, - -1, 96, -1, 97, -1, 98, -1, 99, -1, 100, - -1, 103, -1, 104, -1, 105, -1, 106, -1, 107, - -1, 108, -1, 119, -1, 120, -1, 121, -1, 122, - -1, 109, -1, 110, -1, 111, -1, 112, -1, 113, - -1, 114, -1, 115, -1, 116, -1, 117, -1, 118, - -1, 119, -1, 120, -1, 121, -1, 122, -1, 25, - -1, 26, -1, 131, -1, 132, -1, 133, -1, 134, - -1, 140, -1, 141, -1, 142, -1, 143, -1, 144, - -1, 145, -1, 146, -1, 147, -1, 148, -1, 149, - -1, 150, -1, 151, -1, 139, -1, 11, -1, 9, + 199, 0, -1, 19, -1, 20, -1, 17, -1, 18, + -1, 80, -1, 81, -1, 82, -1, 83, -1, 84, + -1, 85, -1, 86, -1, 87, -1, 88, -1, 89, + -1, 90, -1, 91, -1, 92, -1, 93, -1, 94, + -1, 95, -1, 96, -1, 97, -1, 98, -1, 99, + -1, 102, -1, 103, -1, 104, -1, 105, -1, 106, + -1, 107, -1, 118, -1, 119, -1, 120, -1, 121, + -1, 108, -1, 109, -1, 110, -1, 111, -1, 112, + -1, 113, -1, 114, -1, 115, -1, 116, -1, 117, + -1, 118, -1, 119, -1, 120, -1, 121, -1, 25, + -1, 26, -1, 130, -1, 131, -1, 132, -1, 133, + -1, 139, -1, 140, -1, 141, -1, 142, -1, 143, + -1, 144, -1, 145, -1, 146, -1, 147, -1, 148, + -1, 149, -1, 150, -1, 138, -1, 11, -1, 9, -1, 7, -1, 5, -1, 12, -1, 10, -1, 8, - -1, 6, -1, 176, -1, 177, -1, 13, -1, 14, - -1, 209, 152, -1, -1, 43, -1, 44, -1, 45, - -1, 49, -1, 46, -1, 47, -1, 48, -1, -1, - 67, -1, 68, -1, 69, -1, 70, -1, 71, -1, - 72, -1, 66, 18, -1, -1, -1, 58, 18, -1, - -1, 153, 58, 18, -1, 38, 30, -1, -1, 185, - -1, -1, 153, 188, 187, -1, 185, -1, 58, 18, - -1, 191, -1, 3, -1, 193, -1, 3, -1, 193, + -1, 6, -1, 175, -1, 176, -1, 13, -1, 14, + -1, 208, 151, -1, -1, 42, -1, 43, -1, 44, + -1, 48, -1, 45, -1, 46, -1, 47, -1, -1, + 66, -1, 67, -1, 68, -1, 69, -1, 70, -1, + 71, -1, 65, 18, -1, -1, -1, 57, 18, -1, + -1, 152, 57, 18, -1, 37, 30, -1, -1, 184, + -1, -1, 152, 187, 186, -1, 184, -1, 57, 18, + -1, 190, -1, 3, -1, 192, -1, 3, -1, 192, -1, 4, -1, 5, -1, 6, -1, 7, -1, 8, -1, 9, -1, 10, -1, 11, -1, 12, -1, 13, - -1, 14, -1, 15, -1, 16, -1, 223, -1, 192, - -1, 154, 18, -1, 190, 155, 195, 156, -1, 157, - 18, 158, 193, 159, -1, 160, 18, 158, 193, 161, - -1, 162, 194, 163, -1, 162, 163, -1, 160, 162, - 194, 163, 161, -1, 160, 162, 163, 161, -1, 193, - 164, -1, 193, -1, 194, 153, 193, -1, 194, -1, - 194, 153, 41, -1, 41, -1, -1, 191, 157, 198, - 159, -1, 191, 157, 159, -1, 191, 165, 30, -1, - 191, 160, 198, 161, -1, 191, 162, 198, 163, -1, - 191, 162, 163, -1, 191, 22, -1, 191, 23, -1, - 191, 223, -1, 191, 197, -1, 191, 24, -1, 176, - 168, -1, 177, 18, -1, 4, 25, -1, 4, 26, - -1, 179, 21, -1, 175, 155, 196, 40, 191, 156, - -1, 128, 155, 196, 238, 156, -1, 130, 155, 196, - 153, 196, 153, 196, 156, -1, 169, 155, 196, 153, - 196, 156, -1, 170, 155, 196, 153, 196, 156, -1, - 171, 155, 196, 153, 196, 156, -1, 101, 172, 155, - 196, 153, 196, 156, -1, 102, 173, 155, 196, 153, - 196, 156, -1, 174, 155, 196, 153, 196, 156, -1, - 136, 155, 196, 153, 196, 156, -1, 137, 155, 196, - 153, 196, 153, 196, 156, -1, 138, 155, 196, 153, - 196, 153, 196, 156, -1, 198, 153, 196, -1, 196, - -1, 36, -1, 37, -1, 201, -1, 201, 218, -1, - 201, 220, -1, 201, 64, 63, 204, -1, 201, 31, - -1, 203, -1, 51, -1, 59, -1, 203, 180, 27, - 189, -1, 203, 220, -1, 203, 64, 63, 204, -1, - 203, 180, 181, 199, 196, 187, -1, 203, 180, 202, - 199, 191, 187, -1, 203, 180, 46, 199, 191, 187, - -1, 203, 180, 48, 199, 191, 187, -1, 203, 52, - 206, -1, 203, 60, 152, 207, -1, -1, 30, -1, - 57, -1, 56, -1, 54, 152, 205, -1, 55, 152, - 18, -1, 53, 152, 30, -1, 73, 152, 30, -1, - 157, 208, 159, -1, 208, 153, 30, -1, 30, -1, - -1, 28, -1, 30, -1, 209, -1, -1, 191, 210, - -1, 212, 153, 211, -1, 211, -1, 212, -1, 212, - 153, 41, -1, 41, -1, -1, 182, 189, 209, 155, - 213, 156, 186, 183, -1, 32, -1, 162, -1, 181, - 214, 215, -1, 35, 181, 214, 215, -1, 33, -1, - 163, -1, 216, 226, 217, -1, -1, 46, -1, 48, - -1, 34, 219, 214, -1, -1, 65, -1, 17, -1, - 18, -1, 21, -1, 25, -1, 26, -1, 22, -1, - 23, -1, 24, -1, 160, 198, 161, -1, 197, -1, - 63, 221, 30, 153, 30, -1, 167, -1, 209, -1, - 223, -1, 222, -1, 191, 224, -1, 226, 227, -1, - 227, -1, 228, 230, -1, 228, 232, -1, -1, 29, - -1, 79, -1, 78, -1, 74, 225, -1, 74, 3, - -1, 75, 15, 224, -1, 75, 4, 224, 153, 15, - 224, 153, 15, 224, -1, 76, 178, 224, 153, 15, - 224, 157, 231, 159, -1, 76, 178, 224, 153, 15, - 224, 157, 159, -1, 180, 77, 182, 189, 224, 155, - 235, 156, 40, 15, 224, 229, 15, 224, -1, 229, - -1, 80, -1, 231, 178, 222, 153, 15, 224, -1, - 178, 222, 153, 15, 224, -1, 180, 237, -1, 191, - 157, 224, 153, 224, 159, -1, 233, 153, 157, 224, - 153, 224, 159, -1, 225, -1, 234, 153, 225, -1, - 234, -1, -1, 62, 61, -1, 61, -1, 169, 191, - 224, 153, 224, -1, 170, 191, 224, 153, 224, -1, - 171, 191, 224, 153, 224, -1, 101, 172, 191, 224, - 153, 224, -1, 102, 173, 191, 224, 153, 224, -1, - 50, 225, -1, 174, 225, 153, 225, -1, 175, 225, - 40, 191, -1, 130, 225, 153, 225, 153, 225, -1, - 135, 225, 153, 191, -1, 136, 225, 153, 225, -1, - 137, 225, 153, 225, 153, 225, -1, 138, 225, 153, - 225, 153, 225, -1, 129, 233, -1, 236, 182, 189, - 224, 155, 235, 156, -1, 240, -1, 153, 234, -1, - -1, 39, -1, -1, 123, 191, 184, -1, 123, 191, - 153, 10, 224, 184, -1, 124, 191, 184, -1, 124, - 191, 153, 10, 224, 184, -1, 125, 225, -1, 239, - 126, 191, 224, -1, 239, 127, 225, 153, 191, 224, - -1, 128, 191, 224, 238, -1 + -1, 14, -1, 15, -1, 16, -1, 222, -1, 191, + -1, 153, 18, -1, 189, 154, 194, 155, -1, 156, + 18, 157, 192, 158, -1, 159, 18, 157, 192, 160, + -1, 161, 193, 162, -1, 161, 162, -1, 159, 161, + 193, 162, 160, -1, 159, 161, 162, 160, -1, 192, + 163, -1, 192, -1, 193, 152, 192, -1, 193, -1, + 193, 152, 40, -1, 40, -1, -1, 190, 156, 197, + 158, -1, 190, 156, 158, -1, 190, 164, 30, -1, + 190, 159, 197, 160, -1, 190, 161, 197, 162, -1, + 190, 161, 162, -1, 190, 22, -1, 190, 23, -1, + 190, 222, -1, 190, 196, -1, 190, 24, -1, 175, + 167, -1, 176, 18, -1, 4, 25, -1, 4, 26, + -1, 178, 21, -1, 174, 154, 195, 39, 190, 155, + -1, 127, 154, 195, 237, 155, -1, 129, 154, 195, + 152, 195, 152, 195, 155, -1, 168, 154, 195, 152, + 195, 155, -1, 169, 154, 195, 152, 195, 155, -1, + 170, 154, 195, 152, 195, 155, -1, 100, 171, 154, + 195, 152, 195, 155, -1, 101, 172, 154, 195, 152, + 195, 155, -1, 173, 154, 195, 152, 195, 155, -1, + 135, 154, 195, 152, 195, 155, -1, 136, 154, 195, + 152, 195, 152, 195, 155, -1, 137, 154, 195, 152, + 195, 152, 195, 155, -1, 197, 152, 195, -1, 195, + -1, 35, -1, 36, -1, 200, -1, 200, 217, -1, + 200, 219, -1, 200, 63, 62, 203, -1, 200, 31, + -1, 202, -1, 50, -1, 58, -1, 202, 179, 27, + 188, -1, 202, 219, -1, 202, 63, 62, 203, -1, + 202, 179, 180, 198, 195, 186, -1, 202, 179, 201, + 198, 190, 186, -1, 202, 179, 45, 198, 190, 186, + -1, 202, 179, 47, 198, 190, 186, -1, 202, 51, + 205, -1, 202, 59, 151, 206, -1, -1, 30, -1, + 56, -1, 55, -1, 53, 151, 204, -1, 54, 151, + 18, -1, 52, 151, 30, -1, 72, 151, 30, -1, + 156, 207, 158, -1, 207, 152, 30, -1, 30, -1, + -1, 28, -1, 30, -1, 208, -1, -1, 190, 209, + -1, 211, 152, 210, -1, 210, -1, 211, -1, 211, + 152, 40, -1, 40, -1, -1, 181, 188, 208, 154, + 212, 155, 185, 182, -1, 32, -1, 161, -1, 180, + 213, 214, -1, 33, -1, 162, -1, 215, 225, 216, + -1, -1, 45, -1, 47, -1, 34, 218, 213, -1, + -1, 64, -1, 17, -1, 18, -1, 21, -1, 25, + -1, 26, -1, 22, -1, 23, -1, 24, -1, 159, + 197, 160, -1, 196, -1, 62, 220, 30, 152, 30, + -1, 166, -1, 208, -1, 222, -1, 221, -1, 190, + 223, -1, 225, 226, -1, 226, -1, 227, 229, -1, + 227, 231, -1, -1, 29, -1, 78, -1, 77, -1, + 73, 224, -1, 73, 3, -1, 74, 15, 223, -1, + 74, 4, 223, 152, 15, 223, 152, 15, 223, -1, + 75, 177, 223, 152, 15, 223, 156, 230, 158, -1, + 75, 177, 223, 152, 15, 223, 156, 158, -1, 179, + 76, 181, 188, 223, 154, 234, 155, 39, 15, 223, + 228, 15, 223, -1, 228, -1, 79, -1, 230, 177, + 221, 152, 15, 223, -1, 177, 221, 152, 15, 223, + -1, 179, 236, -1, 190, 156, 223, 152, 223, 158, + -1, 232, 152, 156, 223, 152, 223, 158, -1, 224, + -1, 233, 152, 224, -1, 233, -1, -1, 61, 60, + -1, 60, -1, 168, 190, 223, 152, 223, -1, 169, + 190, 223, 152, 223, -1, 170, 190, 223, 152, 223, + -1, 100, 171, 190, 223, 152, 223, -1, 101, 172, + 190, 223, 152, 223, -1, 49, 224, -1, 173, 224, + 152, 224, -1, 174, 224, 39, 190, -1, 129, 224, + 152, 224, 152, 224, -1, 134, 224, 152, 190, -1, + 135, 224, 152, 224, -1, 136, 224, 152, 224, 152, + 224, -1, 137, 224, 152, 224, 152, 224, -1, 128, + 232, -1, 235, 181, 188, 223, 154, 234, 155, -1, + 239, -1, 152, 233, -1, -1, 38, -1, -1, 122, + 190, 183, -1, 122, 190, 152, 10, 223, 183, -1, + 123, 190, 183, -1, 123, 190, 152, 10, 223, 183, + -1, 124, 224, -1, 238, 125, 190, 223, -1, 238, + 126, 224, 152, 190, 223, -1, 127, 190, 223, 237, + -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned short int yyrline[] = { - 0, 338, 338, 338, 339, 339, 343, 343, 343, 343, - 343, 343, 343, 344, 344, 344, 344, 345, 345, 345, - 346, 346, 346, 346, 346, 346, 347, 347, 347, 347, - 347, 347, 347, 347, 347, 347, 348, 348, 348, 348, - 348, 348, 348, 348, 348, 348, 349, 349, 349, 349, - 349, 349, 350, 350, 350, 350, 351, 351, 351, 351, - 351, 351, 351, 352, 352, 352, 352, 352, 352, 357, - 357, 357, 357, 358, 358, 358, 358, 359, 359, 360, - 360, 363, 366, 371, 371, 371, 371, 371, 371, 372, - 373, 376, 376, 376, 376, 376, 377, 378, 383, 388, - 389, 392, 393, 401, 407, 408, 411, 412, 421, 422, - 435, 435, 436, 436, 437, 441, 441, 441, 441, 441, - 441, 441, 442, 442, 442, 442, 442, 444, 448, 452, - 455, 460, 466, 474, 482, 488, 492, 498, 502, 513, - 516, 524, 525, 530, 533, 543, 549, 554, 560, 566, - 572, 577, 583, 589, 595, 601, 607, 613, 619, 625, - 631, 639, 653, 665, 670, 676, 681, 687, 692, 697, - 705, 710, 715, 725, 730, 735, 735, 745, 750, 753, - 758, 762, 766, 768, 768, 771, 783, 788, 793, 802, - 811, 820, 829, 834, 839, 844, 846, 846, 849, 854, - 861, 866, 873, 880, 885, 886, 894, 894, 895, 895, - 897, 904, 908, 912, 915, 920, 923, 925, 945, 946, - 949, 958, 969, 970, 972, 980, 981, 982, 986, 999, - 1000, 1003, 1003, 1003, 1003, 1003, 1003, 1003, 1004, 1005, - 1010, 1011, 1020, 1020, 1024, 1030, 1041, 1047, 1050, 1058, - 1062, 1067, 1070, 1076, 1076, 1078, 1083, 1088, 1093, 1101, - 1108, 1114, 1134, 1139, 1145, 1150, 1158, 1167, 1174, 1182, - 1186, 1193, 1194, 1198, 1203, 1206, 1212, 1217, 1223, 1228, - 1233, 1238, 1246, 1260, 1265, 1270, 1275, 1280, 1285, 1290, - 1307, 1312, 1313, 1317, 1318, 1321, 1328, 1335, 1342, 1349, - 1354, 1361, 1368 + 0, 343, 343, 343, 344, 344, 348, 348, 348, 348, + 348, 348, 348, 349, 349, 349, 349, 350, 350, 350, + 351, 351, 351, 351, 351, 351, 352, 352, 352, 352, + 352, 352, 352, 352, 352, 352, 353, 353, 353, 353, + 353, 353, 353, 353, 353, 353, 354, 354, 354, 354, + 354, 354, 355, 355, 355, 355, 356, 356, 356, 356, + 356, 356, 356, 357, 357, 357, 357, 357, 357, 362, + 362, 362, 362, 363, 363, 363, 363, 364, 364, 365, + 365, 368, 371, 376, 376, 376, 376, 376, 376, 377, + 378, 381, 381, 381, 381, 381, 382, 383, 388, 393, + 394, 397, 398, 406, 412, 413, 416, 417, 426, 427, + 440, 440, 441, 441, 442, 446, 446, 446, 446, 446, + 446, 446, 447, 447, 447, 447, 447, 449, 453, 457, + 460, 465, 471, 479, 487, 493, 497, 503, 507, 518, + 521, 529, 530, 535, 538, 548, 554, 559, 565, 571, + 577, 582, 588, 594, 600, 606, 612, 618, 624, 630, + 636, 644, 658, 670, 675, 681, 686, 692, 697, 702, + 710, 715, 720, 730, 735, 740, 740, 750, 755, 758, + 763, 767, 771, 773, 773, 776, 788, 793, 798, 807, + 816, 825, 834, 839, 844, 849, 851, 851, 854, 859, + 866, 871, 878, 885, 890, 891, 899, 899, 900, 900, + 902, 909, 913, 917, 920, 925, 928, 931, 950, 951, + 954, 965, 966, 968, 976, 977, 978, 982, 995, 996, + 999, 999, 999, 999, 999, 999, 999, 1000, 1001, 1006, + 1007, 1016, 1016, 1020, 1026, 1037, 1043, 1046, 1054, 1058, + 1063, 1066, 1072, 1072, 1074, 1079, 1084, 1089, 1097, 1104, + 1110, 1130, 1135, 1141, 1146, 1154, 1163, 1170, 1178, 1182, + 1189, 1190, 1194, 1199, 1202, 1208, 1213, 1219, 1224, 1229, + 1234, 1242, 1256, 1261, 1266, 1271, 1276, 1281, 1286, 1303, + 1308, 1309, 1313, 1314, 1317, 1324, 1331, 1338, 1345, 1350, + 1357, 1364 }; #endif @@ -1070,12 +1073,12 @@ static const char *const yytname[] = "LABEL", "OPAQUE", "ESINT64VAL", "EUINT64VAL", "SINTVAL", "UINTVAL", "FPVAL", "NULL_TOK", "UNDEF", "ZEROINITIALIZER", "TRUETOK", "FALSETOK", "TYPE", "VAR_ID", "LABELSTR", "STRINGCONSTANT", "IMPLEMENTATION", - "BEGINTOK", "ENDTOK", "DECLARE", "DEFINE", "GLOBAL", "CONSTANT", - "SECTION", "VOLATILE", "TO", "DOTDOTDOT", "CONST", "INTERNAL", - "LINKONCE", "WEAK", "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "APPENDING", - "NOT", "EXTERNAL", "TARGET", "TRIPLE", "ENDIAN", "POINTERSIZE", "LITTLE", - "BIG", "ALIGN", "UNINITIALIZED", "DEPLIBS", "CALL", "TAIL", "ASM_TOK", - "MODULE", "SIDEEFFECT", "CC_TOK", "CCC_TOK", "CSRETCC_TOK", "FASTCC_TOK", + "BEGINTOK", "ENDTOK", "DECLARE", "GLOBAL", "CONSTANT", "SECTION", + "VOLATILE", "TO", "DOTDOTDOT", "CONST", "INTERNAL", "LINKONCE", "WEAK", + "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "APPENDING", "NOT", "EXTERNAL", + "TARGET", "TRIPLE", "ENDIAN", "POINTERSIZE", "LITTLE", "BIG", "ALIGN", + "UNINITIALIZED", "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE", + "SIDEEFFECT", "CC_TOK", "CCC_TOK", "CSRETCC_TOK", "FASTCC_TOK", "COLDCC_TOK", "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", "DATALAYOUT", "RET", "BR", "SWITCH", "INVOKE", "EXCEPT", "UNWIND", "UNREACHABLE", "ADD", "SUB", "MUL", "DIV", "UDIV", "SDIV", "FDIV", "REM", "UREM", @@ -1127,45 +1130,45 @@ static const unsigned short int yytoknum[] = 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, - 405, 406, 61, 44, 92, 40, 41, 91, 120, 93, - 60, 62, 123, 125, 42, 99 + 405, 61, 44, 92, 40, 41, 91, 120, 93, 60, + 62, 123, 125, 42, 99 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const unsigned char yyr1[] = { - 0, 166, 167, 167, 168, 168, 169, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 170, 170, 170, + 0, 165, 166, 166, 167, 167, 168, 168, 168, 168, + 168, 168, 168, 168, 168, 168, 168, 169, 169, 169, + 170, 170, 170, 170, 170, 170, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 172, 172, 172, 172, - 172, 172, 172, 172, 172, 172, 173, 173, 173, 173, - 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, - 173, 173, 174, 174, 174, 174, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 176, - 176, 176, 176, 177, 177, 177, 177, 178, 178, 179, - 179, 180, 180, 181, 181, 181, 181, 181, 181, 181, - 181, 182, 182, 182, 182, 182, 182, 182, 182, 183, - 183, 184, 184, 185, 186, 186, 187, 187, 188, 188, - 189, 189, 190, 190, 191, 192, 192, 192, 192, 192, - 192, 192, 192, 192, 192, 192, 192, 193, 193, 193, - 193, 193, 193, 193, 193, 193, 193, 193, 193, 194, - 194, 195, 195, 195, 195, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 197, 197, 197, 197, 197, 197, 197, 197, 197, - 197, 197, 197, 198, 198, 199, 199, 200, 201, 201, - 201, 201, 201, 202, 202, 203, 203, 203, 203, 203, - 203, 203, 203, 203, 203, 204, 205, 205, 206, 206, - 206, 206, 207, 208, 208, 208, 209, 209, 210, 210, - 211, 212, 212, 213, 213, 213, 213, 214, 215, 215, - 216, 216, 217, 217, 218, 219, 219, 219, 220, 221, - 221, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 223, 223, 224, 224, 225, 226, 226, 227, - 228, 228, 228, 229, 229, 230, 230, 230, 230, 230, - 230, 230, 230, 230, 231, 231, 232, 233, 233, 234, - 234, 235, 235, 236, 236, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 238, 238, 239, 239, 240, 240, 240, 240, 240, - 240, 240, 240 + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 173, 173, 173, 173, 174, 174, 174, 174, + 174, 174, 174, 174, 174, 174, 174, 174, 174, 175, + 175, 175, 175, 176, 176, 176, 176, 177, 177, 178, + 178, 179, 179, 180, 180, 180, 180, 180, 180, 180, + 180, 181, 181, 181, 181, 181, 181, 181, 181, 182, + 182, 183, 183, 184, 185, 185, 186, 186, 187, 187, + 188, 188, 189, 189, 190, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 191, 191, 191, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, 192, 193, + 193, 194, 194, 194, 194, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 196, 196, 196, 196, 196, 196, 196, 196, 196, + 196, 196, 196, 197, 197, 198, 198, 199, 200, 200, + 200, 200, 200, 201, 201, 202, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 203, 204, 204, 205, 205, + 205, 205, 206, 207, 207, 207, 208, 208, 209, 209, + 210, 211, 211, 212, 212, 212, 212, 213, 214, 214, + 215, 216, 216, 217, 218, 218, 218, 219, 220, 220, + 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, + 221, 222, 222, 223, 223, 224, 225, 225, 226, 227, + 227, 227, 228, 228, 229, 229, 229, 229, 229, 229, + 229, 229, 229, 230, 230, 231, 232, 232, 233, 233, + 234, 234, 235, 235, 236, 236, 236, 236, 236, 236, + 236, 236, 236, 236, 236, 236, 236, 236, 236, 236, + 237, 237, 238, 238, 239, 239, 239, 239, 239, 239, + 239, 239 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1193,15 +1196,15 @@ static const unsigned char yyr2[] = 6, 6, 3, 4, 0, 1, 1, 1, 3, 3, 3, 3, 3, 3, 1, 0, 1, 1, 1, 0, 2, 3, 1, 1, 3, 1, 0, 8, 1, 1, - 3, 4, 1, 1, 3, 0, 1, 1, 3, 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, - 1, 5, 1, 1, 1, 1, 2, 2, 1, 2, - 2, 0, 1, 1, 1, 2, 2, 3, 9, 9, - 8, 14, 1, 1, 6, 5, 2, 6, 7, 1, - 3, 1, 0, 2, 1, 5, 5, 5, 6, 6, - 2, 4, 4, 6, 4, 4, 6, 6, 2, 7, - 1, 2, 0, 1, 0, 3, 6, 3, 6, 2, - 4, 6, 4 + 3, 1, 1, 3, 0, 1, 1, 3, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, + 5, 1, 1, 1, 1, 2, 2, 1, 2, 2, + 0, 1, 1, 1, 2, 2, 3, 9, 9, 8, + 14, 1, 1, 6, 5, 2, 6, 7, 1, 3, + 1, 0, 2, 1, 5, 5, 5, 6, 6, 2, + 4, 4, 6, 4, 4, 6, 6, 2, 7, 1, + 2, 0, 1, 0, 3, 6, 3, 6, 2, 4, + 6, 4 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -1209,157 +1212,157 @@ static const unsigned char yyr2[] = means the default is an error. */ static const unsigned short int yydefact[] = { - 194, 0, 90, 182, 1, 181, 225, 90, 83, 84, - 85, 87, 88, 89, 86, 0, 98, 251, 178, 179, - 206, 207, 0, 0, 0, 90, 0, 186, 226, 227, - 98, 98, 0, 0, 91, 92, 93, 94, 95, 96, - 0, 0, 252, 251, 248, 82, 0, 0, 0, 0, - 192, 0, 0, 0, 0, 0, 183, 184, 0, 0, - 81, 228, 0, 195, 180, 97, 111, 115, 116, 117, - 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, - 2, 3, 0, 0, 0, 0, 242, 0, 0, 110, - 129, 114, 243, 128, 218, 219, 220, 222, 223, 224, - 247, 0, 0, 0, 254, 253, 263, 294, 262, 249, - 250, 0, 0, 0, 0, 205, 193, 187, 185, 175, - 176, 0, 0, 0, 0, 221, 130, 0, 0, 0, - 113, 135, 139, 0, 0, 144, 138, 256, 0, 255, - 0, 0, 72, 76, 71, 75, 70, 74, 69, 73, - 77, 78, 0, 293, 0, 274, 0, 98, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 0, 0, - 0, 0, 0, 0, 0, 0, 52, 53, 54, 55, - 0, 0, 0, 0, 68, 56, 57, 58, 59, 60, - 61, 62, 63, 64, 65, 66, 67, 0, 0, 0, - 0, 0, 98, 266, 0, 290, 200, 197, 196, 198, - 199, 201, 204, 0, 106, 106, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 124, 125, 0, 0, 0, - 0, 106, 106, 0, 0, 0, 0, 0, 134, 216, - 143, 141, 0, 231, 232, 233, 236, 237, 238, 234, - 235, 229, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 240, 245, 244, 246, 0, - 257, 0, 280, 273, 0, 26, 27, 28, 29, 30, - 31, 32, 33, 34, 35, 0, 50, 51, 36, 37, - 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 0, 101, 101, 299, 0, 0, 288, 0, + 194, 0, 90, 182, 1, 181, 224, 83, 84, 85, + 87, 88, 89, 86, 0, 98, 250, 178, 179, 206, + 207, 0, 0, 0, 90, 0, 186, 225, 226, 98, + 0, 0, 91, 92, 93, 94, 95, 96, 0, 0, + 251, 250, 247, 82, 0, 0, 0, 0, 192, 0, + 0, 0, 0, 0, 183, 184, 0, 0, 81, 227, + 195, 180, 97, 111, 115, 116, 117, 118, 119, 120, + 121, 122, 123, 124, 125, 126, 127, 2, 3, 0, + 0, 0, 0, 241, 0, 0, 110, 129, 114, 242, + 128, 218, 219, 220, 221, 222, 223, 246, 0, 0, + 0, 253, 252, 262, 293, 261, 248, 249, 0, 0, + 0, 0, 205, 193, 187, 185, 175, 176, 0, 0, + 0, 0, 130, 0, 0, 0, 113, 135, 139, 0, + 0, 144, 138, 255, 0, 254, 0, 0, 72, 76, + 71, 75, 70, 74, 69, 73, 77, 78, 0, 292, + 0, 273, 0, 98, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 0, 0, 0, 0, 0, 0, + 0, 0, 52, 53, 54, 55, 0, 0, 0, 0, + 68, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 0, 0, 0, 0, 0, 98, 265, + 0, 289, 200, 197, 196, 198, 199, 201, 204, 0, + 106, 106, 115, 116, 117, 118, 119, 120, 121, 122, + 123, 124, 125, 0, 0, 0, 0, 106, 106, 0, + 0, 0, 0, 0, 134, 216, 143, 141, 0, 230, + 231, 232, 235, 236, 237, 233, 234, 228, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 202, 0, 190, 191, 158, 159, 4, - 5, 156, 157, 160, 151, 152, 155, 0, 0, 0, - 0, 154, 153, 188, 189, 112, 112, 137, 0, 140, - 215, 209, 212, 213, 0, 0, 131, 230, 0, 0, - 0, 0, 0, 0, 0, 0, 174, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 295, - 0, 297, 292, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 203, 0, - 0, 108, 106, 146, 0, 0, 150, 0, 147, 132, - 133, 136, 208, 210, 0, 104, 142, 0, 0, 0, - 292, 0, 0, 0, 0, 0, 239, 0, 0, 0, + 0, 239, 244, 243, 245, 0, 256, 0, 279, 272, + 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, + 35, 0, 50, 51, 36, 37, 38, 39, 40, 41, + 42, 43, 44, 45, 46, 47, 48, 49, 0, 101, + 101, 298, 0, 0, 287, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 202, + 0, 190, 191, 158, 159, 4, 5, 156, 157, 160, + 151, 152, 155, 0, 0, 0, 0, 154, 153, 188, + 189, 112, 112, 137, 0, 140, 215, 209, 212, 213, + 0, 0, 131, 229, 0, 0, 0, 0, 0, 0, + 0, 0, 174, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 294, 0, 296, 291, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 302, 0, 0, 0, 284, 285, 0, 0, 0, - 0, 0, 281, 282, 0, 300, 0, 103, 109, 107, - 145, 148, 149, 214, 211, 105, 99, 0, 0, 0, - 0, 0, 0, 0, 0, 173, 0, 0, 0, 0, - 0, 0, 0, 272, 0, 0, 101, 102, 101, 269, - 291, 0, 0, 0, 0, 0, 275, 276, 277, 272, - 0, 0, 217, 241, 0, 0, 162, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 271, 0, - 278, 279, 0, 296, 298, 0, 0, 0, 283, 286, - 287, 0, 301, 100, 0, 0, 0, 170, 0, 0, - 164, 165, 166, 169, 161, 0, 260, 0, 0, 0, - 270, 267, 0, 289, 167, 168, 0, 0, 0, 258, - 0, 259, 0, 0, 268, 163, 171, 172, 0, 0, - 0, 0, 0, 0, 265, 0, 0, 264, 0, 261 + 0, 0, 0, 0, 203, 0, 0, 108, 106, 146, + 0, 0, 150, 0, 147, 132, 133, 136, 208, 210, + 0, 104, 142, 0, 0, 0, 291, 0, 0, 0, + 0, 0, 238, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 301, 0, 0, + 0, 283, 284, 0, 0, 0, 0, 0, 280, 281, + 0, 299, 0, 103, 109, 107, 145, 148, 149, 214, + 211, 105, 99, 0, 0, 0, 0, 0, 0, 0, + 0, 173, 0, 0, 0, 0, 0, 0, 0, 271, + 0, 0, 101, 102, 101, 268, 290, 0, 0, 0, + 0, 0, 274, 275, 276, 271, 0, 0, 217, 240, + 0, 0, 162, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 270, 0, 277, 278, 0, 295, + 297, 0, 0, 0, 282, 285, 286, 0, 300, 100, + 0, 0, 0, 170, 0, 0, 164, 165, 166, 169, + 161, 0, 259, 0, 0, 0, 269, 266, 0, 288, + 167, 168, 0, 0, 0, 257, 0, 258, 0, 0, + 267, 163, 171, 172, 0, 0, 0, 0, 0, 0, + 264, 0, 0, 263, 0, 260 }; /* YYDEFGOTO[NTERM-NUM]. */ static const short int yydefgoto[] = { - -1, 86, 341, 270, 271, 272, 295, 312, 273, 274, - 237, 238, 152, 239, 25, 16, 40, 512, 389, 411, - 476, 335, 412, 87, 88, 240, 90, 91, 133, 252, - 376, 275, 377, 121, 1, 2, 59, 3, 64, 219, - 50, 116, 223, 92, 423, 362, 363, 364, 41, 96, - 17, 99, 18, 30, 19, 368, 276, 93, 278, 499, - 43, 44, 45, 108, 109, 558, 110, 318, 528, 529, - 212, 213, 451, 214, 215 + -1, 83, 337, 266, 267, 268, 291, 308, 269, 270, + 233, 234, 148, 235, 24, 15, 38, 508, 385, 407, + 472, 331, 408, 84, 85, 236, 87, 88, 129, 248, + 372, 271, 373, 118, 1, 2, 57, 3, 61, 215, + 48, 113, 219, 89, 419, 358, 359, 360, 39, 93, + 16, 96, 17, 29, 18, 364, 272, 90, 274, 495, + 41, 42, 43, 105, 106, 554, 107, 314, 524, 525, + 208, 209, 447, 210, 211 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -543 +#define YYPACT_NINF -513 static const short int yypact[] = { - -543, 41, 25, 215, -543, -543, 82, 277, -543, -543, - -543, -543, -543, -543, -543, -10, 300, 62, -543, -543, - -543, -543, 22, -95, 57, 78, 30, -543, -543, -543, - 300, 300, 156, 170, -543, -543, -543, -543, -543, -543, - 887, -26, -543, -17, -543, 37, 39, 42, 46, 48, - -543, 77, 156, 887, 43, 43, -543, -543, 43, 43, - -543, -543, -26, -543, -543, -543, 53, -543, -543, -543, - -543, -543, -543, -543, -543, -543, -543, -543, -543, -543, - -543, -543, 188, 196, -8, 561, -543, 153, 81, -543, - -543, -70, -543, -543, -543, -543, -543, -543, -543, -543, - -543, 924, 13, 307, -543, -543, -543, 1403, -543, -543, - -543, 207, 101, 220, 210, 211, -543, -543, -543, -543, - -543, 969, 969, 1008, 969, -543, -543, 88, 89, 603, - -543, -543, -70, -75, 93, 676, -543, 53, 1201, -543, - 1201, 1201, -543, -543, -543, -543, -543, -543, -543, -543, - -543, -543, 1201, -543, 969, -543, 189, 300, -543, -543, - -543, -543, -543, -543, -543, -543, -543, -543, -543, -543, - -543, -543, -543, -543, -543, -543, -543, -543, 58, 109, - 969, 969, 969, 969, 969, 969, -543, -543, -543, -543, - 969, 969, 969, 969, -543, -543, -543, -543, -543, -543, - -543, -543, -543, -543, -543, -543, -543, 969, 969, 969, - 969, 969, 300, -543, -19, -543, -543, -543, -543, -543, - -543, -543, -543, -133, 100, 100, 149, 167, 236, 179, - 238, 185, 239, 187, 247, 248, 249, 193, 250, 252, - 1052, 100, 100, 969, 969, 110, -66, 969, -543, 723, - -543, 128, 127, -543, -543, -543, -543, -543, -543, -543, - -543, 221, 58, 109, 130, 132, 133, 137, 138, 1008, - 140, 143, 144, 145, 146, -543, -543, -543, -543, 151, - -543, 155, -543, -543, 887, -543, -543, -543, -543, -543, - -543, -543, -543, -543, -543, 969, -543, -543, -543, -543, - -543, -543, -543, -543, -543, -543, -543, -543, -543, -543, - -543, -543, 969, 157, 174, -543, 1201, 152, 175, 176, - 177, 178, 182, 183, 1201, 1201, 1201, 184, 262, 887, - 969, 969, 302, -543, 45, -543, -543, -543, -543, -543, - -543, -543, -543, -543, -543, -543, -543, 764, 1008, 647, - 309, -543, -543, -543, -543, -4, -5, -543, 180, -70, - -543, 153, -543, 190, 186, 809, -543, -543, 315, 191, - 192, 1008, 1008, 1008, 1008, 1008, -543, -134, 1008, 1008, - 1008, 1008, 1008, 333, 334, 1201, 1201, 1201, -3, -543, - 8, -543, 200, 1201, 197, 969, 969, 969, 969, 969, - 208, 209, 223, 969, 969, 1201, 1201, 224, -543, 348, - 361, -543, 100, -543, -21, -57, -543, -61, -543, -543, - -543, -543, -543, -543, 848, 342, -543, 228, 1008, 1008, - 200, 229, 230, 234, 235, 1008, -543, 237, 240, 241, - 242, 349, 1201, 1201, 243, 244, 246, 1201, 373, 1201, - 969, -543, 251, 1201, 253, -543, -543, 254, 255, 1201, - 1201, 1201, -543, -543, 245, -543, 969, -543, -543, -543, - -543, -543, -543, -543, -543, -543, 338, 372, 256, 261, - 259, 1008, 1008, 1008, 1008, -543, 1008, 1008, 1008, 1008, - 969, 263, 260, 969, 1201, 1201, 265, -543, 265, -543, - 266, 1201, 267, 969, 969, 969, -543, -543, -543, 969, - 1201, 385, -543, -543, 1008, 1008, -543, 268, 273, 269, - 270, 274, 275, 276, 281, 282, 390, 28, 266, 283, - -543, -543, 366, -543, -543, 969, 285, 1201, -543, -543, - -543, 284, -543, -543, 289, 291, 1008, -543, 1008, 1008, - -543, -543, -543, -543, -543, 1201, -543, 1290, 40, 393, - -543, -543, 290, -543, -543, -543, 292, 295, 296, -543, - 288, -543, 1290, 442, -543, -543, -543, -543, 444, 308, - 1201, 1201, 445, 134, -543, 1201, 447, -543, 1201, -543 + -513, 46, 217, 541, -513, -513, 82, -513, -513, -513, + -513, -513, -513, -513, 16, 111, 25, -513, -513, -513, + -513, 34, -55, 61, 26, -23, -513, -513, -513, 111, + 132, 146, -513, -513, -513, -513, -513, -513, 873, -26, + -513, -18, -513, 47, 19, 23, 39, 67, -513, 77, + 132, 873, 81, 81, -513, -513, 81, 81, -513, -513, + -513, -513, -513, 86, -513, -513, -513, -513, -513, -513, + -513, -513, -513, -513, -513, -513, -513, -513, -513, 223, + 225, -9, 506, -513, 133, 91, -513, -513, -111, -513, + -513, -513, -513, -513, -513, -513, -513, -513, 901, 36, + 148, -513, -513, -513, 1336, -513, -513, -513, 219, 76, + 229, 222, 224, -513, -513, -513, -513, -513, 933, 933, + 963, 933, -513, 98, 100, 614, -513, -513, -111, -104, + 104, 216, -513, 86, 1134, -513, 1134, 1134, -513, -513, + -513, -513, -513, -513, -513, -513, -513, -513, 1134, -513, + 933, -513, 206, 111, -513, -513, -513, -513, -513, -513, + -513, -513, -513, -513, -513, -513, -513, -513, -513, -513, + -513, -513, -513, -513, 195, 84, 933, 933, 933, 933, + 933, 933, -513, -513, -513, -513, 933, 933, 933, 933, + -513, -513, -513, -513, -513, -513, -513, -513, -513, -513, + -513, -513, -513, 933, 933, 933, 933, 933, 111, -513, + 11, -513, -513, -513, -513, -513, -513, -513, -513, -93, + 115, 115, 121, 166, 250, 169, 251, 191, 253, 193, + 254, 252, 257, 220, 256, 260, 1045, 115, 115, 933, + 933, 122, -73, 933, -513, 701, -513, 134, 129, -513, + -513, -513, -513, -513, -513, -513, -513, 221, 195, 84, + 136, 137, 138, 140, 150, 963, 154, 156, 158, 167, + 168, -513, -513, -513, -513, 171, -513, 172, -513, -513, + 873, -513, -513, -513, -513, -513, -513, -513, -513, -513, + -513, 933, -513, -513, -513, -513, -513, -513, -513, -513, + -513, -513, -513, -513, -513, -513, -513, -513, 933, 173, + 174, -513, 1134, 164, 175, 176, 177, 178, 179, 182, + 1134, 1134, 1134, 183, 297, 873, 933, 933, 308, -513, + -8, -513, -513, -513, -513, -513, -513, -513, -513, -513, + -513, -513, -513, 741, 963, 673, 310, -513, -513, -513, + -513, -113, -99, -513, 181, -111, -513, 133, -513, 190, + 189, 774, -513, -513, 315, 192, 194, 963, 963, 963, + 963, 963, -513, -58, 963, 963, 963, 963, 963, 332, + 337, 1134, 1134, 1134, -2, -513, 9, -513, 207, 1134, + 204, 933, 933, 933, 933, 933, 211, 212, 213, 933, + 933, 1134, 1134, 214, -513, 338, 349, -513, 115, -513, + -61, -57, -513, -70, -513, -513, -513, -513, -513, -513, + 833, 333, -513, 231, 963, 963, 207, 235, 236, 237, + 238, 963, -513, 240, 241, 242, 243, 334, 1134, 1134, + 227, 244, 245, 1134, 353, 1134, 933, -513, 249, 1134, + 255, -513, -513, 258, 262, 1134, 1134, 1134, -513, -513, + 248, -513, 933, -513, -513, -513, -513, -513, -513, -513, + -513, -513, 317, 346, 263, 264, 265, 963, 963, 963, + 963, -513, 963, 963, 963, 963, 933, 266, 247, 933, + 1134, 1134, 267, -513, 267, -513, 269, 1134, 270, 933, + 933, 933, -513, -513, -513, 933, 1134, 386, -513, -513, + 963, 963, -513, 271, 273, 277, 278, 276, 279, 282, + 283, 284, 390, 15, 269, 286, -513, -513, 352, -513, + -513, 933, 259, 1134, -513, -513, -513, 289, -513, -513, + 292, 294, 963, -513, 963, 963, -513, -513, -513, -513, + -513, 1134, -513, 1223, 27, 367, -513, -513, 274, -513, + -513, -513, 295, 300, 303, -513, 281, -513, 1223, 444, + -513, -513, -513, -513, 445, 312, 1134, 1134, 450, 135, + -513, 1134, 451, -513, 1134, -513 }; /* YYPGOTO[NTERM-NUM]. */ static const short int yypgoto[] = { - -543, -543, -543, 359, 360, 363, 206, 212, 367, 370, - -102, -100, -504, -543, 428, 17, -149, -543, -303, 55, - -543, -220, -543, -49, -543, -40, -543, -71, 4, -543, - 159, 257, -200, 51, -543, -543, -543, -543, 426, -543, - -543, -543, -543, -1, -543, 59, -543, -543, 202, 419, - -543, -543, -543, -543, 479, -543, -542, -109, 49, -92, - -543, 441, -543, -98, -543, -543, -543, -543, 36, -22, - -543, -543, 60, -543, -543 + -513, -513, -513, 364, 365, 368, 215, 218, 370, 372, + -98, -97, -507, -513, 436, 456, -141, -513, -303, 60, + -513, -220, -513, -46, -513, -38, -513, -68, -20, -513, + 130, 246, -230, 51, -513, -513, -513, -513, 433, -513, + -513, -513, -513, 1, -513, 64, -513, -513, 457, -513, + -513, -513, -513, -513, 482, -513, -512, -106, -3, -88, + -513, 448, -513, -89, -513, -513, -513, -513, 45, -13, + -513, -513, 69, -513, -513 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1369,387 +1372,373 @@ static const short int yypgoto[] = #define YYTABLE_NINF -178 static const short int yytable[] = { - 89, 150, 26, 151, 118, 336, 94, 447, 284, 139, - 128, 391, 42, 89, 132, 570, 97, 140, 449, 435, - 332, 353, 354, 557, 31, -177, 333, 436, 141, 277, - 579, 277, 277, 142, 143, 144, 145, 146, 147, 148, - 149, 4, 58, 277, 26, 142, 143, 144, 145, 146, - 147, 148, 149, 32, 572, 448, 5, 51, 132, 6, - 7, 138, 282, 329, 132, 20, 448, 21, 8, 9, - 10, 11, 12, 13, 14, 46, 47, 48, 247, 119, - 120, 224, 225, 409, 242, -112, 134, 247, 248, 15, - 315, 42, 435, 319, 136, 49, 435, 358, 320, 321, - 322, 323, 472, 410, 471, 53, 122, 330, 331, 123, - 124, 101, 102, 103, 138, 104, 105, 106, 327, 328, - 52, 8, 9, 10, 54, 12, 55, 14, 28, 56, - 29, 352, 435, 246, 296, 297, 95, 57, 470, 251, - 313, 314, 138, 316, 317, 138, 98, 414, 415, 417, - 138, 138, 138, 138, 129, 419, 420, 217, 218, 136, - 136, 285, 286, 287, 288, 289, 290, 324, 325, 326, - 138, 138, 355, 356, 337, 338, 359, 291, 292, 293, - 294, 20, 60, 21, -72, -72, 63, 556, 65, 279, - 280, 111, 469, 533, 112, 534, -71, -71, 113, 571, - 114, 281, -70, -70, -69, -69, 126, 277, -113, 361, - 339, 340, 104, 105, 127, 277, 277, 277, 298, 299, - 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, - 310, 311, 61, 62, 115, 385, 135, 216, 220, 407, - 221, 222, -82, 20, 89, 21, 243, 244, 249, 6, - 283, -82, -82, 334, -76, 386, -75, -74, -82, -82, - -82, -82, -82, -82, -82, -73, -82, 22, 342, -79, - -80, 357, 387, 343, -82, 23, 277, 277, 277, 24, - 405, 365, 241, 366, 277, 371, 367, 372, 373, 89, - 406, 138, 374, 375, 359, 378, 277, 277, 379, 380, - 381, 382, 404, 454, 383, 456, 457, 458, 384, 393, - 388, 462, 142, 143, 144, 145, 146, 147, 148, 149, - 8, 9, 10, 11, 12, 13, 14, 390, 394, 395, - 396, 397, 408, 277, 277, 398, 399, 403, 277, 418, - 277, 421, 425, 424, 277, 427, 428, 429, 442, 443, - 277, 277, 277, 450, 453, 138, 455, 138, 138, 138, - 422, 459, 460, 138, 463, 392, 33, 34, 35, 36, - 37, 38, 39, 400, 401, 402, 461, 466, 467, 468, - 409, 477, 481, 482, 361, 277, 277, 483, 484, 490, - 486, 497, 277, 487, 488, 489, 511, 494, 493, 495, - 509, 277, 513, 543, 501, 555, 503, 504, 505, 514, - 138, 538, 539, 540, 515, 516, 526, 527, 532, 535, - 537, 546, 548, 549, 448, 150, 510, 151, 277, 547, - 550, 551, 552, 573, 444, 445, 446, 553, 554, 559, - 563, 578, 452, 560, 561, 564, 277, 565, 575, 574, - 525, 576, 577, 138, 464, 465, 150, 580, 151, 581, - 585, 582, 588, 138, 138, 138, 207, 208, 369, 138, - 209, 277, 277, 107, 210, 370, 277, 211, 117, 277, - 475, 125, 27, 474, 100, 586, 500, 541, 0, 0, - 480, 491, 492, 0, 0, 138, 496, 351, 498, 0, - 0, 0, 502, 0, 0, 0, 0, 0, 506, 507, - 508, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 430, 431, 432, 433, 434, 0, 0, 437, 438, 439, - 440, 441, 0, 530, 531, 0, 0, 0, 0, 0, - 536, 0, 0, 0, 0, 0, 0, 0, 0, 542, - 0, 0, 0, 0, 130, 67, 68, 69, 70, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 0, 0, - 80, 81, 0, 0, 0, 0, 562, 478, 479, 20, - 0, 21, 0, 0, 485, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 569, 0, 130, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 0, 0, 80, 81, 0, 0, 0, 0, 0, 583, - 584, 20, 0, 21, 587, 0, 0, 589, 0, 0, - 517, 518, 519, 520, 0, 521, 522, 523, 524, 0, - 130, 226, 227, 228, 229, 230, 231, 232, 233, 234, - 235, 236, 78, 79, 0, 0, 80, 81, 0, 0, - 0, 0, 0, 544, 545, 20, 0, 21, 0, 130, - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 77, 78, 79, 0, 0, 80, 81, 0, 0, 0, - 0, 0, 0, 0, 20, 566, 21, 567, 568, 0, - 0, 0, 0, 0, 0, 82, 0, 250, 83, 0, - 0, 84, 0, 85, 131, 0, 130, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 0, 0, 80, 81, 0, 0, 0, 0, 0, 0, - 0, 20, 0, 21, 0, 0, 0, 82, 0, 0, - 83, 0, 0, 84, 360, 85, 245, 130, 226, 227, - 228, 229, 230, 231, 232, 233, 234, 235, 236, 78, - 79, 0, 0, 80, 81, 0, 0, 0, 0, 0, - 0, 0, 20, 0, 21, 0, 0, 0, 0, 0, - 0, 82, 0, 0, 83, 0, 0, 84, 0, 85, - 416, 0, 130, 67, 68, 69, 70, 71, 72, 73, - 74, 75, 76, 77, 78, 79, 0, 0, 80, 81, - 82, 0, 0, 83, 0, 0, 84, 20, 85, 21, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 426, 130, 67, 68, 69, 70, 71, 72, 73, 74, - 75, 76, 77, 78, 79, 0, 0, 80, 81, 0, - 0, 0, 0, 0, 0, 0, 20, 82, 21, 0, - 83, 0, 0, 84, 0, 85, 0, 0, 0, 473, + 86, 332, 146, 147, 25, 115, 91, 387, 443, 124, + 135, 40, 280, 86, 128, 94, 553, 349, 350, 445, + 138, 139, 140, 141, 142, 143, 144, 145, 273, 405, + 273, 273, 138, 139, 140, 141, 142, 143, 144, 145, + 136, 566, 273, -112, 25, 415, 4, 568, 243, 406, + 132, 137, 132, 51, 40, 444, 575, 128, 244, 328, + 134, 416, 278, 128, 132, 329, 444, 325, 7, 8, + 9, 52, 11, 53, 13, 19, 54, 20, 30, 243, + 220, 221, 431, 238, 55, 130, 44, 45, 46, 354, + 311, 431, 468, 315, 431, 431, 49, 466, 316, 317, + 318, 319, 432, 467, 119, 242, 47, 120, 121, 292, + 293, 247, 134, 410, 411, 413, 116, 117, 323, 324, + 98, 99, 100, 50, 101, 102, 103, 27, 58, 28, + 348, 213, 214, 275, 276, 92, 326, 327, 309, 310, + 134, 312, 313, 134, 95, 277, 333, 334, 134, 134, + 134, 134, 125, 138, 139, 140, 141, 142, 143, 144, + 145, 19, 60, 20, 62, 320, 321, 322, 134, 134, + 108, 351, 352, 552, 109, 355, 31, 32, 33, 34, + 35, 36, 37, -72, -72, 567, -71, -71, 465, 529, + 110, 530, 294, 295, 296, 297, 298, 299, 300, 301, + 302, 303, 304, 305, 306, 307, 273, 357, -70, -70, + -69, -69, 101, 102, 273, 273, 273, -177, 111, 126, + 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, + 74, 75, 76, 112, 381, 77, 78, 335, 336, 403, + -113, 122, 86, 123, 19, 131, 20, 216, 5, 212, + 237, 6, 217, 382, 218, 239, 246, 240, 245, 7, + 8, 9, 10, 11, 12, 13, 279, 330, -76, -75, + 383, -74, -73, -79, 338, 273, 273, 273, -80, 401, + 14, 339, 353, 273, 362, 363, 361, 86, 402, 134, + 367, 368, 369, 355, 370, 273, 273, 281, 282, 283, + 284, 285, 286, 450, 371, 452, 453, 454, 374, 388, + 375, 458, 376, 287, 288, 289, 290, 396, 397, 398, + 389, 377, 378, 379, 380, 384, 386, 390, 391, 392, + 393, 394, 273, 273, 395, 399, 400, 273, 404, 273, + 414, 417, 420, 273, 421, 423, 424, 438, 425, 273, + 273, 273, 439, 134, 451, 134, 134, 134, 418, 446, + 449, 134, 459, 455, 456, 457, 462, 464, 463, 79, + 405, 493, 80, 486, 507, 81, 509, 82, 440, 441, + 442, 489, 357, 473, 273, 273, 448, 477, 478, 479, + 480, 273, 482, 483, 484, 485, 490, 491, 460, 461, + 273, 497, 505, 523, 539, 551, 569, 499, 134, 444, + 500, 534, 535, 536, 501, 510, 511, 557, 522, 528, + 512, 531, 533, 542, 506, 146, 147, 273, 543, 544, + 545, 546, 570, 574, 547, 487, 488, 548, 549, 550, + 492, 555, 494, 556, 559, 273, 498, 560, 521, 561, + 571, 134, 502, 503, 504, 572, 146, 147, 573, 576, + 577, 134, 134, 134, 578, 581, 584, 134, 203, 204, + 273, 273, 205, 365, 206, 273, 207, 366, 273, 104, + 56, 471, 347, 114, 470, 26, 59, 526, 527, 97, + 582, 496, 537, 134, 532, 476, 0, 426, 427, 428, + 429, 430, 0, 538, 433, 434, 435, 436, 437, 126, + 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, + 74, 75, 76, 0, 0, 77, 78, 0, 0, 0, + 558, 0, 0, 0, 19, 0, 20, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 565, 0, + 0, 0, 0, 0, 474, 475, 0, 0, 0, 0, + 0, 481, 0, 0, 0, 0, 0, 0, -82, 19, + 0, 20, 0, 579, 580, 6, -82, -82, 583, 0, + 0, 585, 0, -82, -82, -82, -82, -82, -82, -82, + 0, -82, 21, 0, 0, 0, 0, 0, 0, -82, + 22, 0, 0, 0, 23, 0, 0, 513, 514, 515, + 516, 0, 517, 518, 519, 520, 0, 126, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 0, 0, 80, 81, 0, 0, - 0, 0, 0, 0, 0, 20, 0, 21, 82, 0, - 0, 83, 0, 413, 84, 0, 85, 137, 67, 68, - 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 0, 0, 80, 81, 0, 0, 0, 0, 0, - 0, 0, 20, 0, 21, 0, 0, 0, 0, 0, - 0, 0, 0, 82, 0, 0, 83, 0, 0, 84, - 0, 85, 130, 67, 68, 69, 70, 71, 72, 73, - 74, 75, 76, 77, 78, 79, 0, 0, 80, 81, - 0, 0, 0, 0, 0, 0, 0, 20, 0, 21, - 0, 0, 82, 0, 0, 83, 0, 0, 84, 0, - 85, 130, 226, 227, 228, 229, 230, 231, 232, 233, - 234, 235, 236, 78, 79, 0, 0, 80, 81, 0, - 0, 0, 0, 0, 0, 0, 20, 0, 21, 0, - 0, 82, 0, 0, 83, 0, 0, 84, 0, 85, + 76, 0, 0, 77, 78, 0, 0, 0, 0, 0, + 540, 541, 19, 0, 20, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 79, + 0, 0, 80, 0, 0, 81, 0, 82, 127, 0, + 0, 0, 562, 0, 563, 564, 126, 222, 223, 224, + 225, 226, 227, 228, 229, 230, 231, 232, 75, 76, + 0, 0, 77, 78, 0, 0, 0, 0, 0, 0, + 0, 19, 0, 20, 126, 64, 65, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 0, 0, + 77, 78, 0, 0, 0, 0, 0, 0, 0, 19, + 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 356, 0, 0, 126, 222, 223, 224, 225, 226, + 227, 228, 229, 230, 231, 232, 75, 76, 0, 0, + 77, 78, 0, 0, 0, 0, 0, 79, 0, 19, + 80, 20, 0, 81, 0, 82, 241, 126, 64, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 0, 0, 77, 78, 0, 0, 0, 0, 0, + 0, 0, 19, 0, 20, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 422, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 79, 0, 0, 80, + 0, 0, 81, 0, 82, 412, 126, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 0, 0, 77, 78, 79, 0, 0, 80, 0, 0, + 81, 19, 82, 20, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 469, 0, 0, 63, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 0, 0, 77, 78, 79, 0, 0, 80, 0, 409, + 81, 19, 82, 20, 133, 64, 65, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 0, 0, + 77, 78, 0, 0, 0, 0, 0, 79, 0, 19, + 80, 20, 0, 81, 0, 82, 126, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 0, 0, 77, 78, 0, 0, 0, 0, 0, 0, + 0, 19, 0, 20, 0, 0, 126, 222, 223, 224, + 225, 226, 227, 228, 229, 230, 231, 232, 75, 76, + 0, 0, 77, 78, 0, 0, 79, 0, 0, 80, + 0, 19, 81, 20, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 80, 81, 0, 344, 345, 346, 0, 82, 0, - 20, 83, 21, 0, 84, 0, 85, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 79, 0, 0, 80, + 0, 0, 81, 0, 82, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 79, 0, 0, 80, 0, 0, + 81, 0, 82, 0, 77, 78, 0, 340, 341, 342, + 0, 0, 0, 19, 0, 20, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 79, 0, 0, 80, + 0, 0, 81, 0, 82, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 79, 0, 0, 80, + 0, 0, 81, 0, 82, 154, 155, 156, 157, 158, + 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, + 169, 170, 171, 172, 173, 258, 259, 0, 0, 0, + 0, 249, 250, 77, 78, 251, 252, 253, 254, 255, + 256, 0, 19, 0, 20, 0, 0, 0, 0, 0, + 0, 0, 260, 0, 261, 182, 183, 184, 185, 0, + 262, 263, 264, 190, 191, 192, 193, 194, 195, 196, + 197, 198, 199, 200, 201, 202, 257, 0, 0, 0, + 0, 343, 0, 0, 344, 0, 345, 0, 0, 346, + 0, 0, 0, 0, 154, 155, 156, 157, 158, 159, + 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, + 170, 171, 172, 173, 258, 259, 0, 0, 0, 0, + 249, 250, 0, 0, 251, 252, 253, 254, 255, 256, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 260, 0, 261, 182, 183, 184, 185, 0, 262, + 263, 264, 190, 191, 192, 193, 194, 195, 196, 197, + 198, 199, 200, 201, 202, 257, 0, 0, 0, 0, + 0, 0, 0, 265, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 154, 155, 156, 157, 158, 159, 160, + 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, + 171, 172, 173, 258, 259, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 260, 0, 261, 182, 183, 184, 185, 0, 262, 263, + 264, 190, 191, 192, 193, 194, 195, 196, 197, 198, + 199, 200, 201, 202, 149, 0, 0, 0, 0, 0, + 0, 0, 265, 0, 0, 150, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 151, 152, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 82, 0, 0, 83, 0, 0, 84, - 0, 85, 0, 158, 159, 160, 161, 162, 163, 164, - 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 262, 263, 0, 0, 0, 0, 0, - 0, 0, 82, 0, 0, 83, 0, 0, 84, 0, - 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 264, 0, 265, 186, 187, 188, 189, 0, 266, 267, - 268, 194, 195, 196, 197, 198, 199, 200, 201, 202, - 203, 204, 205, 206, 0, 0, 0, 0, 0, 347, - 0, 0, 348, 0, 349, 0, 0, 350, 253, 254, - 80, 81, 255, 256, 257, 258, 259, 260, 0, 20, - 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 153, 0, 0, 0, 154, 155, 156, 157, + 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, + 168, 169, 170, 171, 172, 173, 174, 175, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 261, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 158, 159, 160, 161, 162, 163, 164, 165, - 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, - 176, 177, 262, 263, 0, 0, 0, 253, 254, 0, - 0, 255, 256, 257, 258, 259, 260, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 264, - 0, 265, 186, 187, 188, 189, 0, 266, 267, 268, - 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, - 204, 205, 206, 261, 0, 0, 0, 0, 0, 0, - 0, 269, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 158, 159, 160, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 177, 262, 263, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 264, 0, - 265, 186, 187, 188, 189, 0, 266, 267, 268, 194, - 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, - 205, 206, 153, 0, 0, 0, 0, 0, 0, 0, - 269, 0, 0, 154, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 155, 156, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 157, 0, 0, 0, 158, 159, 160, 161, 162, 163, - 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, - 174, 175, 176, 177, 178, 179, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 180, 181, 182, 0, - 0, 183, 184, 185, 186, 187, 188, 189, 190, 191, - 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, - 202, 203, 204, 205, 206 + 0, 0, 0, 0, 0, 0, 0, 0, 176, 177, + 178, 0, 0, 179, 180, 181, 182, 183, 184, 185, + 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, + 196, 197, 198, 199, 200, 201, 202 }; static const short int yycheck[] = { - 40, 103, 3, 103, 53, 225, 32, 10, 157, 101, - 18, 314, 29, 53, 85, 557, 33, 4, 10, 153, - 153, 241, 242, 527, 7, 0, 159, 161, 15, 138, - 572, 140, 141, 5, 6, 7, 8, 9, 10, 11, - 12, 0, 25, 152, 45, 5, 6, 7, 8, 9, - 10, 11, 12, 63, 558, 58, 31, 152, 129, 34, - 35, 101, 154, 212, 135, 28, 58, 30, 43, 44, - 45, 46, 47, 48, 49, 53, 54, 55, 153, 36, - 37, 121, 122, 38, 124, 155, 87, 153, 163, 64, - 182, 29, 153, 185, 164, 73, 153, 163, 190, 191, - 192, 193, 163, 58, 161, 27, 55, 126, 127, 58, - 59, 74, 75, 76, 154, 78, 79, 80, 210, 211, - 63, 43, 44, 45, 46, 47, 48, 49, 46, 51, - 48, 240, 153, 129, 25, 26, 162, 59, 159, 135, - 180, 181, 182, 183, 184, 185, 163, 347, 348, 349, - 190, 191, 192, 193, 162, 159, 161, 56, 57, 164, - 164, 103, 104, 105, 106, 107, 108, 207, 208, 209, - 210, 211, 243, 244, 25, 26, 247, 119, 120, 121, - 122, 28, 152, 30, 17, 18, 30, 159, 18, 140, - 141, 152, 412, 496, 152, 498, 17, 18, 152, 159, - 152, 152, 17, 18, 17, 18, 18, 316, 155, 249, - 17, 18, 78, 79, 18, 324, 325, 326, 109, 110, - 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 30, 31, 157, 284, 155, 30, 18, 331, - 30, 30, 27, 28, 284, 30, 158, 158, 155, 34, - 61, 36, 37, 153, 18, 295, 18, 18, 43, 44, - 45, 46, 47, 48, 49, 18, 51, 52, 18, 21, - 21, 161, 312, 21, 59, 60, 385, 386, 387, 64, - 329, 153, 123, 156, 393, 155, 65, 155, 155, 329, - 330, 331, 155, 155, 365, 155, 405, 406, 155, 155, - 155, 155, 40, 395, 153, 397, 398, 399, 153, 157, - 153, 403, 5, 6, 7, 8, 9, 10, 11, 12, - 43, 44, 45, 46, 47, 48, 49, 153, 153, 153, - 153, 153, 30, 442, 443, 153, 153, 153, 447, 30, - 449, 161, 156, 153, 453, 30, 155, 155, 15, 15, - 459, 460, 461, 153, 157, 395, 396, 397, 398, 399, - 361, 153, 153, 403, 404, 316, 66, 67, 68, 69, - 70, 71, 72, 324, 325, 326, 153, 153, 30, 18, - 38, 153, 153, 153, 424, 494, 495, 153, 153, 40, - 153, 18, 501, 153, 153, 153, 58, 153, 155, 153, - 155, 510, 30, 18, 153, 15, 153, 153, 153, 153, - 450, 503, 504, 505, 153, 156, 153, 157, 153, 153, - 153, 153, 153, 153, 58, 527, 466, 527, 537, 156, - 156, 156, 156, 40, 385, 386, 387, 156, 156, 156, - 156, 153, 393, 535, 159, 156, 555, 156, 156, 159, - 490, 156, 156, 493, 405, 406, 558, 15, 558, 15, - 15, 153, 15, 503, 504, 505, 107, 107, 262, 509, - 107, 580, 581, 45, 107, 263, 585, 107, 52, 588, - 425, 62, 3, 424, 43, 583, 450, 509, -1, -1, - 430, 442, 443, -1, -1, 535, 447, 240, 449, -1, - -1, -1, 453, -1, -1, -1, -1, -1, 459, 460, - 461, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 371, 372, 373, 374, 375, -1, -1, 378, 379, 380, - 381, 382, -1, 494, 495, -1, -1, -1, -1, -1, - 501, -1, -1, -1, -1, -1, -1, -1, -1, 510, - -1, -1, -1, -1, 3, 4, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, - 19, 20, -1, -1, -1, -1, 537, 428, 429, 28, - -1, 30, -1, -1, 435, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 555, -1, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, -1, 19, 20, -1, -1, -1, -1, -1, 580, - 581, 28, -1, 30, 585, -1, -1, 588, -1, -1, - 481, 482, 483, 484, -1, 486, 487, 488, 489, -1, - 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, 19, 20, -1, -1, - -1, -1, -1, 514, 515, 28, -1, 30, -1, 3, + 38, 221, 100, 100, 3, 51, 32, 310, 10, 18, + 98, 29, 153, 51, 82, 33, 523, 237, 238, 10, + 5, 6, 7, 8, 9, 10, 11, 12, 134, 37, + 136, 137, 5, 6, 7, 8, 9, 10, 11, 12, + 4, 553, 148, 154, 43, 158, 0, 554, 152, 57, + 163, 15, 163, 27, 29, 57, 568, 125, 162, 152, + 98, 160, 150, 131, 163, 158, 57, 208, 42, 43, + 44, 45, 46, 47, 48, 28, 50, 30, 62, 152, + 118, 119, 152, 121, 58, 84, 52, 53, 54, 162, + 178, 152, 162, 181, 152, 152, 151, 158, 186, 187, + 188, 189, 160, 160, 53, 125, 72, 56, 57, 25, + 26, 131, 150, 343, 344, 345, 35, 36, 206, 207, + 73, 74, 75, 62, 77, 78, 79, 45, 151, 47, + 236, 55, 56, 136, 137, 161, 125, 126, 176, 177, + 178, 179, 180, 181, 162, 148, 25, 26, 186, 187, + 188, 189, 161, 5, 6, 7, 8, 9, 10, 11, + 12, 28, 30, 30, 18, 203, 204, 205, 206, 207, + 151, 239, 240, 158, 151, 243, 65, 66, 67, 68, + 69, 70, 71, 17, 18, 158, 17, 18, 408, 492, + 151, 494, 108, 109, 110, 111, 112, 113, 114, 115, + 116, 117, 118, 119, 120, 121, 312, 245, 17, 18, + 17, 18, 77, 78, 320, 321, 322, 0, 151, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 156, 280, 19, 20, 17, 18, 327, + 154, 18, 280, 18, 28, 154, 30, 18, 31, 30, + 120, 34, 30, 291, 30, 157, 40, 157, 154, 42, + 43, 44, 45, 46, 47, 48, 60, 152, 18, 18, + 308, 18, 18, 21, 18, 381, 382, 383, 21, 325, + 63, 21, 160, 389, 155, 64, 152, 325, 326, 327, + 154, 154, 154, 361, 154, 401, 402, 102, 103, 104, + 105, 106, 107, 391, 154, 393, 394, 395, 154, 312, + 154, 399, 154, 118, 119, 120, 121, 320, 321, 322, + 156, 154, 154, 152, 152, 152, 152, 152, 152, 152, + 152, 152, 438, 439, 152, 152, 39, 443, 30, 445, + 30, 160, 152, 449, 155, 30, 154, 15, 154, 455, + 456, 457, 15, 391, 392, 393, 394, 395, 357, 152, + 156, 399, 400, 152, 152, 152, 152, 18, 30, 153, + 37, 18, 156, 39, 57, 159, 30, 161, 381, 382, + 383, 154, 420, 152, 490, 491, 389, 152, 152, 152, + 152, 497, 152, 152, 152, 152, 152, 152, 401, 402, + 506, 152, 154, 156, 18, 15, 39, 152, 446, 57, + 152, 499, 500, 501, 152, 152, 152, 158, 152, 152, + 155, 152, 152, 152, 462, 523, 523, 533, 155, 152, + 152, 155, 158, 152, 155, 438, 439, 155, 155, 155, + 443, 155, 445, 531, 155, 551, 449, 155, 486, 155, + 155, 489, 455, 456, 457, 155, 554, 554, 155, 15, + 15, 499, 500, 501, 152, 15, 15, 505, 104, 104, + 576, 577, 104, 258, 104, 581, 104, 259, 584, 43, + 24, 421, 236, 50, 420, 3, 29, 490, 491, 41, + 579, 446, 505, 531, 497, 426, -1, 367, 368, 369, + 370, 371, -1, 506, 374, 375, 376, 377, 378, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, 19, 20, -1, -1, -1, - -1, -1, -1, -1, 28, 546, 30, 548, 549, -1, - -1, -1, -1, -1, -1, 154, -1, 41, 157, -1, - -1, 160, -1, 162, 163, -1, 3, 4, 5, 6, + 533, -1, -1, -1, 28, -1, 30, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 551, -1, + -1, -1, -1, -1, 424, 425, -1, -1, -1, -1, + -1, 431, -1, -1, -1, -1, -1, -1, 27, 28, + -1, 30, -1, 576, 577, 34, 35, 36, 581, -1, + -1, 584, -1, 42, 43, 44, 45, 46, 47, 48, + -1, 50, 51, -1, -1, -1, -1, -1, -1, 58, + 59, -1, -1, -1, 63, -1, -1, 477, 478, 479, + 480, -1, 482, 483, 484, 485, -1, 3, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, 19, 20, -1, -1, -1, -1, -1, + 510, 511, 28, -1, 30, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 153, + -1, -1, 156, -1, -1, 159, -1, 161, 162, -1, + -1, -1, 542, -1, 544, 545, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, 19, 20, -1, -1, -1, -1, -1, -1, - -1, 28, -1, 30, -1, -1, -1, 154, -1, -1, - 157, -1, -1, 160, 41, 162, 163, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, 19, 20, -1, -1, -1, -1, -1, - -1, -1, 28, -1, 30, -1, -1, -1, -1, -1, - -1, 154, -1, -1, 157, -1, -1, 160, -1, 162, - 163, -1, 3, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, -1, -1, 19, 20, - 154, -1, -1, 157, -1, -1, 160, 28, 162, 30, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 41, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, -1, -1, 19, 20, -1, - -1, -1, -1, -1, -1, -1, 28, 154, 30, -1, - 157, -1, -1, 160, -1, 162, -1, -1, -1, 41, - 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, -1, -1, 19, 20, -1, -1, - -1, -1, -1, -1, -1, 28, -1, 30, 154, -1, - -1, 157, -1, 159, 160, -1, 162, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, 19, 20, -1, -1, -1, -1, -1, - -1, -1, 28, -1, 30, -1, -1, -1, -1, -1, - -1, -1, -1, 154, -1, -1, 157, -1, -1, 160, - -1, 162, 3, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, -1, -1, 19, 20, - -1, -1, -1, -1, -1, -1, -1, 28, -1, 30, - -1, -1, 154, -1, -1, 157, -1, -1, 160, -1, - 162, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, -1, -1, 19, 20, -1, - -1, -1, -1, -1, -1, -1, 28, -1, 30, -1, - -1, 154, -1, -1, 157, -1, -1, 160, -1, 162, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 19, 20, -1, 22, 23, 24, -1, 154, -1, - 28, 157, 30, -1, 160, -1, 162, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 154, -1, -1, 157, -1, -1, 160, - -1, 162, -1, 81, 82, 83, 84, 85, 86, 87, - 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, -1, -1, -1, -1, -1, - -1, -1, 154, -1, -1, 157, -1, -1, 160, -1, - 162, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 128, -1, 130, 131, 132, 133, 134, -1, 136, 137, - 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 151, -1, -1, -1, -1, -1, 157, - -1, -1, 160, -1, 162, -1, -1, 165, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 26, -1, 28, + -1, 28, -1, 30, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, + 19, 20, -1, -1, -1, -1, -1, -1, -1, 28, -1, 30, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 40, -1, -1, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, + 19, 20, -1, -1, -1, -1, -1, 153, -1, 28, + 156, 30, -1, 159, -1, 161, 162, 3, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, -1, -1, 19, 20, -1, -1, -1, -1, -1, + -1, -1, 28, -1, 30, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 40, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 153, -1, -1, 156, + -1, -1, 159, -1, 161, 162, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + -1, -1, 19, 20, 153, -1, -1, 156, -1, -1, + 159, 28, 161, 30, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 40, -1, -1, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + -1, -1, 19, 20, 153, -1, -1, 156, -1, 158, + 159, 28, 161, 30, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, + 19, 20, -1, -1, -1, -1, -1, 153, -1, 28, + 156, 30, -1, 159, -1, 161, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + -1, -1, 19, 20, -1, -1, -1, -1, -1, -1, + -1, 28, -1, 30, -1, -1, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + -1, -1, 19, 20, -1, -1, 153, -1, -1, 156, + -1, 28, 159, 30, 161, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 63, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 153, -1, -1, 156, + -1, -1, 159, -1, 161, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 81, 82, 83, 84, 85, 86, 87, 88, - 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, - 99, 100, 101, 102, -1, -1, -1, 17, 18, -1, - -1, 21, 22, 23, 24, 25, 26, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 128, - -1, 130, 131, 132, 133, 134, -1, 136, 137, 138, - 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, - 149, 150, 151, 63, -1, -1, -1, -1, -1, -1, - -1, 160, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, - 100, 101, 102, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 153, -1, -1, 156, -1, -1, + 159, -1, 161, -1, 19, 20, -1, 22, 23, 24, + -1, -1, -1, 28, -1, 30, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 153, -1, -1, 156, + -1, -1, 159, -1, 161, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 128, -1, - 130, 131, 132, 133, 134, -1, 136, 137, 138, 139, - 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, - 150, 151, 39, -1, -1, -1, -1, -1, -1, -1, - 160, -1, -1, 50, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 61, 62, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 153, -1, -1, 156, + -1, -1, 159, -1, 161, 80, 81, 82, 83, 84, + 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, + 95, 96, 97, 98, 99, 100, 101, -1, -1, -1, + -1, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, -1, 28, -1, 30, -1, -1, -1, -1, -1, + -1, -1, 127, -1, 129, 130, 131, 132, 133, -1, + 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, + 145, 146, 147, 148, 149, 150, 62, -1, -1, -1, + -1, 156, -1, -1, 159, -1, 161, -1, -1, 164, + -1, -1, -1, -1, 80, 81, 82, 83, 84, 85, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 101, -1, -1, -1, -1, + 17, 18, -1, -1, 21, 22, 23, 24, 25, 26, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 77, -1, -1, -1, 81, 82, 83, 84, 85, 86, + -1, 127, -1, 129, 130, 131, 132, 133, -1, 135, + 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, + 146, 147, 148, 149, 150, 62, -1, -1, -1, -1, + -1, -1, -1, 159, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, - 97, 98, 99, 100, 101, 102, -1, -1, -1, -1, + 97, 98, 99, 100, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 123, 124, 125, -1, - -1, 128, 129, 130, 131, 132, 133, 134, 135, 136, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 127, -1, 129, 130, 131, 132, 133, -1, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, - 147, 148, 149, 150, 151 + 147, 148, 149, 150, 38, -1, -1, -1, -1, -1, + -1, -1, 159, -1, -1, 49, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 60, 61, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 76, -1, -1, -1, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 122, 123, + 124, -1, -1, 127, 128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, + 144, 145, 146, 147, 148, 149, 150 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const unsigned char yystos[] = { - 0, 200, 201, 203, 0, 31, 34, 35, 43, 44, - 45, 46, 47, 48, 49, 64, 181, 216, 218, 220, - 28, 30, 52, 60, 64, 180, 209, 220, 46, 48, - 219, 181, 63, 66, 67, 68, 69, 70, 71, 72, - 182, 214, 29, 226, 227, 228, 53, 54, 55, 73, - 206, 152, 63, 27, 46, 48, 51, 59, 181, 202, - 152, 214, 214, 30, 204, 18, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 19, 20, 154, 157, 160, 162, 167, 189, 190, 191, - 192, 193, 209, 223, 32, 162, 215, 33, 163, 217, - 227, 74, 75, 76, 78, 79, 80, 180, 229, 230, - 232, 152, 152, 152, 152, 157, 207, 204, 189, 36, - 37, 199, 199, 199, 199, 215, 18, 18, 18, 162, - 3, 163, 193, 194, 209, 155, 164, 3, 191, 225, - 4, 15, 5, 6, 7, 8, 9, 10, 11, 12, - 176, 177, 178, 39, 50, 61, 62, 77, 81, 82, - 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, - 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, - 123, 124, 125, 128, 129, 130, 131, 132, 133, 134, - 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, - 145, 146, 147, 148, 149, 150, 151, 169, 170, 171, - 174, 175, 236, 237, 239, 240, 30, 56, 57, 205, - 18, 30, 30, 208, 191, 191, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 176, 177, 179, - 191, 196, 191, 158, 158, 163, 194, 153, 163, 155, - 41, 194, 195, 17, 18, 21, 22, 23, 24, 25, - 26, 63, 101, 102, 128, 130, 136, 137, 138, 160, - 169, 170, 171, 174, 175, 197, 222, 223, 224, 224, - 224, 224, 225, 61, 182, 103, 104, 105, 106, 107, - 108, 119, 120, 121, 122, 172, 25, 26, 109, 110, - 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 173, 191, 191, 225, 191, 191, 233, 225, - 225, 225, 225, 225, 191, 191, 191, 225, 225, 182, - 126, 127, 153, 159, 153, 187, 187, 25, 26, 17, - 18, 168, 18, 21, 22, 23, 24, 157, 160, 162, - 165, 197, 223, 187, 187, 193, 193, 161, 163, 193, - 41, 191, 211, 212, 213, 153, 156, 65, 221, 172, - 173, 155, 155, 155, 155, 155, 196, 198, 155, 155, - 155, 155, 155, 153, 153, 189, 191, 191, 153, 184, - 153, 184, 224, 157, 153, 153, 153, 153, 153, 153, - 224, 224, 224, 153, 40, 189, 191, 225, 30, 38, - 58, 185, 188, 159, 198, 198, 163, 198, 30, 159, - 161, 161, 209, 210, 153, 156, 41, 30, 155, 155, - 196, 196, 196, 196, 196, 153, 161, 196, 196, 196, - 196, 196, 15, 15, 224, 224, 224, 10, 58, 10, - 153, 238, 224, 157, 225, 191, 225, 225, 225, 153, - 153, 153, 225, 191, 224, 224, 153, 30, 18, 187, - 159, 161, 163, 41, 211, 185, 186, 153, 196, 196, - 238, 153, 153, 153, 153, 196, 153, 153, 153, 153, - 40, 224, 224, 155, 153, 153, 224, 18, 224, 225, - 234, 153, 224, 153, 153, 153, 224, 224, 224, 155, - 191, 58, 183, 30, 153, 153, 156, 196, 196, 196, - 196, 196, 196, 196, 196, 191, 153, 157, 234, 235, - 224, 224, 153, 184, 184, 153, 224, 153, 225, 225, - 225, 235, 224, 18, 196, 196, 153, 156, 153, 153, - 156, 156, 156, 156, 156, 15, 159, 178, 231, 156, - 225, 159, 224, 156, 156, 156, 196, 196, 196, 224, - 222, 159, 178, 40, 159, 156, 156, 156, 153, 222, - 15, 15, 153, 224, 224, 15, 229, 224, 15, 224 + 0, 199, 200, 202, 0, 31, 34, 42, 43, 44, + 45, 46, 47, 48, 63, 180, 215, 217, 219, 28, + 30, 51, 59, 63, 179, 208, 219, 45, 47, 218, + 62, 65, 66, 67, 68, 69, 70, 71, 181, 213, + 29, 225, 226, 227, 52, 53, 54, 72, 205, 151, + 62, 27, 45, 47, 50, 58, 180, 201, 151, 213, + 30, 203, 18, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 19, 20, 153, + 156, 159, 161, 166, 188, 189, 190, 191, 192, 208, + 222, 32, 161, 214, 33, 162, 216, 226, 73, 74, + 75, 77, 78, 79, 179, 228, 229, 231, 151, 151, + 151, 151, 156, 206, 203, 188, 35, 36, 198, 198, + 198, 198, 18, 18, 18, 161, 3, 162, 192, 193, + 208, 154, 163, 3, 190, 224, 4, 15, 5, 6, + 7, 8, 9, 10, 11, 12, 175, 176, 177, 38, + 49, 60, 61, 76, 80, 81, 82, 83, 84, 85, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 101, 122, 123, 124, 127, + 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, + 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, + 148, 149, 150, 168, 169, 170, 173, 174, 235, 236, + 238, 239, 30, 55, 56, 204, 18, 30, 30, 207, + 190, 190, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 175, 176, 178, 190, 195, 190, 157, + 157, 162, 193, 152, 162, 154, 40, 193, 194, 17, + 18, 21, 22, 23, 24, 25, 26, 62, 100, 101, + 127, 129, 135, 136, 137, 159, 168, 169, 170, 173, + 174, 196, 221, 222, 223, 223, 223, 223, 224, 60, + 181, 102, 103, 104, 105, 106, 107, 118, 119, 120, + 121, 171, 25, 26, 108, 109, 110, 111, 112, 113, + 114, 115, 116, 117, 118, 119, 120, 121, 172, 190, + 190, 224, 190, 190, 232, 224, 224, 224, 224, 224, + 190, 190, 190, 224, 224, 181, 125, 126, 152, 158, + 152, 186, 186, 25, 26, 17, 18, 167, 18, 21, + 22, 23, 24, 156, 159, 161, 164, 196, 222, 186, + 186, 192, 192, 160, 162, 192, 40, 190, 210, 211, + 212, 152, 155, 64, 220, 171, 172, 154, 154, 154, + 154, 154, 195, 197, 154, 154, 154, 154, 154, 152, + 152, 188, 190, 190, 152, 183, 152, 183, 223, 156, + 152, 152, 152, 152, 152, 152, 223, 223, 223, 152, + 39, 188, 190, 224, 30, 37, 57, 184, 187, 158, + 197, 197, 162, 197, 30, 158, 160, 160, 208, 209, + 152, 155, 40, 30, 154, 154, 195, 195, 195, 195, + 195, 152, 160, 195, 195, 195, 195, 195, 15, 15, + 223, 223, 223, 10, 57, 10, 152, 237, 223, 156, + 224, 190, 224, 224, 224, 152, 152, 152, 224, 190, + 223, 223, 152, 30, 18, 186, 158, 160, 162, 40, + 210, 184, 185, 152, 195, 195, 237, 152, 152, 152, + 152, 195, 152, 152, 152, 152, 39, 223, 223, 154, + 152, 152, 223, 18, 223, 224, 233, 152, 223, 152, + 152, 152, 223, 223, 223, 154, 190, 57, 182, 30, + 152, 152, 155, 195, 195, 195, 195, 195, 195, 195, + 195, 190, 152, 156, 233, 234, 223, 223, 152, 183, + 183, 152, 223, 152, 224, 224, 224, 234, 223, 18, + 195, 195, 152, 155, 152, 152, 155, 155, 155, 155, + 155, 15, 158, 177, 230, 155, 224, 158, 223, 155, + 155, 155, 195, 195, 195, 223, 221, 158, 177, 39, + 158, 155, 155, 155, 152, 221, 15, 15, 152, 223, + 223, 15, 228, 223, 15, 223 }; #define yyerrok (yyerrstatus = 0) @@ -2419,26 +2408,26 @@ yyreduce: switch (yyn) { case 81: -#line 363 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 368 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[-1].String); ;} break; case 82: -#line 366 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 371 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(""); ;} break; case 90: -#line 373 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 378 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(""); ;} break; case 97: -#line 378 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 383 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2447,27 +2436,27 @@ yyreduce: break; case 98: -#line 383 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 388 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(""); ;} break; case 99: -#line 388 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 393 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 100: -#line 389 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 394 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); (yyval.String) = (yyvsp[-1].String); ;} break; case 101: -#line 392 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 397 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 102: -#line 393 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 398 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, ", "); *(yyvsp[-1].String) += " " + *(yyvsp[0].String); @@ -2477,7 +2466,7 @@ yyreduce: break; case 103: -#line 401 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 406 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2486,17 +2475,17 @@ yyreduce: break; case 104: -#line 407 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 412 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 106: -#line 411 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 416 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 107: -#line 412 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 417 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, ", "); if (!(yyvsp[0].String)->empty()) @@ -2507,7 +2496,7 @@ yyreduce: break; case 109: -#line 422 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 427 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2516,7 +2505,7 @@ yyreduce: break; case 127: -#line 444 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 449 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Type).newTy = (yyvsp[0].String); (yyval.Type).oldTy = OpaqueTy; @@ -2524,7 +2513,7 @@ yyreduce: break; case 128: -#line 448 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 453 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Type).newTy = (yyvsp[0].String); (yyval.Type).oldTy = UnresolvedTy; @@ -2532,14 +2521,14 @@ yyreduce: break; case 129: -#line 452 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 457 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Type) = (yyvsp[0].Type); ;} break; case 130: -#line 455 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 460 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Type UpReference (yyvsp[0].String)->insert(0, "\\"); (yyval.Type).newTy = (yyvsp[0].String); @@ -2548,7 +2537,7 @@ yyreduce: break; case 131: -#line 460 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 465 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Function derived type? *(yyvsp[-3].Type).newTy += "( " + *(yyvsp[-1].String) + " )"; delete (yyvsp[-1].String); @@ -2558,7 +2547,7 @@ yyreduce: break; case 132: -#line 466 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 471 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Sized array type? (yyvsp[-3].String)->insert(0,"[ "); *(yyvsp[-3].String) += " x " + *(yyvsp[-1].Type).newTy + " ]"; @@ -2570,7 +2559,7 @@ yyreduce: break; case 133: -#line 474 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 479 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Packed array type? (yyvsp[-3].String)->insert(0,"< "); *(yyvsp[-3].String) += " x " + *(yyvsp[-1].Type).newTy + " >"; @@ -2582,7 +2571,7 @@ yyreduce: break; case 134: -#line 482 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 487 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Structure type? (yyvsp[-1].String)->insert(0, "{ "); *(yyvsp[-1].String) += " }"; @@ -2592,7 +2581,7 @@ yyreduce: break; case 135: -#line 488 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 493 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Empty structure type? (yyval.Type).newTy = new std::string("{}"); (yyval.Type).oldTy = StructTy; @@ -2600,7 +2589,7 @@ yyreduce: break; case 136: -#line 492 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 497 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Packed Structure type? (yyvsp[-2].String)->insert(0, "<{ "); *(yyvsp[-2].String) += " }>"; @@ -2610,7 +2599,7 @@ yyreduce: break; case 137: -#line 498 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 503 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Empty packed structure type? (yyval.Type).newTy = new std::string("<{}>"); (yyval.Type).oldTy = StructTy; @@ -2618,7 +2607,7 @@ yyreduce: break; case 138: -#line 502 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 507 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Pointer type? *(yyvsp[-1].Type).newTy += '*'; (yyval.Type).elemTy = (yyvsp[-1].Type).oldTy; @@ -2628,14 +2617,14 @@ yyreduce: break; case 139: -#line 513 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 518 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].Type).newTy; ;} break; case 140: -#line 516 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 521 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].Type).newTy; delete (yyvsp[0].Type).newTy; @@ -2644,7 +2633,7 @@ yyreduce: break; case 142: -#line 525 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 530 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", ..."; delete (yyvsp[0].String); @@ -2653,21 +2642,21 @@ yyreduce: break; case 143: -#line 530 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 535 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; case 144: -#line 533 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 538 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 145: -#line 543 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 548 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Nonempty unsized arr (yyval.Const).type = (yyvsp[-3].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy); @@ -2677,7 +2666,7 @@ yyreduce: break; case 146: -#line 549 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 554 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-2].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy); @@ -2686,7 +2675,7 @@ yyreduce: break; case 147: -#line 554 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 559 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-2].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy); @@ -2696,7 +2685,7 @@ yyreduce: break; case 148: -#line 560 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 565 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Nonempty unsized arr (yyval.Const).type = (yyvsp[-3].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy); @@ -2706,7 +2695,7 @@ yyreduce: break; case 149: -#line 566 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 571 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-3].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy); @@ -2716,7 +2705,7 @@ yyreduce: break; case 150: -#line 572 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 577 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-2].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy); @@ -2725,7 +2714,7 @@ yyreduce: break; case 151: -#line 577 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 582 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2735,7 +2724,7 @@ yyreduce: break; case 152: -#line 583 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 588 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2745,7 +2734,7 @@ yyreduce: break; case 153: -#line 589 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 594 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2755,7 +2744,7 @@ yyreduce: break; case 154: -#line 595 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 600 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2765,7 +2754,7 @@ yyreduce: break; case 155: -#line 601 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 606 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2775,7 +2764,7 @@ yyreduce: break; case 156: -#line 607 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 612 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // integral constants (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2785,7 +2774,7 @@ yyreduce: break; case 157: -#line 613 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 618 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // integral constants (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2795,7 +2784,7 @@ yyreduce: break; case 158: -#line 619 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 624 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Boolean constants (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2805,7 +2794,7 @@ yyreduce: break; case 159: -#line 625 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 630 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Boolean constants (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2815,7 +2804,7 @@ yyreduce: break; case 160: -#line 631 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 636 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Float & Double constants (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2825,7 +2814,7 @@ yyreduce: break; case 161: -#line 639 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 644 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { std::string source = *(yyvsp[-3].Const).cnst; TypeInfo DstTy = (yyvsp[-1].Type); @@ -2843,7 +2832,7 @@ yyreduce: break; case 162: -#line 653 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 658 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-4].String) += "(" + *(yyvsp[-2].Const).cnst; for (unsigned i = 0; i < (yyvsp[-1].ValList)->size(); ++i) { @@ -2859,7 +2848,7 @@ yyreduce: break; case 163: -#line 665 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 670 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -2868,7 +2857,7 @@ yyreduce: break; case 164: -#line 670 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 675 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { const char* op = getDivRemOpcode(*(yyvsp[-5].String), (yyvsp[-3].Const).type); (yyval.String) = new std::string(op); @@ -2878,7 +2867,7 @@ yyreduce: break; case 165: -#line 676 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 681 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -2887,7 +2876,7 @@ yyreduce: break; case 166: -#line 681 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 686 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) = getCompareOp(*(yyvsp[-5].String), (yyvsp[-3].Const).type); *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; @@ -2897,7 +2886,7 @@ yyreduce: break; case 167: -#line 687 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 692 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-6].String) += "(" + *(yyvsp[-5].String) + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -2906,7 +2895,7 @@ yyreduce: break; case 168: -#line 692 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 697 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-6].String) += "(" + *(yyvsp[-5].String) + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -2915,7 +2904,7 @@ yyreduce: break; case 169: -#line 697 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 702 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { const char* shiftop = (yyvsp[-5].String)->c_str(); if (*(yyvsp[-5].String) == "shr") @@ -2927,7 +2916,7 @@ yyreduce: break; case 170: -#line 705 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 710 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -2936,7 +2925,7 @@ yyreduce: break; case 171: -#line 710 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 715 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -2945,7 +2934,7 @@ yyreduce: break; case 172: -#line 715 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 720 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -2954,7 +2943,7 @@ yyreduce: break; case 173: -#line 725 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 730 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].Const).cnst; (yyvsp[0].Const).destroy(); @@ -2963,25 +2952,25 @@ yyreduce: break; case 174: -#line 730 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 735 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(*(yyvsp[0].Const).cnst); (yyvsp[0].Const).destroy(); ;} break; case 177: -#line 745 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 750 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { ;} break; case 178: -#line 750 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 755 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; case 179: -#line 753 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 758 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << *(yyvsp[0].String) << '\n'; delete (yyvsp[0].String); @@ -2990,7 +2979,7 @@ yyreduce: break; case 180: -#line 758 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 763 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << "module asm " << ' ' << *(yyvsp[0].String) << '\n'; (yyval.String) = 0; @@ -2998,7 +2987,7 @@ yyreduce: break; case 181: -#line 762 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 767 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << "implementation\n"; (yyval.String) = 0; @@ -3006,17 +2995,17 @@ yyreduce: break; case 182: -#line 766 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 771 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; case 184: -#line 768 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 773 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); *(yyval.String) = "external"; ;} break; case 185: -#line 771 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 776 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { EnumeratedTypes.push_back((yyvsp[0].Type)); if (!(yyvsp[-2].String)->empty()) { @@ -3032,7 +3021,7 @@ yyreduce: break; case 186: -#line 783 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 788 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Function prototypes can be in const pool *O << *(yyvsp[0].String) << '\n'; delete (yyvsp[0].String); @@ -3041,7 +3030,7 @@ yyreduce: break; case 187: -#line 788 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 793 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Asm blocks can be in the const pool *O << *(yyvsp[-2].String) << ' ' << *(yyvsp[-1].String) << ' ' << *(yyvsp[0].String) << '\n'; delete (yyvsp[-2].String); delete (yyvsp[-1].String); delete (yyvsp[0].String); @@ -3050,7 +3039,7 @@ yyreduce: break; case 188: -#line 793 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 798 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) { *O << *(yyvsp[-4].String) << " = "; @@ -3063,7 +3052,7 @@ yyreduce: break; case 189: -#line 802 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 807 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) { *O << *(yyvsp[-4].String) << " = "; @@ -3076,7 +3065,7 @@ yyreduce: break; case 190: -#line 811 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 816 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) { *O << *(yyvsp[-4].String) << " = "; @@ -3089,7 +3078,7 @@ yyreduce: break; case 191: -#line 820 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 825 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) { *O << *(yyvsp[-4].String) << " = "; @@ -3102,7 +3091,7 @@ yyreduce: break; case 192: -#line 829 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 834 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << *(yyvsp[-1].String) << ' ' << *(yyvsp[0].String) << '\n'; delete (yyvsp[-1].String); delete (yyvsp[0].String); @@ -3111,7 +3100,7 @@ yyreduce: break; case 193: -#line 834 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 839 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << *(yyvsp[-2].String) << " = " << *(yyvsp[0].String) << '\n'; delete (yyvsp[-2].String); delete (yyvsp[0].String); @@ -3120,14 +3109,14 @@ yyreduce: break; case 194: -#line 839 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 844 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; case 198: -#line 849 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 854 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3136,7 +3125,7 @@ yyreduce: break; case 199: -#line 854 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 859 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); if (*(yyvsp[0].String) == "64") @@ -3147,7 +3136,7 @@ yyreduce: break; case 200: -#line 861 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 866 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3156,7 +3145,7 @@ yyreduce: break; case 201: -#line 866 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 871 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3165,7 +3154,7 @@ yyreduce: break; case 202: -#line 873 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 878 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, "[ "); *(yyvsp[-1].String) += " ]"; @@ -3174,7 +3163,7 @@ yyreduce: break; case 203: -#line 880 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 885 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3183,19 +3172,19 @@ yyreduce: break; case 205: -#line 886 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 891 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 209: -#line 895 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 900 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 210: -#line 897 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 902 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[-1].Type).newTy; if (!(yyvsp[0].String)->empty()) @@ -3205,7 +3194,7 @@ yyreduce: break; case 211: -#line 904 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 909 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3213,21 +3202,21 @@ yyreduce: break; case 212: -#line 908 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 913 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; case 213: -#line 912 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 917 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; case 214: -#line 915 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 920 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", ..."; (yyval.String) = (yyvsp[-2].String); @@ -3236,19 +3225,19 @@ yyreduce: break; case 215: -#line 920 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 925 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; case 216: -#line 923 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 928 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 217: -#line 926 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 931 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-7].String)->empty()) { *(yyvsp[-7].String) += " "; @@ -3270,17 +3259,17 @@ yyreduce: break; case 218: -#line 945 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 950 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string("{"); delete (yyvsp[0].String); ;} break; case 219: -#line 946 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 951 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string ("{"); ;} break; case 220: -#line 949 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 954 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << "define "; if (!(yyvsp[-2].String)->empty()) { @@ -3293,45 +3282,32 @@ yyreduce: break; case 221: -#line 958 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" - { - *O << *(yyvsp[-3].String) << ' '; - if (!(yyvsp[-2].String)->empty()) { - *O << *(yyvsp[-2].String) << ' '; - } - *O << *(yyvsp[-1].String) << ' ' << *(yyvsp[0].String) << '\n'; - delete (yyvsp[-3].String); delete (yyvsp[-2].String); delete (yyvsp[-1].String); delete (yyvsp[0].String); - (yyval.String) = 0; - ;} - break; - - case 222: -#line 969 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 965 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string("}"); delete (yyvsp[0].String); ;} break; - case 223: -#line 970 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 222: +#line 966 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string("}"); ;} break; - case 224: -#line 972 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 223: +#line 968 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if ((yyvsp[-1].String)) *O << *(yyvsp[-1].String); - *O << '\n' << *(yyvsp[0].String) << '\n'; + *O << *(yyvsp[0].String) << "\n\n"; (yyval.String) = 0; ;} break; - case 225: -#line 980 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 224: +#line 976 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 228: -#line 986 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 227: +#line 982 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-1].String)->empty()) *(yyvsp[-2].String) += " " + *(yyvsp[-1].String); @@ -3342,13 +3318,13 @@ yyreduce: ;} break; - case 229: -#line 999 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 228: +#line 995 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 239: -#line 1005 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 238: +#line 1001 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, "<"); *(yyvsp[-1].String) += ">"; @@ -3356,8 +3332,8 @@ yyreduce: ;} break; - case 241: -#line 1011 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 240: +#line 1007 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-3].String)->empty()) { *(yyvsp[-4].String) += " " + *(yyvsp[-3].String); @@ -3368,8 +3344,8 @@ yyreduce: ;} break; - case 244: -#line 1024 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 243: +#line 1020 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Value).val = (yyvsp[0].String); (yyval.Value).constant = false; @@ -3378,8 +3354,8 @@ yyreduce: ;} break; - case 245: -#line 1030 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 244: +#line 1026 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Value).val = (yyvsp[0].String); (yyval.Value).constant = true; @@ -3388,8 +3364,8 @@ yyreduce: ;} break; - case 246: -#line 1041 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 245: +#line 1037 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Value) = (yyvsp[0].Value); (yyval.Value).type = (yyvsp[-1].Type); @@ -3397,29 +3373,29 @@ yyreduce: ;} break; - case 247: -#line 1047 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 246: +#line 1043 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; - case 248: -#line 1050 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 247: +#line 1046 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Do not allow functions with 0 basic blocks (yyval.String) = 0; ;} break; - case 249: -#line 1058 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 248: +#line 1054 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; - case 250: -#line 1062 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 249: +#line 1058 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[0].String) << '\n'; delete (yyvsp[0].String); @@ -3427,15 +3403,15 @@ yyreduce: ;} break; - case 251: -#line 1067 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 250: +#line 1063 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; - case 252: -#line 1070 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 251: +#line 1066 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << *(yyvsp[0].String) << '\n'; delete (yyvsp[0].String); @@ -3443,13 +3419,13 @@ yyreduce: ;} break; - case 254: -#line 1076 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 253: +#line 1072 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); *(yyval.String) = "unwind"; ;} break; - case 255: -#line 1078 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 254: +#line 1074 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Return with a result... *O << " " << *(yyvsp[-1].String) << ' ' << *(yyvsp[0].Value).val << '\n'; delete (yyvsp[-1].String); (yyvsp[0].Value).destroy(); @@ -3457,8 +3433,8 @@ yyreduce: ;} break; - case 256: -#line 1083 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 255: +#line 1079 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Return with no result... *O << " " << *(yyvsp[-1].String) << ' ' << *(yyvsp[0].Type).newTy << '\n'; delete (yyvsp[-1].String); (yyvsp[0].Type).destroy(); @@ -3466,8 +3442,8 @@ yyreduce: ;} break; - case 257: -#line 1088 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 256: +#line 1084 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Unconditional Branch... *O << " " << *(yyvsp[-2].String) << ' ' << *(yyvsp[-1].Type).newTy << ' ' << *(yyvsp[0].Value).val << '\n'; delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); (yyvsp[0].Value).destroy(); @@ -3475,8 +3451,8 @@ yyreduce: ;} break; - case 258: -#line 1093 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 257: +#line 1089 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[-8].String) << ' ' << *(yyvsp[-7].Type).newTy << ' ' << *(yyvsp[-6].Value).val << ", " << *(yyvsp[-4].Type).newTy << ' ' << *(yyvsp[-3].Value).val << ", " << *(yyvsp[-1].Type).newTy << ' ' @@ -3487,8 +3463,8 @@ yyreduce: ;} break; - case 259: -#line 1101 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 258: +#line 1097 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[-8].String) << ' ' << *(yyvsp[-7].Type).newTy << ' ' << *(yyvsp[-6].Value).val << ", " << *(yyvsp[-4].Type).newTy << ' ' << *(yyvsp[-3].Value).val << " [" << *(yyvsp[-1].String) << " ]\n"; @@ -3498,8 +3474,8 @@ yyreduce: ;} break; - case 260: -#line 1108 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 259: +#line 1104 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[-7].String) << ' ' << *(yyvsp[-6].Type).newTy << ' ' << *(yyvsp[-5].Value).val << ", " << *(yyvsp[-3].Type).newTy << ' ' << *(yyvsp[-2].Value).val << "[]\n"; @@ -3508,8 +3484,8 @@ yyreduce: ;} break; - case 261: -#line 1115 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 260: +#line 1111 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << " "; if (!(yyvsp[-13].String)->empty()) @@ -3531,8 +3507,17 @@ yyreduce: ;} break; + case 261: +#line 1130 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + { + *O << " " << *(yyvsp[0].String) << '\n'; + delete (yyvsp[0].String); + (yyval.String) = 0; + ;} + break; + case 262: -#line 1134 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1135 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[0].String) << '\n'; delete (yyvsp[0].String); @@ -3541,16 +3526,7 @@ yyreduce: break; case 263: -#line 1139 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" - { - *O << " " << *(yyvsp[0].String) << '\n'; - delete (yyvsp[0].String); - (yyval.String) = 0; - ;} - break; - - case 264: -#line 1145 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1141 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + " " + *(yyvsp[-3].String) + ", " + *(yyvsp[-1].Type).newTy + " " + *(yyvsp[0].Value).val; (yyvsp[-4].Type).destroy(); delete (yyvsp[-3].String); (yyvsp[-1].Type).destroy(); (yyvsp[0].Value).destroy(); @@ -3558,8 +3534,8 @@ yyreduce: ;} break; - case 265: -#line 1150 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 264: +#line 1146 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-3].String)->insert(0, *(yyvsp[-4].Type).newTy + " " ); *(yyvsp[-3].String) += ", " + *(yyvsp[-1].Type).newTy + " " + *(yyvsp[0].Value).val; @@ -3568,8 +3544,8 @@ yyreduce: ;} break; - case 266: -#line 1158 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 265: +#line 1154 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-1].String)->empty()) *(yyvsp[-1].String) += " = "; @@ -3579,8 +3555,8 @@ yyreduce: ;} break; - case 267: -#line 1167 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 266: +#line 1163 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Used for PHI nodes (yyvsp[-3].Value).val->insert(0, *(yyvsp[-5].Type).newTy + "["); *(yyvsp[-3].Value).val += "," + *(yyvsp[-1].Value).val + "]"; @@ -3590,8 +3566,8 @@ yyreduce: ;} break; - case 268: -#line 1174 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 267: +#line 1170 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-6].String) += ", [" + *(yyvsp[-3].Value).val + "," + *(yyvsp[-1].Value).val + "]"; (yyvsp[-3].Value).destroy(); (yyvsp[-1].Value).destroy(); @@ -3599,34 +3575,34 @@ yyreduce: ;} break; - case 269: -#line 1182 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 268: +#line 1178 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = new ValueList(); (yyval.ValList)->push_back((yyvsp[0].Value)); ;} break; - case 270: -#line 1186 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 269: +#line 1182 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-2].ValList)->push_back((yyvsp[0].Value)); (yyval.ValList) = (yyvsp[-2].ValList); ;} break; - case 271: -#line 1193 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 270: +#line 1189 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = (yyvsp[0].ValList); ;} break; - case 272: -#line 1194 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 271: +#line 1190 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = new ValueList(); ;} break; - case 273: -#line 1198 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 272: +#line 1194 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3634,8 +3610,8 @@ yyreduce: ;} break; - case 275: -#line 1206 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 274: +#line 1202 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { const char* op = getDivRemOpcode(*(yyvsp[-4].String), (yyvsp[-3].Type)); (yyval.String) = new std::string(op); @@ -3644,8 +3620,8 @@ yyreduce: ;} break; - case 276: -#line 1212 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 275: +#line 1208 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-3].Type).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3653,8 +3629,8 @@ yyreduce: ;} break; - case 277: -#line 1217 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 276: +#line 1213 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-4].String) = getCompareOp(*(yyvsp[-4].String), (yyvsp[-3].Type)); *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; @@ -3663,8 +3639,17 @@ yyreduce: ;} break; + case 277: +#line 1219 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + { + *(yyvsp[-5].String) += " " + *(yyvsp[-4].String) + " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + "," + *(yyvsp[0].Value).val; + delete (yyvsp[-4].String); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); + (yyval.String) = (yyvsp[-5].String); + ;} + break; + case 278: -#line 1223 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1224 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].String) + " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + "," + *(yyvsp[0].Value).val; delete (yyvsp[-4].String); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3673,16 +3658,7 @@ yyreduce: break; case 279: -#line 1228 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" - { - *(yyvsp[-5].String) += " " + *(yyvsp[-4].String) + " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + "," + *(yyvsp[0].Value).val; - delete (yyvsp[-4].String); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); - (yyval.String) = (yyvsp[-5].String); - ;} - break; - - case 280: -#line 1233 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1229 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val; (yyvsp[0].Value).destroy(); @@ -3690,8 +3666,8 @@ yyreduce: ;} break; - case 281: -#line 1238 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 280: +#line 1234 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { const char* shiftop = (yyvsp[-3].String)->c_str(); if (*(yyvsp[-3].String) == "shr") @@ -3702,8 +3678,8 @@ yyreduce: ;} break; - case 282: -#line 1246 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 281: +#line 1242 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { std::string source = *(yyvsp[-2].Value).val; TypeInfo SrcTy = (yyvsp[-2].Value).type; @@ -3720,8 +3696,8 @@ yyreduce: ;} break; - case 283: -#line 1260 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 282: +#line 1256 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3729,8 +3705,8 @@ yyreduce: ;} break; - case 284: -#line 1265 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 283: +#line 1261 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Type).newTy; (yyvsp[-2].Value).destroy(); (yyvsp[0].Type).destroy(); @@ -3738,8 +3714,8 @@ yyreduce: ;} break; - case 285: -#line 1270 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 284: +#line 1266 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3747,8 +3723,17 @@ yyreduce: ;} break; + case 285: +#line 1271 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + { + *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; + (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); + (yyval.String) = (yyvsp[-5].String); + ;} + break; + case 286: -#line 1275 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1276 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3757,16 +3742,7 @@ yyreduce: break; case 287: -#line 1280 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" - { - *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; - (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); - (yyval.String) = (yyvsp[-5].String); - ;} - break; - - case 288: -#line 1285 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1281 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3774,8 +3750,8 @@ yyreduce: ;} break; - case 289: -#line 1290 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 288: +#line 1286 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-5].String)->empty()) *(yyvsp[-6].String) += " " + *(yyvsp[-5].String); @@ -3795,23 +3771,23 @@ yyreduce: ;} break; - case 291: -#line 1312 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 290: +#line 1308 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = (yyvsp[0].ValList); ;} break; - case 292: -#line 1313 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 291: +#line 1309 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = new ValueList(); ;} break; - case 294: -#line 1318 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 293: +#line 1314 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 295: -#line 1321 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 294: +#line 1317 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy; if (!(yyvsp[0].String)->empty()) @@ -3821,19 +3797,19 @@ yyreduce: ;} break; + case 295: +#line 1324 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + { + *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].Value).val; + if (!(yyvsp[0].String)->empty()) + *(yyvsp[-5].String) += " " + *(yyvsp[0].String); + (yyvsp[-4].Type).destroy(); (yyvsp[-2].Type).destroy(); (yyvsp[-1].Value).destroy(); delete (yyvsp[0].String); + (yyval.String) = (yyvsp[-5].String); + ;} + break; + case 296: -#line 1328 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" - { - *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].Value).val; - if (!(yyvsp[0].String)->empty()) - *(yyvsp[-5].String) += " " + *(yyvsp[0].String); - (yyvsp[-4].Type).destroy(); (yyvsp[-2].Type).destroy(); (yyvsp[-1].Value).destroy(); delete (yyvsp[0].String); - (yyval.String) = (yyvsp[-5].String); - ;} - break; - - case 297: -#line 1335 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1331 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy; if (!(yyvsp[0].String)->empty()) @@ -3843,8 +3819,8 @@ yyreduce: ;} break; - case 298: -#line 1342 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 297: +#line 1338 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].Value).val; if (!(yyvsp[0].String)->empty()) @@ -3854,8 +3830,8 @@ yyreduce: ;} break; - case 299: -#line 1349 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 298: +#line 1345 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val; (yyvsp[0].Value).destroy(); @@ -3863,8 +3839,8 @@ yyreduce: ;} break; - case 300: -#line 1354 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 299: +#line 1350 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-3].String)->empty()) *(yyvsp[-3].String) += " "; @@ -3874,8 +3850,8 @@ yyreduce: ;} break; - case 301: -#line 1361 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 300: +#line 1357 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-5].String)->empty()) *(yyvsp[-5].String) += " "; @@ -3885,8 +3861,8 @@ yyreduce: ;} break; - case 302: -#line 1368 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" + case 301: +#line 1364 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" { // Upgrade the indices for (unsigned i = 0; i < (yyvsp[0].ValList)->size(); ++i) { @@ -3895,8 +3871,8 @@ yyreduce: VI.type.getBitWidth() < 64) { std::string* old = VI.val; *O << " %gep_upgrade" << unique << " = zext " << *old - << " to ulong\n"; - VI.val = new std::string("ulong %gep_upgrade" + llvm::utostr(unique++)); + << " to i64\n"; + VI.val = new std::string("i64 %gep_upgrade" + llvm::utostr(unique++)); VI.type.oldTy = ULongTy; delete old; } @@ -3917,7 +3893,7 @@ yyreduce: } /* Line 1126 of yacc.c. */ -#line 3921 "UpgradeParser.tab.c" +#line 3897 "UpgradeParser.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -4185,7 +4161,7 @@ yyreturn: } -#line 1392 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 1388 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" int yyerror(const char *ErrorMsg) { @@ -4197,7 +4173,7 @@ int yyerror(const char *ErrorMsg) { errMsg += "end-of-file."; else errMsg += "token: '" + std::string(Upgradetext, Upgradeleng) + "'"; - std::cerr << errMsg << '\n'; + std::cerr << "llvm-upgrade: " << errMsg << '\n'; exit(1); } diff --git a/tools/llvm-upgrade/UpgradeParser.h b/tools/llvm-upgrade/UpgradeParser.h index ea0c85de380..b050b172709 100644 --- a/tools/llvm-upgrade/UpgradeParser.h +++ b/tools/llvm-upgrade/UpgradeParser.h @@ -61,123 +61,122 @@ BEGINTOK = 287, ENDTOK = 288, DECLARE = 289, - DEFINE = 290, - GLOBAL = 291, - CONSTANT = 292, - SECTION = 293, - VOLATILE = 294, - TO = 295, - DOTDOTDOT = 296, - CONST = 297, - INTERNAL = 298, - LINKONCE = 299, - WEAK = 300, - DLLIMPORT = 301, - DLLEXPORT = 302, - EXTERN_WEAK = 303, - APPENDING = 304, - NOT = 305, - EXTERNAL = 306, - TARGET = 307, - TRIPLE = 308, - ENDIAN = 309, - POINTERSIZE = 310, - LITTLE = 311, - BIG = 312, - ALIGN = 313, - UNINITIALIZED = 314, - DEPLIBS = 315, - CALL = 316, - TAIL = 317, - ASM_TOK = 318, - MODULE = 319, - SIDEEFFECT = 320, - CC_TOK = 321, - CCC_TOK = 322, - CSRETCC_TOK = 323, - FASTCC_TOK = 324, - COLDCC_TOK = 325, - X86_STDCALLCC_TOK = 326, - X86_FASTCALLCC_TOK = 327, - DATALAYOUT = 328, - RET = 329, - BR = 330, - SWITCH = 331, - INVOKE = 332, - EXCEPT = 333, - UNWIND = 334, - UNREACHABLE = 335, - ADD = 336, - SUB = 337, - MUL = 338, - DIV = 339, - UDIV = 340, - SDIV = 341, - FDIV = 342, - REM = 343, - UREM = 344, - SREM = 345, - FREM = 346, - AND = 347, - OR = 348, - XOR = 349, - SETLE = 350, - SETGE = 351, - SETLT = 352, - SETGT = 353, - SETEQ = 354, - SETNE = 355, - ICMP = 356, - FCMP = 357, - EQ = 358, - NE = 359, - SLT = 360, - SGT = 361, - SLE = 362, - SGE = 363, - OEQ = 364, - ONE = 365, - OLT = 366, - OGT = 367, - OLE = 368, - OGE = 369, - ORD = 370, - UNO = 371, - UEQ = 372, - UNE = 373, - ULT = 374, - UGT = 375, - ULE = 376, - UGE = 377, - MALLOC = 378, - ALLOCA = 379, - FREE = 380, - LOAD = 381, - STORE = 382, - GETELEMENTPTR = 383, - PHI_TOK = 384, - SELECT = 385, - SHL = 386, - SHR = 387, - ASHR = 388, - LSHR = 389, - VAARG = 390, - EXTRACTELEMENT = 391, - INSERTELEMENT = 392, - SHUFFLEVECTOR = 393, - CAST = 394, - TRUNC = 395, - ZEXT = 396, - SEXT = 397, - FPTRUNC = 398, - FPEXT = 399, - FPTOUI = 400, - FPTOSI = 401, - UITOFP = 402, - SITOFP = 403, - PTRTOINT = 404, - INTTOPTR = 405, - BITCAST = 406 + GLOBAL = 290, + CONSTANT = 291, + SECTION = 292, + VOLATILE = 293, + TO = 294, + DOTDOTDOT = 295, + CONST = 296, + INTERNAL = 297, + LINKONCE = 298, + WEAK = 299, + DLLIMPORT = 300, + DLLEXPORT = 301, + EXTERN_WEAK = 302, + APPENDING = 303, + NOT = 304, + EXTERNAL = 305, + TARGET = 306, + TRIPLE = 307, + ENDIAN = 308, + POINTERSIZE = 309, + LITTLE = 310, + BIG = 311, + ALIGN = 312, + UNINITIALIZED = 313, + DEPLIBS = 314, + CALL = 315, + TAIL = 316, + ASM_TOK = 317, + MODULE = 318, + SIDEEFFECT = 319, + CC_TOK = 320, + CCC_TOK = 321, + CSRETCC_TOK = 322, + FASTCC_TOK = 323, + COLDCC_TOK = 324, + X86_STDCALLCC_TOK = 325, + X86_FASTCALLCC_TOK = 326, + DATALAYOUT = 327, + RET = 328, + BR = 329, + SWITCH = 330, + INVOKE = 331, + EXCEPT = 332, + UNWIND = 333, + UNREACHABLE = 334, + ADD = 335, + SUB = 336, + MUL = 337, + DIV = 338, + UDIV = 339, + SDIV = 340, + FDIV = 341, + REM = 342, + UREM = 343, + SREM = 344, + FREM = 345, + AND = 346, + OR = 347, + XOR = 348, + SETLE = 349, + SETGE = 350, + SETLT = 351, + SETGT = 352, + SETEQ = 353, + SETNE = 354, + ICMP = 355, + FCMP = 356, + EQ = 357, + NE = 358, + SLT = 359, + SGT = 360, + SLE = 361, + SGE = 362, + OEQ = 363, + ONE = 364, + OLT = 365, + OGT = 366, + OLE = 367, + OGE = 368, + ORD = 369, + UNO = 370, + UEQ = 371, + UNE = 372, + ULT = 373, + UGT = 374, + ULE = 375, + UGE = 376, + MALLOC = 377, + ALLOCA = 378, + FREE = 379, + LOAD = 380, + STORE = 381, + GETELEMENTPTR = 382, + PHI_TOK = 383, + SELECT = 384, + SHL = 385, + SHR = 386, + ASHR = 387, + LSHR = 388, + VAARG = 389, + EXTRACTELEMENT = 390, + INSERTELEMENT = 391, + SHUFFLEVECTOR = 392, + CAST = 393, + TRUNC = 394, + ZEXT = 395, + SEXT = 396, + FPTRUNC = 397, + FPEXT = 398, + FPTOUI = 399, + FPTOSI = 400, + UITOFP = 401, + SITOFP = 402, + PTRTOINT = 403, + INTTOPTR = 404, + BITCAST = 405 }; #endif /* Tokens. */ @@ -213,129 +212,128 @@ #define BEGINTOK 287 #define ENDTOK 288 #define DECLARE 289 -#define DEFINE 290 -#define GLOBAL 291 -#define CONSTANT 292 -#define SECTION 293 -#define VOLATILE 294 -#define TO 295 -#define DOTDOTDOT 296 -#define CONST 297 -#define INTERNAL 298 -#define LINKONCE 299 -#define WEAK 300 -#define DLLIMPORT 301 -#define DLLEXPORT 302 -#define EXTERN_WEAK 303 -#define APPENDING 304 -#define NOT 305 -#define EXTERNAL 306 -#define TARGET 307 -#define TRIPLE 308 -#define ENDIAN 309 -#define POINTERSIZE 310 -#define LITTLE 311 -#define BIG 312 -#define ALIGN 313 -#define UNINITIALIZED 314 -#define DEPLIBS 315 -#define CALL 316 -#define TAIL 317 -#define ASM_TOK 318 -#define MODULE 319 -#define SIDEEFFECT 320 -#define CC_TOK 321 -#define CCC_TOK 322 -#define CSRETCC_TOK 323 -#define FASTCC_TOK 324 -#define COLDCC_TOK 325 -#define X86_STDCALLCC_TOK 326 -#define X86_FASTCALLCC_TOK 327 -#define DATALAYOUT 328 -#define RET 329 -#define BR 330 -#define SWITCH 331 -#define INVOKE 332 -#define EXCEPT 333 -#define UNWIND 334 -#define UNREACHABLE 335 -#define ADD 336 -#define SUB 337 -#define MUL 338 -#define DIV 339 -#define UDIV 340 -#define SDIV 341 -#define FDIV 342 -#define REM 343 -#define UREM 344 -#define SREM 345 -#define FREM 346 -#define AND 347 -#define OR 348 -#define XOR 349 -#define SETLE 350 -#define SETGE 351 -#define SETLT 352 -#define SETGT 353 -#define SETEQ 354 -#define SETNE 355 -#define ICMP 356 -#define FCMP 357 -#define EQ 358 -#define NE 359 -#define SLT 360 -#define SGT 361 -#define SLE 362 -#define SGE 363 -#define OEQ 364 -#define ONE 365 -#define OLT 366 -#define OGT 367 -#define OLE 368 -#define OGE 369 -#define ORD 370 -#define UNO 371 -#define UEQ 372 -#define UNE 373 -#define ULT 374 -#define UGT 375 -#define ULE 376 -#define UGE 377 -#define MALLOC 378 -#define ALLOCA 379 -#define FREE 380 -#define LOAD 381 -#define STORE 382 -#define GETELEMENTPTR 383 -#define PHI_TOK 384 -#define SELECT 385 -#define SHL 386 -#define SHR 387 -#define ASHR 388 -#define LSHR 389 -#define VAARG 390 -#define EXTRACTELEMENT 391 -#define INSERTELEMENT 392 -#define SHUFFLEVECTOR 393 -#define CAST 394 -#define TRUNC 395 -#define ZEXT 396 -#define SEXT 397 -#define FPTRUNC 398 -#define FPEXT 399 -#define FPTOUI 400 -#define FPTOSI 401 -#define UITOFP 402 -#define SITOFP 403 -#define PTRTOINT 404 -#define INTTOPTR 405 -#define BITCAST 406 +#define GLOBAL 290 +#define CONSTANT 291 +#define SECTION 292 +#define VOLATILE 293 +#define TO 294 +#define DOTDOTDOT 295 +#define CONST 296 +#define INTERNAL 297 +#define LINKONCE 298 +#define WEAK 299 +#define DLLIMPORT 300 +#define DLLEXPORT 301 +#define EXTERN_WEAK 302 +#define APPENDING 303 +#define NOT 304 +#define EXTERNAL 305 +#define TARGET 306 +#define TRIPLE 307 +#define ENDIAN 308 +#define POINTERSIZE 309 +#define LITTLE 310 +#define BIG 311 +#define ALIGN 312 +#define UNINITIALIZED 313 +#define DEPLIBS 314 +#define CALL 315 +#define TAIL 316 +#define ASM_TOK 317 +#define MODULE 318 +#define SIDEEFFECT 319 +#define CC_TOK 320 +#define CCC_TOK 321 +#define CSRETCC_TOK 322 +#define FASTCC_TOK 323 +#define COLDCC_TOK 324 +#define X86_STDCALLCC_TOK 325 +#define X86_FASTCALLCC_TOK 326 +#define DATALAYOUT 327 +#define RET 328 +#define BR 329 +#define SWITCH 330 +#define INVOKE 331 +#define EXCEPT 332 +#define UNWIND 333 +#define UNREACHABLE 334 +#define ADD 335 +#define SUB 336 +#define MUL 337 +#define DIV 338 +#define UDIV 339 +#define SDIV 340 +#define FDIV 341 +#define REM 342 +#define UREM 343 +#define SREM 344 +#define FREM 345 +#define AND 346 +#define OR 347 +#define XOR 348 +#define SETLE 349 +#define SETGE 350 +#define SETLT 351 +#define SETGT 352 +#define SETEQ 353 +#define SETNE 354 +#define ICMP 355 +#define FCMP 356 +#define EQ 357 +#define NE 358 +#define SLT 359 +#define SGT 360 +#define SLE 361 +#define SGE 362 +#define OEQ 363 +#define ONE 364 +#define OLT 365 +#define OGT 366 +#define OLE 367 +#define OGE 368 +#define ORD 369 +#define UNO 370 +#define UEQ 371 +#define UNE 372 +#define ULT 373 +#define UGT 374 +#define ULE 375 +#define UGE 376 +#define MALLOC 377 +#define ALLOCA 378 +#define FREE 379 +#define LOAD 380 +#define STORE 381 +#define GETELEMENTPTR 382 +#define PHI_TOK 383 +#define SELECT 384 +#define SHL 385 +#define SHR 386 +#define ASHR 387 +#define LSHR 388 +#define VAARG 389 +#define EXTRACTELEMENT 390 +#define INSERTELEMENT 391 +#define SHUFFLEVECTOR 392 +#define CAST 393 +#define TRUNC 394 +#define ZEXT 395 +#define SEXT 396 +#define FPTRUNC 397 +#define FPEXT 398 +#define FPTOUI 399 +#define FPTOSI 400 +#define UITOFP 401 +#define SITOFP 402 +#define PTRTOINT 403 +#define INTTOPTR 404 +#define BITCAST 405 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 275 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 280 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" typedef union YYSTYPE { std::string* String; TypeInfo Type; @@ -344,7 +342,7 @@ typedef union YYSTYPE { ValueList* ValList; } YYSTYPE; /* Line 1447 of yacc.c. */ -#line 348 "UpgradeParser.tab.h" +#line 346 "UpgradeParser.tab.h" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 diff --git a/tools/llvm-upgrade/UpgradeParser.h.cvs b/tools/llvm-upgrade/UpgradeParser.h.cvs index ea0c85de380..b050b172709 100644 --- a/tools/llvm-upgrade/UpgradeParser.h.cvs +++ b/tools/llvm-upgrade/UpgradeParser.h.cvs @@ -61,123 +61,122 @@ BEGINTOK = 287, ENDTOK = 288, DECLARE = 289, - DEFINE = 290, - GLOBAL = 291, - CONSTANT = 292, - SECTION = 293, - VOLATILE = 294, - TO = 295, - DOTDOTDOT = 296, - CONST = 297, - INTERNAL = 298, - LINKONCE = 299, - WEAK = 300, - DLLIMPORT = 301, - DLLEXPORT = 302, - EXTERN_WEAK = 303, - APPENDING = 304, - NOT = 305, - EXTERNAL = 306, - TARGET = 307, - TRIPLE = 308, - ENDIAN = 309, - POINTERSIZE = 310, - LITTLE = 311, - BIG = 312, - ALIGN = 313, - UNINITIALIZED = 314, - DEPLIBS = 315, - CALL = 316, - TAIL = 317, - ASM_TOK = 318, - MODULE = 319, - SIDEEFFECT = 320, - CC_TOK = 321, - CCC_TOK = 322, - CSRETCC_TOK = 323, - FASTCC_TOK = 324, - COLDCC_TOK = 325, - X86_STDCALLCC_TOK = 326, - X86_FASTCALLCC_TOK = 327, - DATALAYOUT = 328, - RET = 329, - BR = 330, - SWITCH = 331, - INVOKE = 332, - EXCEPT = 333, - UNWIND = 334, - UNREACHABLE = 335, - ADD = 336, - SUB = 337, - MUL = 338, - DIV = 339, - UDIV = 340, - SDIV = 341, - FDIV = 342, - REM = 343, - UREM = 344, - SREM = 345, - FREM = 346, - AND = 347, - OR = 348, - XOR = 349, - SETLE = 350, - SETGE = 351, - SETLT = 352, - SETGT = 353, - SETEQ = 354, - SETNE = 355, - ICMP = 356, - FCMP = 357, - EQ = 358, - NE = 359, - SLT = 360, - SGT = 361, - SLE = 362, - SGE = 363, - OEQ = 364, - ONE = 365, - OLT = 366, - OGT = 367, - OLE = 368, - OGE = 369, - ORD = 370, - UNO = 371, - UEQ = 372, - UNE = 373, - ULT = 374, - UGT = 375, - ULE = 376, - UGE = 377, - MALLOC = 378, - ALLOCA = 379, - FREE = 380, - LOAD = 381, - STORE = 382, - GETELEMENTPTR = 383, - PHI_TOK = 384, - SELECT = 385, - SHL = 386, - SHR = 387, - ASHR = 388, - LSHR = 389, - VAARG = 390, - EXTRACTELEMENT = 391, - INSERTELEMENT = 392, - SHUFFLEVECTOR = 393, - CAST = 394, - TRUNC = 395, - ZEXT = 396, - SEXT = 397, - FPTRUNC = 398, - FPEXT = 399, - FPTOUI = 400, - FPTOSI = 401, - UITOFP = 402, - SITOFP = 403, - PTRTOINT = 404, - INTTOPTR = 405, - BITCAST = 406 + GLOBAL = 290, + CONSTANT = 291, + SECTION = 292, + VOLATILE = 293, + TO = 294, + DOTDOTDOT = 295, + CONST = 296, + INTERNAL = 297, + LINKONCE = 298, + WEAK = 299, + DLLIMPORT = 300, + DLLEXPORT = 301, + EXTERN_WEAK = 302, + APPENDING = 303, + NOT = 304, + EXTERNAL = 305, + TARGET = 306, + TRIPLE = 307, + ENDIAN = 308, + POINTERSIZE = 309, + LITTLE = 310, + BIG = 311, + ALIGN = 312, + UNINITIALIZED = 313, + DEPLIBS = 314, + CALL = 315, + TAIL = 316, + ASM_TOK = 317, + MODULE = 318, + SIDEEFFECT = 319, + CC_TOK = 320, + CCC_TOK = 321, + CSRETCC_TOK = 322, + FASTCC_TOK = 323, + COLDCC_TOK = 324, + X86_STDCALLCC_TOK = 325, + X86_FASTCALLCC_TOK = 326, + DATALAYOUT = 327, + RET = 328, + BR = 329, + SWITCH = 330, + INVOKE = 331, + EXCEPT = 332, + UNWIND = 333, + UNREACHABLE = 334, + ADD = 335, + SUB = 336, + MUL = 337, + DIV = 338, + UDIV = 339, + SDIV = 340, + FDIV = 341, + REM = 342, + UREM = 343, + SREM = 344, + FREM = 345, + AND = 346, + OR = 347, + XOR = 348, + SETLE = 349, + SETGE = 350, + SETLT = 351, + SETGT = 352, + SETEQ = 353, + SETNE = 354, + ICMP = 355, + FCMP = 356, + EQ = 357, + NE = 358, + SLT = 359, + SGT = 360, + SLE = 361, + SGE = 362, + OEQ = 363, + ONE = 364, + OLT = 365, + OGT = 366, + OLE = 367, + OGE = 368, + ORD = 369, + UNO = 370, + UEQ = 371, + UNE = 372, + ULT = 373, + UGT = 374, + ULE = 375, + UGE = 376, + MALLOC = 377, + ALLOCA = 378, + FREE = 379, + LOAD = 380, + STORE = 381, + GETELEMENTPTR = 382, + PHI_TOK = 383, + SELECT = 384, + SHL = 385, + SHR = 386, + ASHR = 387, + LSHR = 388, + VAARG = 389, + EXTRACTELEMENT = 390, + INSERTELEMENT = 391, + SHUFFLEVECTOR = 392, + CAST = 393, + TRUNC = 394, + ZEXT = 395, + SEXT = 396, + FPTRUNC = 397, + FPEXT = 398, + FPTOUI = 399, + FPTOSI = 400, + UITOFP = 401, + SITOFP = 402, + PTRTOINT = 403, + INTTOPTR = 404, + BITCAST = 405 }; #endif /* Tokens. */ @@ -213,129 +212,128 @@ #define BEGINTOK 287 #define ENDTOK 288 #define DECLARE 289 -#define DEFINE 290 -#define GLOBAL 291 -#define CONSTANT 292 -#define SECTION 293 -#define VOLATILE 294 -#define TO 295 -#define DOTDOTDOT 296 -#define CONST 297 -#define INTERNAL 298 -#define LINKONCE 299 -#define WEAK 300 -#define DLLIMPORT 301 -#define DLLEXPORT 302 -#define EXTERN_WEAK 303 -#define APPENDING 304 -#define NOT 305 -#define EXTERNAL 306 -#define TARGET 307 -#define TRIPLE 308 -#define ENDIAN 309 -#define POINTERSIZE 310 -#define LITTLE 311 -#define BIG 312 -#define ALIGN 313 -#define UNINITIALIZED 314 -#define DEPLIBS 315 -#define CALL 316 -#define TAIL 317 -#define ASM_TOK 318 -#define MODULE 319 -#define SIDEEFFECT 320 -#define CC_TOK 321 -#define CCC_TOK 322 -#define CSRETCC_TOK 323 -#define FASTCC_TOK 324 -#define COLDCC_TOK 325 -#define X86_STDCALLCC_TOK 326 -#define X86_FASTCALLCC_TOK 327 -#define DATALAYOUT 328 -#define RET 329 -#define BR 330 -#define SWITCH 331 -#define INVOKE 332 -#define EXCEPT 333 -#define UNWIND 334 -#define UNREACHABLE 335 -#define ADD 336 -#define SUB 337 -#define MUL 338 -#define DIV 339 -#define UDIV 340 -#define SDIV 341 -#define FDIV 342 -#define REM 343 -#define UREM 344 -#define SREM 345 -#define FREM 346 -#define AND 347 -#define OR 348 -#define XOR 349 -#define SETLE 350 -#define SETGE 351 -#define SETLT 352 -#define SETGT 353 -#define SETEQ 354 -#define SETNE 355 -#define ICMP 356 -#define FCMP 357 -#define EQ 358 -#define NE 359 -#define SLT 360 -#define SGT 361 -#define SLE 362 -#define SGE 363 -#define OEQ 364 -#define ONE 365 -#define OLT 366 -#define OGT 367 -#define OLE 368 -#define OGE 369 -#define ORD 370 -#define UNO 371 -#define UEQ 372 -#define UNE 373 -#define ULT 374 -#define UGT 375 -#define ULE 376 -#define UGE 377 -#define MALLOC 378 -#define ALLOCA 379 -#define FREE 380 -#define LOAD 381 -#define STORE 382 -#define GETELEMENTPTR 383 -#define PHI_TOK 384 -#define SELECT 385 -#define SHL 386 -#define SHR 387 -#define ASHR 388 -#define LSHR 389 -#define VAARG 390 -#define EXTRACTELEMENT 391 -#define INSERTELEMENT 392 -#define SHUFFLEVECTOR 393 -#define CAST 394 -#define TRUNC 395 -#define ZEXT 396 -#define SEXT 397 -#define FPTRUNC 398 -#define FPEXT 399 -#define FPTOUI 400 -#define FPTOSI 401 -#define UITOFP 402 -#define SITOFP 403 -#define PTRTOINT 404 -#define INTTOPTR 405 -#define BITCAST 406 +#define GLOBAL 290 +#define CONSTANT 291 +#define SECTION 292 +#define VOLATILE 293 +#define TO 294 +#define DOTDOTDOT 295 +#define CONST 296 +#define INTERNAL 297 +#define LINKONCE 298 +#define WEAK 299 +#define DLLIMPORT 300 +#define DLLEXPORT 301 +#define EXTERN_WEAK 302 +#define APPENDING 303 +#define NOT 304 +#define EXTERNAL 305 +#define TARGET 306 +#define TRIPLE 307 +#define ENDIAN 308 +#define POINTERSIZE 309 +#define LITTLE 310 +#define BIG 311 +#define ALIGN 312 +#define UNINITIALIZED 313 +#define DEPLIBS 314 +#define CALL 315 +#define TAIL 316 +#define ASM_TOK 317 +#define MODULE 318 +#define SIDEEFFECT 319 +#define CC_TOK 320 +#define CCC_TOK 321 +#define CSRETCC_TOK 322 +#define FASTCC_TOK 323 +#define COLDCC_TOK 324 +#define X86_STDCALLCC_TOK 325 +#define X86_FASTCALLCC_TOK 326 +#define DATALAYOUT 327 +#define RET 328 +#define BR 329 +#define SWITCH 330 +#define INVOKE 331 +#define EXCEPT 332 +#define UNWIND 333 +#define UNREACHABLE 334 +#define ADD 335 +#define SUB 336 +#define MUL 337 +#define DIV 338 +#define UDIV 339 +#define SDIV 340 +#define FDIV 341 +#define REM 342 +#define UREM 343 +#define SREM 344 +#define FREM 345 +#define AND 346 +#define OR 347 +#define XOR 348 +#define SETLE 349 +#define SETGE 350 +#define SETLT 351 +#define SETGT 352 +#define SETEQ 353 +#define SETNE 354 +#define ICMP 355 +#define FCMP 356 +#define EQ 357 +#define NE 358 +#define SLT 359 +#define SGT 360 +#define SLE 361 +#define SGE 362 +#define OEQ 363 +#define ONE 364 +#define OLT 365 +#define OGT 366 +#define OLE 367 +#define OGE 368 +#define ORD 369 +#define UNO 370 +#define UEQ 371 +#define UNE 372 +#define ULT 373 +#define UGT 374 +#define ULE 375 +#define UGE 376 +#define MALLOC 377 +#define ALLOCA 378 +#define FREE 379 +#define LOAD 380 +#define STORE 381 +#define GETELEMENTPTR 382 +#define PHI_TOK 383 +#define SELECT 384 +#define SHL 385 +#define SHR 386 +#define ASHR 387 +#define LSHR 388 +#define VAARG 389 +#define EXTRACTELEMENT 390 +#define INSERTELEMENT 391 +#define SHUFFLEVECTOR 392 +#define CAST 393 +#define TRUNC 394 +#define ZEXT 395 +#define SEXT 396 +#define FPTRUNC 397 +#define FPEXT 398 +#define FPTOUI 399 +#define FPTOSI 400 +#define UITOFP 401 +#define SITOFP 402 +#define PTRTOINT 403 +#define INTTOPTR 404 +#define BITCAST 405 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 275 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y" +#line 280 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" typedef union YYSTYPE { std::string* String; TypeInfo Type; @@ -344,7 +342,7 @@ typedef union YYSTYPE { ValueList* ValList; } YYSTYPE; /* Line 1447 of yacc.c. */ -#line 348 "UpgradeParser.tab.h" +#line 346 "UpgradeParser.tab.h" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 diff --git a/tools/llvm-upgrade/UpgradeParser.y.cvs b/tools/llvm-upgrade/UpgradeParser.y.cvs index 9f17b92e6d4..de8df5246a0 100644 --- a/tools/llvm-upgrade/UpgradeParser.y.cvs +++ b/tools/llvm-upgrade/UpgradeParser.y.cvs @@ -34,6 +34,10 @@ std::istream* LexInput = 0; unsigned SizeOfPointer = 32; static uint64_t unique = 1; +// This bool controls whether attributes are ever added to function declarations +// definitions and calls. +static bool AddAttributes = false; + typedef std::vector TypeVector; static TypeVector EnumeratedTypes; typedef std::map TypeMap; @@ -50,12 +54,13 @@ void destroy(ValueList* VL) { } void UpgradeAssembly(const std::string &infile, std::istream& in, - std::ostream &out, bool debug) + std::ostream &out, bool debug, bool addAttrs) { Upgradelineno = 1; CurFilename = infile; LexInput = ∈ yydebug = debug; + AddAttributes = addAttrs; O = &out; if (yyparse()) { @@ -176,15 +181,15 @@ static std::string getCastUpgrade( // fp -> ptr cast is no longer supported but we must upgrade this // by doing a double cast: fp -> int -> ptr if (isConst) - Source = "ulong fptoui(" + Source + " to ulong)"; + Source = "i64 fptoui(" + Source + " to i64)"; else { *O << " %cast_upgrade" << unique << " = fptoui " << Source - << " to ulong\n"; - Source = "ulong %cast_upgrade" + llvm::utostr(unique); + << " to i64\n"; + Source = "i64 %cast_upgrade" + llvm::utostr(unique); } // Update the SrcTy for the getCastOpcode call below SrcTy.destroy(); - SrcTy.newTy = new std::string("ulong"); + SrcTy.newTy = new std::string("i64"); SrcTy.oldTy = ULongTy; } else if (DstTy.oldTy == BoolTy && SrcTy.oldTy != BoolTy) { // cast ptr %x to bool was previously defined as setne ptr %x, null @@ -286,7 +291,7 @@ getCompareOp(const std::string& setcc, const TypeInfo& TI) { %token NULL_TOK UNDEF ZEROINITIALIZER TRUETOK FALSETOK %token TYPE VAR_ID LABELSTR STRINGCONSTANT %token IMPLEMENTATION BEGINTOK ENDTOK -%token DECLARE DEFINE GLOBAL CONSTANT SECTION VOLATILE +%token DECLARE GLOBAL CONSTANT SECTION VOLATILE %token TO DOTDOTDOT CONST INTERNAL LINKONCE WEAK %token DLLIMPORT DLLEXPORT EXTERN_WEAK APPENDING %token NOT EXTERNAL TARGET TRIPLE ENDIAN POINTERSIZE LITTLE BIG @@ -922,8 +927,8 @@ ArgList : ArgListH { } | /* empty */ { $$ = new std::string(); }; -FunctionHeaderH : OptCallingConv TypesV Name '(' ArgList ')' - OptSection OptAlign { +FunctionHeaderH + : OptCallingConv TypesV Name '(' ArgList ')' OptSection OptAlign { if (!$1->empty()) { *$1 += " "; } @@ -955,15 +960,6 @@ FunctionHeader delete $1; delete $2; delete $3; $$ = 0; } - | DEFINE OptLinkage FunctionHeaderH BEGIN { - *O << *$1 << ' '; - if (!$2->empty()) { - *O << *$2 << ' '; - } - *O << *$3 << ' ' << *$4 << '\n'; - delete $1; delete $2; delete $3; delete $4; - $$ = 0; - } ; END : ENDTOK { $$ = new std::string("}"); delete $1; } @@ -972,7 +968,7 @@ END : ENDTOK { $$ = new std::string("}"); delete $1; } Function : FunctionHeader BasicBlockList END { if ($2) *O << *$2; - *O << '\n' << *$3 << '\n'; + *O << *$3 << "\n\n"; $$ = 0; }; @@ -1373,8 +1369,8 @@ MemoryInst : MALLOC Types OptCAlign { VI.type.getBitWidth() < 64) { std::string* old = VI.val; *O << " %gep_upgrade" << unique << " = zext " << *old - << " to ulong\n"; - VI.val = new std::string("ulong %gep_upgrade" + llvm::utostr(unique++)); + << " to i64\n"; + VI.val = new std::string("i64 %gep_upgrade" + llvm::utostr(unique++)); VI.type.oldTy = ULongTy; delete old; } @@ -1400,6 +1396,6 @@ int yyerror(const char *ErrorMsg) { errMsg += "end-of-file."; else errMsg += "token: '" + std::string(Upgradetext, Upgradeleng) + "'"; - std::cerr << errMsg << '\n'; + std::cerr << "llvm-upgrade: " << errMsg << '\n'; exit(1); } diff --git a/tools/llvm-upgrade/llvm-upgrade.cpp b/tools/llvm-upgrade/llvm-upgrade.cpp index 65ee452e1c9..64ae5abf9a2 100644 --- a/tools/llvm-upgrade/llvm-upgrade.cpp +++ b/tools/llvm-upgrade/llvm-upgrade.cpp @@ -38,7 +38,11 @@ OutputFilename("o", cl::desc("Override output filename"), cl::value_desc("filename"), cl::init("-")); static cl::opt -Force("f", cl::desc("Overwrite output files")); +Force("f", cl::desc("Overwrite output files"), cl::init(false)); + +static cl::opt +AddAttrs("add-attrs", cl::desc("Add function result and argument attributes"), + cl::init(false)); static cl::opt Debug("debug", cl::desc("Print debug output from yacc parser"),cl::Hidden, @@ -115,7 +119,7 @@ int main(int argc, char **argv) { return 1; } - UpgradeAssembly(InputFilename, *In, *Out, Debug); + UpgradeAssembly(InputFilename, *In, *Out, Debug, AddAttrs); } catch (const std::string& caught_message) { cerr << argv[0] << ": " << caught_message << "\n"; diff --git a/tools/llvm2cpp/CppWriter.cpp b/tools/llvm2cpp/CppWriter.cpp index 94391e35eba..d2d2d849f5f 100644 --- a/tools/llvm2cpp/CppWriter.cpp +++ b/tools/llvm2cpp/CppWriter.cpp @@ -166,14 +166,10 @@ getTypePrefix(const Type* Ty ) { switch (Ty->getTypeID()) { case Type::VoidTyID: prefix = "void_"; break; case Type::BoolTyID: prefix = "bool_"; break; - case Type::UByteTyID: prefix = "ubyte_"; break; - case Type::SByteTyID: prefix = "sbyte_"; break; - case Type::UShortTyID: prefix = "ushort_"; break; - case Type::ShortTyID: prefix = "short_"; break; - case Type::UIntTyID: prefix = "uint_"; break; - case Type::IntTyID: prefix = "int_"; break; - case Type::ULongTyID: prefix = "ulong_"; break; - case Type::LongTyID: prefix = "long_"; break; + case Type::Int8TyID: prefix = "int8_"; break; + case Type::Int16TyID: prefix = "int16_"; break; + case Type::Int32TyID: prefix = "int32_"; break; + case Type::Int64TyID: prefix = "int64_"; break; case Type::FloatTyID: prefix = "float_"; break; case Type::DoubleTyID: prefix = "double_"; break; case Type::LabelTyID: prefix = "label_"; break; @@ -318,19 +314,15 @@ CppWriter::getCppName(const Type* Ty) // First, handle the primitive types .. easy if (Ty->isPrimitiveType()) { switch (Ty->getTypeID()) { - case Type::VoidTyID: return "Type::VoidTy"; - case Type::BoolTyID: return "Type::BoolTy"; - case Type::UByteTyID: return "Type::UByteTy"; - case Type::SByteTyID: return "Type::SByteTy"; - case Type::UShortTyID: return "Type::UShortTy"; - case Type::ShortTyID: return "Type::ShortTy"; - case Type::UIntTyID: return "Type::UIntTy"; - case Type::IntTyID: return "Type::IntTy"; - case Type::ULongTyID: return "Type::ULongTy"; - case Type::LongTyID: return "Type::LongTy"; - case Type::FloatTyID: return "Type::FloatTy"; - case Type::DoubleTyID: return "Type::DoubleTy"; - case Type::LabelTyID: return "Type::LabelTy"; + case Type::VoidTyID: return "Type::VoidTy"; + case Type::BoolTyID: return "Type::BoolTy"; + case Type::Int8TyID: return "Type::Int8Ty"; + case Type::Int16TyID: return "Type::Int16Ty"; + case Type::Int32TyID: return "Type::Int32Ty"; + case Type::Int64TyID: return "Type::Int64Ty"; + case Type::FloatTyID: return "Type::FloatTy"; + case Type::DoubleTyID: return "Type::DoubleTy"; + case Type::LabelTyID: return "Type::LabelTy"; default: error("Invalid primitive type"); break; @@ -692,7 +684,7 @@ void CppWriter::printConstant(const Constant *CV) { printCFP(CFP); Out << ";"; } else if (const ConstantArray *CA = dyn_cast(CV)) { - if (CA->isString() && CA->getType()->getElementType() == Type::SByteTy) { + if (CA->isString() && CA->getType()->getElementType() == Type::Int8Ty) { Out << "Constant* " << constName << " = ConstantArray::get(\""; printEscapedString(CA->getAsString()); // Determine if we want null termination or not.