[kdevelop-pg-qt] kdev-pg: Update the pre-generated files so bison/flex are optional again

Andreas Pakulat apaku at gmx.de
Thu Jun 9 22:43:59 UTC 2011


Git commit ba59270f286c50569de5bbe8eb0261d2280b6913 by Andreas Pakulat.
Committed on 10/06/2011 at 00:41.
Pushed by apaku into branch 'master'.

Update the pre-generated files so bison/flex are optional again

Seems like the last changes to the parser-files for kdev-pg's own language
haven't made it into the pre-generated files. Hence it was necessary to
have bison+flex installed to get the -parser/-lexer source code that the
rest of the sources expect. I've copied those generated files from the
builddir back into the source, so this requirement is lifted again.

CCMAIL: git at the-user.org
CCMAIL: kdevelop-devel at kdevelop.org

M  +409  -397  kdev-pg/kdev-pg-lexer.cc     
M  +203  -202  kdev-pg/kdev-pg-parser.cc     
M  +2    -2    kdev-pg/kdev-pg-parser.hh     

http://commits.kde.org/kdevelop-pg-qt/ba59270f286c50569de5bbe8eb0261d2280b6913

diff --git a/kdev-pg/kdev-pg-lexer.cc b/kdev-pg/kdev-pg-lexer.cc
index 97893e7..19eea0a 100644
--- a/kdev-pg/kdev-pg-lexer.cc
+++ b/kdev-pg/kdev-pg-lexer.cc
@@ -1,6 +1,6 @@
-#line 2 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-lexer.cc"
+#line 2 "/home/andreas/src/kdevelop-pg-qt/build/kdev-pg/kdev-pg-lexer.cc"
 
-#line 4 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-lexer.cc"
+#line 4 "/home/andreas/src/kdevelop-pg-qt/build/kdev-pg/kdev-pg-lexer.cc"
 
 #define  YY_INT_ALIGNED short int
 
@@ -54,7 +54,6 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -85,6 +84,8 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! C99 */
+
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -141,7 +142,15 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
 #define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -553,80 +562,80 @@ static yyconst flex_int32_t yy_meta[71] =
 static yyconst flex_int16_t yy_base[692] =
     {   0,
         0,    0,   68,   70,   73,   77,   92,   98,  138,    0,
-       83,  100,  208,    0, 1810, 1811,   92, 1811, 1806,   76,
-     1811,  254, 1811, 1811, 1811, 1811, 1811, 1811,   82, 1782,
-       91,  106, 1811, 1783, 1811, 1811, 1811,  252, 1783,    0,
-     1762, 1744, 1811, 1811, 1811,    0, 1811, 1800,   93, 1811,
-      132, 1811, 1799, 1811, 1811, 1750, 1743, 1752,  230,    0,
-     1811, 1795,  284, 1811, 1811, 1811,  290, 1811, 1794, 1811,
-     1780,    0,  298, 1811,  298, 1811,  305,  309,  313,  317,
-      323,    0, 1811, 1792, 1811, 1811, 1811, 1811, 1791,  302,
-     1811, 1811, 1811, 1811, 1811,  280, 1811,  344, 1811,  373,
-
-     1811, 1811,  396, 1770,  348, 1811, 1811,    0, 1811, 1811,
-      348, 1811,  315, 1811,  333, 1811, 1811, 1731, 1740, 1733,
-     1724,  250, 1741, 1744,  330, 1735, 1738,  312,    0, 1811,
-     1811,  387, 1760,    0,  409, 1811, 1721, 1716,    0, 1811,
-      281,  340, 1811,  356, 1811, 1719, 1724,   45,   57, 1735,
-        0, 1811,  364, 1811,  379,  386, 1811,    0,    0,  390,
-      402,  428,  433,  437,  441,  445,  449,    0, 1811, 1811,
-      386, 1811,  395,    0, 1811,  470, 1739,  476, 1811,  453,
-      501, 1761,  518,  509, 1811, 1760, 1811,  365,  508,  516,
-      540,  524, 1706,  469,  500,  519, 1712, 1717, 1716, 1713,
-
-     1712,  382,  371, 1714, 1708, 1706,  435, 1717, 1706, 1720,
-     1703, 1709,    0, 1716, 1742, 1698, 1697, 1703, 1694, 1691,
-     1692, 1699,  534,  538,  539,    0,  529,  545,  574,  578,
-      582,  586,  573,  574,  575,    0, 1811,  586,  515,  619,
-      626,  650,  611, 1728,  348,  640,  666,  687,  672, 1682,
-     1811, 1708, 1811, 1687, 1691, 1684, 1699, 1694, 1682, 1696,
-     1695,  349, 1679, 1811, 1683, 1689, 1675, 1683, 1680, 1688,
-     1684, 1673, 1811, 1670, 1688, 1670, 1686, 1681, 1676,  655,
+       83,  100,  208,    0, 1808, 1809,   92, 1809, 1804,   76,
+     1809,  254, 1809, 1809, 1809, 1809, 1809, 1809,   82, 1780,
+       91,  106, 1809, 1781, 1809, 1809, 1809,  252, 1781,    0,
+     1760, 1742, 1809, 1809, 1809,    0, 1809, 1798,   93, 1809,
+      132, 1809, 1797, 1809, 1809, 1748, 1741, 1750,  230,    0,
+     1809, 1793,  284, 1809, 1809, 1809,  290, 1809, 1792, 1809,
+     1778,    0,  298, 1809,  298, 1809,  305,  309,  313,  317,
+      323,    0, 1809, 1790, 1809, 1809, 1809, 1809, 1789,  302,
+     1809, 1809, 1809, 1809, 1809,  280, 1809,  344, 1809,  373,
+
+     1809, 1809,  396, 1768,  348, 1809, 1809,    0, 1809, 1809,
+      348, 1809,  315, 1809,  333, 1809, 1809, 1729, 1738, 1731,
+     1722,  250, 1739, 1742,  330, 1733, 1736,  312,    0, 1809,
+     1809,  387, 1758,    0,  409, 1809, 1719, 1714,    0, 1809,
+      281,  340, 1809,  356, 1809, 1717, 1722,   45,   57, 1733,
+        0, 1809,  364, 1809,  379,  386, 1809,    0,    0,  390,
+      402,  428,  433,  437,  441,  445,  449,    0, 1809, 1809,
+      386, 1809,  395,    0, 1809,  470, 1737,  476, 1809,  453,
+      501, 1759,  518,  509, 1809, 1758, 1809,  365,  508,  516,
+      540,  524, 1704,  469,  500,  519, 1710, 1715, 1714, 1711,
+
+     1710,  382,  371, 1712, 1706, 1704,  435, 1715, 1704, 1718,
+     1701, 1707,    0, 1714, 1740, 1696, 1695, 1701, 1692, 1689,
+     1690, 1697,  534,  538,  539,    0,  529,  545,  574,  578,
+      582,  586,  573,  574,  575,    0, 1809,  586,  515,  619,
+      626,  650,  611, 1726,  348,  640,  666,  687,  672, 1680,
+     1809, 1706, 1809, 1685, 1689, 1682, 1697, 1692, 1680, 1694,
+     1693,  349, 1677, 1809, 1681, 1687, 1673, 1681, 1678, 1686,
+     1682, 1671, 1809, 1668, 1686, 1668, 1684, 1679, 1674,  655,
       680,  693,  700,  704,  718,  722,  555,    0,  482,  729,
-      743,  764,  736,  549,  750,  757,  794,  781,  743, 1675,
+      743,  764,  736,  549,  750,  757,  794,  781,  743, 1673,
 
-     1665, 1662, 1675, 1673, 1811, 1661, 1659, 1663, 1671, 1811,
-     1657, 1654, 1668, 1667, 1811, 1657,    0,  310, 1652, 1651,
-     1647, 1647, 1663, 1662,  783,  807,  812,  824,  829,  833,
+     1663, 1660, 1673, 1671, 1809, 1659, 1657, 1661, 1669, 1809,
+     1655, 1652, 1666, 1665, 1809, 1655,    0,  310, 1650, 1649,
+     1645, 1645, 1661, 1660,  783,  807,  812,  824,  829,  833,
       590,    0,  549,  840,  849,  870,  855,  864,  900,  886,
-     1663, 1640, 1657, 1647, 1640, 1659, 1638, 1649, 1653, 1639,
-     1811, 1636, 1644, 1811, 1638, 1651, 1650, 1646, 1636, 1626,
-     1645, 1642, 1613, 1595, 1811,  876,  888,  907,  914,  918,
-      605,    0,  571,  933,  954,  940,  942,  984,  950, 1595,
-     1588, 1606, 1569, 1589,  572, 1811, 1556, 1550, 1547,  573,
-     1514, 1517, 1494, 1482, 1485, 1487, 1479, 1459, 1458, 1811,
-
-     1458,  971,  988,  997, 1001,    0,  634, 1018, 1039, 1026,
-     1033, 1069, 1055, 1451, 1431, 1440, 1438, 1426, 1424, 1405,
-     1811, 1413, 1408,  447, 1385, 1365, 1378, 1373,  435, 1355,
-     1362, 1284, 1294, 1287, 1297, 1057, 1076, 1082, 1086,    0,
-      644, 1102, 1124, 1109, 1111,  618, 1118, 1811, 1299, 1294,
-     1811, 1297, 1293, 1276, 1274, 1287,   49, 1286, 1289, 1811,
-     1288, 1264, 1279, 1262, 1274, 1267, 1252, 1241, 1237, 1811,
-     1139, 1143,    0,  648, 1157,  639, 1164,  742, 1166, 1244,
-     1225, 1229, 1216, 1215, 1200, 1811, 1189, 1187, 1198, 1177,
-     1183, 1179, 1182, 1177, 1163, 1174, 1157, 1157, 1811, 1168,
-
-      664,  749, 1175, 1181, 1156, 1811, 1142, 1153, 1155, 1811,
-     1146, 1131, 1127, 1114, 1127, 1106, 1101, 1110, 1811, 1098,
-     1811, 1811, 1811,  670, 1188, 1190, 1100, 1083, 1084, 1071,
-     1811, 1078, 1076, 1811, 1046, 1811, 1068, 1054, 1811,  684,
-     1196, 1202, 1038, 1050, 1025, 1811, 1030, 1013, 1021, 1016,
-     1014,  709, 1212, 1214, 1007,  993,  992,  989,  992,  966,
-      978,  980,  727, 1220, 1226,  966,  965, 1811,  968,  934,
-     1811,  950,  748,  734, 1228, 1236,  934,  945,  941,  931,
-      924,  916,  909,  760, 1238, 1244,  906,  905,  894,  867,
-      880,  857,  838,  798, 1250, 1252, 1811,  846,  827,  822,
-
-      806, 1811,  805,  802, 1260, 1262,  763, 1811,  777,  763,
-      748,  816, 1268, 1274, 1811,  742,  712,  720,  838, 1276,
+     1661, 1638, 1655, 1645, 1638, 1657, 1636, 1647, 1651, 1637,
+     1809, 1634, 1642, 1809, 1636, 1649, 1648, 1644, 1634, 1624,
+     1643, 1640, 1637, 1621, 1809,  876,  888,  907,  914,  918,
+      605,    0,  571,  933,  954,  940,  942,  984,  950, 1621,
+     1619, 1637, 1590, 1608,  572, 1809, 1587, 1590, 1600,  573,
+     1564, 1580, 1558, 1537, 1527, 1516, 1511, 1480, 1462, 1809,
+
+     1474,  971,  988,  997, 1001,    0,  634, 1018, 1039, 1026,
+     1033, 1069, 1055, 1473, 1445, 1452, 1444, 1431, 1429, 1419,
+     1809, 1437, 1422,  447, 1402, 1387, 1392, 1384,  435, 1361,
+     1376, 1357, 1355, 1289, 1299, 1057, 1076, 1082, 1086,    0,
+      644, 1102, 1124, 1109, 1111,  618, 1118, 1809, 1301, 1296,
+     1809, 1299, 1296, 1280, 1277, 1289,   49, 1288, 1291, 1809,
+     1291, 1267, 1283, 1269, 1279, 1279, 1264, 1253, 1249, 1809,
+     1139, 1143,    0,  648, 1157,  639, 1164,  742, 1166, 1256,
+     1237, 1241, 1228, 1227, 1212, 1809, 1201, 1199, 1205, 1188,
+     1189, 1191, 1194, 1179, 1165, 1179, 1163, 1163, 1809, 1168,
+
+      664,  749, 1175, 1181, 1162, 1809, 1153, 1165, 1159, 1809,
+     1152, 1137, 1139, 1131, 1134, 1115, 1119, 1123, 1809, 1103,
+     1809, 1809, 1809,  670, 1188, 1190, 1106, 1094, 1096, 1085,
+     1809, 1093, 1083, 1809, 1055, 1809, 1077, 1056, 1809,  684,
+     1196, 1202, 1055, 1067, 1037, 1809, 1042, 1021, 1033, 1027,
+     1026,  709, 1212, 1214, 1018, 1006, 1002,  996,  998,  976,
+      988,  982,  727, 1220, 1226,  978,  977, 1809,  970,  950,
+     1809,  966,  748,  734, 1228, 1236,  936,  952,  948,  937,
+      933,  921,  916,  760, 1238, 1244,  916,  925,  920,  894,
+      898,  857,  838,  798, 1250, 1252, 1809,  846,  827,  822,
+
+      806, 1809,  805,  802, 1260, 1262,  763, 1809,  777,  763,
+      748,  816, 1268, 1274, 1809,  742,  712,  720,  838, 1276,
      1284,  689,  665,  630,  844, 1286, 1292,  605,  587,  582,
       857, 1298, 1300,  570,  516,  510,  862, 1308,  926,  491,
-      443,  377,  892,  941,  356,  312, 1811, 1811, 1811,  266,
-      259,  234,   82,   60, 1811, 1811, 1347, 1361, 1375, 1389,
+      443,  377,  892,  941,  356,  312, 1809, 1809, 1809,  266,
+      259,  234,   82,   60, 1809, 1809, 1347, 1361, 1375, 1389,
      1403, 1410, 1422, 1436, 1450, 1464, 1471, 1476, 1488, 1502,
-     1515, 1525, 1533, 1545, 1559, 1573, 1587, 1601, 1615, 1622,
-     1632, 1640, 1647, 1658, 1672,  975, 1039, 1055, 1056, 1128,
+     1515, 1525,  912, 1539, 1553, 1567, 1581, 1595, 1609, 1616,
+     1626, 1634, 1640, 1651, 1665,  975, 1039, 1055, 1056, 1128,
      1141
 
     } ;
