Title: [152821] trunk/Source/ThirdParty/ANGLE
Revision
152821
Author
[email protected]
Date
2013-07-17 17:23:41 -0700 (Wed, 17 Jul 2013)

Log Message

Made a repeatable process for updating ANGLE that does not include manually editing any files.
https://bugs.webkit.org/show_bug.cgi?id=118815

Reviewed by Dean Jackson.

* src/compiler/glslang.y:
* src/compiler/glslang_lex.cpp:
* src/compiler/glslang_tab.cpp:
* src/compiler/glslang_tab.h: Put YYLTYPE definition in %union instead of prologue and ran Bison.

Modified Paths

Diff

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (152820 => 152821)


--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2013-07-17 23:54:43 UTC (rev 152820)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2013-07-18 00:23:41 UTC (rev 152821)
@@ -1,3 +1,15 @@
+2013-07-17  Alex Christensen  <[email protected]>
+
+        Made a repeatable process for updating ANGLE that does not include manually editing any files.
+        https://bugs.webkit.org/show_bug.cgi?id=118815
+
+        Reviewed by Dean Jackson.
+
+        * src/compiler/glslang.y:
+        * src/compiler/glslang_lex.cpp:
+        * src/compiler/glslang_tab.cpp:
+        * src/compiler/glslang_tab.h: Put YYLTYPE definition in %union instead of prologue and ran Bison.
+
 2013-07-16  Alex Christensen  <[email protected]>
 
         Update ANGLE from r1987 to r2426 while keeping these changes:

Modified: trunk/Source/ThirdParty/ANGLE/src/compiler/glslang.y (152820 => 152821)


--- trunk/Source/ThirdParty/ANGLE/src/compiler/glslang.y	2013-07-17 23:54:43 UTC (rev 152820)
+++ trunk/Source/ThirdParty/ANGLE/src/compiler/glslang.y	2013-07-18 00:23:41 UTC (rev 152821)
@@ -48,12 +48,9 @@
 %parse-param {TParseContext* context}
 %locations
 
-%code requires {
+%union {
 #define YYLTYPE TSourceLoc
 #define YYLTYPE_IS_DECLARED 1
-}
-
-%union {
     struct {
         union {
             TString *string;

Modified: trunk/Source/ThirdParty/ANGLE/src/compiler/glslang_lex.cpp (152820 => 152821)


--- trunk/Source/ThirdParty/ANGLE/src/compiler/glslang_lex.cpp	2013-07-17 23:54:43 UTC (rev 152820)
+++ trunk/Source/ThirdParty/ANGLE/src/compiler/glslang_lex.cpp	2013-07-18 00:23:41 UTC (rev 152821)
@@ -1,4 +1,4 @@
-#line 17 "src/compiler/glslang.l"
+#line 17 "./glslang.l"
 //
 // Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
@@ -21,7 +21,7 @@
 
 
 
-#line 25 "src/compiler/glslang_lex.cpp"
+#line 25 "./glslang_lex.cpp"
 
 #define  YY_INT_ALIGNED short int
 

Modified: trunk/Source/ThirdParty/ANGLE/src/compiler/glslang_tab.cpp (152820 => 152821)


--- trunk/Source/ThirdParty/ANGLE/src/compiler/glslang_tab.cpp	2013-07-17 23:54:43 UTC (rev 152820)
+++ trunk/Source/ThirdParty/ANGLE/src/compiler/glslang_tab.cpp	2013-07-18 00:23:41 UTC (rev 152821)
@@ -288,11 +288,7 @@
 
 #define YYLEX_PARAM context->scanner
 
-#define YYLTYPE TSourceLoc
-#define YYLTYPE_IS_DECLARED 1
 
-
-
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -315,6 +311,8 @@
 typedef union YYSTYPE
 
 {
+#define YYLTYPE TSourceLoc
+#define YYLTYPE_IS_DECLARED 1
     struct {
         union {
             TString *string;
@@ -772,27 +770,27 @@
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   178,   178,   179,   182,   225,   228,   241,   246,   251,
-     257,   260,   335,   338,   433,   443,   456,   464,   564,   567,
-     575,   578,   584,   588,   595,   601,   610,   618,   673,   683,
-     686,   696,   706,   727,   728,   729,   734,   735,   743,   754,
-     755,   763,   774,   778,   779,   789,   799,   809,   822,   823,
-     833,   846,   850,   854,   858,   859,   872,   873,   886,   887,
-     900,   901,   918,   919,   932,   933,   934,   935,   936,   940,
-     943,   954,   962,   989,   994,  1008,  1045,  1048,  1055,  1063,
-    1084,  1105,  1115,  1143,  1148,  1158,  1163,  1173,  1176,  1179,
-    1182,  1188,  1195,  1198,  1220,  1238,  1262,  1285,  1289,  1307,
-    1315,  1347,  1367,  1388,  1397,  1420,  1423,  1429,  1437,  1445,
-    1453,  1463,  1470,  1473,  1476,  1482,  1485,  1500,  1504,  1508,
-    1512,  1516,  1521,  1526,  1531,  1536,  1541,  1546,  1551,  1556,
-    1561,  1566,  1571,  1576,  1580,  1584,  1592,  1600,  1604,  1617,
-    1617,  1631,  1631,  1640,  1643,  1659,  1692,  1696,  1702,  1709,
-    1724,  1728,  1732,  1733,  1739,  1740,  1741,  1742,  1743,  1747,
-    1748,  1748,  1748,  1758,  1759,  1763,  1763,  1764,  1764,  1769,
-    1772,  1782,  1785,  1791,  1792,  1796,  1804,  1808,  1818,  1823,
-    1840,  1840,  1845,  1845,  1852,  1852,  1860,  1863,  1869,  1872,
-    1878,  1882,  1889,  1896,  1903,  1910,  1921,  1930,  1934,  1941,
-    1944,  1950,  1950
+       0,   176,   176,   177,   180,   223,   226,   239,   244,   249,
+     255,   258,   333,   336,   431,   441,   454,   462,   562,   565,
+     573,   576,   582,   586,   593,   599,   608,   616,   671,   681,
+     684,   694,   704,   725,   726,   727,   732,   733,   741,   752,
+     753,   761,   772,   776,   777,   787,   797,   807,   820,   821,
+     831,   844,   848,   852,   856,   857,   870,   871,   884,   885,
+     898,   899,   916,   917,   930,   931,   932,   933,   934,   938,
+     941,   952,   960,   987,   992,  1006,  1043,  1046,  1053,  1061,
+    1082,  1103,  1113,  1141,  1146,  1156,  1161,  1171,  1174,  1177,
+    1180,  1186,  1193,  1196,  1218,  1236,  1260,  1283,  1287,  1305,
+    1313,  1345,  1365,  1386,  1395,  1418,  1421,  1427,  1435,  1443,
+    1451,  1461,  1468,  1471,  1474,  1480,  1483,  1498,  1502,  1506,
+    1510,  1514,  1519,  1524,  1529,  1534,  1539,  1544,  1549,  1554,
+    1559,  1564,  1569,  1574,  1578,  1582,  1590,  1598,  1602,  1615,
+    1615,  1629,  1629,  1638,  1641,  1657,  1690,  1694,  1700,  1707,
+    1722,  1726,  1730,  1731,  1737,  1738,  1739,  1740,  1741,  1745,
+    1746,  1746,  1746,  1756,  1757,  1761,  1761,  1762,  1762,  1767,
+    1770,  1780,  1783,  1789,  1790,  1794,  1802,  1806,  1816,  1821,
+    1838,  1838,  1843,  1843,  1850,  1850,  1858,  1861,  1867,  1870,
+    1876,  1880,  1887,  1894,  1901,  1908,  1919,  1928,  1932,  1939,
+    1942,  1948,  1948
 };
 #endif
 

Modified: trunk/Source/ThirdParty/ANGLE/src/compiler/glslang_tab.h (152820 => 152821)


--- trunk/Source/ThirdParty/ANGLE/src/compiler/glslang_tab.h	2013-07-17 23:54:43 UTC (rev 152820)
+++ trunk/Source/ThirdParty/ANGLE/src/compiler/glslang_tab.h	2013-07-18 00:23:41 UTC (rev 152821)
@@ -33,11 +33,6 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-// These were put here with %code requires, which our version of Bison does not support,
-// so I put them here manually.
-#define YYLTYPE TSourceLoc
-#define YYLTYPE_IS_DECLARED 1
-
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -239,6 +234,8 @@
 typedef union YYSTYPE
 
 {
+#define YYLTYPE TSourceLoc
+#define YYLTYPE_IS_DECLARED 1
     struct {
         union {
             TString *string;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to