From 7ac9be9704010a6fa85bd10fd3346242fcc3bdc5 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 24 Jun 2013 11:31:28 +0000 Subject: [PATCH] build: fix PS3 and Android builds. --- src/easymesh/easymesh-parser.y | 10 +-- src/generated/easymesh-parser.cpp | 14 ++-- src/generated/easymesh-parser.h | 2 +- src/generated/lolfx-parser.cpp | 129 +++++++++++++++--------------- src/generated/lolfx-parser.h | 2 +- src/generated/lolfx-scanner.cpp | 2 +- src/gpu/lolfx-parser.y | 9 ++- src/gpu/lolfx-scanner.l | 2 +- 8 files changed, 86 insertions(+), 84 deletions(-) diff --git a/src/easymesh/easymesh-parser.y b/src/easymesh/easymesh-parser.y index 2f67c9ba..8dbffb1a 100644 --- a/src/easymesh/easymesh-parser.y +++ b/src/easymesh/easymesh-parser.y @@ -19,11 +19,6 @@ #include "easymesh/easymesh.h" #include - -/* HACK: workaround for Bison who insists on using exceptions */ -#define try if (true) -#define catch(...) if (false) -#define throw (void)0 %} %require "2.3" @@ -72,6 +67,11 @@ #undef yylex #define yylex mc.m_lexer->lex + +/* HACK: workaround for Bison who insists on using exceptions */ +#define try if (true) +#define catch(...) if (false) +#define throw (void)0 %} %% diff --git a/src/generated/easymesh-parser.cpp b/src/generated/easymesh-parser.cpp index b40e613f..fd9e4b22 100644 --- a/src/generated/easymesh-parser.cpp +++ b/src/generated/easymesh-parser.cpp @@ -58,26 +58,26 @@ #include -/* HACK: workaround for Bison who insists on using exceptions */ -#define try if (true) -#define catch(...) if (false) -#define throw (void)0 - /* Line 283 of lalr1.cc */ -#line 68 "generated/easymesh-parser.cpp" +#line 63 "generated/easymesh-parser.cpp" #include "easymesh-parser.h" /* User implementation prologue. */ /* Line 289 of lalr1.cc */ -#line 70 "easymesh/easymesh-parser.y" +#line 65 "easymesh/easymesh-parser.y" #include "easymesh/easymesh-compiler.h" #undef yylex #define yylex mc.m_lexer->lex +/* HACK: workaround for Bison who insists on using exceptions */ +#define try if (true) +#define catch(...) if (false) +#define throw (void)0 + /* Line 289 of lalr1.cc */ #line 83 "generated/easymesh-parser.cpp" diff --git a/src/generated/easymesh-parser.h b/src/generated/easymesh-parser.h index 0cef2dfa..df43cdd2 100644 --- a/src/generated/easymesh-parser.h +++ b/src/generated/easymesh-parser.h @@ -66,7 +66,7 @@ namespace lol { union semantic_type { /* Line 33 of lalr1.cc */ -#line 40 "easymesh/easymesh-parser.y" +#line 35 "easymesh/easymesh-parser.y" float fval; /* Can't use uin32_t here for some reason */ diff --git a/src/generated/lolfx-parser.cpp b/src/generated/lolfx-parser.cpp index 5d6ecd07..3d137284 100644 --- a/src/generated/lolfx-parser.cpp +++ b/src/generated/lolfx-parser.cpp @@ -55,28 +55,29 @@ #include -/* HACK: workaround for Bison who insists on using exceptions */ -#define try if (true) -#define catch(...) if (false) -#define throw (void)0 /* Line 283 of lalr1.cc */ -#line 65 "generated/lolfx-parser.cpp" +#line 61 "generated/lolfx-parser.cpp" #include "lolfx-parser.h" /* User implementation prologue. */ /* Line 289 of lalr1.cc */ -#line 245 "gpu/lolfx-parser.y" +#line 241 "gpu/lolfx-parser.y" #include "gpu/lolfx-compiler.h" #undef yylex #define yylex mc.m_lexer->lex +/* HACK: workaround for Bison who insists on using exceptions */ +#define try if (true) +#define catch(...) if (false) +#define throw (void)0 + /* Line 289 of lalr1.cc */ -#line 80 "generated/lolfx-parser.cpp" +#line 81 "generated/lolfx-parser.cpp" # ifndef YY_NULL @@ -171,7 +172,7 @@ do { \ namespace lol { /* Line 357 of lalr1.cc */ -#line 175 "generated/lolfx-parser.cpp" +#line 176 "generated/lolfx-parser.cpp" /* Return YYSTR after stripping away unnecessary quotes and backslashes, so that it's suitable for yyerror. The heuristic is @@ -473,37 +474,37 @@ namespace lol { { case 206: /* Line 664 of lalr1.cc */ -#line 733 "gpu/lolfx-parser.y" +#line 734 "gpu/lolfx-parser.y" { std::cout << "New tech " << std::endl; } break; case 207: /* Line 664 of lalr1.cc */ -#line 741 "gpu/lolfx-parser.y" +#line 742 "gpu/lolfx-parser.y" { std::cout << "New name " << (yysemantic_stack_[(1) - (1)].sval) << std::endl; } break; case 208: /* Line 664 of lalr1.cc */ -#line 742 "gpu/lolfx-parser.y" +#line 743 "gpu/lolfx-parser.y" { std::cout << "New name " << (yysemantic_stack_[(1) - (1)].sval) << std::endl; } break; case 211: /* Line 664 of lalr1.cc */ -#line 755 "gpu/lolfx-parser.y" +#line 756 "gpu/lolfx-parser.y" { std::cout << "New pass " << std::endl; } break; case 230: /* Line 664 of lalr1.cc */ -#line 791 "gpu/lolfx-parser.y" +#line 792 "gpu/lolfx-parser.y" { std::cout << "new shader" << std::endl; } break; /* Line 664 of lalr1.cc */ -#line 507 "generated/lolfx-parser.cpp" +#line 508 "generated/lolfx-parser.cpp" default: break; } @@ -3838,54 +3839,54 @@ namespace lol { const unsigned short int LolFxParser::yyrline_[] = { - 0, 259, 275, 276, 277, 278, 279, 280, 281, 282, - 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, - 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, - 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, - 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, - 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, - 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, - 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, - 353, 512, 513, 514, 515, 516, 517, 518, 519, 520, - 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, - 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, - 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, - 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, - 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, - 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, - 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, - 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, - 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, - 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, - 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, - 631, 714, 719, 720, 724, 725, 733, 741, 742, 750, - 751, 755, 759, 760, 765, 766, 767, 768, 769, 770, - 771, 772, 773, 774, 775, 776, 777, 778, 779, 787, - 791, 795, 796, 800, 808, 812, 813, 814, 815, 816, - 817, 821, 822, 823, 824, 825, 826, 830, 834, 838, - 839, 843, 844, 848, 849, 853, 854, 858, 862, 863, - 864, 868, 869, 870, 871, 875, 876, 877, 878, 882, - 883, 884, 885, 889, 890, 891, 895, 896, 897, 901, - 902, 903, 904, 905, 909, 910, 911, 915, 916, 920, - 921, 925, 926, 930, 931, 935, 936, 940, 941, 945, - 946, 950, 951, 955, 956, 957, 958, 959, 960, 961, - 962, 963, 964, 965, 969, 970, 974, 978, 979, 980, - 981, 982, 983, 984, 985, 989, 993, 994, 998, 999, - 1003, 1007, 1008, 1012, 1013, 1017, 1018, 1019, 1020, 1024, - 1025, 1028, 1030, 1031, 1032, 1033, 1034, 1038, 1042, 1043, - 1044, 1045, 1046, 1047, 1048, 1052, 1053, 1054, 1055, 1056, - 1057, 1058, 1059, 1063, 1064, 1068, 1072, 1073, 1074, 1078, - 1082, 1083, 1087, 1088, 1092, 1096, 1097, 1098, 1099, 1100, - 1101, 1102, 1103, 1107, 1108, 1109, 1110, 1111, 1112, 1113, - 1114, 1115, 1116, 1117, 1118, 1122, 1123, 1127, 1128, 1129, - 1132, 1133, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, - 1145, 1146, 1147, 1148, 1149, 1153, 1154, 1155, 1159, 1160, - 1164, 1165, 1169, 1170, 1174, 1175, 1179, 1180, 1181, 1185, - 1189, 1193, 1194, 1198, 1199, 1200, 1201, 1202, 1203, 1204, - 1208, 1209, 1213, 1214, 1218, 1219, 1223, 1224, 1228, 1229, - 1233, 1237, 1238, 1242, 1243, 1247, 1250, 1252, 1256, 1257, - 1261, 1262, 1263, 1267, 1268, 1272, 1273, 1277, 1278, 1282, - 1283, 1284, 1285, 1286, 1290, 1291, 1295, 1296, 1300 + 0, 260, 276, 277, 278, 279, 280, 281, 282, 283, + 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, + 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, + 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, + 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, + 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, + 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, + 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, + 354, 513, 514, 515, 516, 517, 518, 519, 520, 521, + 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, + 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, + 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, + 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, + 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, + 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, + 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, + 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, + 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, + 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, + 622, 623, 624, 625, 626, 627, 628, 629, 630, 631, + 632, 715, 720, 721, 725, 726, 734, 742, 743, 751, + 752, 756, 760, 761, 766, 767, 768, 769, 770, 771, + 772, 773, 774, 775, 776, 777, 778, 779, 780, 788, + 792, 796, 797, 801, 809, 813, 814, 815, 816, 817, + 818, 822, 823, 824, 825, 826, 827, 831, 835, 839, + 840, 844, 845, 849, 850, 854, 855, 859, 863, 864, + 865, 869, 870, 871, 872, 876, 877, 878, 879, 883, + 884, 885, 886, 890, 891, 892, 896, 897, 898, 902, + 903, 904, 905, 906, 910, 911, 912, 916, 917, 921, + 922, 926, 927, 931, 932, 936, 937, 941, 942, 946, + 947, 951, 952, 956, 957, 958, 959, 960, 961, 962, + 963, 964, 965, 966, 970, 971, 975, 979, 980, 981, + 982, 983, 984, 985, 986, 990, 994, 995, 999, 1000, + 1004, 1008, 1009, 1013, 1014, 1018, 1019, 1020, 1021, 1025, + 1026, 1029, 1031, 1032, 1033, 1034, 1035, 1039, 1043, 1044, + 1045, 1046, 1047, 1048, 1049, 1053, 1054, 1055, 1056, 1057, + 1058, 1059, 1060, 1064, 1065, 1069, 1073, 1074, 1075, 1079, + 1083, 1084, 1088, 1089, 1093, 1097, 1098, 1099, 1100, 1101, + 1102, 1103, 1104, 1108, 1109, 1110, 1111, 1112, 1113, 1114, + 1115, 1116, 1117, 1118, 1119, 1123, 1124, 1128, 1129, 1130, + 1133, 1134, 1138, 1139, 1140, 1141, 1142, 1143, 1144, 1145, + 1146, 1147, 1148, 1149, 1150, 1154, 1155, 1156, 1160, 1161, + 1165, 1166, 1170, 1171, 1175, 1176, 1180, 1181, 1182, 1186, + 1190, 1194, 1195, 1199, 1200, 1201, 1202, 1203, 1204, 1205, + 1209, 1210, 1214, 1215, 1219, 1220, 1224, 1225, 1229, 1230, + 1234, 1238, 1239, 1243, 1244, 1248, 1251, 1253, 1257, 1258, + 1262, 1263, 1264, 1268, 1269, 1273, 1274, 1278, 1279, 1283, + 1284, 1285, 1286, 1287, 1291, 1292, 1296, 1297, 1301 }; // Print the state stack on the debug stream. @@ -4017,9 +4018,9 @@ namespace lol { } // lol /* Line 1135 of lalr1.cc */ -#line 4021 "generated/lolfx-parser.cpp" +#line 4022 "generated/lolfx-parser.cpp" /* Line 1136 of lalr1.cc */ -#line 1303 "gpu/lolfx-parser.y" +#line 1304 "gpu/lolfx-parser.y" void lol::LolFxParser::error(const LolFxParser::location_type& l, diff --git a/src/generated/lolfx-parser.h b/src/generated/lolfx-parser.h index cfe7c778..ca4c9da2 100644 --- a/src/generated/lolfx-parser.h +++ b/src/generated/lolfx-parser.h @@ -66,7 +66,7 @@ namespace lol { union semantic_type { /* Line 33 of lalr1.cc */ -#line 38 "gpu/lolfx-parser.y" +#line 34 "gpu/lolfx-parser.y" int ival; unsigned uval; diff --git a/src/generated/lolfx-scanner.cpp b/src/generated/lolfx-scanner.cpp index 8abe6cb9..f1bae3f2 100644 --- a/src/generated/lolfx-scanner.cpp +++ b/src/generated/lolfx-scanner.cpp @@ -5284,7 +5284,7 @@ int lol::LolFxScanner::LexerInput(char* buf, int max_size) bool lol::LolFxScanner::IsExpressionTrue(char const *buf) { /* FIXME: this is really too limited */ - return atoi(buf) != 0; + return std::atoi(buf) != 0; } #ifdef yylex diff --git a/src/gpu/lolfx-parser.y b/src/gpu/lolfx-parser.y index 62c07657..8d3dca91 100644 --- a/src/gpu/lolfx-parser.y +++ b/src/gpu/lolfx-parser.y @@ -17,10 +17,6 @@ #include -/* HACK: workaround for Bison who insists on using exceptions */ -#define try if (true) -#define catch(...) if (false) -#define throw (void)0 %} %require "2.3" @@ -247,6 +243,11 @@ #undef yylex #define yylex mc.m_lexer->lex + +/* HACK: workaround for Bison who insists on using exceptions */ +#define try if (true) +#define catch(...) if (false) +#define throw (void)0 %} %% diff --git a/src/gpu/lolfx-scanner.l b/src/gpu/lolfx-scanner.l index 55a341df..2835dbd5 100644 --- a/src/gpu/lolfx-scanner.l +++ b/src/gpu/lolfx-scanner.l @@ -777,7 +777,7 @@ int lol::LolFxScanner::LexerInput(char* buf, int max_size) bool lol::LolFxScanner::IsExpressionTrue(char const *buf) { /* FIXME: this is really too limited */ - return atoi(buf) != 0; + return std::atoi(buf) != 0; } #ifdef yylex