@@ -712,7 +721,7 @@ static yyconst flex_int16_t yy_def[692] =
 
     } ;
 
-static yyconst flex_int16_t yy_nxt[1882] =
+static yyconst flex_int16_t yy_nxt[1880] =
     {   0,
        16,   17,   18,   19,   17,   16,   20,   21,   22,   23,
        24,   25,   26,   27,   28,   29,   30,   16,   31,   32,
@@ -815,115 +824,114 @@ static yyconst flex_int16_t yy_nxt[1882] =
 
       375,  177,  180,  602,  379,  379,  159,  159,  159,  159,
       648,  648,  375,  375,  375,  375,  375,  375,  378,  378,
-      378,  378,  601,  600,  180,  159,  159,  159,  159,  378,
+      378,  378,  193,  193,  180,  159,  159,  159,  159,  378,
       378,  402,  159,  159,  159,  159,  405,  405,  405,  405,
-      599,  177,  378,  378,  378,  378,  378,  378,  656,  403,
-      598,  408,  408,  408,  408,  656,  656,  177,  410,  410,
-      411,  411,  411,  411,  180,  177,  597,  404,  413,  413,
-      593,  180,  409,  409,  409,  409,  592,  591,  180,  180,
-      180,  590,  332,  409,  409,  332,  589,  588,  180,  159,
-      159,  159,  159,  587,  581,  580,  409,  409,  409,  409,
+      601,  177,  378,  378,  378,  378,  378,  378,  656,  403,
+      600,  408,  408,  408,  408,  656,  656,  177,  410,  410,
+      411,  411,  411,  411,  180,  177,  599,  404,  413,  413,
+      598,  180,  409,  409,  409,  409,  597,  593,  180,  180,
+      180,  592,  332,  409,  409,  332,  591,  590,  180,  159,
+      159,  159,  159,  589,  588,  587,  409,  409,  409,  409,
 
       409,  409,  412,  412,  412,  412,  159,  159,  159,  159,
-      579,  578,  577,  412,  412,  159,  159,  159,  159,  439,
-      439,  439,  439,  573,  572,  571,  412,  412,  412,  412,
-      412,  412,  436,  656,  570,  569,  442,  442,  442,  442,
-      568,  656,  567,  438,  444,  444,  372,  437,  177,  372,
-      566,  445,  445,  445,  445,  562,  180,  443,  443,  443,
-      443,  561,  406,  440,  180,  406,  440,  560,  443,  443,
-      177,  180,  559,  447,  447,  159,  159,  159,  159,  558,
-      557,  443,  443,  443,  443,  443,  443,  446,  446,  446,
-      446,  556,  555,  180,  159,  159,  159,  159,  446,  446,
-
-      159,  159,  159,  159,  472,  472,  472,  472,  551,  550,
-      549,  446,  446,  446,  446,  446,  446,  656,  548,  547,
-      475,  475,  475,  475,  656,  546,  177,  477,  477,  478,
-      478,  478,  478,  177,  545,  473,  479,  479,  473,  544,
-      180,  471,  476,  476,  476,  476,  543,  180,  237,  180,
-      539,  237,  538,  476,  476,  537,  180,  159,  159,  159,
-      159,  500,  500,  500,  500,  536,  476,  476,  476,  476,
-      476,  476,  656,  535,  534,  502,  502,  502,  502,  656,
-      533,  177,  503,  503,  504,  504,  523,  523,  523,  523,
-      656,  532,  531,  525,  525,  180,  177,  530,  529,  526,
-
-      526,  528,  180,  656,  180,  177,  541,  541,  542,  542,
-      527,  656,  522,  180,  553,  553,  521,  177,  520,  180,
-      554,  554,  519,  518,  517,  516,  180,  656,  180,  177,
-      564,  564,  565,  565,  180,  656,  515,  514,  575,  575,
-      180,  177,  513,  656,  576,  576,  585,  585,  512,  511,
+      581,  580,  579,  412,  412,  159,  159,  159,  159,  439,
+      439,  439,  439,  578,  577,  573,  412,  412,  412,  412,
+      412,  412,  436,  656,  572,  571,  442,  442,  442,  442,
+      570,  656,  569,  438,  444,  444,  372,  437,  177,  372,
+      568,  445,  445,  445,  445,  567,  180,  443,  443,  443,
+      443,  566,  406,  440,  180,  406,  440,  562,  443,  443,
+      177,  180,  561,  447,  447,  159,  159,  159,  159,  560,
+      559,  443,  443,  443,  443,  443,  443,  446,  446,  446,
+      446,  558,  557,  180,  159,  159,  159,  159,  446,  446,
+
+      159,  159,  159,  159,  472,  472,  472,  472,  556,  555,
+      551,  446,  446,  446,  446,  446,  446,  656,  550,  549,
+      475,  475,  475,  475,  656,  548,  177,  477,  477,  478,
+      478,  478,  478,  177,  547,  473,  479,  479,  473,  546,
+      180,  471,  476,  476,  476,  476,  545,  180,  237,  180,
+      544,  237,  543,  476,  476,  539,  180,  159,  159,  159,
+      159,  500,  500,  500,  500,  538,  476,  476,  476,  476,
+      476,  476,  656,  537,  536,  502,  502,  502,  502,  656,
+      535,  177,  503,  503,  504,  504,  523,  523,  523,  523,
+      656,  534,  533,  525,  525,  180,  177,  532,  531,  526,
+
+      526,  530,  180,  656,  180,  177,  541,  541,  542,  542,
+      529,  656,  528,  180,  553,  553,  527,  177,  522,  180,
+      554,  554,  521,  520,  519,  518,  180,  656,  180,  177,
+      564,  564,  565,  565,  180,  656,  517,  516,  575,  575,
+      180,  177,  515,  656,  576,  576,  585,  585,  514,  513,
       180,  177,  180,  656,  586,  586,  595,  595,  180,  177,
-      510,  509,  596,  596,  180,  656,  180,  177,  605,  605,
-      606,  606,  508,  507,  180,  656,  180,  177,  613,  613,
-      614,  614,  180,  656,  506,  505,  620,  620,  180,  177,
-      180,  656,  621,  621,  626,  626,  499,  498,  180,  177,
+      512,  511,  596,  596,  180,  656,  180,  177,  605,  605,
+      606,  606,  510,  509,  180,  656,  180,  177,  613,  613,
+      614,  614,  180,  656,  508,  507,  620,  620,  180,  177,
+      180,  656,  621,  621,  626,  626,  506,  505,  180,  177,
 
-      180,  656,  627,  627,  632,  632,  180,  177,  497,  496,
+      180,  656,  627,  627,  632,  632,  180,  177,  499,  498,
       633,  633,  180,  656,  180,  177,  638,  638,  639,  639,
-      495,  494,  180,  656,  180,  493,  644,  644,  492,  491,
-      180,  490,  489,  486,  485,  484,  180,  483,  180,  482,
-      481,  480,  470,  469,  468,  467,  180,   46,   46,   46,
+      497,  496,  180,  656,  180,  495,  644,  644,  494,  493,
+      180,  492,  491,  490,  489,  486,  180,  485,  180,  484,
+      483,  482,  481,  480,  470,  469,  180,   46,   46,   46,
        46,   46,   46,   46,   46,   46,   46,   46,   46,   46,
        46,   50,   50,   50,   50,   50,   50,   50,   50,   50,
        50,   50,   50,   50,   50,   60,   60,   60,   60,   60,
        60,   60,   60,   60,   60,   60,   60,   60,   60,   82,
        82,   82,   82,   82,   82,   82,   82,   82,   82,   82,
 
-       82,   82,   82,  113,  113,  466,  113,  113,  113,  113,
-      113,  113,  113,  113,  113,  113,  113,  134,  465,  462,
-      134,  134,  139,  139,  461,  139,  139,  139,  139,  139,
-      460,  139,  139,  139,  139,  139,  141,  141,  459,  141,
+       82,   82,   82,  113,  113,  468,  113,  113,  113,  113,
+      113,  113,  113,  113,  113,  113,  113,  134,  467,  466,
+      134,  134,  139,  139,  465,  139,  139,  139,  139,  139,
+      462,  139,  139,  139,  139,  139,  141,  141,  461,  141,
       141,  141,  141,  141,  141,  141,  141,  141,  141,  141,
-      151,  151,  456,  151,  151,  455,  151,  151,  151,  151,
-      151,  151,  151,  151,  153,  153,  454,  153,  153,  153,
-      153,  153,  153,  153,  153,  153,  153,  153,  159,  453,
-      452,  159,  159,  161,  451,  450,  161,  161,  168,  168,
-      449,  168,  168,  168,  168,  168,  168,  448,  168,  168,
-
-      168,  168,  171,  171,  435,  171,  171,  171,  171,  171,
-      171,  171,  171,  171,  171,  171,  178,  178,  178,  434,
-      433,  178,  178,  432,  178,  178,  178,  178,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  193,
-      431,  430,  429,  193,  193,  194,  194,  428,  194,  194,
-      194,  194,  194,  194,  194,  194,  194,  194,  194,  213,
-      213,  427,  213,  213,  213,  213,  213,  213,  213,  213,
-      213,  213,  213,  223,  223,  426,  223,  223,  223,  223,
-      223,  223,  223,  223,  223,  223,  223,  226,  226,  423,
-      226,  226,  226,  226,  226,  226,  226,  226,  226,  226,
-
-      226,  233,  233,  422,  233,  233,  233,  233,  233,  233,
-      233,  233,  233,  233,  233,  236,  236,  421,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  237,
-      418,  417,  237,  237,  237,  239,  239,  239,  239,  239,
-      239,  239,  239,  239,  239,  239,  239,  239,  416,  415,
-      239,  239,  239,  250,  250,  414,  401,  250,  250,  400,
-      250,  237,  237,  237,  237,  237,  237,  237,  237,  237,
-      237,  237,  294,  294,  294,  294,  294,  294,  294,  294,
-      294,  294,  294,  294,  294,  294,  399,  398,  397,  396,
-      395,  394,  393,  392,  391,  390,  389,  388,  387,  386,
-
-      385,  384,  383,  382,  381,  380,  365,  364,  363,  362,
-      361,  360,  357,  356,  355,  354,  353,  352,  351,  350,
-      349,  348,  347,  346,  345,  344,  324,  323,  322,  321,
-      320,  319,  318,  317,  316,  315,  314,  313,  312,  311,
-      310,  307,  306,  305,  304,  303,  302,  301,  300,  299,
-      251,  244,  279,  278,  277,  276,  275,  274,  273,  272,
-      271,  270,  269,  268,  267,  266,  263,  262,  261,  256,
-      255,  254,  253,  252,  251,  656,  245,  238,  222,  217,
-      216,  215,  214,  133,  209,  208,  204,  203,  200,  199,
-      198,  197,  187,  170,  169,  158,  157,  152,  148,  147,
-
-      146,  145,  140,  138,  137,  136,  133,  131,  112,  656,
-       15,  656,  656,  656,  656,  656,  656,  656,  656,  656,
+      151,  151,  460,  151,  151,  459,  151,  151,  151,  151,
+      151,  151,  151,  151,  153,  153,  456,  153,  153,  153,
+      153,  153,  153,  153,  153,  153,  153,  153,  159,  455,
+      454,  159,  159,  161,  453,  452,  161,  161,  168,  168,
+      451,  168,  168,  168,  168,  168,  168,  450,  168,  168,
+
+      168,  168,  171,  171,  449,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  178,  178,  178,  448,
+      435,  178,  178,  434,  178,  178,  178,  178,  188,  188,
+      188,  188,  188,  188,  188,  188,  188,  188,  188,  194,
+      194,  433,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  213,  213,  432,  213,  213,  213,  213,
+      213,  213,  213,  213,  213,  213,  213,  223,  223,  431,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  226,  226,  430,  226,  226,  226,  226,  226,  226,
+      226,  226,  226,  226,  226,  233,  233,  429,  233,  233,
+
+      233,  233,  233,  233,  233,  233,  233,  233,  233,  236,
+      236,  428,  236,  236,  236,  236,  236,  236,  236,  236,
+      236,  236,  236,  237,  427,  426,  237,  237,  237,  239,
+      239,  239,  239,  239,  239,  239,  239,  239,  239,  239,
+      239,  239,  423,  422,  239,  239,  239,  250,  421,  418,
+      250,  250,  417,  250,  237,  237,  237,  237,  237,  237,
+      237,  237,  237,  237,  237,  294,  294,  294,  294,  294,
+      294,  294,  294,  294,  294,  294,  294,  294,  294,  416,
+      415,  414,  401,  400,  399,  398,  397,  396,  395,  394,
+      393,  392,  391,  390,  389,  388,  387,  386,  385,  384,
+
+      383,  382,  381,  380,  365,  364,  363,  362,  361,  360,
+      357,  356,  355,  354,  353,  352,  351,  350,  349,  348,
+      347,  346,  345,  344,  324,  323,  322,  321,  320,  319,
+      318,  317,  316,  315,  314,  313,  312,  311,  310,  307,
+      306,  305,  304,  303,  302,  301,  300,  299,  251,  244,
+      279,  278,  277,  276,  275,  274,  273,  272,  271,  270,
+      269,  268,  267,  266,  263,  262,  261,  256,  255,  254,
+      253,  252,  251,  656,  245,  238,  222,  217,  216,  215,
+      214,  133,  209,  208,  204,  203,  200,  199,  198,  197,
+      187,  170,  169,  158,  157,  152,  148,  147,  146,  145,
+
+      140,  138,  137,  136,  133,  131,  112,  656,   15,  656,
       656,  656,  656,  656,  656,  656,  656,  656,  656,  656,
       656,  656,  656,  656,  656,  656,  656,  656,  656,  656,
       656,  656,  656,  656,  656,  656,  656,  656,  656,  656,
       656,  656,  656,  656,  656,  656,  656,  656,  656,  656,
       656,  656,  656,  656,  656,  656,  656,  656,  656,  656,
       656,  656,  656,  656,  656,  656,  656,  656,  656,  656,
-      656
+      656,  656,  656,  656,  656,  656,  656,  656,  656
     } ;
 
