[arch-commits] Commit in kdevelop-pg-qt/trunk (fix-build.patch kde-unstable)

Antonio Rojas arojas at archlinux.org
Tue Aug 30 14:44:01 UTC 2016


    Date: Tuesday, August 30, 2016 @ 14:44:00
  Author: arojas
Revision: 275289

Remove bogus files

Deleted:
  kdevelop-pg-qt/trunk/fix-build.patch
  kdevelop-pg-qt/trunk/kde-unstable/

-----------------+
 fix-build.patch | 2410 ------------------------------------------------------
 1 file changed, 2410 deletions(-)

Deleted: fix-build.patch
===================================================================
--- fix-build.patch	2016-08-30 14:42:57 UTC (rev 275288)
+++ fix-build.patch	2016-08-30 14:44:00 UTC (rev 275289)
@@ -1,2410 +0,0 @@
-From: Jonathan Schmidt-Dominé <git at the-user.org>
-Date: Mon, 29 Oct 2012 17:13:56 +0000
-Subject: Updated generated files.
-X-Git-Url: http://quickgit.kde.org/?p=kdevelop-pg-qt.git&a=commitdiff&h=a045f1060153318d5664bd3c68a3fb38cb3a7a56
----
-Updated generated files.
----
-
-
---- a/kdev-pg/kdev-pg-parser.cc
-+++ b/kdev-pg/kdev-pg-parser.cc
-@@ -1,10 +1,8 @@
--
--/* A Bison parser, made by GNU Bison 2.4.1.  */
--
--/* Skeleton implementation for Bison's Yacc-like parsers in C
-+/* A Bison parser, made by GNU Bison 2.5.  */
-+
-+/* Bison implementation for Yacc-like parsers in C
-    
--      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
--   Free Software Foundation, Inc.
-+      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
-    
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -46,7 +44,7 @@
- #define YYBISON 1
- 
- /* Bison version.  */
--#define YYBISON_VERSION "2.4.1"
-+#define YYBISON_VERSION "2.5"
- 
- /* Skeleton name.  */
- #define YYSKELETON_NAME "yacc.c"
-@@ -67,7 +65,7 @@
- 
- /* Copy the first part of user declarations.  */
- 
--/* Line 189 of yacc.c  */
-+/* Line 268 of yacc.c  */
- #line 2 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
- 
- /* This file is part of kdev-pg-qt
-@@ -116,8 +114,8 @@
- 
- 
- 
--/* Line 189 of yacc.c  */
--#line 121 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
-+/* Line 268 of yacc.c  */
-+#line 119 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
- 
- /* Enabling traces.  */
- #ifndef YYDEBUG
-@@ -220,7 +218,7 @@
- typedef union YYSTYPE
- {
- 
--/* Line 214 of yacc.c  */
-+/* Line 293 of yacc.c  */
- #line 49 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
- 
-     KDevPG::Model::Node *item;
-@@ -233,8 +231,8 @@
- 
- 
- 
--/* Line 214 of yacc.c  */
--#line 238 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
-+/* Line 293 of yacc.c  */
-+#line 236 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
- } YYSTYPE;
- # define YYSTYPE_IS_TRIVIAL 1
- # define yystype YYSTYPE /* obsolescent; will be withdrawn */
-@@ -245,8 +243,8 @@
- /* Copy the second part of user declarations.  */
- 
- 
--/* Line 264 of yacc.c  */
--#line 250 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
-+/* Line 343 of yacc.c  */
-+#line 248 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
- 
- #ifdef short
- # undef short
-@@ -296,7 +294,7 @@
- #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
- 
- #ifndef YY_
--# if YYENABLE_NLS
-+# if defined YYENABLE_NLS && YYENABLE_NLS
- #  if ENABLE_NLS
- #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
- #   define YY_(msgid) dgettext ("bison-runtime", msgid)
-@@ -349,11 +347,11 @@
- #    define alloca _alloca
- #   else
- #    define YYSTACK_ALLOC alloca
--#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-      || defined __cplusplus || defined _MSC_VER)
- #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
--#     ifndef _STDLIB_H
--#      define _STDLIB_H 1
-+#     ifndef EXIT_SUCCESS
-+#      define EXIT_SUCCESS 0
- #     endif
- #    endif
- #   endif
-@@ -376,24 +374,24 @@
- #  ifndef YYSTACK_ALLOC_MAXIMUM
- #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
- #  endif
--#  if (defined __cplusplus && ! defined _STDLIB_H \
-+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
-        && ! ((defined YYMALLOC || defined malloc) \
- 	     && (defined YYFREE || defined free)))
- #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
--#   ifndef _STDLIB_H
--#    define _STDLIB_H 1
-+#   ifndef EXIT_SUCCESS
-+#    define EXIT_SUCCESS 0
- #   endif
- #  endif
- #  ifndef YYMALLOC
- #   define YYMALLOC malloc
--#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-+#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-      || defined __cplusplus || defined _MSC_VER)
- void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
- #   endif
- #  endif
- #  ifndef YYFREE
- #   define YYFREE free
--#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-+#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-      || defined __cplusplus || defined _MSC_VER)
- void free (void *); /* INFRINGES ON USER NAME SPACE */
- #   endif
-@@ -422,6 +420,27 @@
-      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
-       + YYSTACK_GAP_MAXIMUM)
- 
-+# define YYCOPY_NEEDED 1
-+
-+/* Relocate STACK from its old location to the new one.  The
-+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-+   elements in the stack, and YYPTR gives the new location of the
-+   stack.  Advance YYPTR to a properly aligned location for the next
-+   stack.  */
-+# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
-+    do									\
-+      {									\
-+	YYSIZE_T yynewbytes;						\
-+	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-+	Stack = &yyptr->Stack_alloc;					\
-+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-+	yyptr += yynewbytes / sizeof (*yyptr);				\
-+      }									\
-+    while (YYID (0))
-+
-+#endif
-+
-+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
- /* Copy COUNT objects from FROM to TO.  The source and destination do
-    not overlap.  */
- # ifndef YYCOPY
-@@ -439,24 +458,7 @@
-       while (YYID (0))
- #  endif
- # endif
--
--/* Relocate STACK from its old location to the new one.  The
--   local variables YYSIZE and YYSTACKSIZE give the old and new number of
--   elements in the stack, and YYPTR gives the new location of the
--   stack.  Advance YYPTR to a properly aligned location for the next
--   stack.  */
--# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
--    do									\
--      {									\
--	YYSIZE_T yynewbytes;						\
--	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
--	Stack = &yyptr->Stack_alloc;					\
--	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
--	yyptr += yynewbytes / sizeof (*yyptr);				\
--      }									\
--    while (YYID (0))
--
--#endif
-+#endif /* !YYCOPY_NEEDED */
- 
- /* YYFINAL -- State number of the termination state.  */
- #define YYFINAL  4
-@@ -734,8 +736,8 @@
-        5,     7,     6,     0,     1,     1,     1,     1,     1
- };
- 
--/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
--   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-+   Performed when YYTABLE doesn't specify something else to do.  Zero
-    means the default is an error.  */
- static const yytype_uint8 yydefact[] =
- {
-@@ -842,8 +844,7 @@
- 
- /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-    positive, shift that token.  If negative, reduce the rule which
--   number is the opposite.  If zero, do what YYDEFACT says.
--   If YYTABLE_NINF, syntax error.  */
-+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
- #define YYTABLE_NINF -145
- static const yytype_int16 yytable[] =
- {
-@@ -889,6 +890,12 @@
-      254,   194,   193,   199,   273
- };
- 
-+#define yypact_value_is_default(yystate) \
-+  ((yystate) == (-258))
-+
-+#define yytable_value_is_error(yytable_value) \
-+  YYID (0)
-+
- static const yytype_uint16 yycheck[] =
- {
-       53,    74,    99,   106,    84,     5,     0,     3,     9,     3,
-@@ -986,9 +993,18 @@
- 
- /* Like YYERROR except do call yyerror.  This remains here temporarily
-    to ease the transition to the new meaning of YYERROR, for GCC.
--   Once GCC version 2 has supplanted version 1, this can go.  */
-+   Once GCC version 2 has supplanted version 1, this can go.  However,
-+   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-+   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-+   discussed.  */
- 
- #define YYFAIL		goto yyerrlab
-+#if defined YYFAIL
-+  /* This is here to suppress warnings from the GCC cpp's
-+     -Wunused-macros.  Normally we don't worry about that warning, but
-+     some users do, and we want to make it easy for users to remove
-+     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-+#endif
- 
- #define YYRECOVERING()  (!!yyerrstatus)
- 
-@@ -998,7 +1014,6 @@
-     {								\
-       yychar = (Token);						\
-       yylval = (Value);						\
--      yytoken = YYTRANSLATE (yychar);				\
-       YYPOPSTACK (1);						\
-       goto yybackup;						\
-     }								\
-@@ -1040,19 +1055,10 @@
- #endif
- 
- 
--/* YY_LOCATION_PRINT -- Print the location on the stream.
--   This macro was not mandated originally: define only if we know
--   we won't break user code: when these are the locations we know.  */
-+/* This macro is provided for backward compatibility. */
- 
- #ifndef YY_LOCATION_PRINT
--# if YYLTYPE_IS_TRIVIAL
--#  define YY_LOCATION_PRINT(File, Loc)			\
--     fprintf (File, "%d.%d-%d.%d",			\
--	      (Loc).first_line, (Loc).first_column,	\
--	      (Loc).last_line,  (Loc).last_column)
--# else
--#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
--# endif
-+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
- #endif
- 
- 
-@@ -1244,7 +1250,6 @@
- # define YYMAXDEPTH 10000
- #endif
- 
--

- 
- #if YYERROR_VERBOSE
- 
-@@ -1347,115 +1352,142 @@
- }
- # endif
- 
--/* Copy into YYRESULT an error message about the unexpected token
--   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
--   including the terminating null byte.  If YYRESULT is null, do not
--   copy anything; just return the number of bytes that would be
--   copied.  As a special case, return 0 if an ordinary "syntax error"
--   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
--   size calculation.  */
--static YYSIZE_T
--yysyntax_error (char *yyresult, int yystate, int yychar)
-+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-+   about the unexpected token YYTOKEN for the state stack whose top is
-+   YYSSP.
-+
-+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-+   not large enough to hold the message.  In that case, also set
-+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-+   required number of bytes is too large to store.  */
-+static int
-+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-+                yytype_int16 *yyssp, int yytoken)
- {
--  int yyn = yypact[yystate];
--
--  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
--    return 0;
--  else
--    {
--      int yytype = YYTRANSLATE (yychar);
--      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
--      YYSIZE_T yysize = yysize0;
--      YYSIZE_T yysize1;
--      int yysize_overflow = 0;
--      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
--      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
--      int yyx;
--
--# if 0
--      /* This is so xgettext sees the translatable formats that are
--	 constructed on the fly.  */
--      YY_("syntax error, unexpected %s");
--      YY_("syntax error, unexpected %s, expecting %s");
--      YY_("syntax error, unexpected %s, expecting %s or %s");
--      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
--      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
--# endif
--      char *yyfmt;
--      char const *yyf;
--      static char const yyunexpected[] = "syntax error, unexpected %s";
--      static char const yyexpecting[] = ", expecting %s";
--      static char const yyor[] = " or %s";
--      char yyformat[sizeof yyunexpected
--		    + sizeof yyexpecting - 1
--		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
--		       * (sizeof yyor - 1))];
--      char const *yyprefix = yyexpecting;
--
--      /* Start YYX at -YYN if negative to avoid negative indexes in
--	 YYCHECK.  */
--      int yyxbegin = yyn < 0 ? -yyn : 0;
--
--      /* Stay within bounds of both yycheck and yytname.  */
--      int yychecklim = YYLAST - yyn + 1;
--      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
--      int yycount = 1;
--
--      yyarg[0] = yytname[yytype];
--      yyfmt = yystpcpy (yyformat, yyunexpected);
--
--      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
--	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
--	  {
--	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
--	      {
--		yycount = 1;
--		yysize = yysize0;
--		yyformat[sizeof yyunexpected - 1] = '\0';
--		break;
--	      }
--	    yyarg[yycount++] = yytname[yyx];
--	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
--	    yysize_overflow |= (yysize1 < yysize);
--	    yysize = yysize1;
--	    yyfmt = yystpcpy (yyfmt, yyprefix);
--	    yyprefix = yyor;
--	  }
--
--      yyf = YY_(yyformat);
--      yysize1 = yysize + yystrlen (yyf);
--      yysize_overflow |= (yysize1 < yysize);
--      yysize = yysize1;
--
--      if (yysize_overflow)
--	return YYSIZE_MAXIMUM;
--
--      if (yyresult)
--	{
--	  /* Avoid sprintf, as that infringes on the user's name space.
--	     Don't have undefined behavior even if the translation
--	     produced a string with the wrong number of "%s"s.  */
--	  char *yyp = yyresult;
--	  int yyi = 0;
--	  while ((*yyp = *yyf) != '\0')
--	    {
--	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
--		{
--		  yyp += yytnamerr (yyp, yyarg[yyi++]);
--		  yyf += 2;
--		}
--	      else
--		{
--		  yyp++;
--		  yyf++;
--		}
--	    }
--	}
--      return yysize;
-+  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
-+  YYSIZE_T yysize = yysize0;
-+  YYSIZE_T yysize1;
-+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-+  /* Internationalized format string. */
-+  const char *yyformat = 0;
-+  /* Arguments of yyformat. */
-+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-+  /* Number of reported tokens (one for the "unexpected", one per
-+     "expected"). */
-+  int yycount = 0;
-+
-+  /* There are many possibilities here to consider:
-+     - Assume YYFAIL is not used.  It's too flawed to consider.  See
-+       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-+       for details.  YYERROR is fine as it does not invoke this
-+       function.
-+     - If this state is a consistent state with a default action, then
-+       the only way this function was invoked is if the default action
-+       is an error action.  In that case, don't check for expected
-+       tokens because there are none.
-+     - The only way there can be no lookahead present (in yychar) is if
-+       this state is a consistent state with a default action.  Thus,
-+       detecting the absence of a lookahead is sufficient to determine
-+       that there is no unexpected or expected token to report.  In that
-+       case, just report a simple "syntax error".
-+     - Don't assume there isn't a lookahead just because this state is a
-+       consistent state with a default action.  There might have been a
-+       previous inconsistent state, consistent state with a non-default
-+       action, or user semantic action that manipulated yychar.
-+     - Of course, the expected token list depends on states to have
-+       correct lookahead information, and it depends on the parser not
-+       to perform extra reductions after fetching a lookahead from the
-+       scanner and before detecting a syntax error.  Thus, state merging
-+       (from LALR or IELR) and default reductions corrupt the expected
-+       token list.  However, the list is correct for canonical LR with
-+       one exception: it will still contain any token that will not be
-+       accepted due to an error action in a later state.
-+  */
-+  if (yytoken != YYEMPTY)
-+    {
-+      int yyn = yypact[*yyssp];
-+      yyarg[yycount++] = yytname[yytoken];
-+      if (!yypact_value_is_default (yyn))
-+        {
-+          /* Start YYX at -YYN if negative to avoid negative indexes in
-+             YYCHECK.  In other words, skip the first -YYN actions for
-+             this state because they are default actions.  */
-+          int yyxbegin = yyn < 0 ? -yyn : 0;
-+          /* Stay within bounds of both yycheck and yytname.  */
-+          int yychecklim = YYLAST - yyn + 1;
-+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-+          int yyx;
-+
-+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-+                && !yytable_value_is_error (yytable[yyx + yyn]))
-+              {
-+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-+                  {
-+                    yycount = 1;
-+                    yysize = yysize0;
-+                    break;
-+                  }
-+                yyarg[yycount++] = yytname[yyx];
-+                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-+                if (! (yysize <= yysize1
-+                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-+                  return 2;
-+                yysize = yysize1;
-+              }
-+        }
-     }
-+
-+  switch (yycount)
-+    {
-+# define YYCASE_(N, S)                      \
-+      case N:                               \
-+        yyformat = S;                       \
-+      break
-+      YYCASE_(0, YY_("syntax error"));
-+      YYCASE_(1, YY_("syntax error, unexpected %s"));
-+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-+# undef YYCASE_
-+    }
-+
-+  yysize1 = yysize + yystrlen (yyformat);
-+  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-+    return 2;
-+  yysize = yysize1;
-+
-+  if (*yymsg_alloc < yysize)
-+    {
-+      *yymsg_alloc = 2 * yysize;
-+      if (! (yysize <= *yymsg_alloc
-+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-+      return 1;
-+    }
-+
-+  /* Avoid sprintf, as that infringes on the user's name space.
-+     Don't have undefined behavior even if the translation
-+     produced a string with the wrong number of "%s"s.  */
-+  {
-+    char *yyp = *yymsg;
-+    int yyi = 0;
-+    while ((*yyp = *yyformat) != '\0')
-+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-+        {
-+          yyp += yytnamerr (yyp, yyarg[yyi++]);
-+          yyformat += 2;
-+        }
-+      else
-+        {
-+          yyp++;
-+          yyformat++;
-+        }
-+  }
-+  return 0;
- }
- #endif /* YYERROR_VERBOSE */
--

- 
- /*-----------------------------------------------.
- | Release the memory associated to this symbol.  |
-@@ -1488,6 +1520,7 @@
-     }
- }
- 
-+
- /* Prevent warnings from -Wmissing-prototypes.  */
- #ifdef YYPARSE_PARAM
- #if defined __STDC__ || defined __cplusplus
-@@ -1514,10 +1547,9 @@
- int yynerrs;
- 
- 
--
--/*-------------------------.
--| yyparse or yypush_parse.  |
--`-------------------------*/
-+/*----------.
-+| yyparse.  |
-+`----------*/
- 
- #ifdef YYPARSE_PARAM
- #if (defined __STDC__ || defined __C99__FUNC__ \
-@@ -1541,8 +1573,6 @@
- #endif
- #endif
- {
--
--
-     int yystate;
-     /* Number of tokens to shift before error messages enabled.  */
-     int yyerrstatus;
-@@ -1697,7 +1727,7 @@
- 
-   /* First try to decide what to do without reference to lookahead token.  */
-   yyn = yypact[yystate];
--  if (yyn == YYPACT_NINF)
-+  if (yypact_value_is_default (yyn))
-     goto yydefault;
- 
-   /* Not known => get a lookahead token if don't already have one.  */
-@@ -1728,8 +1758,8 @@
-   yyn = yytable[yyn];
-   if (yyn <= 0)
-     {
--      if (yyn == 0 || yyn == YYTABLE_NINF)
--	goto yyerrlab;
-+      if (yytable_value_is_error (yyn))
-+        goto yyerrlab;
-       yyn = -yyn;
-       goto yyreduce;
-     }
-@@ -1784,49 +1814,49 @@
-     {
-         case 2:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 94 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.decl = (yyvsp[(1) - (1)].str); ;}
-+    { KDevPG::globalSystem.decl = (yyvsp[(1) - (1)].str); }
-     break;
- 
-   case 3:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 97 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.bits += (yyvsp[(5) - (5)].str); ;}
-+    { KDevPG::globalSystem.bits += (yyvsp[(5) - (5)].str); }
-     break;
- 
-   case 6:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 107 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.pushParserClassMember((yyvsp[(2) - (2)].item)); ;}
-+    { KDevPG::globalSystem.pushParserClassMember((yyvsp[(2) - (2)].item)); }
-     break;
- 
-   case 7:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 109 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.bits += (yyvsp[(5) - (5)].str); ;}
-+    { KDevPG::globalSystem.bits += (yyvsp[(5) - (5)].str); }
-     break;
- 
-   case 8:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 111 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.pushLexerClassMember((yyvsp[(2) - (2)].item)); ;}
-+    { KDevPG::globalSystem.pushLexerClassMember((yyvsp[(2) - (2)].item)); }
-     break;
- 
-   case 9:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 113 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.lexerBits += (yyvsp[(5) - (5)].str); ;}
-+    { KDevPG::globalSystem.lexerBits += (yyvsp[(5) - (5)].str); }
-     break;
- 
-   case 11:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 116 "/home/jonathan/gitKDE/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); }
-@@ -1840,12 +1870,12 @@
- /*           case KDevPG::SUcs4: KDevPG::GDFA::type = KDevPG::TUcs4; break; */
-           default: /* empty */;
-         }
--      ;}
-+      }
-     break;
- 
-   case 12:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 130 "/home/jonathan/gitKDE/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); }
-@@ -1859,12 +1889,12 @@
- /*         case KDevPG::TUcs4: KDevPG::GDFA::type = KDevPG::SUcs4; break; */
-         default: /* empty */;
-       }
--      ;}
-+      }
-     break;
- 
-   case 13:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 144 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     {
-         if(KDevPG::globalSystem.hasLexer)
-@@ -1891,132 +1921,132 @@
-           exit(-1);
-         }
-         KDevPG::GDFA::type = KDevPG::AutomatonType(base);
--      ;}
-+      }
-     break;
- 
-   case 14:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 171 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.tokenStream = (yyvsp[(2) - (3)].str);           ;}
-+    { KDevPG::globalSystem.tokenStream = (yyvsp[(2) - (3)].str);           }
-     break;
- 
-   case 15:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 173 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.exportMacro = (yyvsp[(2) - (2)].str);           ;}
-+    { KDevPG::globalSystem.exportMacro = (yyvsp[(2) - (2)].str);           }
-     break;
- 
-   case 16:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 175 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.exportMacroHeader = (yyvsp[(2) - (2)].str);     ;}
-+    { KDevPG::globalSystem.exportMacroHeader = (yyvsp[(2) - (2)].str);     }
-     break;
- 
-   case 17:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 177 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.namespaceCode = (yyvsp[(2) - (2)].str);         ;}
-+    { KDevPG::globalSystem.namespaceCode = (yyvsp[(2) - (2)].str);         }
-     break;
- 
-   case 18:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 179 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.astCode = (yyvsp[(2) - (2)].str);               ;}
-+    { KDevPG::globalSystem.astCode = (yyvsp[(2) - (2)].str);               }
-     break;
- 
-   case 19:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 181 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.pushParserDeclarationHeader((yyvsp[(2) - (2)].str)); ;}
-+    { KDevPG::globalSystem.pushParserDeclarationHeader((yyvsp[(2) - (2)].str)); }
-     break;
- 
-   case 20:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 183 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.pushParserBitsHeader((yyvsp[(2) - (2)].str)); ;}
-+    { KDevPG::globalSystem.pushParserBitsHeader((yyvsp[(2) - (2)].str)); }
-     break;
- 
-   case 21:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 185 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.pushAstHeader((yyvsp[(2) - (2)].str)); ;}
-+    { KDevPG::globalSystem.pushAstHeader((yyvsp[(2) - (2)].str)); }
-     break;
- 
-   case 22:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 187 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.pushLexerDeclarationHeader((yyvsp[(2) - (2)].str)); ;}
-+    { KDevPG::globalSystem.pushLexerDeclarationHeader((yyvsp[(2) - (2)].str)); }
-     break;
- 
-   case 23:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 189 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.inputStream = (yyvsp[(2) - (2)].str); ;}
-+    { KDevPG::globalSystem.inputStream = (yyvsp[(2) - (2)].str); }
-     break;
- 
-   case 24:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 191 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.pushLexerBitsHeader((yyvsp[(2) - (2)].str)); ;}
-+    { KDevPG::globalSystem.pushLexerBitsHeader((yyvsp[(2) - (2)].str)); }
-     break;
- 
-   case 25:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 193 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.astBaseClasses[(yyvsp[(2) - (3)].str)] = (yyvsp[(3) - (3)].str); ;}
-+    { KDevPG::globalSystem.astBaseClasses[(yyvsp[(2) - (3)].str)] = (yyvsp[(3) - (3)].str); }
-     break;
- 
-   case 26:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 195 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.parserBaseClass = (yyvsp[(2) - (2)].str); ;}
-+    { KDevPG::globalSystem.parserBaseClass = (yyvsp[(2) - (2)].str); }
-     break;
- 
-   case 27:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 197 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.lexerBaseClass = (yyvsp[(2) - (2)].str); ;}
-+    { KDevPG::globalSystem.lexerBaseClass = (yyvsp[(2) - (2)].str); }
-     break;
- 
-   case 28:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 198 "/home/jonathan/gitKDE/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);"); ;}
-+    { 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 1806 of yacc.c  */
- #line 199 "/home/jonathan/gitKDE/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);"); ;}
-+    { 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 1806 of yacc.c  */
- #line 204 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     { KDevPG::globalSystem.regexpById[(yyvsp[(3) - (4)].str)] = (yyvsp[(1) - (4)].nfa);
--            ;}
-+            }
-     break;
- 
-   case 34:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 207 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     {
-               if((yyvsp[(1) - (4)].nfa)->acceptsEpsilon())
-@@ -2026,12 +2056,12 @@
-               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(s);
--            ;}
-+            }
-     break;
- 
-   case 36:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 217 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     {
-               if((yyvsp[(1) - (8)].nfa)->acceptsEpsilon())
-@@ -2063,12 +2093,12 @@
-                 KDevPG::globalSystem.lexerEnvs[lexerEnv].push_back((yyvsp[(1) - (8)].nfa));
-                 KDevPG::globalSystem.lexerActions[lexerEnv].push_back(s);
-               }
--            ;}
-+            }
-     break;
- 
-   case 38:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 249 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     {
-               if((yyvsp[(1) - (8)].nfa)->acceptsEpsilon())
-@@ -2110,211 +2140,211 @@
-                 KDevPG::globalSystem.lexerEnvs[lexerEnv].push_back((yyvsp[(1) - (8)].nfa));
-                 KDevPG::globalSystem.lexerActions[lexerEnv].push_back(s);
-               }
--            ;}
-+            }
-     break;
- 
-   case 40:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 291 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     {
-               KDevPG::globalSystem.lexerActions[lexerEnv][0] = QString((yyvsp[(2) - (2)].str));
--            ;}
-+            }
-     break;
- 
-   case 42:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 295 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     {
-               KDevPG::globalSystem.enteringCode[lexerEnv] = QString((yyvsp[(2) - (2)].str));
--            ;}
-+            }
-     break;
- 
-   case 44:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 299 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     {
-               KDevPG::globalSystem.leavingCode[lexerEnv] = QString((yyvsp[(2) - (2)].str));
--            ;}
-+            }
-     break;
- 
-   case 47:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 306 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     {
-         r = "\nlxRETURN(" + QString((yyvsp[(1) - (1)].str)) + ")\n";
--      ;}
-+      }
-     break;
- 
-   case 48:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 309 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     {
-         r = "\nlxCONTINUE;\n";
--      ;}
-+      }
-     break;
- 
-   case 49:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 312 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     { r = "\nlxSKIP\n" ;}
-     break;
- 
-   case 50:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 316 "/home/jonathan/gitKDE/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); ;}
-+    { (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 51:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 317 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
-+    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
-     break;
- 
-   case 52:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 321 "/home/jonathan/gitKDE/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); ;}
-+    { (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 53:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 322 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
-+    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
-     break;
- 
-   case 54:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 326 "/home/jonathan/gitKDE/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); ;}
-+    { (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 55:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 327 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
-+    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
-     break;
- 
-   case 56:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 331 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = new KDevPG::GNFA((yyvsp[(2) - (2)].nfa)->negate()); delete (yyvsp[(2) - (2)].nfa); ;}
-+    { (yyval.nfa) = new KDevPG::GNFA((yyvsp[(2) - (2)].nfa)->negate()); delete (yyvsp[(2) - (2)].nfa); }
-     break;
- 
-   case 57:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 332 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (2)].nfa) |= KDevPG::GNFA::emptyWord()); delete (yyvsp[(2) - (2)].nfa); ;}
-+    { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (2)].nfa) |= KDevPG::GNFA::emptyWord()); delete (yyvsp[(2) - (2)].nfa); }
-     break;
- 
-   case 58:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 333 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
-+    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
-     break;
- 
-   case 59:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 337 "/home/jonathan/gitKDE/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); ;}
-+    { (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 60:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 338 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
-+    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
-     break;
- 
-   case 61:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 342 "/home/jonathan/gitKDE/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); ;}
-+    { (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 62:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 343 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
-+    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
-     break;
- 
-   case 63:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 347 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = new KDevPG::GNFA(**(yyvsp[(1) - (2)].nfa)); delete (yyvsp[(1) - (2)].nfa); ;}
-+    { (yyval.nfa) = new KDevPG::GNFA(**(yyvsp[(1) - (2)].nfa)); delete (yyvsp[(1) - (2)].nfa); }
-     break;
- 
-   case 64:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 348 "/home/jonathan/gitKDE/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); ;}
-+    { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (2)].nfa)); **(yyval.nfa); *(yyval.nfa) <<= *(yyvsp[(1) - (2)].nfa); delete (yyvsp[(1) - (2)].nfa); }
-     break;
- 
-   case 65:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 349 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
-+    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
-     break;
- 
-   case 66:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 353 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (3)].nfa)); delete (yyvsp[(2) - (3)].nfa); ;}
-+    { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (3)].nfa)); delete (yyvsp[(2) - (3)].nfa); }
-     break;
- 
-   case 67:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 354 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = (yyvsp[(2) - (3)].nfa); ;}
-+    { (yyval.nfa) = (yyvsp[(2) - (3)].nfa); }
-     break;
- 
-   case 68:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 355 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::anyChar()); ;}
-+    { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::anyChar()); }
-     break;
- 
-   case 69:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 356 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::word(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); ;}
-+    { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::word(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); }
-     break;
- 
-   case 70:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 357 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::word(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); ;}
-+    { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::word(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); }
-     break;
- 
-   case 71:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 358 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     {
-                               if(!KDevPG::globalSystem.regexpById.contains((yyvsp[(1) - (1)].str)))
-@@ -2330,152 +2360,152 @@
-                                 *regexp = KDevPG::globalSystem.dfaForNfa[regexp]->nfa();
-                               }
-                               (yyval.nfa) = new KDevPG::GNFA(*regexp);
--                            ;}
-+                            }
-     break;
- 
-   case 72:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 373 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::emptyWord()); ;}
-+    { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::emptyWord()); }
-     break;
- 
-   case 73:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 377 "/home/jonathan/gitKDE/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); ;}
-+    { (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 74:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 378 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
-+    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
-     break;
- 
-   case 75:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 382 "/home/jonathan/gitKDE/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); ;}
-+    { (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 76:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 383 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
-+    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
-     break;
- 
-   case 77:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 387 "/home/jonathan/gitKDE/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); ;}
-+    { (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 78:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 388 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
-+    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
-     break;
- 
-   case 79:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 392 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = new KDevPG::GNFA((yyvsp[(2) - (2)].nfa)->negate()); delete (yyvsp[(2) - (2)].nfa); ;}
-+    { (yyval.nfa) = new KDevPG::GNFA((yyvsp[(2) - (2)].nfa)->negate()); delete (yyvsp[(2) - (2)].nfa); }
-     break;
- 
-   case 80:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 393 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (2)].nfa) |= KDevPG::GNFA::emptyWord()); delete (yyvsp[(2) - (2)].nfa); ;}
-+    { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (2)].nfa) |= KDevPG::GNFA::emptyWord()); delete (yyvsp[(2) - (2)].nfa); }
-     break;
- 
-   case 81:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 394 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
-+    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
-     break;
- 
-   case 82:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 398 "/home/jonathan/gitKDE/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); ;}
-+    { (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 84:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 403 "/home/jonathan/gitKDE/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); ;}
-+    { (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 85:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 404 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
-+    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
-     break;
- 
-   case 86:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 408 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = new KDevPG::GNFA(**(yyvsp[(1) - (2)].nfa)); delete (yyvsp[(1) - (2)].nfa); ;}
-+    { (yyval.nfa) = new KDevPG::GNFA(**(yyvsp[(1) - (2)].nfa)); delete (yyvsp[(1) - (2)].nfa); }
-     break;
- 
-   case 87:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 409 "/home/jonathan/gitKDE/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); ;}
-+    { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (2)].nfa)); **(yyval.nfa); *(yyval.nfa) <<= *(yyvsp[(1) - (2)].nfa); delete (yyvsp[(1) - (2)].nfa); }
-     break;
- 
-   case 88:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 410 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
-+    { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
-     break;
- 
-   case 89:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 414 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (3)].nfa)); delete (yyvsp[(2) - (3)].nfa); ;}
-+    { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (3)].nfa)); delete (yyvsp[(2) - (3)].nfa); }
-     break;
- 
-   case 90:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 415 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = (yyvsp[(2) - (3)].nfa); ;}
-+    { (yyval.nfa) = (yyvsp[(2) - (3)].nfa); }
-     break;
- 
-   case 91:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 416 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::anyChar()); ;}
-+    { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::anyChar()); }
-     break;
- 
-   case 92:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 417 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::word(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); ;}
-+    { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::word(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); }
-     break;
- 
-   case 93:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 418 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     {
-       quint32 begin, end;
-@@ -2499,19 +2529,19 @@
-           end = QChar::surrogateToUcs4(str[3], str[4]);
-       }
-       (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::range(begin, end+1));
--    ;}
-+    }
-     break;
- 
-   case 94:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 441 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::collection(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); ;}
-+    { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::collection(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); }
-     break;
- 
-   case 95:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 442 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     {
-                               if(!KDevPG::globalSystem.regexpById.contains((yyvsp[(1) - (1)].str)))
-@@ -2527,335 +2557,335 @@
-                                 *regexp = KDevPG::globalSystem.dfaForNfa[regexp]->nfa();
-                               }
-                               (yyval.nfa) = new KDevPG::GNFA(*regexp);
--                            ;}
-+                            }
-     break;
- 
-   case 96:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 457 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::emptyWord()); ;}
-+    { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::emptyWord()); }
-     break;
- 
-   case 97:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 463 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::PublicDeclaration, (yyvsp[(5) - (5)].str));    ;}
-+    { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::PublicDeclaration, (yyvsp[(5) - (5)].str));    }
-     break;
- 
-   case 98:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 465 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::ProtectedDeclaration, (yyvsp[(5) - (5)].str)); ;}
-+    { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::ProtectedDeclaration, (yyvsp[(5) - (5)].str)); }
-     break;
- 
-   case 99:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 467 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::PrivateDeclaration, (yyvsp[(5) - (5)].str));   ;}
-+    { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::PrivateDeclaration, (yyvsp[(5) - (5)].str));   }
-     break;
- 
-   case 100:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 469 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::ConstructorCode, (yyvsp[(4) - (4)].str));      ;}
-+    { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::ConstructorCode, (yyvsp[(4) - (4)].str));      }
-     break;
- 
-   case 101:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 471 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::DestructorCode, (yyvsp[(4) - (4)].str));       ;}
-+    { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::DestructorCode, (yyvsp[(4) - (4)].str));       }
-     break;
- 
-   case 102:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 475 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.pushTerminal((yyvsp[(1) - (1)].str),(yyvsp[(1) - (1)].str)); ;}
-+    { KDevPG::globalSystem.pushTerminal((yyvsp[(1) - (1)].str),(yyvsp[(1) - (1)].str)); }
-     break;
- 
-   case 103:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 476 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.pushTerminal((yyvsp[(1) - (4)].str),(yyvsp[(3) - (4)].str)); ;}
-+    { KDevPG::globalSystem.pushTerminal((yyvsp[(1) - (4)].str),(yyvsp[(3) - (4)].str)); }
-     break;
- 
-   case 104:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 477 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.pushTerminal((yyvsp[(3) - (3)].str),(yyvsp[(3) - (3)].str)); ;}
-+    { KDevPG::globalSystem.pushTerminal((yyvsp[(3) - (3)].str),(yyvsp[(3) - (3)].str)); }
-     break;
- 
-   case 105:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 479 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.pushTerminal((yyvsp[(3) - (6)].str),(yyvsp[(5) - (6)].str)); ;}
-+    { KDevPG::globalSystem.pushTerminal((yyvsp[(3) - (6)].str),(yyvsp[(5) - (6)].str)); }
-     break;
- 
-   case 107:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 484 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.pushRule((yyvsp[(2) - (3)].item)); ;}
-+    { KDevPG::globalSystem.pushRule((yyvsp[(2) - (3)].item)); }
-     break;
- 
-   case 108:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 488 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = KDevPG::globalSystem.zero(); ;}
-+    { (yyval.item) = KDevPG::globalSystem.zero(); }
-     break;
- 
-   case 109:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 489 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = (yyvsp[(2) - (3)].item); ;}
-+    { (yyval.item) = (yyvsp[(2) - (3)].item); }
-     break;
- 
-   case 110:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 490 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
-+    { (yyval.item) = (yyvsp[(1) - (1)].item); }
-     break;
- 
-   case 111:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 491 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
-+    { (yyval.item) = (yyvsp[(1) - (1)].item); }
-     break;
- 
-   case 112:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 492 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = KDevPG::inlinedNonTerminal(KDevPG::globalSystem.pushSymbol((yyvsp[(2) - (2)].str))); ;}
-+    { (yyval.item) = KDevPG::inlinedNonTerminal(KDevPG::globalSystem.pushSymbol((yyvsp[(2) - (2)].str))); }
-     break;
- 
-   case 113:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 493 "/home/jonathan/gitKDE/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)); ;}
-+    { (yyval.item) = KDevPG::annotation((yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].item), false, (yyvsp[(2) - (3)].storageType)); }
-     break;
- 
-   case 114:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 494 "/home/jonathan/gitKDE/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));  ;}
-+    { (yyval.item) = KDevPG::annotation((yyvsp[(2) - (4)].str), (yyvsp[(4) - (4)].item), true, (yyvsp[(3) - (4)].storageType));  }
-     break;
- 
-   case 115:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 498 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = KDevPG::nonTerminal(KDevPG::globalSystem.pushSymbol((yyvsp[(1) - (2)].str)), (yyvsp[(2) - (2)].str)); ;}
-+    { (yyval.item) = KDevPG::nonTerminal(KDevPG::globalSystem.pushSymbol((yyvsp[(1) - (2)].str)), (yyvsp[(2) - (2)].str)); }
-     break;
- 
-   case 116:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 499 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = KDevPG::globalSystem.terminal((yyvsp[(1) - (1)].str)); ;}
-+    { (yyval.item) = KDevPG::globalSystem.terminal((yyvsp[(1) - (1)].str)); }
-     break;
- 
-   case 117:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 504 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     {
-           KDevPG::globalSystem.needStateManagement = true;
-           (yyval.item) = KDevPG::tryCatch((yyvsp[(3) - (4)].item), 0);
--        ;}
-+        }
-     break;
- 
-   case 118:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 509 "/home/jonathan/gitKDE/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));
--        ;}
-+        }
-     break;
- 
-   case 119:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 515 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.str) = const_cast<char*>(""); ;}
-+    { (yyval.str) = const_cast<char*>(""); }
-     break;
- 
-   case 120:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 516 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
-+    { (yyval.str) = (yyvsp[(1) - (1)].str); }
-     break;
- 
-   case 121:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 520 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
-+    { (yyval.str) = (yyvsp[(1) - (1)].str); }
-     break;
- 
-   case 122:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 530 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageAstMember; ;}
-+    { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageAstMember; }
-     break;
- 
-   case 123:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 531 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageTemporary;  ;}
-+    { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageTemporary;  }
-     break;
- 
-   case 124:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 535 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = KDevPG::plus((yyvsp[(1) - (2)].item)); ;}
-+    { (yyval.item) = KDevPG::plus((yyvsp[(1) - (2)].item)); }
-     break;
- 
-   case 125:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 536 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = KDevPG::star((yyvsp[(1) - (2)].item)); ;}
-+    { (yyval.item) = KDevPG::star((yyvsp[(1) - (2)].item)); }
-     break;
- 
-   case 126:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 537 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
-+    { (yyval.item) = (yyvsp[(1) - (1)].item); }
-     break;
- 
-   case 127:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 538 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = KDevPG::alternative((yyvsp[(2) - (2)].item), KDevPG::globalSystem.zero()); ;}
-+    { (yyval.item) = KDevPG::alternative((yyvsp[(2) - (2)].item), KDevPG::globalSystem.zero()); }
-     break;
- 
-   case 128:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 542 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
-+    { (yyval.item) = (yyvsp[(1) - (1)].item); }
-     break;
- 
-   case 129:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 544 "/home/jonathan/gitKDE/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)))));
--        ;}
-+        }
-     break;
- 
-   case 130:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 548 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = KDevPG::action((yyvsp[(1) - (2)].item), (yyvsp[(2) - (2)].str)); ;}
-+    { (yyval.item) = KDevPG::action((yyvsp[(1) - (2)].item), (yyvsp[(2) - (2)].str)); }
-     break;
- 
-   case 131:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 549 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = KDevPG::action(0, (yyvsp[(1) - (1)].str)); ;}
-+    { (yyval.item) = KDevPG::action(0, (yyvsp[(1) - (1)].str)); }
-     break;
- 
-   case 132:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 553 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
-+    { (yyval.item) = (yyvsp[(1) - (1)].item); }
-     break;
- 
-   case 133:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 554 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = KDevPG::cons((yyvsp[(1) - (2)].item), (yyvsp[(2) - (2)].item)); ;}
-+    { (yyval.item) = KDevPG::cons((yyvsp[(1) - (2)].item), (yyvsp[(2) - (2)].item)); }
-     break;
- 
-   case 134:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 558 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
-+    { (yyval.item) = (yyvsp[(1) - (1)].item); }
-     break;
- 
-   case 135:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 559 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = KDevPG::condition((yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].item)); ;}
-+    { (yyval.item) = KDevPG::condition((yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].item)); }
-     break;
- 
-   case 136:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 563 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
-+    { (yyval.item) = (yyvsp[(1) - (1)].item); }
-     break;
- 
-   case 137:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 564 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = KDevPG::alternative((yyvsp[(1) - (3)].item), (yyvsp[(3) - (3)].item)); ;}
-+    { (yyval.item) = KDevPG::alternative((yyvsp[(1) - (3)].item), (yyvsp[(3) - (3)].item)); }
-     break;
- 
-   case 138:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 569 "/home/jonathan/gitKDE/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));
--        ;}
-+        }
-     break;
- 
-   case 139:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 574 "/home/jonathan/gitKDE/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));
--        ;}
-+        }
-     break;
- 
-   case 140:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 579 "/home/jonathan/gitKDE/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)); ;}
-+    { (yyval.item) = KDevPG::evolve((yyvsp[(1) - (4)].item), KDevPG::globalSystem.pushSymbol((yyvsp[(3) - (4)].str)), 0, (yyvsp[(4) - (4)].str)); }
-     break;
- 
-   case 141:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 580 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     { if(KDevPG::globalSystem.generateAst == false)
-         {
-@@ -2863,40 +2893,40 @@
-           exit(-1);
-         }
-         operatorNode = KDevPG::createNode<KDevPG::Model::OperatorItem>();
--      ;}
-+      }
-     break;
- 
-   case 142:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 586 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { KDevPG::globalSystem.needOperatorStack = true; (yyval.item) = (yyvsp[(2) - (2)].item); ;}
-+    { KDevPG::globalSystem.needOperatorStack = true; (yyval.item) = (yyvsp[(2) - (2)].item); }
-     break;
- 
-   case 143:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 590 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.str) = const_cast<char*>(""); ;}
-+    { (yyval.str) = const_cast<char*>(""); }
-     break;
- 
-   case 144:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 591 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
-+    { (yyval.str) = (yyvsp[(1) - (1)].str); }
-     break;
- 
-   case 146:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 597 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { ; ;}
-+    { ; }
-     break;
- 
-   case 147:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 602 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     {
-               operatorNode->mBase = (KDevPG::Model::NonTerminalItem*)(yyvsp[(2) - (9)].item);
-@@ -2904,12 +2934,12 @@
-               if(!KDevPG::globalSystem.astBaseClasses.contains(operatorNode->mBase->mSymbol->mName))
-                 KDevPG::globalSystem.astBaseClasses[operatorNode->mBase->mSymbol->mName] = KDevPG::capitalized(operatorNode->mName) + "Ast";
-               (yyval.item) = KDevPG::evolve(operatorNode, KDevPG::globalSystem.pushSymbol((yyvsp[(5) - (9)].str)), (KDevPG::Model::VariableDeclarationItem*)(yyvsp[(7) - (9)].item), (yyvsp[(9) - (9)].str));
--            ;}
-+            }
-     break;
- 
-   case 148:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 610 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     {
-               operatorNode->mBase = (KDevPG::Model::NonTerminalItem*)(yyvsp[(2) - (9)].item);
-@@ -2917,12 +2947,12 @@
-               if(!KDevPG::globalSystem.astBaseClasses.contains(operatorNode->mBase->mSymbol->mName))
-                 KDevPG::globalSystem.astBaseClasses[operatorNode->mBase->mSymbol->mName] = KDevPG::capitalized(operatorNode->mName) + "Ast";
-               (yyval.item) = KDevPG::evolve(operatorNode, KDevPG::globalSystem.pushSymbol((yyvsp[(5) - (9)].str)), (KDevPG::Model::VariableDeclarationItem*)(yyvsp[(8) - (9)].item), (yyvsp[(6) - (9)].str));
--            ;}
-+            }
-     break;
- 
-   case 149:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 618 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     {
-               operatorNode->mBase = (KDevPG::Model::NonTerminalItem*)(yyvsp[(2) - (6)].item);
-@@ -2930,89 +2960,89 @@
-               if(!KDevPG::globalSystem.astBaseClasses.contains(operatorNode->mBase->mSymbol->mName))
-                 KDevPG::globalSystem.astBaseClasses[operatorNode->mBase->mSymbol->mName] = KDevPG::capitalized(operatorNode->mName) + "Ast";
-               (yyval.item) = KDevPG::evolve(operatorNode, KDevPG::globalSystem.pushSymbol((yyvsp[(5) - (6)].str)), 0, (yyvsp[(6) - (6)].str));
--            ;}
-+            }
-     break;
- 
-   case 150:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 628 "/home/jonathan/gitKDE/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)); ;}
-+    { operatorNode->pushBin(*(yyvsp[(2) - (4)].operatorInformation), (yyvsp[(4) - (4)].str), (yyvsp[(3) - (4)].str)); free((yyvsp[(2) - (4)].operatorInformation)); }
-     break;
- 
-   case 151:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 629 "/home/jonathan/gitKDE/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)); ;}
-+    { 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 152:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 630 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { operatorNode->pushPre(*(yyvsp[(2) - (3)].operatorInformation), (yyvsp[(3) - (3)].str)); free((yyvsp[(2) - (3)].operatorInformation)); ;}
-+    { operatorNode->pushPre(*(yyvsp[(2) - (3)].operatorInformation), (yyvsp[(3) - (3)].str)); free((yyvsp[(2) - (3)].operatorInformation)); }
-     break;
- 
-   case 153:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 631 "/home/jonathan/gitKDE/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)); ;}
-+    { operatorNode->pushPost(*(yyvsp[(2) - (3)].operatorInformation), "0", (yyvsp[(3) - (3)].str)); free((yyvsp[(2) - (3)].operatorInformation)); free((yyvsp[(3) - (3)].str)); }
-     break;
- 
-   case 154:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 632 "/home/jonathan/gitKDE/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)); ;}
-+    { operatorNode->pushPost(*(yyvsp[(2) - (4)].operatorInformation), (yyvsp[(4) - (4)].str), (yyvsp[(3) - (4)].str)); free((yyvsp[(2) - (4)].operatorInformation)); }
-     break;
- 
-   case 155:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 633 "/home/jonathan/gitKDE/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)); ;}
-+    { operatorNode->pushParen(*(yyvsp[(2) - (3)].operatorInformation), *(yyvsp[(3) - (3)].operatorInformation)); free((yyvsp[(2) - (3)].operatorInformation)); free((yyvsp[(3) - (3)].operatorInformation)); }
-     break;
- 
-   case 156:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 637 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.str) = (char*)"0"; ;}
-+    { (yyval.str) = (char*)"0"; }
-     break;
- 
-   case 157:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 638 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
-+    { (yyval.str) = (yyvsp[(1) - (1)].str); }
-     break;
- 
-   case 158:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 639 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
-+    { (yyval.str) = (yyvsp[(2) - (2)].str); }
-     break;
- 
-   case 159:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 643 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.str) = (char*)"1"; ;}
-+    { (yyval.str) = (char*)"1"; }
-     break;
- 
-   case 160:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 644 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.str) = (char*)"0"; ;}
-+    { (yyval.str) = (char*)"0"; }
-     break;
- 
-   case 161:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 645 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     { uint yyleng = strlen((yyvsp[(2) - (2)].str));
-                                      char *tmp = (char*)calloc(yyleng+7, sizeof(char));
-@@ -3020,12 +3050,12 @@
-                                      strcpy(tmp+1, (yyvsp[(2) - (2)].str));
-                                      strcpy(tmp+yyleng+6-6+1, "?1:0)");
-                                      (yyval.str) = tmp;
--                                   ;}
-+                                   }
-     break;
- 
-   case 162:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 652 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     { uint yyleng = strlen((yyvsp[(2) - (2)].str));
-                                      char *tmp = (char*)calloc(yyleng+7, sizeof(char));
-@@ -3033,47 +3063,47 @@
-                                      strcpy(tmp+1, (yyvsp[(2) - (2)].str));
-                                      strcpy(tmp+yyleng+6-6+1, "?0:1)");
-                                      (yyval.str) = tmp;
--                                   ;}
-+                                   }
-     break;
- 
-   case 163:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 662 "/home/jonathan/gitKDE/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)); ;}
-+    { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(3) - (4)].str)), (yyvsp[(2) - (4)].str), (yyvsp[(4) - (4)].str)); }
-     break;
- 
-   case 164:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 663 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(3) - (3)].str)), (yyvsp[(2) - (3)].str), ""); ;}
-+    { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(3) - (3)].str)), (yyvsp[(2) - (3)].str), ""); }
-     break;
- 
-   case 165:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 664 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(1) - (2)].str)), "", (yyvsp[(2) - (2)].str)); ;}
-+    { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(1) - (2)].str)), "", (yyvsp[(2) - (2)].str)); }
-     break;
- 
-   case 166:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 665 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(1) - (1)].str)), "", ""); ;}
-+    { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(1) - (1)].str)), "", ""); }
-     break;
- 
-   case 167:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 669 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
-+    { (yyval.item) = (yyvsp[(1) - (1)].item); }
-     break;
- 
-   case 168:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 671 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
-     {
-           KDevPG::Model::VariableDeclarationItem *last = (KDevPG::Model::VariableDeclarationItem*) (yyvsp[(1) - (2)].item);
-@@ -3082,85 +3112,96 @@
-           }
-           last->mNext = (KDevPG::Model::VariableDeclarationItem*) (yyvsp[(2) - (2)].item);
-           (yyval.item) = (yyvsp[(1) - (2)].item);
--        ;}
-+        }
-     break;
- 
-   case 169:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 683 "/home/jonathan/gitKDE/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)); ;}
-+    { (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 170:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 685 "/home/jonathan/gitKDE/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), ""); ;}
-+    { (yyval.item) = KDevPG::variableDeclaration((yyvsp[(1) - (5)].declarationType), (yyvsp[(2) - (5)].storageType), KDevPG::Model::VariableDeclarationItem::TypeToken, false, (yyvsp[(4) - (5)].str), ""); }
-     break;
- 
-   case 171:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 687 "/home/jonathan/gitKDE/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)); ;}
-+    { (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 172:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 689 "/home/jonathan/gitKDE/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), ""); ;}
-+    { (yyval.item) = KDevPG::variableDeclaration((yyvsp[(1) - (6)].declarationType), (yyvsp[(2) - (6)].storageType), KDevPG::Model::VariableDeclarationItem::TypeToken, true, (yyvsp[(5) - (6)].str), ""); }
-     break;
- 
-   case 173:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 693 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.declarationType) = KDevPG::Model::VariableDeclarationItem::DeclarationLocal;     ;}
-+    { (yyval.declarationType) = KDevPG::Model::VariableDeclarationItem::DeclarationLocal;     }
-     break;
- 
-   case 174:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 694 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.declarationType) = KDevPG::Model::VariableDeclarationItem::DeclarationArgument;  ;}
-+    { (yyval.declarationType) = KDevPG::Model::VariableDeclarationItem::DeclarationArgument;  }
-     break;
- 
-   case 175:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 698 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageAstMember;    ;}
-+    { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageAstMember;    }
-     break;
- 
-   case 176:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 699 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageTemporary;     ;}
-+    { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageTemporary;     }
-     break;
- 
-   case 177:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 703 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.variableType) = KDevPG::Model::VariableDeclarationItem::TypeNode;             ;}
-+    { (yyval.variableType) = KDevPG::Model::VariableDeclarationItem::TypeNode;             }
-     break;
- 
-   case 178:
- 
--/* Line 1455 of yacc.c  */
-+/* Line 1806 of yacc.c  */
- #line 704 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { (yyval.variableType) = KDevPG::Model::VariableDeclarationItem::TypeVariable;         ;}
--    break;
--
--
--
--/* Line 1455 of yacc.c  */
--#line 3162 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
-+    { (yyval.variableType) = KDevPG::Model::VariableDeclarationItem::TypeVariable;         }
-+    break;
-+
-+
-+
-+/* Line 1806 of yacc.c  */
-+#line 3192 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
-       default: break;
-     }
-+  /* User semantic actions sometimes alter yychar, and that requires
-+     that yytoken be updated with the new translation.  We take the
-+     approach of translating immediately before every use of yytoken.
-+     One alternative is translating here after every semantic action,
-+     but that translation would be missed if the semantic action invokes
-+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
-+     incorrect destructor might then be invoked immediately.  In the
-+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
-+     to an incorrect destructor call or verbose syntax error message
-+     before the lookahead is translated.  */
-   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
- 
-   YYPOPSTACK (yylen);
-@@ -3188,6 +3229,10 @@
- | yyerrlab -- here on detecting error |
- `------------------------------------*/
- yyerrlab:
-+  /* Make sure we have latest lookahead translation.  See comments at
-+     user semantic actions for why this is necessary.  */
-+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-+
-   /* If not already recovering from an error, report this error.  */
-   if (!yyerrstatus)
-     {
-@@ -3195,37 +3240,36 @@
- #if ! YYERROR_VERBOSE
-       yyerror (YY_("syntax error"));
- #else
-+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-+                                        yyssp, yytoken)
-       {
--	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
--	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
--	  {
--	    YYSIZE_T yyalloc = 2 * yysize;
--	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
--	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
--	    if (yymsg != yymsgbuf)
--	      YYSTACK_FREE (yymsg);
--	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
--	    if (yymsg)
--	      yymsg_alloc = yyalloc;
--	    else
--	      {
--		yymsg = yymsgbuf;
--		yymsg_alloc = sizeof yymsgbuf;
--	      }
--	  }
--
--	if (0 < yysize && yysize <= yymsg_alloc)
--	  {
--	    (void) yysyntax_error (yymsg, yystate, yychar);
--	    yyerror (yymsg);
--	  }
--	else
--	  {
--	    yyerror (YY_("syntax error"));
--	    if (yysize != 0)
--	      goto yyexhaustedlab;
--	  }
-+        char const *yymsgp = YY_("syntax error");
-+        int yysyntax_error_status;
-+        yysyntax_error_status = YYSYNTAX_ERROR;
-+        if (yysyntax_error_status == 0)
-+          yymsgp = yymsg;
-+        else if (yysyntax_error_status == 1)
-+          {
-+            if (yymsg != yymsgbuf)
-+              YYSTACK_FREE (yymsg);
-+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-+            if (!yymsg)
-+              {
-+                yymsg = yymsgbuf;
-+                yymsg_alloc = sizeof yymsgbuf;
-+                yysyntax_error_status = 2;
-+              }
-+            else
-+              {
-+                yysyntax_error_status = YYSYNTAX_ERROR;
-+                yymsgp = yymsg;
-+              }
-+          }
-+        yyerror (yymsgp);
-+        if (yysyntax_error_status == 2)
-+          goto yyexhaustedlab;
-       }
-+# undef YYSYNTAX_ERROR
- #endif
-     }
- 
-@@ -3284,7 +3328,7 @@
-   for (;;)
-     {
-       yyn = yypact[yystate];
--      if (yyn != YYPACT_NINF)
-+      if (!yypact_value_is_default (yyn))
- 	{
- 	  yyn += YYTERROR;
- 	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-@@ -3343,8 +3387,13 @@
- 
- yyreturn:
-   if (yychar != YYEMPTY)
--     yydestruct ("Cleanup: discarding lookahead",
--		 yytoken, &yylval);
-+    {
-+      /* Make sure we have latest lookahead translation.  See comments at
-+         user semantic actions for why this is necessary.  */
-+      yytoken = YYTRANSLATE (yychar);
-+      yydestruct ("Cleanup: discarding lookahead",
-+                  yytoken, &yylval);
-+    }
-   /* Do not reclaim the symbols of the rule which action triggered
-      this YYABORT or YYACCEPT.  */
-   YYPOPSTACK (yylen);
-@@ -3369,7 +3418,7 @@
- 
- 
- 
--/* Line 1675 of yacc.c  */
-+/* Line 2067 of yacc.c  */
- #line 707 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
- 
- 
-
---- a/kdev-pg/kdev-pg-parser.hh
-+++ b/kdev-pg/kdev-pg-parser.hh
-@@ -1,10 +1,8 @@
-+/* A Bison parser, made by GNU Bison 2.5.  */
- 
--/* A Bison parser, made by GNU Bison 2.4.1.  */
--
--/* Skeleton interface for Bison's Yacc-like parsers in C
-+/* Bison interface for Yacc-like parsers in C
-    
--      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
--   Free Software Foundation, Inc.
-+      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
-    
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -115,7 +113,7 @@
- typedef union YYSTYPE
- {
- 
--/* Line 1676 of yacc.c  */
-+/* Line 2068 of yacc.c  */
- #line 49 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
- 
-     KDevPG::Model::Node *item;
-@@ -128,8 +126,8 @@
- 
- 
- 
--/* Line 1676 of yacc.c  */
--#line 133 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.hh"
-+/* Line 2068 of yacc.c  */
-+#line 131 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.hh"
- } YYSTYPE;
- # define YYSTYPE_IS_TRIVIAL 1
- # define yystype YYSTYPE /* obsolescent; will be withdrawn */
-
-From: Milian Wolff <mail at milianw.de>
-Date: Thu, 29 Nov 2012 14:56:40 +0000
-Subject: fix some warnings
-X-Git-Url: http://quickgit.kde.org/?p=kdevelop-pg-qt.git&a=commitdiff&h=ac587957cd0cabbc668604507e2cfebb6810ed09
----
-fix some warnings
----
-
-
---- a/kdev-pg/kdev-pg-code-gen.cpp
-+++ b/kdev-pg/kdev-pg-code-gen.cpp
-@@ -51,7 +51,7 @@
- 
-   void generateCondition(const World::NodeSet& s, QTextStream& out)
-   {
--    if(s.size() == 0 || s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0)
-+    if(s.size() == 0 || (s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0))
-     {
-       out << "true /*epsilon*/";
-       return;
-
---- a/kdev-pg/kdev-pg-lexer.ll
-+++ b/kdev-pg/kdev-pg-lexer.ll
-@@ -425,7 +425,7 @@
-   strcpy(yyTextLine+currentOffset, yytext + (yymoreFlag ? lastTextLeng : 0)); /* append current */
-   /* strcpy is faster than strcat */
-   
--  Q_ASSERT(strlen(yyTextLine) < yyTextLineLeng);
-+  Q_ASSERT(strlen(yyTextLine) < size_t(yyTextLineLeng));
-   
-   lastTextLeng = strlen(yytext);
-   yymoreFlag = false;
-
---- a/kdev-pg/kdev-pg-parser.yy
-+++ b/kdev-pg/kdev-pg-parser.yy
-@@ -309,7 +309,7 @@
-     | T_CONTINUE {
-         r = "\nlxCONTINUE;\n";
-       }
--    | /* empty */ { r = "\nlxSKIP\n" }
-+    | /* empty */ { r = "\nlxSKIP\n"; }
-     ;
- 
- regexp
-
-From: Jonathan Schmidt-Dominé <git at the-user.org>
-Date: Thu, 29 Nov 2012 15:02:28 +0000
-Subject: updated generated files
-X-Git-Url: http://quickgit.kde.org/?p=kdevelop-pg-qt.git&a=commitdiff&h=97e140477e7247ec8c823cdc54500b5691d9a896
----
-updated generated files
----
-
-
---- a/kdev-pg/kdev-pg-lexer.cc
-+++ b/kdev-pg/kdev-pg-lexer.cc
-@@ -3423,7 +3423,7 @@
-   strcpy(yyTextLine+currentOffset, yytext + (yymoreFlag ? lastTextLeng : 0)); /* append current */
-   /* strcpy is faster than strcat */
-   
--  Q_ASSERT(strlen(yyTextLine) < yyTextLineLeng);
-+  Q_ASSERT(strlen(yyTextLine) < size_t(yyTextLineLeng));
-   
-   lastTextLeng = strlen(yytext);
-   yymoreFlag = false;
-
---- a/kdev-pg/kdev-pg-parser.cc
-+++ b/kdev-pg/kdev-pg-parser.cc
-@@ -2192,7 +2192,7 @@
- 
- /* Line 1806 of yacc.c  */
- #line 312 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
--    { r = "\nlxSKIP\n" ;}
-+    { r = "\nlxSKIP\n"; }
-     break;
- 
-   case 50:
-



More information about the arch-commits mailing list