aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2006-12-31 06:02:26 +0000
committerReid Spencer <rspencer@reidspencer.com>2006-12-31 06:02:26 +0000
commit71d2ec9e6d20bd8701471bc6e6db620838ce3539 (patch)
tree28ce6e79e463228525b1ae5a2b97ec86cb682b86
parenteacb7020ec7b0a6a0078f1be7bfd77bf6fe1ff06 (diff)
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
Diffstat
-rw-r--r--tools/bugpoint/ExtractFunction.cpp2
-rw-r--r--tools/bugpoint/Miscompilation.cpp6
-rw-r--r--tools/lli/lli.cpp4
-rw-r--r--tools/llvm-upgrade/ParserInternals.h11
-rw-r--r--tools/llvm-upgrade/UpgradeLexer.cpp1683
-rw-r--r--tools/llvm-upgrade/UpgradeLexer.cpp.cvs1683
-rw-r--r--tools/llvm-upgrade/UpgradeLexer.l.cvs21
-rw-r--r--tools/llvm-upgrade/UpgradeParser.cpp2278
-rw-r--r--tools/llvm-upgrade/UpgradeParser.cpp.cvs2278
-rw-r--r--tools/llvm-upgrade/UpgradeParser.h470
-rw-r--r--tools/llvm-upgrade/UpgradeParser.h.cvs470
-rw-r--r--tools/llvm-upgrade/UpgradeParser.y.cvs38
-rw-r--r--tools/llvm-upgrade/llvm-upgrade.cpp8
-rw-r--r--tools/llvm2cpp/CppWriter.cpp36
14 files changed, 4485 insertions, 4503 deletions
diff --git a/tools/bugpoint/ExtractFunction.cpp b/tools/bugpoint/ExtractFunction.cpp
index 43e68404cb..34fa727f0e 100644
--- a/tools/bugpoint/ExtractFunction.cpp
+++ b/tools/bugpoint/ExtractFunction.cpp
@@ -180,7 +180,7 @@ static Constant *GetTorInit(std::vector<std::pair<Function*, int> > &TorList) {
std::vector<Constant*> ArrayElts;
for (unsigned i = 0, e = TorList.size(); i != e; ++i) {
std::vector<Constant*> 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 344d350b29..e3d52717d9 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<Constant*> GEPargs(2,Constant::getNullValue(Type::IntTy));
+ std::vector<Constant*> GEPargs(2,Constant::getNullValue(Type::Int32Ty));
Value *GEP =
ConstantExpr::getGetElementPtr(funcName, GEPargs);
std::vector<Value*> ResolverArgs;
diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp
index 149536af1b..5b139bff1a 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<GenericValue> 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 7487a58160..85182c5dc1 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 722ffc617f..3894057d56 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,
-
- 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,
-
- 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
+ 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,
+
+ 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,
+
+ 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,
-
- 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,
-
- 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,
-
- 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,
-
- 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,
-
- 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,
-
- 230, 231, 231, 232, 232
+ 84, 84, 84, 85, 85, 85, 85, 85, 85, 85,
+ 85, 85, 85, 85, 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,
+ 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,
+
+ 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,
+
+ 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,
+
+ 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,
+
+ 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,
+
+ 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,
- 3, 3, 3, 3, 3, 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
} ;
-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,
-
- 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,
-
- 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,
-
- 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,
-
- 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,
-
- 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,
-
- 334, 1132, 331, 1299, 1167, 1169, 296, 1173, 253
+ 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,
+
+ 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,
+
+ 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,
+
+ 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,
+
+ 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,
+
+ 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,
+
+ 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,
-
- 606, 606, 606, 606, 606, 606, 606, 606, 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,
-
- 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,
-
- 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,
-
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
-
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
- 606, 606, 606, 606, 606, 606, 606, 606, 606, 606,
-
- 606, 606, 606, 0, 604, 604, 604, 604, 604
+ 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,
+
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 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,
+
+ 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,
+
+ 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,
+
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+ 609, 609, 609, 609, 609, 609, 609, 609, 609, 609,
+
+ 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,
-
- 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,
-
- 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,
-
- 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,
-
- 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,