-static yyconst flex_int16_t yy_chk[1882] =
+static yyconst flex_int16_t yy_chk[1880] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -1026,112 +1034,111 @@ static yyconst flex_int16_t yy_chk[1882] =
 
       336,  340,  338,  592,  340,  340,  367,  367,  367,  367,
       643,  643,  336,  336,  336,  336,  336,  336,  339,  339,
-      339,  339,  591,  590,  340,  368,  368,  368,  368,  339,
+      339,  339,  673,  673,  340,  368,  368,  368,  368,  339,
       339,  366,  369,  369,  369,  369,  370,  370,  370,  370,
-      589,  639,  339,  339,  339,  339,  339,  339,  374,  368,
-      588,  374,  374,  374,  374,  376,  644,  377,  376,  376,
-      377,  377,  377,  377,  639,  379,  587,  369,  379,  379,
-      583,  374,  375,  375,  375,  375,  582,  581,  376,  644,
-      377,  580,  686,  375,  375,  686,  579,  578,  379,  402,
-      402,  402,  402,  577,  572,  570,  375,  375,  375,  375,
+      591,  639,  339,  339,  339,  339,  339,  339,  374,  368,
+      590,  374,  374,  374,  374,  376,  644,  377,  376,  376,
+      377,  377,  377,  377,  639,  379,  589,  369,  379,  379,
+      588,  374,  375,  375,  375,  375,  587,  583,  376,  644,
+      377,  582,  686,  375,  375,  686,  581,  580,  379,  402,
+      402,  402,  402,  579,  578,  577,  375,  375,  375,  375,
 
       375,  375,  378,  378,  378,  378,  403,  403,  403,  403,
-      569,  567,  566,  378,  378,  404,  404,  404,  404,  405,
-      405,  405,  405,  562,  561,  560,  378,  378,  378,  378,
-      378,  378,  402,  408,  559,  558,  408,  408,  408,  408,
-      557,  410,  556,  404,  410,  410,  687,  403,  411,  687,
-      555,  411,  411,  411,  411,  551,  408,  409,  409,  409,
-      409,  550,  688,  689,  410,  688,  689,  549,  409,  409,
-      413,  411,  548,  413,  413,  436,  436,  436,  436,  547,
-      545,  409,  409,  409,  409,  409,  409,  412,  412,  412,
-      412,  544,  543,  413,  437,  437,  437,  437,  412,  412,
-
-      438,  438,  438,  438,  439,  439,  439,  439,  538,  537,
-      535,  412,  412,  412,  412,  412,  412,  442,  533,  532,
-      442,  442,  442,  442,  444,  530,  445,  444,  444,  445,
-      445,  445,  445,  447,  529,  690,  447,  447,  690,  528,
-      442,  437,  443,  443,  443,  443,  527,  444,  691,  445,
-      520,  691,  518,  443,  443,  517,  447,  471,  471,  471,
-      471,  472,  472,  472,  472,  516,  443,  443,  443,  443,
-      443,  443,  475,  515,  514,  475,  475,  475,  475,  477,
-      513,  479,  477,  477,  479,  479,  500,  500,  500,  500,
-      503,  512,  511,  503,  503,  475,  504,  509,  508,  504,
-
-      504,  507,  477,  525,  479,  526,  525,  525,  526,  526,
-      505,  541,  498,  503,  541,  541,  497,  542,  496,  504,
-      542,  542,  495,  494,  493,  492,  525,  553,  526,  554,
-      553,  553,  554,  554,  541,  564,  491,  490,  564,  564,
-      542,  565,  489,  575,  565,  565,  575,  575,  488,  487,
+      572,  570,  569,  378,  378,  404,  404,  404,  404,  405,
+      405,  405,  405,  567,  566,  562,  378,  378,  378,  378,
+      378,  378,  402,  408,  561,  560,  408,  408,  408,  408,
+      559,  410,  558,  404,  410,  410,  687,  403,  411,  687,
+      557,  411,  411,  411,  411,  556,  408,  409,  409,  409,
+      409,  555,  688,  689,  410,  688,  689,  551,  409,  409,
+      413,  411,  550,  413,  413,  436,  436,  436,  436,  549,
+      548,  409,  409,  409,  409,  409,  409,  412,  412,  412,
+      412,  547,  545,  413,  437,  437,  437,  437,  412,  412,
+
+      438,  438,  438,  438,  439,  439,  439,  439,  544,  543,
+      538,  412,  412,  412,  412,  412,  412,  442,  537,  535,
+      442,  442,  442,  442,  444,  533,  445,  444,  444,  445,
+      445,  445,  445,  447,  532,  690,  447,  447,  690,  530,
+      442,  437,  443,  443,  443,  443,  529,  444,  691,  445,
+      528,  691,  527,  443,  443,  520,  447,  471,  471,  471,
+      471,  472,  472,  472,  472,  518,  443,  443,  443,  443,
+      443,  443,  475,  517,  516,  475,  475,  475,  475,  477,
+      515,  479,  477,  477,  479,  479,  500,  500,  500,  500,
+      503,  514,  513,  503,  503,  475,  504,  512,  511,  504,
+
+      504,  509,  477,  525,  479,  526,  525,  525,  526,  526,
+      508,  541,  507,  503,  541,  541,  505,  542,  498,  504,
+      542,  542,  497,  496,  495,  494,  525,  553,  526,  554,
+      553,  553,  554,  554,  541,  564,  493,  492,  564,  564,
+      542,  565,  491,  575,  565,  565,  575,  575,  490,  489,
       553,  576,  554,  585,  576,  576,  585,  585,  564,  586,
-      485,  484,  586,  586,  565,  595,  575,  596,  595,  595,
-      596,  596,  483,  482,  576,  605,  585,  606,  605,  605,
-      606,  606,  586,  613,  481,  480,  613,  613,  595,  614,
-      596,  620,  614,  614,  620,  620,  469,  468,  605,  621,
+      488,  487,  586,  586,  565,  595,  575,  596,  595,  595,
+      596,  596,  485,  484,  576,  605,  585,  606,  605,  605,
+      606,  606,  586,  613,  483,  482,  613,  613,  595,  614,
+      596,  620,  614,  614,  620,  620,  481,  480,  605,  621,
 
-      606,  626,  621,  621,  626,  626,  613,  627,  467,  466,
+      606,  626,  621,  621,  626,  626,  613,  627,  469,  468,
       627,  627,  614,  632,  620,  633,  632,  632,  633,  633,
-      465,  464,  621,  638,  626,  463,  638,  638,  462,  461,
-      627,  459,  458,  456,  455,  454,  632,  453,  633,  452,
-      450,  449,  435,  434,  433,  432,  638,  657,  657,  657,
+      467,  466,  621,  638,  626,  465,  638,  638,  464,  463,
+      627,  462,  461,  459,  458,  456,  632,  455,  633,  454,
+      453,  452,  450,  449,  435,  434,  638,  657,  657,  657,
       657,  657,  657,  657,  657,  657,  657,  657,  657,  657,
       657,  658,  658,  658,  658,  658,  658,  658,  658,  658,
       658,  658,  658,  658,  658,  659,  659,  659,  659,  659,
       659,  659,  659,  659,  659,  659,  659,  659,  659,  660,
       660,  660,  660,  660,  660,  660,  660,  660,  660,  660,
 
-      660,  660,  660,  661,  661,  431,  661,  661,  661,  661,
-      661,  661,  661,  661,  661,  661,  661,  662,  430,  428,
-      662,  662,  663,  663,  427,  663,  663,  663,  663,  663,
-      426,  663,  663,  663,  663,  663,  664,  664,  425,  664,
+      660,  660,  660,  661,  661,  433,  661,  661,  661,  661,
+      661,  661,  661,  661,  661,  661,  661,  662,  432,  431,
+      662,  662,  663,  663,  430,  663,  663,  663,  663,  663,
+      428,  663,  663,  663,  663,  663,  664,  664,  427,  664,
       664,  664,  664,  664,  664,  664,  664,  664,  664,  664,
