diff --git a/pandatool/src/xfile/xLexer.cxx.prebuilt b/pandatool/src/xfile/xLexer.cxx.prebuilt index 6b1a3fb166..2c7bd5cb1f 100644 --- a/pandatool/src/xfile/xLexer.cxx.prebuilt +++ b/pandatool/src/xfile/xLexer.cxx.prebuilt @@ -389,15 +389,15 @@ struct yy_trans_info static yyconst flex_int16_t yy_acclist[200] = { 0, 36, 34, 35, 2, 34, 35, 1, 35, 30, 34, - 35, 4, 34, 35, 34, 35, 10, 34, 35, 32, - 34, 35, 9, 34, 35, 34, 35, 26, 34, 35, - 11, 34, 35, 31, 34, 35, 32, 34, 35, 32, + 35, 4, 34, 35, 32, 34, 35, 34, 35, 10, + 34, 35, 32, 34, 35, 9, 34, 35, 34, 35, + 26, 34, 35, 11, 34, 35, 31, 34, 35, 32, 34, 35, 32, 34, 35, 32, 34, 35, 32, 34, 35, 32, 34, 35, 32, 34, 35, 32, 34, 35, 32, 34, 35, 32, 34, 35, 7, 34, 35, 8, 34, 35, 5, 34, 35, 6, 34, 35, 1, 4, - 26, 32, 33, 32, 26, 32, 32, 33, 3, 27, - 16412, 26, 27,16412, 33, 26, 33, 32, 32, 32, + 32, 26, 32, 33, 32, 33, 32, 26, 32, 3, + 27,16412, 26, 27,16412, 33, 33, 26, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 32, 33, 32, 33, 32, 33, @@ -414,11 +414,11 @@ static yyconst flex_int16_t yy_acclist[200] = static yyconst flex_int16_t yy_accept[142] = { 0, - 1, 1, 1, 2, 4, 7, 9, 12, 15, 17, - 20, 23, 26, 28, 31, 34, 37, 40, 43, 46, + 1, 1, 1, 2, 4, 7, 9, 12, 15, 18, + 20, 23, 26, 29, 31, 34, 37, 40, 43, 46, 49, 52, 55, 58, 61, 64, 67, 70, 73, 76, - 79, 80, 81, 81, 82, 84, 85, 87, 89, 89, - 90, 92, 95, 96, 96, 97, 98, 99, 100, 101, + 79, 80, 81, 82, 82, 83, 85, 87, 88, 90, + 90, 91, 93, 96, 97, 98, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 115, 117, 119, 121, 122, 123, 124, 124, 125, 125, 126, 127, 128, 129, 130, 131, 132, 133, @@ -437,17 +437,17 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 5, 1, 6, 7, 1, 1, 1, 1, 1, - 1, 1, 8, 9, 10, 11, 12, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 1, 14, 15, - 1, 1, 1, 1, 16, 17, 18, 19, 20, 21, - 22, 23, 24, 25, 25, 26, 27, 28, 29, 30, - 25, 31, 32, 33, 34, 25, 35, 25, 36, 25, - 37, 1, 38, 1, 25, 1, 39, 40, 41, 42, + 1, 5, 1, 6, 7, 1, 1, 1, 1, 8, + 8, 1, 9, 10, 11, 12, 13, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 1, 15, 16, + 1, 1, 1, 1, 17, 18, 19, 20, 21, 22, + 23, 24, 25, 8, 8, 26, 27, 28, 29, 30, + 8, 31, 32, 33, 34, 8, 35, 8, 36, 8, + 37, 1, 38, 1, 8, 1, 39, 40, 41, 42, - 43, 44, 45, 46, 47, 25, 25, 48, 49, 50, - 51, 52, 25, 53, 54, 55, 56, 25, 57, 25, - 58, 25, 59, 1, 60, 1, 1, 1, 1, 1, + 43, 44, 45, 46, 47, 8, 8, 48, 49, 50, + 51, 52, 8, 53, 54, 55, 56, 8, 57, 8, + 58, 8, 59, 1, 60, 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, @@ -466,8 +466,8 @@ static yyconst flex_int32_t yy_ec[256] = static yyconst flex_int32_t yy_meta[61] = { 0, - 1, 2, 3, 1, 2, 1, 1, 1, 2, 4, - 4, 1, 4, 2, 1, 4, 4, 4, 4, 4, + 1, 2, 3, 1, 2, 1, 1, 4, 1, 2, + 4, 4, 1, 4, 2, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, @@ -476,98 +476,96 @@ static yyconst flex_int32_t yy_meta[61] = static yyconst flex_int16_t yy_base[151] = { 0, - 0, 0, 225, 385, 385, 0, 385, 0, 50, 385, - 54, 209, 183, 64, 385, 385, 31, 32, 47, 47, - 0, 46, 64, 60, 67, 58, 385, 385, 385, 385, - 0, 0, 177, 109, 78, 173, 122, 0, 132, 0, - 145, 155, 102, 165, 178, 0, 0, 76, 83, 86, - 93, 105, 111, 115, 114, 120, 143, 149, 82, 153, - 150, 186, 0, 191, 0, 204, 214, 227, 197, 0, - 143, 237, 201, 0, 220, 0, 204, 201, 162, 214, - 209, 221, 237, 226, 232, 227, 229, 244, 243, 243, - 255, 171, 130, 253, 129, 273, 385, 233, 0, 0, + 0, 0, 336, 370, 370, 0, 370, 0, 0, 49, + 370, 53, 320, 290, 64, 370, 370, 31, 32, 48, + 42, 44, 53, 60, 63, 54, 370, 370, 370, 370, + 0, 0, 0, 248, 104, 0, 86, 215, 110, 121, + 0, 135, 146, 0, 116, 157, 171, 54, 56, 100, + 99, 107, 114, 118, 117, 122, 129, 139, 144, 145, + 146, 0, 0, 182, 190, 193, 207, 228, 202, 0, + 201, 239, 0, 0, 212, 220, 167, 176, 174, 194, + 217, 214, 229, 219, 227, 224, 226, 241, 240, 240, + 252, 175, 196, 206, 177, 274, 370, 228, 0, 0, - 246, 246, 254, 255, 258, 262, 273, 269, 266, 269, - 0, 117, 300, 316, 326, 0, 272, 281, 0, 0, - 284, 282, 0, 316, 0, 314, 334, 312, 0, 0, - 0, 283, 317, 97, 349, 0, 321, 0, 0, 385, - 369, 373, 96, 376, 92, 88, 82, 380, 77, 67 + 240, 243, 251, 239, 242, 247, 263, 259, 259, 263, + 0, 165, 294, 296, 311, 0, 272, 281, 0, 0, + 295, 295, 0, 302, 0, 300, 319, 300, 0, 0, + 0, 294, 308, 124, 333, 0, 310, 0, 0, 370, + 354, 358, 130, 129, 361, 125, 97, 365, 92, 83 } ; static yyconst flex_int16_t yy_def[151] = { 0, - 140, 1, 140, 140, 140, 141, 140, 142, 140, 140, - 143, 140, 140, 144, 140, 140, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 140, 140, 140, 140, - 141, 142, 140, 140, 146, 145, 143, 147, 140, 148, - 140, 140, 149, 140, 144, 150, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 146, 147, 146, 147, 145, 145, 140, 140, 148, - 140, 140, 149, 150, 149, 150, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 140, 140, 140, 140, 140, 140, 145, 145, 145, + 140, 1, 140, 140, 140, 141, 140, 142, 143, 140, + 140, 144, 140, 140, 145, 140, 140, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 140, 140, 140, 140, + 141, 142, 143, 140, 140, 146, 147, 143, 144, 140, + 148, 140, 140, 149, 150, 140, 145, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 146, 146, 147, 147, 143, 143, 140, 140, 148, + 140, 140, 149, 149, 150, 150, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 140, 140, 140, 140, 140, 140, 143, 143, 143, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 140, 140, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 140, 145, 145, 145, - 145, 145, 145, 140, 140, 145, 145, 145, 145, 0, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 143, 140, 140, 143, 143, 143, 143, 143, + 143, 143, 143, 143, 143, 143, 140, 143, 143, 143, + 143, 143, 143, 140, 140, 143, 143, 143, 143, 0, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140 } ; -static yyconst flex_int16_t yy_nxt[446] = +static yyconst flex_int16_t yy_nxt[431] = { 0, 4, 5, 6, 5, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 22, 21, 21, 21, 21, 21, 21, 21, 21, 21, - 21, 23, 24, 25, 26, 21, 27, 28, 17, 18, - 19, 20, 21, 22, 21, 21, 21, 21, 21, 21, - 21, 21, 21, 23, 24, 25, 26, 21, 29, 30, - 33, 48, 34, 35, 36, 41, 37, 49, 42, 50, - 74, 54, 41, 43, 44, 52, 45, 41, 51, 58, - 76, 53, 55, 48, 59, 63, 61, 62, 63, 49, - 64, 65, 50, 54, 60, 47, 56, 52, 57, 38, + 9, 22, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 23, 24, 25, 26, 9, 27, 28, 18, 19, + 20, 21, 9, 22, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 23, 24, 25, 26, 9, 29, 30, + 34, 48, 35, 37, 38, 42, 39, 49, 43, 54, + 52, 50, 55, 42, 45, 46, 53, 47, 42, 51, + 58, 59, 61, 48, 77, 56, 74, 57, 78, 49, + 60, 54, 52, 50, 55, 73, 64, 62, 53, 65, - 51, 79, 58, 53, 88, 55, 77, 59, 61, 135, - 41, 73, 74, 42, 75, 78, 60, 41, 56, 44, - 57, 34, 41, 41, 79, 80, 42, 88, 77, 113, - 41, 35, 67, 68, 37, 41, 68, 78, 81, 82, - 68, 96, 114, 83, 39, 68, 41, 80, 84, 41, - 85, 69, 71, 41, 71, 72, 41, 72, 41, 42, - 81, 82, 71, 41, 71, 83, 68, 72, 41, 68, - 84, 86, 85, 68, 69, 87, 89, 39, 68, 41, - 90, 93, 42, 94, 69, 66, 41, 43, 44, 39, - 45, 41, 100, 86, 40, 62, 63, 87, 64, 89, + 63, 51, 58, 59, 61, 42, 77, 56, 43, 57, + 78, 42, 60, 42, 43, 46, 79, 35, 42, 42, + 37, 67, 68, 39, 42, 68, 75, 73, 62, 76, + 68, 80, 36, 33, 40, 68, 42, 135, 79, 42, + 81, 69, 82, 71, 42, 71, 83, 42, 72, 42, + 43, 84, 85, 80, 71, 42, 71, 86, 68, 72, + 42, 68, 81, 69, 82, 87, 68, 88, 83, 89, + 40, 68, 42, 84, 85, 43, 90, 69, 113, 86, + 42, 45, 46, 98, 47, 42, 93, 87, 94, 88, + 96, 89, 64, 62, 68, 65, 99, 68, 90, 69, - 62, 63, 90, 64, 95, 68, 95, 69, 68, 96, - 73, 74, 68, 75, 100, 68, 66, 68, 68, 98, - 99, 39, 68, 91, 140, 102, 66, 68, 68, 73, - 74, 68, 75, 91, 92, 68, 92, 93, 41, 94, - 68, 41, 98, 99, 101, 41, 91, 97, 102, 72, - 41, 103, 104, 140, 105, 106, 91, 107, 108, 109, - 110, 111, 95, 115, 112, 94, 101, 113, 116, 117, - 140, 118, 119, 103, 68, 104, 105, 68, 106, 107, - 108, 68, 109, 110, 111, 96, 68, 120, 121, 122, - 116, 123, 117, 118, 124, 119, 125, 126, 140, 128, + 64, 62, 68, 65, 100, 98, 66, 68, 68, 114, + 95, 68, 95, 91, 72, 96, 68, 115, 99, 94, + 66, 68, 75, 73, 101, 76, 100, 91, 66, 68, + 75, 73, 68, 76, 102, 91, 92, 68, 92, 93, + 42, 94, 68, 42, 103, 104, 101, 105, 42, 91, + 97, 106, 72, 42, 107, 108, 102, 109, 110, 111, + 95, 40, 112, 116, 117, 113, 103, 104, 118, 105, + 119, 120, 121, 106, 122, 68, 107, 108, 68, 109, + 110, 111, 123, 68, 124, 116, 117, 96, 68, 125, + 118, 126, 119, 120, 121, 68, 122, 68, 68, 128, - 129, 68, 130, 131, 68, 140, 140, 140, 68, 120, - 121, 122, 113, 68, 123, 137, 124, 68, 125, 126, - 68, 128, 140, 129, 68, 130, 131, 68, 114, 68, - 68, 132, 133, 136, 68, 127, 138, 137, 114, 68, - 139, 134, 140, 134, 140, 127, 135, 140, 140, 140, - 68, 140, 140, 68, 132, 133, 136, 68, 127, 138, - 140, 135, 68, 139, 140, 140, 140, 140, 127, 31, - 31, 140, 31, 32, 32, 140, 32, 46, 140, 46, - 70, 70, 140, 70, 3, 140, 140, 140, 140, 140, + 68, 129, 41, 68, 123, 68, 124, 113, 68, 114, + 68, 125, 68, 126, 130, 68, 127, 131, 132, 133, + 68, 128, 136, 129, 114, 68, 137, 134, 138, 134, + 139, 127, 135, 40, 68, 140, 130, 68, 127, 131, + 132, 133, 68, 140, 136, 140, 135, 68, 137, 140, + 138, 140, 139, 127, 31, 31, 140, 31, 32, 32, + 140, 32, 44, 140, 44, 70, 70, 140, 70, 3, + 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, + 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140 + 140, 140, 140, 140, 140, 140, 140, 140, 140, 140 } ; -static yyconst flex_int16_t yy_chk[446] = +static yyconst flex_int16_t yy_chk[431] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -575,49 +573,47 @@ static yyconst flex_int16_t yy_chk[446] = 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, 17, 9, 11, 11, 14, 11, 18, 14, 19, - 150, 22, 14, 14, 14, 20, 14, 14, 19, 24, - 149, 20, 23, 17, 25, 147, 26, 35, 35, 18, - 35, 146, 19, 22, 25, 145, 23, 20, 23, 143, + 10, 18, 10, 12, 12, 15, 12, 19, 15, 22, + 21, 20, 23, 15, 15, 15, 21, 15, 15, 20, + 24, 25, 26, 18, 48, 23, 150, 23, 49, 19, + 25, 22, 21, 20, 23, 149, 37, 37, 21, 37, - 19, 50, 24, 20, 59, 23, 48, 25, 26, 134, - 34, 43, 43, 34, 43, 49, 25, 34, 23, 34, - 23, 34, 34, 37, 50, 51, 37, 59, 48, 112, - 37, 37, 37, 39, 37, 37, 39, 49, 52, 53, - 39, 95, 93, 54, 39, 39, 41, 51, 55, 41, - 56, 39, 41, 41, 41, 71, 42, 41, 41, 42, - 52, 53, 42, 42, 42, 54, 44, 42, 42, 44, - 55, 57, 56, 44, 39, 58, 60, 44, 44, 45, - 61, 92, 45, 92, 44, 36, 45, 45, 45, 33, - 45, 45, 79, 57, 13, 62, 62, 58, 62, 60, + 147, 20, 24, 25, 26, 35, 48, 23, 35, 23, + 49, 39, 25, 35, 39, 35, 50, 35, 35, 39, + 39, 39, 40, 39, 39, 40, 45, 45, 146, 45, + 40, 51, 144, 143, 40, 40, 42, 134, 50, 42, + 52, 40, 53, 42, 42, 42, 54, 43, 42, 42, + 43, 55, 56, 51, 43, 43, 43, 57, 46, 43, + 43, 46, 52, 40, 53, 58, 46, 59, 54, 60, + 46, 46, 47, 55, 56, 47, 61, 46, 112, 57, + 47, 47, 47, 77, 47, 47, 92, 58, 92, 59, + 95, 60, 64, 64, 66, 64, 78, 66, 61, 46, - 64, 64, 61, 64, 69, 66, 69, 44, 66, 69, - 73, 73, 66, 73, 79, 67, 66, 66, 67, 77, - 78, 12, 67, 66, 3, 81, 67, 67, 68, 75, - 75, 68, 75, 67, 68, 68, 68, 68, 72, 68, - 68, 72, 77, 78, 80, 72, 66, 72, 81, 72, - 72, 82, 83, 0, 84, 85, 67, 86, 87, 88, - 89, 90, 91, 94, 91, 94, 80, 91, 98, 101, - 0, 102, 103, 82, 96, 83, 84, 96, 85, 86, - 87, 96, 88, 89, 90, 96, 96, 104, 105, 106, - 98, 107, 101, 102, 108, 103, 109, 110, 0, 117, + 65, 65, 66, 65, 79, 77, 66, 66, 67, 93, + 69, 67, 69, 66, 71, 69, 67, 94, 78, 94, + 67, 67, 75, 75, 80, 75, 79, 67, 38, 68, + 76, 76, 68, 76, 81, 66, 68, 68, 68, 68, + 72, 68, 68, 72, 82, 83, 80, 84, 72, 67, + 72, 85, 72, 72, 86, 87, 81, 88, 89, 90, + 91, 34, 91, 98, 101, 91, 82, 83, 102, 84, + 103, 104, 105, 85, 106, 96, 86, 87, 96, 88, + 89, 90, 107, 96, 108, 98, 101, 96, 96, 109, + 102, 110, 103, 104, 105, 113, 106, 114, 113, 117, - 118, 113, 121, 122, 113, 0, 0, 0, 113, 104, - 105, 106, 113, 113, 107, 132, 108, 114, 109, 110, - 114, 117, 0, 118, 114, 121, 122, 115, 114, 114, - 115, 124, 126, 128, 115, 114, 133, 132, 115, 115, - 137, 127, 0, 127, 0, 115, 127, 0, 0, 0, - 135, 0, 0, 135, 124, 126, 128, 135, 114, 133, - 0, 135, 135, 137, 0, 0, 0, 0, 115, 141, - 141, 0, 141, 142, 142, 0, 142, 144, 0, 144, - 148, 148, 0, 148, 140, 140, 140, 140, 140, 140, + 114, 118, 14, 113, 107, 114, 108, 113, 113, 114, + 114, 109, 115, 110, 121, 115, 114, 122, 124, 126, + 115, 117, 128, 118, 115, 115, 132, 127, 133, 127, + 137, 115, 127, 13, 135, 3, 121, 135, 114, 122, + 124, 126, 135, 0, 128, 0, 135, 135, 132, 0, + 133, 0, 137, 115, 141, 141, 0, 141, 142, 142, + 0, 142, 145, 0, 145, 148, 148, 0, 148, 140, + 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, + 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140 + 140, 140, 140, 140, 140, 140, 140, 140, 140, 140 } ; extern int xyy_flex_debug; @@ -1045,7 +1041,7 @@ inline void accept() { x_col_number += xyyleng; } -#line 1049 "lex.yy.c" +#line 1045 "lex.yy.c" #define INITIAL 0 @@ -1144,7 +1140,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - unsigned n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( xyyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1232,7 +1228,7 @@ YY_DECL -#line 1237 "lex.yy.c" +#line 1233 "lex.yy.c" if ( !(yy_init) ) { @@ -1297,7 +1293,7 @@ yy_match: *(yy_state_ptr)++ = yy_current_state; ++yy_cp; } - while ( yy_base[yy_current_state] != 385 ); + while ( yy_base[yy_current_state] != 370 ); yy_find_action: yy_current_state = *--(yy_state_ptr); @@ -1660,7 +1656,7 @@ YY_RULE_SETUP #line 619 "xLexer.lxx" ECHO; YY_BREAK -#line 1665 "lex.yy.c" +#line 1661 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); diff --git a/pandatool/src/xfile/xLexer.lxx b/pandatool/src/xfile/xLexer.lxx index 795f6a3fc6..798fd2601f 100644 --- a/pandatool/src/xfile/xLexer.lxx +++ b/pandatool/src/xfile/xLexer.lxx @@ -597,14 +597,14 @@ WHITESPACE [ ]+ return TOKEN_GUID; } -[A-Za-z_-][A-Za-z0-9_.-]* { +[A-Za-z_()-][A-Za-z0-9_.()-]* { // Identifier. accept(); xyylval.str = xyytext; return TOKEN_NAME; } -[0-9-]+[A-Za-z_-][A-Za-z0-9_.-]* { +[0-9-]+[A-Za-z_()-][A-Za-z0-9_.()-]* { // Identifier with leading digit. accept(); xyylval.str = xyytext; diff --git a/pandatool/src/xfile/xParser.cxx.prebuilt b/pandatool/src/xfile/xParser.cxx.prebuilt index 58e962f50a..e10dd9fa6d 100644 --- a/pandatool/src/xfile/xParser.cxx.prebuilt +++ b/pandatool/src/xfile/xParser.cxx.prebuilt @@ -269,7 +269,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -775,7 +775,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \