From 3a74e7ab7eee76a1d2ec4d7f861a66e084cfa420 Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 25 Jul 2005 21:54:50 +0000 Subject: [PATCH] fix semicolon rules --- direct/src/dcparser/dcParser.cxx.prebuilt | 353 +++++++++++----------- direct/src/dcparser/dcParser.yxx | 12 +- 2 files changed, 180 insertions(+), 185 deletions(-) diff --git a/direct/src/dcparser/dcParser.cxx.prebuilt b/direct/src/dcparser/dcParser.cxx.prebuilt index c3847785c1..a8adcc2e96 100644 --- a/direct/src/dcparser/dcParser.cxx.prebuilt +++ b/direct/src/dcparser/dcParser.cxx.prebuilt @@ -355,7 +355,7 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 57 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 430 +#define YYLAST 428 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 58 @@ -364,7 +364,7 @@ union yyalloc /* YYNRULES -- Number of rules. */ #define YYNRULES 188 /* YYNRULES -- Number of states. */ -#define YYNSTATES 282 +#define YYNSTATES 280 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -417,21 +417,21 @@ static const unsigned short int yyprhs[] = 26, 29, 32, 34, 38, 40, 44, 47, 48, 54, 56, 58, 60, 64, 67, 70, 73, 75, 77, 78, 86, 88, 90, 93, 95, 99, 101, 104, 108, 111, - 114, 118, 121, 122, 130, 132, 134, 137, 139, 143, - 145, 148, 152, 155, 158, 162, 165, 166, 172, 174, - 176, 178, 182, 184, 185, 189, 191, 193, 194, 199, - 201, 202, 207, 209, 211, 213, 215, 217, 219, 222, - 225, 228, 230, 235, 239, 243, 245, 247, 249, 251, - 253, 255, 259, 262, 266, 272, 277, 279, 281, 285, - 288, 292, 298, 303, 305, 310, 312, 316, 320, 325, - 327, 329, 331, 333, 335, 337, 339, 341, 343, 345, - 347, 349, 350, 355, 357, 359, 361, 363, 365, 366, - 371, 372, 377, 378, 383, 387, 391, 395, 399, 401, - 404, 406, 408, 410, 414, 416, 418, 420, 422, 424, - 426, 428, 430, 432, 434, 436, 438, 440, 442, 444, - 446, 448, 450, 452, 454, 456, 459, 461, 462, 467, - 469, 471, 475, 477, 479, 480, 490, 492, 495, 498, - 501, 504, 507, 508, 513, 516, 519, 522, 524 + 114, 117, 120, 121, 129, 131, 133, 136, 138, 142, + 144, 147, 151, 154, 157, 160, 163, 164, 170, 172, + 174, 176, 180, 182, 183, 187, 189, 191, 192, 197, + 199, 200, 205, 207, 209, 211, 213, 215, 217, 220, + 223, 226, 228, 233, 237, 241, 243, 245, 247, 249, + 251, 253, 257, 260, 264, 270, 275, 277, 279, 283, + 286, 290, 296, 301, 303, 308, 310, 314, 318, 323, + 325, 327, 329, 331, 333, 335, 337, 339, 341, 343, + 345, 347, 348, 353, 355, 357, 359, 361, 363, 364, + 369, 370, 375, 376, 381, 385, 389, 393, 397, 399, + 402, 404, 406, 408, 412, 414, 416, 418, 420, 422, + 424, 426, 428, 430, 432, 434, 436, 438, 440, 442, + 444, 446, 448, 450, 452, 454, 457, 459, 460, 465, + 467, 469, 473, 475, 477, 478, 488, 490, 493, 496, + 499, 503, 507, 508, 513, 516, 518, 520, 522 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -448,48 +448,48 @@ static const short int yyrhs[] = 71, 73, 48, 75, 49, -1, 8, -1, 138, -1, 50, 74, -1, 72, -1, 74, 47, 72, -1, 138, -1, 75, 43, -1, 75, 76, 43, -1, 84, 123, - -1, 125, 124, -1, 94, 123, 43, -1, 92, 123, - -1, -1, 11, 129, 78, 80, 48, 82, 49, -1, - 8, -1, 138, -1, 50, 81, -1, 79, -1, 81, - 47, 79, -1, 138, -1, 82, 43, -1, 82, 83, - 43, -1, 84, 124, -1, 125, 124, -1, 94, 124, - 43, -1, 92, 124, -1, -1, 129, 51, 85, 86, - 52, -1, 138, -1, 87, -1, 88, -1, 87, 47, - 88, -1, 97, -1, -1, 104, 90, 105, -1, 104, - -1, 89, -1, -1, 89, 53, 93, 113, -1, 91, - -1, -1, 91, 53, 95, 113, -1, 89, -1, 91, - -1, 92, -1, 94, -1, 96, -1, 84, -1, 84, - 124, -1, 94, 124, -1, 92, 124, -1, 122, -1, - 100, 51, 102, 52, -1, 100, 44, 107, -1, 100, - 54, 111, -1, 100, -1, 8, -1, 77, -1, 130, - -1, 138, -1, 112, -1, 112, 55, 112, -1, 112, - 111, -1, 102, 47, 112, -1, 102, 47, 112, 55, - 112, -1, 102, 47, 112, 111, -1, 138, -1, 106, - -1, 106, 55, 106, -1, 106, 108, -1, 103, 47, - 106, -1, 103, 47, 106, 55, 106, -1, 103, 47, - 106, 108, -1, 101, -1, 104, 56, 103, 57, -1, - 8, -1, 105, 44, 107, -1, 105, 54, 111, -1, - 105, 56, 103, 57, -1, 6, -1, 107, -1, 3, - -1, 4, -1, 4, -1, 3, -1, 110, -1, 109, - -1, 5, -1, 6, -1, 111, -1, 115, -1, -1, - 8, 53, 114, 115, -1, 109, -1, 110, -1, 5, - -1, 6, -1, 7, -1, -1, 48, 116, 119, 49, - -1, -1, 56, 117, 119, 57, -1, -1, 51, 118, - 119, 52, -1, 109, 46, 107, -1, 110, 46, 107, - -1, 5, 46, 107, -1, 7, 46, 107, -1, 120, - -1, 121, 120, -1, 138, -1, 47, -1, 113, -1, - 121, 47, 113, -1, 20, -1, 21, -1, 22, -1, - 23, -1, 24, -1, 25, -1, 26, -1, 27, -1, - 28, -1, 29, -1, 30, -1, 31, -1, 32, -1, - 33, -1, 34, -1, 35, -1, 36, -1, 37, -1, - 38, -1, 39, -1, 138, -1, 123, 9, -1, 123, - -1, -1, 8, 50, 126, 128, -1, 8, -1, 127, - -1, 128, 47, 127, -1, 138, -1, 8, -1, -1, - 16, 129, 51, 98, 52, 48, 131, 132, 49, -1, - 138, -1, 132, 43, -1, 132, 133, -1, 132, 135, - -1, 132, 136, -1, 132, 137, -1, -1, 17, 134, - 113, 50, -1, 18, 50, -1, 19, 43, -1, 94, - 43, -1, 92, -1, -1 + -1, 125, 124, -1, 94, 123, -1, 92, 123, -1, + -1, 11, 129, 78, 80, 48, 82, 49, -1, 8, + -1, 138, -1, 50, 81, -1, 79, -1, 81, 47, + 79, -1, 138, -1, 82, 43, -1, 82, 83, 43, + -1, 84, 124, -1, 125, 124, -1, 94, 124, -1, + 92, 124, -1, -1, 129, 51, 85, 86, 52, -1, + 138, -1, 87, -1, 88, -1, 87, 47, 88, -1, + 97, -1, -1, 104, 90, 105, -1, 104, -1, 89, + -1, -1, 89, 53, 93, 113, -1, 91, -1, -1, + 91, 53, 95, 113, -1, 89, -1, 91, -1, 92, + -1, 94, -1, 96, -1, 84, -1, 84, 124, -1, + 94, 124, -1, 92, 124, -1, 122, -1, 100, 51, + 102, 52, -1, 100, 44, 107, -1, 100, 54, 111, + -1, 100, -1, 8, -1, 77, -1, 130, -1, 138, + -1, 112, -1, 112, 55, 112, -1, 112, 111, -1, + 102, 47, 112, -1, 102, 47, 112, 55, 112, -1, + 102, 47, 112, 111, -1, 138, -1, 106, -1, 106, + 55, 106, -1, 106, 108, -1, 103, 47, 106, -1, + 103, 47, 106, 55, 106, -1, 103, 47, 106, 108, + -1, 101, -1, 104, 56, 103, 57, -1, 8, -1, + 105, 44, 107, -1, 105, 54, 111, -1, 105, 56, + 103, 57, -1, 6, -1, 107, -1, 3, -1, 4, + -1, 4, -1, 3, -1, 110, -1, 109, -1, 5, + -1, 6, -1, 111, -1, 115, -1, -1, 8, 53, + 114, 115, -1, 109, -1, 110, -1, 5, -1, 6, + -1, 7, -1, -1, 48, 116, 119, 49, -1, -1, + 56, 117, 119, 57, -1, -1, 51, 118, 119, 52, + -1, 109, 46, 107, -1, 110, 46, 107, -1, 5, + 46, 107, -1, 7, 46, 107, -1, 120, -1, 121, + 120, -1, 138, -1, 47, -1, 113, -1, 121, 47, + 113, -1, 20, -1, 21, -1, 22, -1, 23, -1, + 24, -1, 25, -1, 26, -1, 27, -1, 28, -1, + 29, -1, 30, -1, 31, -1, 32, -1, 33, -1, + 34, -1, 35, -1, 36, -1, 37, -1, 38, -1, + 39, -1, 138, -1, 123, 9, -1, 123, -1, -1, + 8, 50, 126, 128, -1, 8, -1, 127, -1, 128, + 47, 127, -1, 138, -1, 8, -1, -1, 16, 129, + 51, 98, 52, 48, 131, 132, 49, -1, 138, -1, + 132, 43, -1, 132, 133, -1, 132, 135, -1, 132, + 136, 43, -1, 132, 137, 43, -1, -1, 17, 134, + 113, 50, -1, 18, 50, -1, 19, -1, 94, -1, + 92, -1, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -600,8 +600,8 @@ static const unsigned char yyr2[] = 2, 2, 1, 3, 1, 3, 2, 0, 5, 1, 1, 1, 3, 2, 2, 2, 1, 1, 0, 7, 1, 1, 2, 1, 3, 1, 2, 3, 2, 2, - 3, 2, 0, 7, 1, 1, 2, 1, 3, 1, - 2, 3, 2, 2, 3, 2, 0, 5, 1, 1, + 2, 2, 0, 7, 1, 1, 2, 1, 3, 1, + 2, 3, 2, 2, 2, 2, 0, 5, 1, 1, 1, 3, 1, 0, 3, 1, 1, 0, 4, 1, 0, 4, 1, 1, 1, 1, 1, 1, 2, 2, 2, 1, 4, 3, 3, 1, 1, 1, 1, 1, @@ -614,7 +614,7 @@ static const unsigned char yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 0, 4, 1, 1, 3, 1, 1, 0, 9, 1, 2, 2, 2, - 2, 2, 0, 4, 2, 2, 2, 1, 0 + 3, 3, 0, 4, 2, 1, 1, 1, 0 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -646,11 +646,10 @@ static const unsigned char yydefact[] = 188, 49, 174, 0, 95, 0, 102, 108, 61, 0, 188, 35, 0, 48, 86, 50, 43, 0, 188, 188, 188, 188, 188, 94, 101, 34, 36, 29, 0, 188, - 188, 188, 188, 22, 167, 51, 52, 55, 0, 53, - 0, 176, 37, 38, 41, 0, 39, 0, 54, 182, - 0, 0, 177, 175, 187, 0, 178, 179, 180, 181, - 40, 169, 170, 168, 0, 184, 185, 186, 0, 0, - 171, 183 + 188, 188, 188, 22, 167, 51, 52, 55, 54, 53, + 0, 176, 37, 38, 41, 40, 39, 0, 182, 0, + 185, 177, 175, 187, 186, 178, 179, 0, 0, 169, + 170, 168, 0, 184, 180, 181, 0, 0, 171, 183 }; /* YYDEFGOTO[NTERM-NUM]. */ @@ -662,8 +661,8 @@ static const short int yydefgoto[] = 177, 45, 93, 46, 101, 123, 102, 124, 159, 178, 160, 49, 50, 51, 128, 136, 52, 141, 137, 138, 171, 16, 17, 131, 132, 111, 109, 19, 74, 76, - 75, 112, 113, 114, 53, 82, 83, 231, 257, 272, - 273, 54, 55, 232, 250, 266, 274, 267, 268, 269, + 75, 112, 113, 114, 53, 82, 83, 231, 257, 270, + 271, 54, 55, 232, 250, 265, 272, 266, 267, 268, 84 }; @@ -672,48 +671,47 @@ static const short int yydefgoto[] = #define YYPACT_NINF -141 static const short int yypact[] = { - 93, -141, 122, 359, 32, 138, -141, -141, -141, 4, - -141, 6, 1, -141, -141, -141, 10, 12, -141, -141, - -6, 52, 52, -141, -141, -141, -141, -141, -141, -141, + 93, -141, 122, 357, 32, 138, -141, -141, -141, -7, + -141, 12, 7, -141, -141, -141, 34, 54, -141, -141, + -6, 79, 79, -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, - -141, -141, -141, -141, -141, 27, 61, -141, -141, -141, - -7, -141, 8, -141, 46, -141, -141, -141, 52, 108, - 108, 391, 31, -141, -141, -141, -141, -141, -141, -141, + -141, -141, -141, -141, -141, 48, 50, -141, -141, -141, + -13, -141, 8, -141, 63, -141, -141, -141, 79, 108, + 108, 389, 81, -141, -141, -141, -141, -141, -141, -141, -141, 116, 116, -141, 62, 62, 62, 116, 116, -141, -141, 69, 128, -141, -141, -141, -141, -141, -141, 116, - 102, 152, 84, 123, -141, -141, -141, 94, 44, 99, + 102, 152, 53, 123, -141, -141, -141, 94, 27, 99, -141, -141, -141, -141, -141, -141, -141, -141, -141, 136, - -141, -141, 109, -141, 117, -141, 113, 110, -141, -141, - 118, 359, -141, 122, 122, -141, -141, -141, 51, -141, - -141, -141, 16, -141, -141, -141, -16, 18, -141, -141, - -141, -8, 391, 119, 158, -141, 108, -141, -141, 122, - -141, -141, -141, 163, 124, -141, -141, -141, -141, -141, - 127, -141, -141, 102, -141, 102, -141, 84, -141, -141, - 84, -141, 116, 152, 84, 130, 129, -141, -141, -141, - 166, 132, -141, -141, 35, 94, -141, -141, -141, 139, - -141, 135, 30, -141, 19, -141, -141, -141, 2, -141, - 391, -141, -141, 147, -141, -141, 94, -141, 148, 163, - 291, -141, -141, 102, -141, 84, -141, -141, -141, 166, - 325, -141, 108, -141, 50, -141, -141, 142, -141, -141, - -141, -141, -141, -141, -141, -141, -141, -141, 153, -141, - -141, -141, -141, 94, -141, -141, -141, -141, 154, -141, - 257, -141, -141, 128, 128, 29, -141, 167, -141, -141, - 149, 155, -141, -141, -141, 157, -141, -141, -141, -141, - -141, -141, -141, 156, 122, -141, -141, -141, 167, 151, - -141, -141 + -141, -141, 109, -141, 115, -141, 111, 107, -141, -141, + 117, 357, -141, 122, 122, -141, -141, -141, 5, -141, + -141, -141, 16, -141, -141, -141, -10, 18, -141, -141, + -141, -8, 389, 118, 157, -141, 108, -141, -141, 122, + -141, -141, -141, 158, 121, -141, -141, -141, -141, -141, + 119, -141, -141, 102, -141, 102, -141, 53, -141, -141, + 53, -141, 116, 152, 53, 120, 127, -141, -141, -141, + 167, 131, -141, -141, 35, 94, -141, -141, -141, 129, + -141, 132, 30, -141, 19, -141, -141, -141, -3, -141, + 389, -141, -141, 135, -141, -141, 94, -141, 139, 158, + 289, -141, -141, 102, -141, 53, -141, -141, -141, 167, + 323, -141, 108, -141, 47, -141, -141, 140, -141, -141, + -141, -141, -141, -141, -141, -141, -141, -141, 142, -141, + -141, -141, -141, 94, -141, -141, -141, -141, -141, -141, + 255, -141, -141, 128, 128, 128, -141, 186, -141, 145, + -141, -141, -141, -141, -141, -141, -141, 153, 154, -141, + -141, 151, 122, -141, -141, -141, 186, 149, -141, -141 }; /* YYPGOTO[NTERM-NUM]. */ static const short int yypgoto[] = { - -141, -141, -141, -131, 144, -141, -141, -141, -141, -141, - -141, -141, -141, -141, -14, -141, -141, -141, -141, 201, - -141, 5, -141, -141, -141, -141, -116, -141, -141, -141, - 11, 91, -141, 95, -1, -141, 0, -141, -141, 160, - -141, -141, -141, -141, -141, 34, -141, -141, -140, -60, - 21, -81, -77, -90, -137, -2, -141, 115, -141, -141, - -141, 87, 103, -141, -141, -80, -40, 7, -141, -56, - -141, 41, 213, -141, -141, -141, -141, -141, -141, -141, + -141, -141, -141, -131, 141, -141, -141, -141, -141, -141, + -141, -141, -141, -141, -19, -141, -141, -141, -141, 198, + -141, -5, -141, -141, -141, -141, -116, -141, -141, -141, + 6, 84, -141, 87, -1, -141, 0, -141, -141, 150, + -141, -141, -141, -141, -141, 38, -141, -141, -140, -60, + 20, -81, -77, -90, -137, -2, -141, 106, -141, -141, + -141, -26, 103, -141, -141, -80, -40, -4, -141, -58, + -141, 41, 216, -141, -141, -141, -141, -141, -141, -141, 3 }; @@ -727,47 +725,46 @@ static const short int yytable[] = 18, 134, 47, 48, 6, 156, 56, 87, 88, 129, 129, 107, 108, 130, 130, 185, -63, 118, 119, 7, 8, 126, 169, 169, 56, 56, 192, 194, 193, 125, - 195, 167, 57, 7, 8, 126, 172, 89, 122, 104, - 105, 168, 166, 96, 90, -173, 173, 91, 174, 167, - 71, 129, 72, 206, 73, 130, 77, 145, 78, 217, - 79, 56, 80, 81, 92, 7, 8, 9, 10, 11, - 12, 165, 270, 170, 215, 234, 233, 115, 115, 115, - 85, 205, 129, 197, 129, 213, 130, 106, 130, 146, - 135, 243, 129, 133, 228, 139, 130, 94, 163, 95, - 244, -173, 214, 164, 239, 7, 8, 126, 127, 110, - 13, 129, 196, 14, 86, 130, 96, 115, 15, 106, + 195, 89, 57, 7, 8, 126, 172, 167, 90, 71, + 145, 91, 166, 96, 167, -173, 173, 168, 174, 116, + 117, 129, 163, 206, 217, 130, 106, 164, 72, 135, + 73, 56, 80, 81, 92, 7, 8, 9, 10, 11, + 12, 165, 146, 170, 215, 234, 233, 115, 115, 115, + 77, 205, 129, 197, 129, 213, 130, 79, 130, 104, + 105, 243, 129, 133, 228, 139, 130, 244, -173, 95, + 78, 85, 214, 86, 239, 7, 8, 126, 127, 110, + 13, 129, 196, 14, 94, 130, 96, 115, 15, 106, 121, 161, 162, 155, 56, 7, 8, 9, 10, 11, 12, 140, 129, 1, 2, 3, 130, 122, 144, 7, 8, 9, 10, 11, 146, 179, 182, 186, 58, 21, 59, 60, 61, 62, 22, 7, 8, 126, 148, 253, - 254, 255, 116, 117, 149, 151, 183, 152, 153, 180, - 13, 187, 190, 14, 201, 271, 200, 139, 15, 191, - 204, 63, 199, 212, 13, 245, 209, 14, 246, 247, - 248, 249, 15, 211, 219, 222, 252, 258, 276, 275, - 277, 281, 256, 278, 99, 235, 69, 221, 198, 229, - 230, 218, 157, 56, 223, 216, 158, 150, 70, 240, - 241, 103, 280, 56, 147, 0, 0, 242, 0, 0, + 254, 255, 149, 151, 152, 183, 187, 153, 180, 190, + 13, 191, 199, 14, 200, 201, 209, 139, 15, 204, + 212, 63, 219, 245, 13, 252, 222, 14, 246, 247, + 248, 249, 15, 211, 269, 273, 274, 275, 276, 279, + 235, 99, 256, 69, 223, 157, 218, 221, 158, 229, + 230, 103, 198, 56, 216, 147, 242, 150, 278, 240, + 241, 70, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 251, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 264, - 265, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 100, 0, 0, 21, 0, - 0, 0, 279, 22, 259, 260, 261, 23, 24, 25, - 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 0, 0, 224, - 262, 0, 21, 0, 0, 0, 263, 22, 0, 0, - 0, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 0, 0, 224, 225, 0, 21, 0, 0, 0, - 226, 22, 0, 0, 0, 23, 24, 25, 26, 27, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 263, + 264, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 100, 0, 0, 21, 0, 0, 0, + 277, 22, 258, 259, 260, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, 0, 0, 20, 236, 0, - 21, 0, 0, 0, 237, 22, 0, 0, 0, 23, + 38, 39, 40, 41, 42, 0, 0, 224, 261, 0, + 21, 0, 0, 0, 262, 22, 0, 0, 0, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 100, - 0, 0, 21, 0, 0, 0, 0, 22, 0, 0, - 0, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42 + 34, 35, 36, 37, 38, 39, 40, 41, 42, 0, + 0, 224, 225, 0, 21, 0, 0, 0, 226, 22, + 0, 0, 0, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 0, 0, 20, 236, 0, 21, 0, + 0, 0, 237, 22, 0, 0, 0, 23, 24, 25, + 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + 36, 37, 38, 39, 40, 41, 42, 100, 0, 0, + 21, 0, 0, 0, 0, 22, 0, 0, 0, 23, + 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42 }; static const short int yycheck[] = @@ -775,47 +772,46 @@ static const short int yycheck[] = 2, 91, 3, 3, 1, 121, 3, 47, 48, 90, 91, 71, 72, 90, 91, 146, 8, 77, 78, 3, 4, 5, 4, 4, 21, 22, 163, 167, 165, 89, - 170, 47, 0, 3, 4, 5, 44, 44, 9, 8, - 9, 57, 132, 8, 51, 51, 54, 54, 56, 47, - 46, 132, 46, 184, 53, 132, 46, 13, 46, 57, - 8, 58, 21, 22, 56, 3, 4, 5, 6, 7, - 8, 55, 43, 55, 55, 215, 213, 74, 75, 76, - 53, 46, 163, 173, 165, 55, 163, 3, 165, 45, - 6, 222, 173, 90, 210, 92, 173, 51, 47, 58, - 50, 51, 192, 52, 220, 3, 4, 5, 6, 47, - 48, 192, 172, 51, 53, 192, 8, 114, 56, 3, + 170, 44, 0, 3, 4, 5, 44, 47, 51, 46, + 13, 54, 132, 8, 47, 51, 54, 57, 56, 75, + 76, 132, 47, 184, 57, 132, 3, 52, 46, 6, + 53, 58, 21, 22, 56, 3, 4, 5, 6, 7, + 8, 55, 45, 55, 55, 215, 213, 74, 75, 76, + 46, 46, 163, 173, 165, 55, 163, 8, 165, 8, + 9, 222, 173, 90, 210, 92, 173, 50, 51, 58, + 46, 53, 192, 53, 220, 3, 4, 5, 6, 47, + 48, 192, 172, 51, 51, 192, 8, 114, 56, 3, 51, 123, 124, 120, 121, 3, 4, 5, 6, 7, 8, 8, 213, 40, 41, 42, 213, 9, 44, 3, 4, 5, 6, 7, 45, 142, 143, 149, 10, 11, 12, 13, 14, 15, 16, 3, 4, 5, 49, 239, - 240, 241, 75, 76, 47, 52, 8, 57, 50, 50, - 48, 8, 48, 51, 8, 8, 47, 174, 56, 52, - 48, 43, 52, 48, 48, 43, 47, 51, 228, 229, - 230, 231, 56, 190, 47, 47, 43, 43, 43, 50, - 43, 50, 242, 47, 60, 219, 5, 204, 174, 210, - 210, 200, 121, 210, 209, 194, 121, 114, 5, 220, - 220, 61, 278, 220, 109, -1, -1, 220, -1, -1, + 240, 241, 47, 52, 57, 8, 8, 50, 50, 48, + 48, 52, 52, 51, 47, 8, 47, 174, 56, 48, + 48, 43, 47, 43, 48, 43, 47, 51, 228, 229, + 230, 231, 56, 190, 8, 50, 43, 43, 47, 50, + 219, 60, 242, 5, 209, 121, 200, 204, 121, 210, + 210, 61, 174, 210, 194, 109, 220, 114, 276, 220, + 220, 5, -1, 220, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 232, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 250, 250, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 8, -1, -1, 11, -1, - -1, -1, 274, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, -1, -1, 8, - 43, -1, 11, -1, -1, -1, 49, 16, -1, -1, - -1, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 39, -1, -1, 8, 43, -1, 11, -1, -1, -1, - 49, 16, -1, -1, -1, 20, 21, 22, 23, 24, + -1, -1, -1, 8, -1, -1, 11, -1, -1, -1, + 272, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, -1, -1, 8, 43, -1, 11, -1, -1, -1, 49, 16, -1, -1, -1, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, - 31, 32, 33, 34, 35, 36, 37, 38, 39, 8, - -1, -1, 11, -1, -1, -1, -1, 16, -1, -1, - -1, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 39 + 31, 32, 33, 34, 35, 36, 37, 38, 39, -1, + -1, 8, 43, -1, 11, -1, -1, -1, 49, 16, + -1, -1, -1, 20, 21, 22, 23, 24, 25, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, + 37, 38, 39, -1, -1, 8, 43, -1, 11, -1, + -1, -1, 49, 16, -1, -1, -1, 20, 21, 22, + 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, + 33, 34, 35, 36, 37, 38, 39, 8, -1, -1, + 11, -1, -1, -1, -1, 16, -1, -1, -1, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -847,10 +843,9 @@ static const unsigned char yystos[] = 75, 138, 47, 79, 8, 43, 49, 83, 84, 92, 94, 125, 131, 112, 106, 72, 43, 49, 76, 84, 92, 94, 125, 61, 50, 43, 124, 124, 124, 124, - 132, 138, 43, 123, 123, 123, 124, 126, 43, 17, - 18, 19, 43, 49, 92, 94, 133, 135, 136, 137, - 43, 8, 127, 128, 134, 50, 43, 43, 47, 113, - 127, 50 + 132, 138, 43, 123, 123, 123, 124, 126, 17, 18, + 19, 43, 49, 92, 94, 133, 135, 136, 137, 8, + 127, 128, 134, 50, 43, 43, 47, 113, 127, 50 }; #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) @@ -1697,10 +1692,10 @@ yyreduce: #line 375 "dcParser.yxx" { yyerror("Unnamed parameters are not allowed on a dclass"); - if ((yyvsp[-2].u.parameter) != (DCField *)NULL) { - (yyvsp[-2].u.parameter)->copy_keywords(current_keyword_list); + if ((yyvsp[-1].u.parameter) != (DCField *)NULL) { + (yyvsp[-1].u.parameter)->copy_keywords(current_keyword_list); } - (yyval.u.field) = (yyvsp[-2].u.parameter); + (yyval.u.field) = (yyvsp[-1].u.parameter); } break; @@ -1795,7 +1790,7 @@ yyreduce: case 54: #line 470 "dcParser.yxx" { - (yyval.u.field) = (yyvsp[-2].u.parameter); + (yyval.u.field) = (yyvsp[-1].u.parameter); } break; @@ -2716,9 +2711,9 @@ yyreduce: { if (!current_switch->is_field_valid()) { yyerror("case declaration required before first element"); - } else if ((yyvsp[0].u.field) != (DCField *)NULL) { - if (!current_switch->add_field((yyvsp[0].u.field))) { - yyerror("Duplicate field name: " + (yyvsp[0].u.field)->get_name()); + } else if ((yyvsp[-1].u.field) != (DCField *)NULL) { + if (!current_switch->add_field((yyvsp[-1].u.field))) { + yyerror("Duplicate field name: " + (yyvsp[-1].u.field)->get_name()); } } } @@ -2767,7 +2762,7 @@ yyreduce: case 186: #line 1297 "dcParser.yxx" { - (yyval.u.field) = (yyvsp[-1].u.parameter); + (yyval.u.field) = (yyvsp[0].u.parameter); } break; @@ -2782,7 +2777,7 @@ yyreduce: } /* Line 1037 of yacc.c. */ -#line 2786 "y.tab.c" +#line 2781 "y.tab.c" yyvsp -= yylen; yyssp -= yylen; diff --git a/direct/src/dcparser/dcParser.yxx b/direct/src/dcparser/dcParser.yxx index ecc814bbc6..65ac5f7bbd 100644 --- a/direct/src/dcparser/dcParser.yxx +++ b/direct/src/dcparser/dcParser.yxx @@ -371,7 +371,7 @@ dclass_field: $$ = $1; } | molecular_field no_keyword_list - | unnamed_parameter_with_default keyword_list ';' + | unnamed_parameter_with_default keyword_list { yyerror("Unnamed parameters are not allowed on a dclass"); if ($1 != (DCField *)NULL) { @@ -466,7 +466,7 @@ struct_field: $$ = $1; } | molecular_field no_keyword_list - | unnamed_parameter_with_default no_keyword_list ';' + | unnamed_parameter_with_default no_keyword_list { $$ = $1; } @@ -1242,8 +1242,8 @@ switch_fields: | switch_fields ';' | switch_fields switch_case | switch_fields switch_default - | switch_fields switch_break - | switch_fields switch_field + | switch_fields switch_break ';' + | switch_fields switch_field ';' { if (!current_switch->is_field_valid()) { yyerror("case declaration required before first element"); @@ -1286,14 +1286,14 @@ switch_default: ; switch_break: - KW_BREAK ';' + KW_BREAK { current_switch->add_break(); } ; switch_field: - unnamed_parameter_with_default ';' + unnamed_parameter_with_default { $$ = $1; }