-      665,  665,  423,  665,  665,  422,  665,  665,  665,  665,
-      665,  665,  665,  665,  666,  666,  420,  666,  666,  666,
-      666,  666,  666,  666,  666,  666,  666,  666,  667,  419,
-      418,  667,  667,  668,  417,  416,  668,  668,  669,  669,
-      415,  669,  669,  669,  669,  669,  669,  414,  669,  669,
-
-      669,  669,  670,  670,  401,  670,  670,  670,  670,  670,
-      670,  670,  670,  670,  670,  670,  671,  671,  671,  399,
-      398,  671,  671,  397,  671,  671,  671,  671,  672,  672,
-      672,  672,  672,  672,  672,  672,  672,  672,  672,  673,
-      396,  395,  394,  673,  673,  674,  674,  393,  674,  674,
-      674,  674,  674,  674,  674,  674,  674,  674,  674,  675,
-      675,  392,  675,  675,  675,  675,  675,  675,  675,  675,
-      675,  675,  675,  676,  676,  391,  676,  676,  676,  676,
-      676,  676,  676,  676,  676,  676,  676,  677,  677,  389,
-      677,  677,  677,  677,  677,  677,  677,  677,  677,  677,
-
-      677,  678,  678,  388,  678,  678,  678,  678,  678,  678,
-      678,  678,  678,  678,  678,  679,  679,  387,  679,  679,
-      679,  679,  679,  679,  679,  679,  679,  679,  679,  680,
-      384,  383,  680,  680,  680,  681,  681,  681,  681,  681,
-      681,  681,  681,  681,  681,  681,  682,  682,  382,  381,
-      682,  682,  682,  683,  683,  380,  364,  683,  683,  363,
-      683,  684,  684,  684,  684,  684,  684,  684,  684,  684,
-      684,  684,  685,  685,  685,  685,  685,  685,  685,  685,
-      685,  685,  685,  685,  685,  685,  362,  361,  360,  359,
-      358,  357,  356,  355,  353,  352,  350,  349,  348,  347,
-
-      346,  345,  344,  343,  342,  341,  324,  323,  322,  321,
-      320,  319,  316,  314,  313,  312,  311,  309,  308,  307,
-      306,  304,  303,  302,  301,  300,  279,  278,  277,  276,
-      275,  274,  272,  271,  270,  269,  268,  267,  266,  265,
-      263,  261,  260,  259,  258,  257,  256,  255,  254,  252,
-      250,  244,  222,  221,  220,  219,  218,  217,  216,  215,
-      214,  212,  211,  210,  209,  208,  206,  205,  204,  201,
-      200,  199,  198,  197,  193,  186,  182,  177,  150,  147,
-      146,  138,  137,  133,  127,  126,  124,  123,  121,  120,
-      119,  118,  104,   89,   84,   71,   69,   62,   58,   57,
-
-       56,   53,   48,   42,   41,   39,   34,   30,   19,   15,
-      656,  656,  656,  656,  656,  656,  656,  656,  656,  656,
+      665,  665,  426,  665,  665,  425,  665,  665,  665,  665,
+      665,  665,  665,  665,  666,  666,  423,  666,  666,  666,
+      666,  666,  666,  666,  666,  666,  666,  666,  667,  422,
+      420,  667,  667,  668,  419,  418,  668,  668,  669,  669,
+      417,  669,  669,  669,  669,  669,  669,  416,  669,  669,
+
+      669,  669,  670,  670,  415,  670,  670,  670,  670,  670,
+      670,  670,  670,  670,  670,  670,  671,  671,  671,  414,
+      401,  671,  671,  399,  671,  671,  671,  671,  672,  672,
+      672,  672,  672,  672,  672,  672,  672,  672,  672,  674,
+      674,  398,  674,  674,  674,  674,  674,  674,  674,  674,
+      674,  674,  674,  675,  675,  397,  675,  675,  675,  675,
+      675,  675,  675,  675,  675,  675,  675,  676,  676,  396,
+      676,  676,  676,  676,  676,  676,  676,  676,  676,  676,
+      676,  677,  677,  395,  677,  677,  677,  677,  677,  677,
+      677,  677,  677,  677,  677,  678,  678,  394,  678,  678,
+
+      678,  678,  678,  678,  678,  678,  678,  678,  678,  679,
+      679,  393,  679,  679,  679,  679,  679,  679,  679,  679,
+      679,  679,  679,  680,  392,  391,  680,  680,  680,  681,
+      681,  681,  681,  681,  681,  681,  681,  681,  681,  681,
+      682,  682,  389,  388,  682,  682,  682,  683,  387,  384,
+      683,  683,  383,  683,  684,  684,  684,  684,  684,  684,
+      684,  684,  684,  684,  684,  685,  685,  685,  685,  685,
+      685,  685,  685,  685,  685,  685,  685,  685,  685,  382,
+      381,  380,  364,  363,  362,  361,  360,  359,  358,  357,
+      356,  355,  353,  352,  350,  349,  348,  347,  346,  345,
+
+      344,  343,  342,  341,  324,  323,  322,  321,  320,  319,
+      316,  314,  313,  312,  311,  309,  308,  307,  306,  304,
+      303,  302,  301,  300,  279,  278,  277,  276,  275,  274,
+      272,  271,  270,  269,  268,  267,  266,  265,  263,  261,
+      260,  259,  258,  257,  256,  255,  254,  252,  250,  244,
+      222,  221,  220,  219,  218,  217,  216,  215,  214,  212,
+      211,  210,  209,  208,  206,  205,  204,  201,  200,  199,
+      198,  197,  193,  186,  182,  177,  150,  147,  146,  138,
+      137,  133,  127,  126,  124,  123,  121,  120,  119,  118,
+      104,   89,   84,   71,   69,   62,   58,   57,   56,   53,
+
+       48,   42,   41,   39,   34,   30,   19,   15,  656,  656,
       656,  656,  656,  656,  656,  656,  656,  656,  656,  656,
       656,  656,  656,  656,  656,  656,  656,  656,  656,  656,
       656,  656,  656,  656,  656,  656,  656,  656,  656,  656,
       656,  656,  656,  656,  656,  656,  656,  656,  656,  656,
       656,  656,  656,  656,  656,  656,  656,  656,  656,  656,
       656,  656,  656,  656,  656,  656,  656,  656,  656,  656,
-      656
+      656,  656,  656,  656,  656,  656,  656,  656,  656
     } ;
 
 extern int yy_flex_debug;
@@ -1162,8 +1169,8 @@ static int yy_more_len = 0;
 #define YY_MORE_ADJ (yy_more_len)
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
-#line 2 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 1 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 2 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 /* This file is part of kdev-pg-qt
    Copyright (C) 2006 Jakob Petsovits <jpetso at gmx.at>
 
