Skip to content

Commit 2a9b5bd

Browse files
guidotackguidotack
committed
Add generated parser files and change log entry. Closes #931.
1 parent 6a5d7c0 commit 2a9b5bd

File tree

5 files changed

+57
-49
lines changed

5 files changed

+57
-49
lines changed

‎changes.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ Changes:
1616
It is never output into FlatZinc by the compiler and violated the rule that
1717
FlatZinc builtins are not overloaded (:bugref:`913`). Also remove
1818
some other duplicates and incorrect overloads from ``flatzinc_builtins.mzn``.
19+
- Add includes for header files where symbols are required, in order to
20+
avoid issues with some compilers.
1921

2022
Bug fixes:
2123
^^^^^^^^^^

‎include/minizinc/htmlprinter.hh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
#pragma once
1313

14+
#include <minizinc/flatten_internal.hh>
15+
1416
#include <iostream>
1517
#include <utility>
1618
#include <vector>
1719

18-
#include <minizinc/flatten_internal.hh>
19-
2020
namespace MiniZinc {
2121

2222
class Model;

‎lib/cached/md5_cached.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
set(lexer_lxx_md5_cached "32d69703b364c176cd579c08cd355b7a")
2-
set(parser_yxx_md5_cached "ed96a803e2f630ee9aca4a51654bb067")
2+
set(parser_yxx_md5_cached "05473ab05bdc731a974f36a75cfa93cf")
33
set(regex_lexer_lxx_md5_cached "5b4c138ececa989083ac2ed39f8959c2")
44
set(regex_parser_yxx_md5_cached "e44695248dcfad64a56982f126f8e4f5")

‎lib/cached/minizinc/parser.tab.hh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@
4444
#if YYDEBUG
4545
extern int mzn_yydebug;
4646
#endif
47+
/* "%code requires" blocks. */
48+
49+
#include <minizinc/ast.hh>
50+
4751

4852
/* Token kinds. */
4953
#ifndef YYTOKENTYPE

‎lib/cached/parser.tab.cpp‎

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ namespace MiniZinc{ class ParserLocation; }
8888
#define YYMAXDEPTH 10000
8989
#define YYINITDEPTH 10000
9090

91+
#include <vector>
92+
9193
#include <minizinc/parser.hh>
9294
#include <minizinc/file_utils.hh>
9395

@@ -906,52 +908,52 @@ static const yytype_uint8 yytranslate[] =
906908
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
907909
static const yytype_int16 yyrline[] =
908910
{
909-
0, 374, 374, 376, 378, 381, 390, 399, 408, 417,
910-
419, 422, 430, 439, 439, 441, 457, 461, 463, 465,
911-
466, 468, 470, 472, 474, 476, 479, 479, 479, 480,
912-
480, 480, 480, 480, 481, 484, 507, 516, 523, 533,
913-
551, 565, 577, 581, 590, 595, 601, 608, 609, 613,
914-
621, 622, 626, 630, 636, 638, 645, 650, 655, 662,
915-
664, 672, 674, 676, 678, 682, 693, 704, 715, 728,
916-
742, 758, 771, 781, 782, 792, 793, 798, 799, 801,
917-
806, 807, 811, 822, 834, 834, 835, 835, 838, 840,
918-
844, 854, 858, 860, 863, 867, 869, 873, 874, 886,
919-
895, 909, 912, 921, 933, 946, 954, 964, 977, 991,
920-
995, 1000, 1001, 1005, 1007, 1009, 1011, 1013, 1015, 1022,
921-
1032, 1034, 1039, 1045, 1048, 1050, 1054, 1056, 1058, 1060,
922-
1062, 1065, 1068, 1070, 1076, 1077, 1079, 1081, 1083, 1085,
923-
1094, 1096, 1098, 1100, 1102, 1104, 1106, 1108, 1110, 1112,
924-
1114, 1116, 1118, 1120, 1122, 1131, 1133, 1135, 1137, 1139,
925-
1141, 1143, 1145, 1147, 1149, 1151, 1153, 1155, 1160, 1165,
926-
1170, 1175, 1180, 1185, 1190, 1196, 1202, 1204, 1213, 1219,
927-
1220, 1222, 1224, 1226, 1228, 1230, 1232, 1234, 1236, 1238,
928-
1240, 1242, 1244, 1246, 1248, 1250, 1252, 1254, 1256, 1258,
929-
1267, 1269, 1271, 1273, 1275, 1277, 1279, 1281, 1283, 1285,
930-
1287, 1289, 1291, 1293, 1295, 1304, 1306, 1308, 1310, 1312,
931-
1314, 1316, 1318, 1320, 1322, 1324, 1326, 1328, 1330, 1335,
932-
1340, 1345, 1350, 1355, 1360, 1365, 1370, 1376, 1378, 1385,
933-
1394, 1399, 1401, 1405, 1407, 1409, 1411, 1413, 1415, 1418,
934-
1420, 1423, 1425, 1428, 1430, 1433, 1435, 1437, 1439, 1441,
935-
1443, 1445, 1447, 1449, 1451, 1453, 1455, 1456, 1459, 1461,
936-
1464, 1465, 1468, 1470, 1473, 1474, 1477, 1479, 1482, 1483,
937-
1486, 1488, 1491, 1492, 1495, 1497, 1500, 1501, 1504, 1506,
938-
1509, 1510, 1511, 1514, 1515, 1518, 1519, 1522, 1524, 1527,
939-
1528, 1531, 1533, 1538, 1540, 1546, 1552, 1561, 1570, 1576,
940-
1585, 1594, 1596, 1601, 1606, 1620, 1628, 1630, 1634, 1641,
941-
1647, 1650, 1653, 1655, 1657, 1663, 1665, 1667, 1675, 1677,
942-
1680, 1683, 1686, 1688, 1690, 1692, 1696, 1698, 1745, 1747,
943-
1808, 1848, 1851, 1856, 1863, 1868, 1871, 1874, 1884, 1896,
944-
1907, 1910, 1914, 1925, 1936, 1955, 1962, 1966, 1969, 1976,
945-
1987, 2007, 2021, 2037, 2038, 2042, 2044, 2046, 2048, 2050,
946-
2052, 2054, 2056, 2058, 2060, 2062, 2064, 2066, 2068, 2070,
947-
2072, 2074, 2076, 2078, 2080, 2082, 2084, 2086, 2088, 2090,
948-
2092, 2094, 2096, 2100, 2108, 2140, 2142, 2144, 2145, 2165,
949-
2219, 2239, 2294, 2297, 2303, 2309, 2311, 2315, 2317, 2324,
950-
2333, 2335, 2343, 2345, 2354, 2354, 2357, 2365, 2376, 2377,
951-
2380, 2382, 2384, 2388, 2392, 2396, 2398, 2400, 2402, 2404,
952-
2406, 2408, 2410, 2412, 2414, 2416, 2418, 2420, 2422, 2424,
953-
2426, 2428, 2430, 2432, 2434, 2436, 2438, 2440, 2442, 2444,
954-
2446, 2448, 2450, 2452, 2454, 2456, 2458, 2460, 2462
911+
0, 380, 380, 382, 384, 387, 396, 405, 414, 423,
912+
425, 428, 436, 445, 445, 447, 463, 467, 469, 471,
913+
472, 474, 476, 478, 480, 482, 485, 485, 485, 486,
914+
486, 486, 486, 486, 487, 490, 513, 522, 529, 539,
915+
557, 571, 583, 587, 596, 601, 607, 614, 615, 619,
916+
627, 628, 632, 636, 642, 644, 651, 656, 661, 668,
917+
670, 678, 680, 682, 684, 688, 699, 710, 721, 734,
918+
748, 764, 777, 787, 788, 798, 799, 804, 805, 807,
919+
812, 813, 817, 828, 840, 840, 841, 841, 844, 846,
920+
850, 860, 864, 866, 869, 873, 875, 879, 880, 892,
921+
901, 915, 918, 927, 939, 952, 960, 970, 983, 997,
922+
1001, 1006, 1007, 1011, 1013, 1015, 1017, 1019, 1021, 1028,
923+
1038, 1040, 1045, 1051, 1054, 1056, 1060, 1062, 1064, 1066,
924+
1068, 1071, 1074, 1076, 1082, 1083, 1085, 1087, 1089, 1091,
925+
1100, 1102, 1104, 1106, 1108, 1110, 1112, 1114, 1116, 1118,
926+
1120, 1122, 1124, 1126, 1128, 1137, 1139, 1141, 1143, 1145,
927+
1147, 1149, 1151, 1153, 1155, 1157, 1159, 1161, 1166, 1171,
928+
1176, 1181, 1186, 1191, 1196, 1202, 1208, 1210, 1219, 1225,
929+
1226, 1228, 1230, 1232, 1234, 1236, 1238, 1240, 1242, 1244,
930+
1246, 1248, 1250, 1252, 1254, 1256, 1258, 1260, 1262, 1264,
931+
1273, 1275, 1277, 1279, 1281, 1283, 1285, 1287, 1289, 1291,
932+
1293, 1295, 1297, 1299, 1301, 1310, 1312, 1314, 1316, 1318,
933+
1320, 1322, 1324, 1326, 1328, 1330, 1332, 1334, 1336, 1341,
934+
1346, 1351, 1356, 1361, 1366, 1371, 1376, 1382, 1384, 1391,
935+
1400, 1405, 1407, 1411, 1413, 1415, 1417, 1419, 1421, 1424,
936+
1426, 1429, 1431, 1434, 1436, 1439, 1441, 1443, 1445, 1447,
937+
1449, 1451, 1453, 1455, 1457, 1459, 1461, 1462, 1465, 1467,
938+
1470, 1471, 1474, 1476, 1479, 1480, 1483, 1485, 1488, 1489,
939+
1492, 1494, 1497, 1498, 1501, 1503, 1506, 1507, 1510, 1512,
940+
1515, 1516, 1517, 1520, 1521, 1524, 1525, 1528, 1530, 1533,
941+
1534, 1537, 1539, 1544, 1546, 1552, 1558, 1567, 1576, 1582,
942+
1591, 1600, 1602, 1607, 1612, 1626, 1634, 1636, 1640, 1647,
943+
1653, 1656, 1659, 1661, 1663, 1669, 1671, 1673, 1681, 1683,
944+
1686, 1689, 1692, 1694, 1696, 1698, 1702, 1704, 1751, 1753,
945+
1814, 1854, 1857, 1862, 1869, 1874, 1877, 1880, 1890, 1902,
946+
1913, 1916, 1920, 1931, 1942, 1961, 1968, 1972, 1975, 1982,
947+
1993, 2013, 2027, 2043, 2044, 2048, 2050, 2052, 2054, 2056,
948+
2058, 2060, 2062, 2064, 2066, 2068, 2070, 2072, 2074, 2076,
949+
2078, 2080, 2082, 2084, 2086, 2088, 2090, 2092, 2094, 2096,
950+
2098, 2100, 2102, 2106, 2114, 2146, 2148, 2150, 2151, 2171,
951+
2225, 2245, 2300, 2303, 2309, 2315, 2317, 2321, 2323, 2330,
952+
2339, 2341, 2349, 2351, 2360, 2360, 2363, 2371, 2382, 2383,
953+
2386, 2388, 2390, 2394, 2398, 2402, 2404, 2406, 2408, 2410,
954+
2412, 2414, 2416, 2418, 2420, 2422, 2424, 2426, 2428, 2430,
955+
2432, 2434, 2436, 2438, 2440, 2442, 2444, 2446, 2448, 2450,
956+
2452, 2454, 2456, 2458, 2460, 2462, 2464, 2466, 2468
955957
};
956958
#endif
957959

0 commit comments

Comments
 (0)