@@ -1259,7 +1266,7 @@ namespace {
 
 
 
-#line 1263 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-lexer.cc"
+#line 1270 "/home/andreas/src/kdevelop-pg-qt/build/kdev-pg/kdev-pg-lexer.cc"
 
 #define INITIAL 0
 #define CODE 1
@@ -1346,7 +1353,12 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
 #define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -1354,7 +1366,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1365,7 +1377,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		int n; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -1447,11 +1459,11 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 105 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 105 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 
 
 
-#line 1455 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-lexer.cc"
+#line 1467 "/home/andreas/src/kdevelop-pg-qt/build/kdev-pg/kdev-pg-lexer.cc"
 
 	if ( !(yy_init) )
 		{
@@ -1522,7 +1534,7 @@ yy_match:
 			*(yy_state_ptr)++ = yy_current_state;
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 1811 );
+		while ( yy_base[yy_current_state] != 1809 );
 
 yy_find_action:
 		yy_current_state = *--(yy_state_ptr);
@@ -1574,366 +1586,366 @@ do_action:	/* This label is used only to access EOF actions. */
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 108 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 108 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 /* skip */ ;
 	YY_BREAK
 case 2:
 /* rule 2 can match eol */
 YY_RULE_SETUP
-#line 109 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 109 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 newline();
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 110 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 110 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 /* line comments, skip */ ;
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 112 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 112 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 rulePosition = RuleBody; return ';';
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 113 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 113 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 if(rulePosition == RuleLexer) BEGIN(RULE_LEXER); else rulePosition = RuleFooter; return T_ARROW;
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 114 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 114 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_INLINE;
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 116 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 116 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '(';
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 117 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 117 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return ')';
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 118 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 118 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '{';
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 119 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 119 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '}';
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 120 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 120 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return ',';
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 121 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 121 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '0';
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 122 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 122 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '#';
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 123 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 123 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '.';
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 124 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 124 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return ':';
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 125 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 125 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '=';
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 126 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 126 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '+';
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 127 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 127 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '*';
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 128 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 128 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '?';
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 129 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 129 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '@';
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 130 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 130 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '|';
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 131 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 131 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '&';
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 133 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 133 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_TRY_RECOVER;
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 134 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 134 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_TRY_ROLLBACK;
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 135 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 135 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_CATCH;
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 137 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 137 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_EXPORT_MACRO;
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 138 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 138 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_EXPORT_MACRO_HEADER;
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 139 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 139 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_TOKEN_DECLARATION;
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 140 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 140 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_TOKEN_STREAM_DECLARATION;
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 141 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 141 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_NAMESPACE_DECLARATION;
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 142 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 142 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 BEGIN(PARSERCLASS); return T_PARSERCLASS_DECLARATION;
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 143 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 143 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 BEGIN(PARSERCLASS); return T_LEXERCLASS_DECLARATION;
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 144 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 144 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_INPUT_STREAM;
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 145 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 145 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_AST_DECLARATION;
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 146 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 146 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_PARSER_DECLARATION_HEADER;
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 147 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 147 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_PARSER_BITS_HEADER;
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 148 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 148 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_AST_HEADER;
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 149 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 149 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_TOKEN_STREAM_DECLARATION_HEADER;
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 150 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 150 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_TOKEN_STREAM_BITS_HEADER;
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 151 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 151 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_INPUT_ENCODING;
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 152 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 152 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_TABLE_LEXER;
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 153 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 153 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_SEQUENCE_LEXER;
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 154 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 154 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_AST_BASE;
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 155 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 155 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_PARSER_BASE;
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 156 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 156 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_TOKEN_STREAM_BASE;
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 157 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 157 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_BIN;
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 158 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 158 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_PRE;
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 159 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 159 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_POST;
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 160 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 160 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_TERN;
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 161 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 161 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_PAREN;
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 162 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 162 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_PRIORITY;
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 163 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 163 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 rulePosition = RuleBody; return T_LOPR;
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 164 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 164 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 rulePosition = RuleFooter; return T_ROPR;
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 165 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 165 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_LEFT_ASSOC;
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 166 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 166 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_RIGHT_ASSOC;
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 167 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 167 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_IS_LEFT_ASSOC;
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 168 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 168 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_IS_RIGHT_ASSOC;
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 169 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 169 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 rulePosition = RuleLexer; return T_LEXER;
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 170 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 170 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_CONTINUE;
 	YY_BREAK
 
 case 60:
 YY_RULE_SETUP
-#line 173 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 173 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 /* skip */ ;
 	YY_BREAK
 case 61:
 /* rule 61 can match eol */
 YY_RULE_SETUP
-#line 174 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 174 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 newline();
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 175 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 175 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '(';
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 176 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 176 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_PUBLIC;
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 177 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 177 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_PRIVATE;
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 178 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 178 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_PROTECTED;
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 179 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 179 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_DECLARATION;
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 180 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 180 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_CONSTRUCTOR;
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 181 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 181 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_DESTRUCTOR;
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 182 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 182 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_BITS;
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 183 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 183 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 BEGIN(INITIAL); return ')';
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 184 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 184 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 BEGIN(INITIAL); REJECT; /* everything else */
 	YY_BREAK
 
 case 72:
 YY_RULE_SETUP
-#line 188 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 188 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 {
     if (rulePosition == RuleBody) { /* use the arguments in a rule call */
       firstCodeLine = yyLine;
@@ -1948,145 +1960,145 @@ YY_RULE_SETUP
 
 case 73:
 YY_RULE_SETUP
-#line 200 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 200 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 /* line comments, skip */ ;
 	YY_BREAK
 case 74:
 /* rule 74 can match eol */
 YY_RULE_SETUP
-#line 201 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 201 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 newline();
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 202 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 202 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 ++yytext; COPY_TO_YYLVAL(yytext,yyleng-2); return T_NAMED_REGEXP;
 	YY_BREAK
 case 76:
 /* rule 76 can match eol */
 YY_RULE_SETUP
-#line 203 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 203 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 rulePosition = RuleBody; BEGIN(INITIAL); return ';';
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 204 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 204 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return ';';
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 205 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 205 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return ';';
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 206 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 206 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 ++openBrackets; return '[';
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 207 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 207 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 --openBrackets; return ']';
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 208 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 208 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 ++openBrackets; return '(';
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 209 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 209 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 --openBrackets; return ')';
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 210 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 210 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '?';
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 211 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 211 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '|';
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 212 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 212 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '^';
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 213 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 213 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 COPY_TO_YYLVAL(yytext,yyleng); return T_RANGE;
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 214 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 214 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '&';
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 215 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 215 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '~';
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 216 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 216 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '*';
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 217 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 217 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '+';
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 218 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 218 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '@';
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 219 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 219 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '.';
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 220 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 220 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_ARROW;
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 221 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 221 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 firstCodeLine = yyLine; firstCodeColumn = currentOffset + 2; BEGIN(CODE);
 	YY_BREAK
 case 95:
 /* rule 95 can match eol */
 YY_RULE_SETUP
-#line 222 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 222 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 COPY_TO_YYLVAL(yytext,yyleng); return T_TERMINAL;
 	YY_BREAK
 case 96:
 /* rule 96 can match eol */
 YY_RULE_SETUP
-#line 223 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 223 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 COPY_TO_YYLVAL(yytext,yyleng); return T_IDENTIFIER;
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 224 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 224 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 COPY_TO_YYLVAL(yytext,yyleng); return T_UNQUOTED_STRING;
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 225 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 225 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 /* skip */
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 226 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 226 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 yytext++; COPY_TO_YYLVAL(yytext,yyleng-2); return T_STRING;
 	YY_BREAK
 case YY_STATE_EOF(RULE_LEXER):
-#line 228 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 228 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 {
     BEGIN(INITIAL); // is not set automatically by yyrestart()
     KDevPG::checkOut << "** ERROR Encountered end of file in an unclosed rule lexer definition..." << endl;
@@ -2099,32 +2111,32 @@ case YY_STATE_EOF(RULE_LEXER):
 case 100:
 /* rule 100 can match eol */
 YY_RULE_SETUP
-#line 237 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 237 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 newline(); yymore();
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 238 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 238 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 yymore(); /* this and... */
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 239 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 239 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 yymore(); /* ...this prevent brackets inside strings to be counted */
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 240 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 240 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 yymore(); /* gather everything that's not a bracket, and append what comes next */
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 241 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 241 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 openBrackets++; yymore();
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 242 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 242 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 {
       openBrackets--;
       if (openBrackets < 0) {
@@ -2135,7 +2147,7 @@ YY_RULE_SETUP
   }
 	YY_BREAK
 case YY_STATE_EOF(RULE_ARGUMENTS):
-#line 250 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 250 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 {
       BEGIN(INITIAL); // is not set automatically by yyrestart()
       KDevPG::checkOut << "** ERROR Encountered end of file in an unclosed rule argument specification..." << endl;
@@ -2147,78 +2159,78 @@ case YY_STATE_EOF(RULE_ARGUMENTS):
 
 case 106:
 YY_RULE_SETUP
-#line 259 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 259 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 /* skip */ ;
 	YY_BREAK
 case 107:
 /* rule 107 can match eol */
 YY_RULE_SETUP
-#line 260 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 260 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 newline();
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 261 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 261 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 /* line comments, skip */ ;
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 262 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 262 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 BEGIN(RULE_PARAMETERS_VARNAME); return ':';
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 263 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 263 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return '#';
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 264 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 264 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_MEMBER;
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 265 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 265 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_TEMPORARY;
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 266 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 266 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_ARGUMENT;
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 267 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 267 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_NODE;
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 268 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 268 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_TOKEN;
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 269 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 269 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return T_VARIABLE;
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 270 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 270 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 return ';';  /* only used for "token" types */
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 271 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 271 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 COPY_TO_YYLVAL(yytext,yyleng); return T_IDENTIFIER;
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 272 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 272 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 BEGIN(INITIAL); return ']';
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 273 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 273 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 BEGIN(INITIAL); REJECT; /* everything else */
 	YY_BREAK
 
@@ -2226,17 +2238,17 @@ BEGIN(INITIAL); REJECT; /* everything else */
 case 121:
 /* rule 121 can match eol */
 YY_RULE_SETUP
-#line 277 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 277 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 newline(); yymore();
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 278 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 278 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 yymore(); /* gather everything that's not a semicolon, and append what comes next */
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 279 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 279 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 {
       // strip trailing whitespace
       int length = yyleng-1; // and first, the trailing semicolon
@@ -2259,35 +2271,35 @@ YY_RULE_SETUP
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 298 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 298 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 BEGIN(INITIAL); REJECT; /* everything else */
 	YY_BREAK
 
 case 125:
 YY_RULE_SETUP
-#line 302 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 302 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 firstCodeLine = yyLine; firstCodeColumn = currentOffset + 2; BEGIN(CODE);
 	YY_BREAK
 
 case 126:
 /* rule 126 can match eol */
 YY_RULE_SETUP
-#line 304 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 304 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 newline(); yymore();
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 305 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 305 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 yymore(); /* gather everything that's not a colon, and append what comes next */
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 306 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 306 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 yymore(); /* also gather colons that are not followed by colons or newlines */
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 307 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 307 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 {
       COPY_CODE_TO_YYLVAL(yytext, (yyleng-2)); /* cut off the trailing stuff */
       if(rulePosition == RuleLexer)
@@ -2298,7 +2310,7 @@ YY_RULE_SETUP
   }
 	YY_BREAK
 case YY_STATE_EOF(CODE):
-#line 315 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 315 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 {
       BEGIN(INITIAL); // is not set automatically by yyrestart()
       KDevPG::checkOut << "** ERROR Encountered end of file in an unclosed code segment..." << endl;
@@ -2309,22 +2321,22 @@ case YY_STATE_EOF(CODE):
 
 case 130:
 YY_RULE_SETUP
-#line 324 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 324 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 COPY_TO_YYLVAL(yytext,yyleng); return T_TERMINAL;
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 325 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 325 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 COPY_TO_YYLVAL(yytext,yyleng); return T_IDENTIFIER;
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 326 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 326 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 COPY_TO_YYLVAL(yytext,yyleng); return T_NUMBER;
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 329 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 329 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 {
    yytext++;                         /* start inside the quotes */
    COPY_TO_YYLVAL(yytext,yyleng-2);  /* cut off the trailing quote */
@@ -2333,7 +2345,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 335 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 335 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 {
   KDevPG::checkOut << "Unexpected character: ``" << yytext[0] << "''" << endl;
   yyerror("");
@@ -2341,10 +2353,10 @@ YY_RULE_SETUP
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 341 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 341 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 ECHO;
 	YY_BREAK
-#line 2348 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-lexer.cc"
+#line 2360 "/home/andreas/src/kdevelop-pg-qt/build/kdev-pg/kdev-pg-lexer.cc"
 			case YY_STATE_EOF(INITIAL):
 			case YY_STATE_EOF(PARSERCLASS):
 			case YY_STATE_EOF(RULE_PARAMETERS_HEADER):
@@ -3071,8 +3083,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
 
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */
@@ -3319,7 +3331,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 341 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
+#line 341 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-lexer.ll"
 
 
 
diff --git a/kdev-pg/kdev-pg-parser.cc b/kdev-pg/kdev-pg-parser.cc
index b732871..57713b1 100644
--- a/kdev-pg/kdev-pg-parser.cc
+++ b/kdev-pg/kdev-pg-parser.cc
@@ -68,7 +68,7 @@
 /* Copy the first part of user declarations.  */
 
 /* Line 189 of yacc.c  */
-#line 2 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 2 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
 
 /* This file is part of kdev-pg-qt
    Copyright (C) 2005 Roberto Raggi <roberto at kdevelop.org>
@@ -117,7 +117,7 @@ QString r;
 
 
 /* Line 189 of yacc.c  */
-#line 121 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
+#line 121 "/home/andreas/src/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -216,7 +216,7 @@ typedef union YYSTYPE
 {
 
 /* Line 214 of yacc.c  */
-#line 49 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 49 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
 
     KDevPG::Model::Node *item;
     char* str;
@@ -229,7 +229,7 @@ typedef union YYSTYPE
 
 
 /* Line 214 of yacc.c  */
-#line 233 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
+#line 233 "/home/andreas/src/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -241,7 +241,7 @@ typedef union YYSTYPE
 
 
 /* Line 264 of yacc.c  */
-#line 245 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
+#line 245 "/home/andreas/src/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
 
 #ifdef short
 # undef short
@@ -602,20 +602,20 @@ static const yytype_uint16 yyrline[] =
        0,    93,    93,    93,   100,   101,   105,   107,   109,   111,
      113,   114,   128,   142,   169,   171,   173,   175,   177,   179,
      181,   183,   185,   187,   189,   191,   193,   195,   197,   197,
-     198,   198,   203,   202,   206,   205,   216,   220,   223,   226,
-     230,   231,   235,   236,   240,   241,   245,   246,   247,   251,
-     252,   256,   257,   261,   262,   263,   267,   268,   269,   270,
-     271,   272,   286,   290,   291,   295,   296,   300,   301,   305,
+     198,   198,   203,   202,   206,   205,   215,   219,   222,   225,
+     229,   230,   234,   235,   239,   240,   244,   245,   246,   250,
+     251,   255,   256,   260,   261,   262,   266,   267,   268,   269,
+     270,   271,   286,   290,   291,   295,   296,   300,   301,   305,
      306,   307,   311,   312,   316,   317,   321,   322,   323,   327,
-     328,   329,   330,   331,   354,   355,   369,   374,   376,   378,
-     380,   382,   387,   388,   389,   390,   394,   396,   400,   401,
-     402,   403,   404,   405,   406,   410,   411,   415,   420,   427,
-     428,   432,   442,   443,   447,   448,   449,   450,   454,   455,
-     460,   461,   465,   466,   470,   471,   475,   476,   480,   485,
-     490,   492,   492,   502,   503,   508,   509,   513,   521,   529,
-     540,   541,   542,   543,   544,   545,   549,   550,   551,   555,
-     556,   557,   564,   574,   575,   576,   577,   581,   582,   594,
-     596,   598,   600,   605,   606,   610,   611,   615,   616
+     328,   329,   330,   331,   354,   355,   370,   375,   377,   379,
+     381,   383,   388,   389,   390,   391,   395,   397,   401,   402,
+     403,   404,   405,   406,   407,   411,   412,   416,   421,   428,
+     429,   433,   443,   444,   448,   449,   450,   451,   455,   456,
+     461,   462,   466,   467,   471,   472,   476,   477,   481,   486,
+     491,   493,   493,   503,   504,   509,   510,   514,   522,   530,
+     541,   542,   543,   544,   545,   546,   550,   551,   552,   556,
+     557,   558,   565,   575,   576,   577,   578,   582,   583,   595,
+     597,   599,   601,   606,   607,   611,   612,   616,   617
 };
 #endif
 
@@ -1757,59 +1757,59 @@ yyreduce:
         case 2:
 
 /* Line 1455 of yacc.c  */
-#line 93 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 93 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.decl = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 3:
 
 /* Line 1455 of yacc.c  */
-#line 96 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 96 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.bits += (yyvsp[(5) - (5)].str); ;}
     break;
 
   case 6:
 
 /* Line 1455 of yacc.c  */
-#line 106 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 106 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.pushParserClassMember((yyvsp[(2) - (2)].item)); ;}
     break;
 
   case 7:
 
 /* Line 1455 of yacc.c  */
-#line 108 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 108 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.bits += (yyvsp[(5) - (5)].str); ;}
     break;
 
   case 8:
 
 /* Line 1455 of yacc.c  */
-#line 110 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 110 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.pushLexerClassMember((yyvsp[(2) - (2)].item)); ;}
     break;
 
   case 9:
 
 /* Line 1455 of yacc.c  */
-#line 112 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 112 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.lexerBits += (yyvsp[(5) - (5)].str); ;}
     break;
 
   case 11:
 
 /* Line 1455 of yacc.c  */
-#line 115 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 115 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { if(KDevPG::globalSystem.hasLexer)
         { KDevPG::checkOut << "** ERROR you have to specify the lexer-type (%table_lexer) before any lexer rules"; exit(-1); }
         switch(KDevPG::GDFA::type)
         {
-          case KDevPG::GDFA::SAscii: KDevPG::GDFA::type = KDevPG::GDFA::TAscii; break;
-          case KDevPG::GDFA::SLatin1: KDevPG::GDFA::type = KDevPG::GDFA::TLatin1; break;
-          case KDevPG::GDFA::SUtf8: KDevPG::GDFA::type = KDevPG::GDFA::TUtf8; break;
-          case KDevPG::GDFA::SUcs2: KDevPG::GDFA::type = KDevPG::GDFA::TUcs2; break;
-          case KDevPG::GDFA::SUtf16: KDevPG::GDFA::type = KDevPG::GDFA::TUtf16; break;
-/*           case KDevPG::GDFA::SUcs4: KDevPG::GDFA::type = KDevPG::GDFA::TUcs4; break; */
+          case KDevPG::SAscii: KDevPG::GDFA::type = KDevPG::TAscii; break;
+          case KDevPG::SLatin1: KDevPG::GDFA::type = KDevPG::TLatin1; break;
+          case KDevPG::SUtf8: KDevPG::GDFA::type = KDevPG::TUtf8; break;
+          case KDevPG::SUcs2: KDevPG::GDFA::type = KDevPG::TUcs2; break;
+          case KDevPG::SUtf16: KDevPG::GDFA::type = KDevPG::TUtf16; break;
+/*           case KDevPG::SUcs4: KDevPG::GDFA::type = KDevPG::TUcs4; break; */
           default: /* empty */;
         }
       ;}
@@ -1818,17 +1818,17 @@ yyreduce:
   case 12:
 
 /* Line 1455 of yacc.c  */
-#line 129 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 129 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { if(KDevPG::globalSystem.hasLexer)
       { KDevPG::checkOut << "** ERROR you have to specify the lexer-type (%sequence_lexer) before any lexer rules"; exit(-1); }
       switch(KDevPG::GDFA::type)
       {
-        case KDevPG::GDFA::TAscii: KDevPG::GDFA::type = KDevPG::GDFA::SAscii; break;
-        case KDevPG::GDFA::TLatin1: KDevPG::GDFA::type = KDevPG::GDFA::SLatin1; break;
-        case KDevPG::GDFA::TUtf8: KDevPG::GDFA::type = KDevPG::GDFA::SUtf8; break;
-        case KDevPG::GDFA::TUcs2: KDevPG::GDFA::type = KDevPG::GDFA::SUcs2; break;
-        case KDevPG::GDFA::TUtf16: KDevPG::GDFA::type = KDevPG::GDFA::SUtf16; break;
-/*         case KDevPG::GDFA::TUcs4: KDevPG::GDFA::type = KDevPG::GDFA::SUcs4; break; */
+        case KDevPG::TAscii: KDevPG::GDFA::type = KDevPG::SAscii; break;
+        case KDevPG::TLatin1: KDevPG::GDFA::type = KDevPG::SLatin1; break;
+        case KDevPG::TUtf8: KDevPG::GDFA::type = KDevPG::SUtf8; break;
+        case KDevPG::TUcs2: KDevPG::GDFA::type = KDevPG::SUcs2; break;
+        case KDevPG::TUtf16: KDevPG::GDFA::type = KDevPG::SUtf16; break;
+/*         case KDevPG::TUcs4: KDevPG::GDFA::type = KDevPG::SUcs4; break; */
         default: /* empty */;
       }
       ;}
@@ -1837,7 +1837,7 @@ yyreduce:
   case 13:
 
 /* Line 1455 of yacc.c  */
-#line 143 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 143 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     {
         if(KDevPG::globalSystem.hasLexer)
         { KDevPG::checkOut << "** ERROR you have to specify the lexer-type (%sequence_lexer) before any lexer rules"; exit(-1); }
@@ -1862,126 +1862,126 @@ yyreduce:
           KDevPG::checkOut << "** ERROR unknown codec  ``" << (yyvsp[(2) - (2)].str) << "''" << endl;
           exit(-1);
         }
-        KDevPG::GDFA::type = (typeof(KDevPG::GDFA::type))(base);
+        KDevPG::GDFA::type = KDevPG::AutomatonType(base);
       ;}
     break;
 
   case 14:
 
 /* Line 1455 of yacc.c  */
-#line 170 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 170 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.tokenStream = (yyvsp[(2) - (3)].str);           ;}
     break;
 
   case 15:
 
 /* Line 1455 of yacc.c  */
-#line 172 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 172 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.exportMacro = (yyvsp[(2) - (2)].str);           ;}
     break;
 
   case 16:
 
 /* Line 1455 of yacc.c  */
-#line 174 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 174 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.exportMacroHeader = (yyvsp[(2) - (2)].str);     ;}
     break;
 
   case 17:
 
 /* Line 1455 of yacc.c  */
-#line 176 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 176 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.namespaceCode = (yyvsp[(2) - (2)].str);         ;}
     break;
 
   case 18:
 
 /* Line 1455 of yacc.c  */
-#line 178 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 178 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.astCode = (yyvsp[(2) - (2)].str);               ;}
     break;
 
   case 19:
 
 /* Line 1455 of yacc.c  */
-#line 180 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 180 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.pushParserDeclarationHeader((yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 20:
 
 /* Line 1455 of yacc.c  */
-#line 182 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 182 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.pushParserBitsHeader((yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 21:
 
 /* Line 1455 of yacc.c  */
-#line 184 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 184 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.pushAstHeader((yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 22:
 
 /* Line 1455 of yacc.c  */
-#line 186 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 186 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.pushTokenStreamDeclarationHeader((yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 23:
 
 /* Line 1455 of yacc.c  */
-#line 188 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 188 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.inputStream = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 24:
 
 /* Line 1455 of yacc.c  */
-#line 190 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 190 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.pushTokenStreamBitsHeader((yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 25:
 
 /* Line 1455 of yacc.c  */
-#line 192 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 192 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.astBaseClasses[(yyvsp[(2) - (3)].str)] = (yyvsp[(3) - (3)].str); ;}
     break;
 
   case 26:
 
 /* Line 1455 of yacc.c  */
-#line 194 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 194 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.parserBaseClass = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 27:
 
 /* Line 1455 of yacc.c  */
-#line 196 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 196 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.tokenStreamBaseClass = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 28:
 
 /* Line 1455 of yacc.c  */
-#line 197 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 197 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.hasLexer = true; lexerEnv = (yyvsp[(2) - (2)].str); if(KDevPG::globalSystem.lexerActions[lexerEnv].empty()) KDevPG::globalSystem.lexerActions[lexerEnv].push_back("qDebug() << \"error\"; exit(-1);"); ;}
     break;
 
   case 30:
 
 /* Line 1455 of yacc.c  */
-#line 198 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 198 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.hasLexer = true; KDevPG::loadUnicodeData(); lexerEnv = "start"; if(KDevPG::globalSystem.lexerActions["start"].empty()) KDevPG::globalSystem.lexerActions["start"].push_back("qDebug() << \"error\"; exit(-1);"); ;}
     break;
 
   case 32:
 
 /* Line 1455 of yacc.c  */
-#line 203 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 203 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.regexpById[(yyvsp[(4) - (5)].str)] = (yyvsp[(1) - (5)].nfa);
             ;}
     break;
@@ -1989,12 +1989,11 @@ yyreduce:
   case 34:
 
 /* Line 1455 of yacc.c  */
-#line 206 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 206 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     {
               if((yyvsp[(1) - (4)].nfa)->acceptsEpsilon())
               {
-                KDevPG::checkOut << "** ERROR Lexer rule accepting the empty word at line " << yyLine << endl;
-                KDevPG::ProblemSummaryPrinter::reportError();
+                KDevPG::checkOut << "** WARNING Lexer rule accepting the empty word at line " << yyLine << endl;
               }
               QString s = QString((yyvsp[(2) - (4)].str)) + QString(r); KDevPG::globalSystem.lexerEnvs[lexerEnv].push_back((yyvsp[(1) - (4)].nfa));
               KDevPG::globalSystem.lexerActions[lexerEnv].push_back(
@@ -2005,190 +2004,191 @@ yyreduce:
   case 37:
 
 /* Line 1455 of yacc.c  */
-#line 220 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 219 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     {
-        r = "\nRETURN(" + QString((yyvsp[(1) - (1)].str)) + ");\n"
+        r = "\nlxRETURN(" + QString((yyvsp[(1) - (1)].str)) + ");\n"
       ;}
     break;
 
   case 38:
 
 /* Line 1455 of yacc.c  */
-#line 223 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 222 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     {
-        r = "\nCONTINUE;\n"; 
+        r = "\nlxCONTINUE;\n"; 
       ;}
     break;
 
   case 39:
 
 /* Line 1455 of yacc.c  */
-#line 226 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-    { r = "\nSKIP\n" ;}
+#line 225 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+    { r = "\nlxSKIP\n" ;}
     break;
 
   case 40:
 
 /* Line 1455 of yacc.c  */
-#line 230 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 229 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa) |= *(yyvsp[(3) - (3)].nfa)); delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); ;}
     break;
 
   case 41:
 
 /* Line 1455 of yacc.c  */
-#line 231 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 230 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
     break;
 
   case 42:
 
 /* Line 1455 of yacc.c  */
-#line 235 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 234 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa) &= *(yyvsp[(3) - (3)].nfa)); delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); ;}
     break;
 
   case 43:
 
 /* Line 1455 of yacc.c  */
-#line 236 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 235 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
     break;
 
   case 44:
 
 /* Line 1455 of yacc.c  */
-#line 240 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 239 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa) ^= *(yyvsp[(3) - (3)].nfa)); delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); ;}
     break;
 
   case 45:
 
 /* Line 1455 of yacc.c  */
-#line 241 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 240 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
     break;
 
   case 46:
 
 /* Line 1455 of yacc.c  */
-#line 245 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 244 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA((yyvsp[(2) - (2)].nfa)->negate()); delete (yyvsp[(2) - (2)].nfa); ;}
     break;
 
   case 47:
 
 /* Line 1455 of yacc.c  */
-#line 246 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 245 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (2)].nfa) |= KDevPG::GNFA()); delete (yyvsp[(2) - (2)].nfa); ;}
     break;
 
   case 48:
 
 /* Line 1455 of yacc.c  */
-#line 247 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 246 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
     break;
 
   case 49:
 
 /* Line 1455 of yacc.c  */
-#line 251 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 250 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (2)].nfa) <<= *(yyvsp[(2) - (2)].nfa)); delete (yyvsp[(1) - (2)].nfa); delete (yyvsp[(2) - (2)].nfa); ;}
     break;
 
   case 50:
 
 /* Line 1455 of yacc.c  */
-#line 252 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 251 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
     break;
 
   case 51:
 
 /* Line 1455 of yacc.c  */
-#line 256 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 255 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa)); KDevPG::GNFA *tmp = new KDevPG::GNFA(*(yyvsp[(3) - (3)].nfa) <<= *(yyvsp[(1) - (3)].nfa)); **tmp; *(yyval.nfa) <<= *tmp; delete tmp; delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); ;}
     break;
 
   case 52:
 
 /* Line 1455 of yacc.c  */
-#line 257 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 256 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
     break;
 
   case 53:
 
 /* Line 1455 of yacc.c  */
-#line 261 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 260 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(**(yyvsp[(1) - (2)].nfa)); delete (yyvsp[(1) - (2)].nfa); ;}
     break;
 
   case 54:
 
 /* Line 1455 of yacc.c  */
-#line 262 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 261 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (2)].nfa)); **(yyval.nfa); *(yyval.nfa) <<= *(yyvsp[(1) - (2)].nfa); delete (yyvsp[(1) - (2)].nfa); ;}
     break;
 
   case 55:
 
 /* Line 1455 of yacc.c  */
-#line 263 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 262 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
     break;
 
   case 56:
 
 /* Line 1455 of yacc.c  */
-#line 267 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 266 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (3)].nfa)); delete (yyvsp[(2) - (3)].nfa); ;}
     break;
 
   case 57:
 
 /* Line 1455 of yacc.c  */
-#line 268 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 267 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = (yyvsp[(2) - (3)].nfa); ;}
     break;
 
   case 58:
 
 /* Line 1455 of yacc.c  */
-#line 269 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 268 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::anyChar()); ;}
     break;
 
   case 59:
 
 /* Line 1455 of yacc.c  */
-#line 270 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 269 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::keyword(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); ;}
     break;
 
   case 60:
 
 /* Line 1455 of yacc.c  */
-#line 271 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 270 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::keyword(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); ;}
     break;
 
   case 61:
 
 /* Line 1455 of yacc.c  */
-#line 272 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 271 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     {
-                              if(KDevPG::globalSystem.regexpById[(yyvsp[(1) - (1)].str)] == 0)
+                              if(!KDevPG::globalSystem.regexpById.contains((yyvsp[(1) - (1)].str)))
                               {
                                 KDevPG::checkOut << "** ERROR: no named regexp " << (yyvsp[(1) - (1)].str) << endl;
                                 exit(-1);
                               }
                               KDevPG::GNFA *regexp = KDevPG::globalSystem.regexpById[(yyvsp[(1) - (1)].str)];
-                              if(!KDevPG::globalSystem.isUsedRegexp.contains(regexp))
+                              if(!KDevPG::globalSystem.dfaForNfa.contains(regexp))
                               {
-                                regexp->minimize();
-                                KDevPG::globalSystem.isUsedRegexp.insert(regexp);
+                                KDevPG::globalSystem.dfaForNfa[regexp] = new KDevPG::GDFA(regexp->dfa());
+                                KDevPG::globalSystem.dfaForNfa[regexp]->minimize();
+                                *regexp = KDevPG::globalSystem.dfaForNfa[regexp]->nfa();
                               }
                               (yyval.nfa) = new KDevPG::GNFA(*regexp);
                             ;}
@@ -2197,147 +2197,147 @@ yyreduce:
   case 62:
 
 /* Line 1455 of yacc.c  */
-#line 286 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 286 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::emptyWord()); ;}
     break;
 
   case 63:
 
 /* Line 1455 of yacc.c  */
-#line 290 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 290 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa) |= *(yyvsp[(3) - (3)].nfa)); delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); ;}
     break;
 
   case 64:
 
 /* Line 1455 of yacc.c  */
-#line 291 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 291 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
     break;
 
   case 65:
 
 /* Line 1455 of yacc.c  */
-#line 295 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 295 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa) &= *(yyvsp[(3) - (3)].nfa)); delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); ;}
     break;
 
   case 66:
 
 /* Line 1455 of yacc.c  */
-#line 296 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 296 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
     break;
 
   case 67:
 
 /* Line 1455 of yacc.c  */
-#line 300 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 300 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa) ^= *(yyvsp[(3) - (3)].nfa)); delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); ;}
     break;
 
   case 68:
 
 /* Line 1455 of yacc.c  */
-#line 301 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 301 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
     break;
 
   case 69:
 
 /* Line 1455 of yacc.c  */
-#line 305 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 305 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA((yyvsp[(2) - (2)].nfa)->negate()); delete (yyvsp[(2) - (2)].nfa); ;}
     break;
 
   case 70:
 
 /* Line 1455 of yacc.c  */
-#line 306 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 306 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (2)].nfa) |= KDevPG::GNFA()); delete (yyvsp[(2) - (2)].nfa); ;}
     break;
 
   case 71:
 
 /* Line 1455 of yacc.c  */
-#line 307 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 307 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
     break;
 
   case 72:
 
 /* Line 1455 of yacc.c  */
-#line 311 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 311 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (2)].nfa) |= *(yyvsp[(2) - (2)].nfa)); delete (yyvsp[(1) - (2)].nfa); delete (yyvsp[(2) - (2)].nfa); ;}
     break;
 
   case 74:
 
 /* Line 1455 of yacc.c  */
-#line 316 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 316 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa)); KDevPG::GNFA *tmp = new KDevPG::GNFA(*(yyvsp[(3) - (3)].nfa) <<= *(yyvsp[(1) - (3)].nfa)); **tmp; *(yyval.nfa) <<= *tmp; delete tmp; delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); ;}
     break;
 
   case 75:
 
 /* Line 1455 of yacc.c  */
-#line 317 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 317 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
     break;
 
   case 76:
 
 /* Line 1455 of yacc.c  */
-#line 321 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 321 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(**(yyvsp[(1) - (2)].nfa)); delete (yyvsp[(1) - (2)].nfa); ;}
     break;
 
   case 77:
 
 /* Line 1455 of yacc.c  */
-#line 322 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 322 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (2)].nfa)); **(yyval.nfa); *(yyval.nfa) <<= *(yyvsp[(1) - (2)].nfa); delete (yyvsp[(1) - (2)].nfa); ;}
     break;
 
   case 78:
 
 /* Line 1455 of yacc.c  */
-#line 323 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 323 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
     break;
 
   case 79:
 
 /* Line 1455 of yacc.c  */
-#line 327 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 327 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (3)].nfa)); delete (yyvsp[(2) - (3)].nfa); ;}
     break;
 
   case 80:
 
 /* Line 1455 of yacc.c  */
-#line 328 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 328 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = (yyvsp[(2) - (3)].nfa); ;}
     break;
 
   case 81:
 
 /* Line 1455 of yacc.c  */
-#line 329 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 329 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::anyChar()); ;}
     break;
 
   case 82:
 
 /* Line 1455 of yacc.c  */
-#line 330 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 330 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::keyword(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); ;}
     break;
 
   case 83:
 
 /* Line 1455 of yacc.c  */
-#line 331 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 331 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     {
       quint32 begin, end;
       QString str = KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str)));
@@ -2366,25 +2366,26 @@ yyreduce:
   case 84:
 
 /* Line 1455 of yacc.c  */
-#line 354 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 354 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::collection(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); ;}
     break;
 
   case 85:
 
 /* Line 1455 of yacc.c  */
-#line 355 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 355 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     {
-                              if(KDevPG::globalSystem.regexpById[(yyvsp[(1) - (1)].str)] == 0)
+                              if(!KDevPG::globalSystem.regexpById.contains((yyvsp[(1) - (1)].str)))
                               {
                                 KDevPG::checkOut << "** ERROR: no named regexp " << (yyvsp[(1) - (1)].str) << endl;
                                 exit(-1);
                               }
                               KDevPG::GNFA *regexp = KDevPG::globalSystem.regexpById[(yyvsp[(1) - (1)].str)];
-                              if(!KDevPG::globalSystem.isUsedRegexp.contains(regexp))
+                              if(!KDevPG::globalSystem.dfaForNfa.contains(regexp))
                               {
-                                regexp->minimize();
-                                KDevPG::globalSystem.isUsedRegexp.insert(regexp);
+                                KDevPG::globalSystem.dfaForNfa[regexp] = new KDevPG::GDFA(regexp->dfa());
+                                KDevPG::globalSystem.dfaForNfa[regexp]->minimize();
+                                *regexp = KDevPG::globalSystem.dfaForNfa[regexp]->nfa();
                               }
                               (yyval.nfa) = new KDevPG::GNFA(*regexp);
                             ;}
@@ -2393,147 +2394,147 @@ yyreduce:
   case 86:
 
 /* Line 1455 of yacc.c  */
-#line 369 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 370 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::emptyWord()); ;}
     break;
 
   case 87:
 
 /* Line 1455 of yacc.c  */
-#line 375 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 376 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::PublicDeclaration, (yyvsp[(5) - (5)].str));    ;}
     break;
 
   case 88:
 
 /* Line 1455 of yacc.c  */
-#line 377 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 378 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::ProtectedDeclaration, (yyvsp[(5) - (5)].str)); ;}
     break;
 
   case 89:
 
 /* Line 1455 of yacc.c  */
-#line 379 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 380 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::PrivateDeclaration, (yyvsp[(5) - (5)].str));   ;}
     break;
 
   case 90:
 
 /* Line 1455 of yacc.c  */
-#line 381 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 382 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::ConstructorCode, (yyvsp[(4) - (4)].str));      ;}
     break;
 
   case 91:
 
 /* Line 1455 of yacc.c  */
-#line 383 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 384 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::DestructorCode, (yyvsp[(4) - (4)].str));       ;}
     break;
 
   case 92:
 
 /* Line 1455 of yacc.c  */
-#line 387 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 388 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.pushTerminal((yyvsp[(1) - (1)].str),(yyvsp[(1) - (1)].str)); ;}
     break;
 
   case 93:
 
 /* Line 1455 of yacc.c  */
-#line 388 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 389 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.pushTerminal((yyvsp[(1) - (4)].str),(yyvsp[(3) - (4)].str)); ;}
     break;
 
   case 94:
 
 /* Line 1455 of yacc.c  */
-#line 389 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 390 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.pushTerminal((yyvsp[(3) - (3)].str),(yyvsp[(3) - (3)].str)); ;}
     break;
 
   case 95:
 
 /* Line 1455 of yacc.c  */
-#line 391 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 392 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.pushTerminal((yyvsp[(3) - (6)].str),(yyvsp[(5) - (6)].str)); ;}
     break;
 
   case 97:
 
 /* Line 1455 of yacc.c  */
-#line 396 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 397 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.pushRule((yyvsp[(2) - (3)].item)); ;}
     break;
 
   case 98:
 
 /* Line 1455 of yacc.c  */
-#line 400 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 401 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::globalSystem.zero(); ;}
     break;
 
   case 99:
 
 /* Line 1455 of yacc.c  */
-#line 401 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 402 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = (yyvsp[(2) - (3)].item); ;}
     break;
 
   case 100:
 
 /* Line 1455 of yacc.c  */
-#line 402 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 403 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
     break;
 
   case 101:
 
 /* Line 1455 of yacc.c  */
-#line 403 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 404 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
     break;
 
   case 102:
 
 /* Line 1455 of yacc.c  */
-#line 404 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 405 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::inlinedNonTerminal(KDevPG::globalSystem.pushSymbol((yyvsp[(2) - (2)].str))); ;}
     break;
 
   case 103:
 
 /* Line 1455 of yacc.c  */
-#line 405 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 406 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::annotation((yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].item), false, (yyvsp[(2) - (3)].storageType)); ;}
     break;
 
   case 104:
 
 /* Line 1455 of yacc.c  */
-#line 406 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 407 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::annotation((yyvsp[(2) - (4)].str), (yyvsp[(4) - (4)].item), true, (yyvsp[(3) - (4)].storageType));  ;}
     break;
 
   case 105:
 
 /* Line 1455 of yacc.c  */
-#line 410 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 411 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::nonTerminal(KDevPG::globalSystem.pushSymbol((yyvsp[(1) - (2)].str)), (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 106:
 
 /* Line 1455 of yacc.c  */
-#line 411 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 412 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::globalSystem.terminal((yyvsp[(1) - (1)].str)); ;}
     break;
 
   case 107:
 
 /* Line 1455 of yacc.c  */
-#line 416 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 417 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     {
           KDevPG::globalSystem.needStateManagement = true;
           (yyval.item) = KDevPG::tryCatch((yyvsp[(3) - (4)].item), 0);
@@ -2543,7 +2544,7 @@ yyreduce:
   case 108:
 
 /* Line 1455 of yacc.c  */
-#line 421 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 422 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     {
           KDevPG::globalSystem.needStateManagement = true;
           (yyval.item) = KDevPG::tryCatch((yyvsp[(3) - (8)].item), (yyvsp[(7) - (8)].item));
@@ -2553,77 +2554,77 @@ yyreduce:
   case 109:
 
 /* Line 1455 of yacc.c  */
-#line 427 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 428 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.str) = const_cast<char*>(""); ;}
     break;
 
   case 110:
 
 /* Line 1455 of yacc.c  */
-#line 428 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 429 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 111:
 
 /* Line 1455 of yacc.c  */
-#line 432 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 433 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 112:
 
 /* Line 1455 of yacc.c  */
-#line 442 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 443 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageAstMember; ;}
     break;
 
   case 113:
 
 /* Line 1455 of yacc.c  */
-#line 443 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 444 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageTemporary;  ;}
     break;
 
   case 114:
 
 /* Line 1455 of yacc.c  */
-#line 447 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 448 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::plus((yyvsp[(1) - (2)].item)); ;}
     break;
 
   case 115:
 
 /* Line 1455 of yacc.c  */
-#line 448 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 449 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::star((yyvsp[(1) - (2)].item)); ;}
     break;
 
   case 116:
 
 /* Line 1455 of yacc.c  */
-#line 449 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 450 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
     break;
 
   case 117:
 
 /* Line 1455 of yacc.c  */
-#line 450 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 451 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::alternative((yyvsp[(2) - (2)].item), KDevPG::globalSystem.zero()); ;}
     break;
 
   case 118:
 
 /* Line 1455 of yacc.c  */
-#line 454 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 455 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
     break;
 
   case 119:
 
 /* Line 1455 of yacc.c  */
-#line 456 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 457 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     {
           KDevPG::CloneTree cl;
           (yyval.item) = KDevPG::cons((yyvsp[(1) - (3)].item), KDevPG::star(KDevPG::cons(cl.clone((yyvsp[(3) - (3)].item)), cl.clone((yyvsp[(1) - (3)].item)))));
@@ -2633,63 +2634,63 @@ yyreduce:
   case 120:
 
 /* Line 1455 of yacc.c  */
-#line 460 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 461 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::action((yyvsp[(1) - (2)].item), (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 121:
 
 /* Line 1455 of yacc.c  */
-#line 461 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 462 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::action(0, (yyvsp[(1) - (1)].str)); ;}
     break;
 
   case 122:
 
 /* Line 1455 of yacc.c  */
-#line 465 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 466 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
     break;
 
   case 123:
 
 /* Line 1455 of yacc.c  */
-#line 466 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 467 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::cons((yyvsp[(1) - (2)].item), (yyvsp[(2) - (2)].item)); ;}
     break;
 
   case 124:
 
 /* Line 1455 of yacc.c  */
-#line 470 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 471 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
     break;
 
   case 125:
 
 /* Line 1455 of yacc.c  */
-#line 471 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 472 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::condition((yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].item)); ;}
     break;
 
   case 126:
 
 /* Line 1455 of yacc.c  */
-#line 475 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 476 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
     break;
 
   case 127:
 
 /* Line 1455 of yacc.c  */
-#line 476 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 477 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::alternative((yyvsp[(1) - (3)].item), (yyvsp[(3) - (3)].item)); ;}
     break;
 
   case 128:
 
 /* Line 1455 of yacc.c  */
-#line 481 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 482 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     {
           (yyval.item) = KDevPG::evolve((yyvsp[(1) - (7)].item), KDevPG::globalSystem.pushSymbol((yyvsp[(3) - (7)].str)),
                           (KDevPG::Model::VariableDeclarationItem*) (yyvsp[(6) - (7)].item), (yyvsp[(4) - (7)].str));
@@ -2699,7 +2700,7 @@ yyreduce:
   case 129:
 
 /* Line 1455 of yacc.c  */
-#line 486 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 487 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     {
           (yyval.item) = KDevPG::evolve((yyvsp[(1) - (7)].item), KDevPG::globalSystem.pushSymbol((yyvsp[(3) - (7)].str)),
                           (KDevPG::Model::VariableDeclarationItem*) (yyvsp[(5) - (7)].item), (yyvsp[(7) - (7)].str));
@@ -2709,14 +2710,14 @@ yyreduce:
   case 130:
 
 /* Line 1455 of yacc.c  */
-#line 491 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 492 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::evolve((yyvsp[(1) - (4)].item), KDevPG::globalSystem.pushSymbol((yyvsp[(3) - (4)].str)), 0, (yyvsp[(4) - (4)].str)); ;}
     break;
 
   case 131:
 
 /* Line 1455 of yacc.c  */
-#line 492 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 493 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { if(KDevPG::globalSystem.generateAst == false)
         {
           qFatal("Operator-expression-parsing is not yet supported with --no-ast!");
@@ -2729,35 +2730,35 @@ yyreduce:
   case 132:
 
 /* Line 1455 of yacc.c  */
-#line 498 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 499 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { KDevPG::globalSystem.needOperatorStack = true; (yyval.item) = (yyvsp[(2) - (2)].item); ;}
     break;
 
   case 133:
 
 /* Line 1455 of yacc.c  */
-#line 502 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 503 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.str) = const_cast<char*>(""); ;}
     break;
 
   case 134:
 
 /* Line 1455 of yacc.c  */
-#line 503 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 504 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 136:
 
 /* Line 1455 of yacc.c  */
-#line 509 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 510 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { ; ;}
     break;
 
   case 137:
 
 /* Line 1455 of yacc.c  */
-#line 514 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 515 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     {
               operatorNode->mBase = (KDevPG::Model::NonTerminalItem*)(yyvsp[(2) - (9)].item);
               operatorNode->mName = (yyvsp[(5) - (9)].str);
@@ -2770,7 +2771,7 @@ yyreduce:
   case 138:
 
 /* Line 1455 of yacc.c  */
-#line 522 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 523 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     {
               operatorNode->mBase = (KDevPG::Model::NonTerminalItem*)(yyvsp[(2) - (9)].item);
               operatorNode->mName = (yyvsp[(5) - (9)].str);
@@ -2783,7 +2784,7 @@ yyreduce:
   case 139:
 
 /* Line 1455 of yacc.c  */
-#line 530 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 531 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     {
               operatorNode->mBase = (KDevPG::Model::NonTerminalItem*)(yyvsp[(2) - (6)].item);
               operatorNode->mName = (yyvsp[(5) - (6)].str);
@@ -2796,84 +2797,84 @@ yyreduce:
   case 140:
 
 /* Line 1455 of yacc.c  */
-#line 540 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 541 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { operatorNode->pushBin(*(yyvsp[(2) - (4)].operatorInformation), (yyvsp[(4) - (4)].str), (yyvsp[(3) - (4)].str)); free((yyvsp[(2) - (4)].operatorInformation)); ;}
     break;
 
   case 141:
 
 /* Line 1455 of yacc.c  */
-#line 541 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 542 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { operatorNode->pushTern(*(yyvsp[(2) - (5)].operatorInformation), *(yyvsp[(3) - (5)].operatorInformation), (yyvsp[(5) - (5)].str), (yyvsp[(4) - (5)].str)); free((yyvsp[(2) - (5)].operatorInformation)); free((yyvsp[(3) - (5)].operatorInformation)); ;}
     break;
 
   case 142:
 
 /* Line 1455 of yacc.c  */
-#line 542 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 543 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { operatorNode->pushPre(*(yyvsp[(2) - (3)].operatorInformation), (yyvsp[(3) - (3)].str)); free((yyvsp[(2) - (3)].operatorInformation)); ;}
     break;
 
   case 143:
 
 /* Line 1455 of yacc.c  */
-#line 543 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 544 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { operatorNode->pushPost(*(yyvsp[(2) - (3)].operatorInformation), "0", (yyvsp[(3) - (3)].str)); free((yyvsp[(2) - (3)].operatorInformation)); free((yyvsp[(3) - (3)].str)); ;}
     break;
 
   case 144:
 
 /* Line 1455 of yacc.c  */
-#line 544 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 545 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { operatorNode->pushPost(*(yyvsp[(2) - (4)].operatorInformation), (yyvsp[(4) - (4)].str), (yyvsp[(3) - (4)].str)); free((yyvsp[(2) - (4)].operatorInformation)); ;}
     break;
 
   case 145:
 
 /* Line 1455 of yacc.c  */
-#line 545 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 546 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { operatorNode->pushParen(*(yyvsp[(2) - (3)].operatorInformation), *(yyvsp[(3) - (3)].operatorInformation)); free((yyvsp[(2) - (3)].operatorInformation)); free((yyvsp[(3) - (3)].operatorInformation)); ;}
     break;
 
   case 146:
 
 /* Line 1455 of yacc.c  */
-#line 549 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 550 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.str) = (char*)"0"; ;}
     break;
 
   case 147:
 
 /* Line 1455 of yacc.c  */
-#line 550 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 551 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 148:
 
 /* Line 1455 of yacc.c  */
-#line 551 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 552 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 149:
 
 /* Line 1455 of yacc.c  */
-#line 555 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 556 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.str) = (char*)"1"; ;}
     break;
 
   case 150:
 
 /* Line 1455 of yacc.c  */
-#line 556 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 557 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.str) = (char*)"0"; ;}
     break;
 
   case 151:
 
 /* Line 1455 of yacc.c  */
-#line 557 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 558 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { uint yyleng = strlen((yyvsp[(2) - (2)].str));
                                      char *tmp = (char*)calloc(yyleng+7, sizeof(char));
                                      tmp[0] = '(';
@@ -2886,7 +2887,7 @@ yyreduce:
   case 152:
 
 /* Line 1455 of yacc.c  */
-#line 564 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 565 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { uint yyleng = strlen((yyvsp[(2) - (2)].str));
                                      char *tmp = (char*)calloc(yyleng+7, sizeof(char));
                                      tmp[0] = '(';
@@ -2899,42 +2900,42 @@ yyreduce:
   case 153:
 
 /* Line 1455 of yacc.c  */
-#line 574 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 575 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(3) - (4)].str)), (yyvsp[(2) - (4)].str), (yyvsp[(4) - (4)].str)); ;}
     break;
 
   case 154:
 
 /* Line 1455 of yacc.c  */
-#line 575 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 576 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(3) - (3)].str)), (yyvsp[(2) - (3)].str), ""); ;}
     break;
 
   case 155:
 
 /* Line 1455 of yacc.c  */
-#line 576 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 577 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(1) - (2)].str)), "", (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 156:
 
 /* Line 1455 of yacc.c  */
-#line 577 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 578 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(1) - (1)].str)), "", ""); ;}
     break;
 
   case 157:
 
 /* Line 1455 of yacc.c  */
-#line 581 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 582 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
     break;
 
   case 158:
 
 /* Line 1455 of yacc.c  */
-#line 583 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 584 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     {
           KDevPG::Model::VariableDeclarationItem *last = (KDevPG::Model::VariableDeclarationItem*) (yyvsp[(1) - (2)].item);
           while (last->mNext != 0) {
@@ -2948,77 +2949,77 @@ yyreduce:
   case 159:
 
 /* Line 1455 of yacc.c  */
-#line 595 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 596 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::variableDeclaration((yyvsp[(1) - (6)].declarationType), (yyvsp[(2) - (6)].storageType), (yyvsp[(3) - (6)].variableType), false, (yyvsp[(4) - (6)].str), (yyvsp[(6) - (6)].str)); ;}
     break;
 
   case 160:
 
 /* Line 1455 of yacc.c  */
-#line 597 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 598 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::variableDeclaration((yyvsp[(1) - (5)].declarationType), (yyvsp[(2) - (5)].storageType), KDevPG::Model::VariableDeclarationItem::TypeToken, false, (yyvsp[(4) - (5)].str), ""); ;}
     break;
 
   case 161:
 
 /* Line 1455 of yacc.c  */
-#line 599 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 600 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::variableDeclaration((yyvsp[(1) - (7)].declarationType), (yyvsp[(2) - (7)].storageType), (yyvsp[(3) - (7)].variableType), true, (yyvsp[(5) - (7)].str), (yyvsp[(7) - (7)].str)); ;}
     break;
 
   case 162:
 
 /* Line 1455 of yacc.c  */
-#line 601 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 602 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.item) = KDevPG::variableDeclaration((yyvsp[(1) - (6)].declarationType), (yyvsp[(2) - (6)].storageType), KDevPG::Model::VariableDeclarationItem::TypeToken, true, (yyvsp[(5) - (6)].str), ""); ;}
     break;
 
   case 163:
 
 /* Line 1455 of yacc.c  */
-#line 605 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 606 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.declarationType) = KDevPG::Model::VariableDeclarationItem::DeclarationLocal;     ;}
     break;
 
   case 164:
 
 /* Line 1455 of yacc.c  */
-#line 606 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 607 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.declarationType) = KDevPG::Model::VariableDeclarationItem::DeclarationArgument;  ;}
     break;
 
   case 165:
 
 /* Line 1455 of yacc.c  */
-#line 610 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 611 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageAstMember;    ;}
     break;
 
   case 166:
 
 /* Line 1455 of yacc.c  */
-#line 611 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 612 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageTemporary;     ;}
     break;
 
   case 167:
 
 /* Line 1455 of yacc.c  */
-#line 615 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 616 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.variableType) = KDevPG::Model::VariableDeclarationItem::TypeNode;             ;}
     break;
 
   case 168:
 
 /* Line 1455 of yacc.c  */
-#line 616 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 617 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
     { (yyval.variableType) = KDevPG::Model::VariableDeclarationItem::TypeVariable;         ;}
     break;
 
 
 
 /* Line 1455 of yacc.c  */
-#line 3022 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
+#line 3023 "/home/andreas/src/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -3230,6 +3231,6 @@ yyreturn:
 
 
 /* Line 1675 of yacc.c  */
-#line 619 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 620 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
 
 
diff --git a/kdev-pg/kdev-pg-parser.hh b/kdev-pg/kdev-pg-parser.hh
index a8b0b99..aef182f 100644
--- a/kdev-pg/kdev-pg-parser.hh
+++ b/kdev-pg/kdev-pg-parser.hh
@@ -111,7 +111,7 @@ typedef union YYSTYPE
 {
 
 /* Line 1676 of yacc.c  */
-#line 49 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
+#line 49 "/home/andreas/src/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
 
     KDevPG::Model::Node *item;
     char* str;
@@ -124,7 +124,7 @@ typedef union YYSTYPE
 
 
 /* Line 1676 of yacc.c  */
-#line 128 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.hh"
+#line 128 "/home/andreas/src/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.hh"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */




More information about the KDevelop-devel mailing list