Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kdevelop-pg-qt/patches/kdevelop-pg-qt-1.0.0-bison25.patch

    Contents of /trunk/kdevelop-pg-qt/patches/kdevelop-pg-qt-1.0.0-bison25.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2542 - (show annotations) (download)
    Wed Feb 18 09:55:07 2015 UTC (9 years, 2 months ago) by niro
    File size: 87196 byte(s) 
    -fix build with bison-2.5
    1 From: Jonathan Schmidt-Dominé <git@the-user.org>
    2 Date: Mon, 29 Oct 2012 17:13:56 +0000
    3 Subject: Updated generated files.
    4 X-Git-Url: http://quickgit.kde.org/?p=kdevelop-pg-qt.git&a=commitdiff&h=a045f1060153318d5664bd3c68a3fb38cb3a7a56
    5 ---
    6 Updated generated files.
    7 ---
    8
    9
    10 --- a/kdev-pg/kdev-pg-parser.cc
    11 +++ b/kdev-pg/kdev-pg-parser.cc
    12 @@ -1,10 +1,8 @@
    13 -
    14 -/* A Bison parser, made by GNU Bison 2.4.1. */
    15 -
    16 -/* Skeleton implementation for Bison's Yacc-like parsers in C
    17 +/* A Bison parser, made by GNU Bison 2.5. */
    18 +
    19 +/* Bison implementation for Yacc-like parsers in C
    20
    21 - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    22 - Free Software Foundation, Inc.
    23 + Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
    24
    25 This program is free software: you can redistribute it and/or modify
    26 it under the terms of the GNU General Public License as published by
    27 @@ -46,7 +44,7 @@
    28 #define YYBISON 1
    29
    30 /* Bison version. */
    31 -#define YYBISON_VERSION "2.4.1"
    32 +#define YYBISON_VERSION "2.5"
    33
    34 /* Skeleton name. */
    35 #define YYSKELETON_NAME "yacc.c"
    36 @@ -67,7 +65,7 @@
    37
    38 /* Copy the first part of user declarations. */
    39
    40 -/* Line 189 of yacc.c */
    41 +/* Line 268 of yacc.c */
    42 #line 2 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    43
    44 /* This file is part of kdev-pg-qt
    45 @@ -116,8 +114,8 @@
    46
    47
    48
    49 -/* Line 189 of yacc.c */
    50 -#line 121 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
    51 +/* Line 268 of yacc.c */
    52 +#line 119 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
    53
    54 /* Enabling traces. */
    55 #ifndef YYDEBUG
    56 @@ -220,7 +218,7 @@
    57 typedef union YYSTYPE
    58 {
    59
    60 -/* Line 214 of yacc.c */
    61 +/* Line 293 of yacc.c */
    62 #line 49 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    63
    64 KDevPG::Model::Node *item;
    65 @@ -233,8 +231,8 @@
    66
    67
    68
    69 -/* Line 214 of yacc.c */
    70 -#line 238 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
    71 +/* Line 293 of yacc.c */
    72 +#line 236 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
    73 } YYSTYPE;
    74 # define YYSTYPE_IS_TRIVIAL 1
    75 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
    76 @@ -245,8 +243,8 @@
    77 /* Copy the second part of user declarations. */
    78
    79
    80 -/* Line 264 of yacc.c */
    81 -#line 250 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
    82 +/* Line 343 of yacc.c */
    83 +#line 248 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
    84
    85 #ifdef short
    86 # undef short
    87 @@ -296,7 +294,7 @@
    88 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
    89
    90 #ifndef YY_
    91 -# if YYENABLE_NLS
    92 +# if defined YYENABLE_NLS && YYENABLE_NLS
    93 # if ENABLE_NLS
    94 # include <libintl.h> /* INFRINGES ON USER NAME SPACE */
    95 # define YY_(msgid) dgettext ("bison-runtime", msgid)
    96 @@ -349,11 +347,11 @@
    97 # define alloca _alloca
    98 # else
    99 # define YYSTACK_ALLOC alloca
    100 -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
    101 +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
    102 || defined __cplusplus || defined _MSC_VER)
    103 # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
    104 -# ifndef _STDLIB_H
    105 -# define _STDLIB_H 1
    106 +# ifndef EXIT_SUCCESS
    107 +# define EXIT_SUCCESS 0
    108 # endif
    109 # endif
    110 # endif
    111 @@ -376,24 +374,24 @@
    112 # ifndef YYSTACK_ALLOC_MAXIMUM
    113 # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
    114 # endif
    115 -# if (defined __cplusplus && ! defined _STDLIB_H \
    116 +# if (defined __cplusplus && ! defined EXIT_SUCCESS \
    117 && ! ((defined YYMALLOC || defined malloc) \
    118 && (defined YYFREE || defined free)))
    119 # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
    120 -# ifndef _STDLIB_H
    121 -# define _STDLIB_H 1
    122 +# ifndef EXIT_SUCCESS
    123 +# define EXIT_SUCCESS 0
    124 # endif
    125 # endif
    126 # ifndef YYMALLOC
    127 # define YYMALLOC malloc
    128 -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
    129 +# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
    130 || defined __cplusplus || defined _MSC_VER)
    131 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
    132 # endif
    133 # endif
    134 # ifndef YYFREE
    135 # define YYFREE free
    136 -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
    137 +# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
    138 || defined __cplusplus || defined _MSC_VER)
    139 void free (void *); /* INFRINGES ON USER NAME SPACE */
    140 # endif
    141 @@ -422,6 +420,27 @@
    142 ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
    143 + YYSTACK_GAP_MAXIMUM)
    144
    145 +# define YYCOPY_NEEDED 1
    146 +
    147 +/* Relocate STACK from its old location to the new one. The
    148 + local variables YYSIZE and YYSTACKSIZE give the old and new number of
    149 + elements in the stack, and YYPTR gives the new location of the
    150 + stack. Advance YYPTR to a properly aligned location for the next
    151 + stack. */
    152 +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
    153 + do \
    154 + { \
    155 + YYSIZE_T yynewbytes; \
    156 + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
    157 + Stack = &yyptr->Stack_alloc; \
    158 + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
    159 + yyptr += yynewbytes / sizeof (*yyptr); \
    160 + } \
    161 + while (YYID (0))
    162 +
    163 +#endif
    164 +
    165 +#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
    166 /* Copy COUNT objects from FROM to TO. The source and destination do
    167 not overlap. */
    168 # ifndef YYCOPY
    169 @@ -439,24 +458,7 @@
    170 while (YYID (0))
    171 # endif
    172 # endif
    173 -
    174 -/* Relocate STACK from its old location to the new one. The
    175 - local variables YYSIZE and YYSTACKSIZE give the old and new number of
    176 - elements in the stack, and YYPTR gives the new location of the
    177 - stack. Advance YYPTR to a properly aligned location for the next
    178 - stack. */
    179 -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
    180 - do \
    181 - { \
    182 - YYSIZE_T yynewbytes; \
    183 - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
    184 - Stack = &yyptr->Stack_alloc; \
    185 - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
    186 - yyptr += yynewbytes / sizeof (*yyptr); \
    187 - } \
    188 - while (YYID (0))
    189 -
    190 -#endif
    191 +#endif /* !YYCOPY_NEEDED */
    192
    193 /* YYFINAL -- State number of the termination state. */
    194 #define YYFINAL 4
    195 @@ -734,8 +736,8 @@
    196 5, 7, 6, 0, 1, 1, 1, 1, 1
    197 };
    198
    199 -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
    200 - STATE-NUM when YYTABLE doesn't specify something else to do. Zero
    201 +/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
    202 + Performed when YYTABLE doesn't specify something else to do. Zero
    203 means the default is an error. */
    204 static const yytype_uint8 yydefact[] =
    205 {
    206 @@ -842,8 +844,7 @@
    207
    208 /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
    209 positive, shift that token. If negative, reduce the rule which
    210 - number is the opposite. If zero, do what YYDEFACT says.
    211 - If YYTABLE_NINF, syntax error. */
    212 + number is the opposite. If YYTABLE_NINF, syntax error. */
    213 #define YYTABLE_NINF -145
    214 static const yytype_int16 yytable[] =
    215 {
    216 @@ -889,6 +890,12 @@
    217 254, 194, 193, 199, 273
    218 };
    219
    220 +#define yypact_value_is_default(yystate) \
    221 + ((yystate) == (-258))
    222 +
    223 +#define yytable_value_is_error(yytable_value) \
    224 + YYID (0)
    225 +
    226 static const yytype_uint16 yycheck[] =
    227 {
    228 53, 74, 99, 106, 84, 5, 0, 3, 9, 3,
    229 @@ -986,9 +993,18 @@
    230
    231 /* Like YYERROR except do call yyerror. This remains here temporarily
    232 to ease the transition to the new meaning of YYERROR, for GCC.
    233 - Once GCC version 2 has supplanted version 1, this can go. */
    234 + Once GCC version 2 has supplanted version 1, this can go. However,
    235 + YYFAIL appears to be in use. Nevertheless, it is formally deprecated
    236 + in Bison 2.4.2's NEWS entry, where a plan to phase it out is
    237 + discussed. */
    238
    239 #define YYFAIL goto yyerrlab
    240 +#if defined YYFAIL
    241 + /* This is here to suppress warnings from the GCC cpp's
    242 + -Wunused-macros. Normally we don't worry about that warning, but
    243 + some users do, and we want to make it easy for users to remove
    244 + YYFAIL uses, which will produce warnings from Bison 2.5. */
    245 +#endif
    246
    247 #define YYRECOVERING() (!!yyerrstatus)
    248
    249 @@ -998,7 +1014,6 @@
    250 { \
    251 yychar = (Token); \
    252 yylval = (Value); \
    253 - yytoken = YYTRANSLATE (yychar); \
    254 YYPOPSTACK (1); \
    255 goto yybackup; \
    256 } \
    257 @@ -1040,19 +1055,10 @@
    258 #endif
    259
    260
    261 -/* YY_LOCATION_PRINT -- Print the location on the stream.
    262 - This macro was not mandated originally: define only if we know
    263 - we won't break user code: when these are the locations we know. */
    264 +/* This macro is provided for backward compatibility. */
    265
    266 #ifndef YY_LOCATION_PRINT
    267 -# if YYLTYPE_IS_TRIVIAL
    268 -# define YY_LOCATION_PRINT(File, Loc) \
    269 - fprintf (File, "%d.%d-%d.%d", \
    270 - (Loc).first_line, (Loc).first_column, \
    271 - (Loc).last_line, (Loc).last_column)
    272 -# else
    273 -# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
    274 -# endif
    275 +# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
    276 #endif
    277
    278
    279 @@ -1244,7 +1250,6 @@
    280 # define YYMAXDEPTH 10000
    281 #endif
    282
    283 -
    284
    285 #if YYERROR_VERBOSE
    286
    287 @@ -1347,115 +1352,142 @@
    288 }
    289 # endif
    290
    291 -/* Copy into YYRESULT an error message about the unexpected token
    292 - YYCHAR while in state YYSTATE. Return the number of bytes copied,
    293 - including the terminating null byte. If YYRESULT is null, do not
    294 - copy anything; just return the number of bytes that would be
    295 - copied. As a special case, return 0 if an ordinary "syntax error"
    296 - message will do. Return YYSIZE_MAXIMUM if overflow occurs during
    297 - size calculation. */
    298 -static YYSIZE_T
    299 -yysyntax_error (char *yyresult, int yystate, int yychar)
    300 +/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
    301 + about the unexpected token YYTOKEN for the state stack whose top is
    302 + YYSSP.
    303 +
    304 + Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is
    305 + not large enough to hold the message. In that case, also set
    306 + *YYMSG_ALLOC to the required number of bytes. Return 2 if the
    307 + required number of bytes is too large to store. */
    308 +static int
    309 +yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
    310 + yytype_int16 *yyssp, int yytoken)
    311 {
    312 - int yyn = yypact[yystate];
    313 -
    314 - if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
    315 - return 0;
    316 - else
    317 - {
    318 - int yytype = YYTRANSLATE (yychar);
    319 - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
    320 - YYSIZE_T yysize = yysize0;
    321 - YYSIZE_T yysize1;
    322 - int yysize_overflow = 0;
    323 - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
    324 - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
    325 - int yyx;
    326 -
    327 -# if 0
    328 - /* This is so xgettext sees the translatable formats that are
    329 - constructed on the fly. */
    330 - YY_("syntax error, unexpected %s");
    331 - YY_("syntax error, unexpected %s, expecting %s");
    332 - YY_("syntax error, unexpected %s, expecting %s or %s");
    333 - YY_("syntax error, unexpected %s, expecting %s or %s or %s");
    334 - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
    335 -# endif
    336 - char *yyfmt;
    337 - char const *yyf;
    338 - static char const yyunexpected[] = "syntax error, unexpected %s";
    339 - static char const yyexpecting[] = ", expecting %s";
    340 - static char const yyor[] = " or %s";
    341 - char yyformat[sizeof yyunexpected
    342 - + sizeof yyexpecting - 1
    343 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
    344 - * (sizeof yyor - 1))];
    345 - char const *yyprefix = yyexpecting;
    346 -
    347 - /* Start YYX at -YYN if negative to avoid negative indexes in
    348 - YYCHECK. */
    349 - int yyxbegin = yyn < 0 ? -yyn : 0;
    350 -
    351 - /* Stay within bounds of both yycheck and yytname. */
    352 - int yychecklim = YYLAST - yyn + 1;
    353 - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
    354 - int yycount = 1;
    355 -
    356 - yyarg[0] = yytname[yytype];
    357 - yyfmt = yystpcpy (yyformat, yyunexpected);
    358 -
    359 - for (yyx = yyxbegin; yyx < yyxend; ++yyx)
    360 - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
    361 - {
    362 - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
    363 - {
    364 - yycount = 1;
    365 - yysize = yysize0;
    366 - yyformat[sizeof yyunexpected - 1] = '\0';
    367 - break;
    368 - }
    369 - yyarg[yycount++] = yytname[yyx];
    370 - yysize1 = yysize + yytnamerr (0, yytname[yyx]);
    371 - yysize_overflow |= (yysize1 < yysize);
    372 - yysize = yysize1;
    373 - yyfmt = yystpcpy (yyfmt, yyprefix);
    374 - yyprefix = yyor;
    375 - }
    376 -
    377 - yyf = YY_(yyformat);
    378 - yysize1 = yysize + yystrlen (yyf);
    379 - yysize_overflow |= (yysize1 < yysize);
    380 - yysize = yysize1;
    381 -
    382 - if (yysize_overflow)
    383 - return YYSIZE_MAXIMUM;
    384 -
    385 - if (yyresult)
    386 - {
    387 - /* Avoid sprintf, as that infringes on the user's name space.
    388 - Don't have undefined behavior even if the translation
    389 - produced a string with the wrong number of "%s"s. */
    390 - char *yyp = yyresult;
    391 - int yyi = 0;
    392 - while ((*yyp = *yyf) != '\0')
    393 - {
    394 - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
    395 - {
    396 - yyp += yytnamerr (yyp, yyarg[yyi++]);
    397 - yyf += 2;
    398 - }
    399 - else
    400 - {
    401 - yyp++;
    402 - yyf++;
    403 - }
    404 - }
    405 - }
    406 - return yysize;
    407 + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
    408 + YYSIZE_T yysize = yysize0;
    409 + YYSIZE_T yysize1;
    410 + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
    411 + /* Internationalized format string. */
    412 + const char *yyformat = 0;
    413 + /* Arguments of yyformat. */
    414 + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
    415 + /* Number of reported tokens (one for the "unexpected", one per
    416 + "expected"). */
    417 + int yycount = 0;
    418 +
    419 + /* There are many possibilities here to consider:
    420 + - Assume YYFAIL is not used. It's too flawed to consider. See
    421 + <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
    422 + for details. YYERROR is fine as it does not invoke this
    423 + function.
    424 + - If this state is a consistent state with a default action, then
    425 + the only way this function was invoked is if the default action
    426 + is an error action. In that case, don't check for expected
    427 + tokens because there are none.
    428 + - The only way there can be no lookahead present (in yychar) is if
    429 + this state is a consistent state with a default action. Thus,
    430 + detecting the absence of a lookahead is sufficient to determine
    431 + that there is no unexpected or expected token to report. In that
    432 + case, just report a simple "syntax error".
    433 + - Don't assume there isn't a lookahead just because this state is a
    434 + consistent state with a default action. There might have been a
    435 + previous inconsistent state, consistent state with a non-default
    436 + action, or user semantic action that manipulated yychar.
    437 + - Of course, the expected token list depends on states to have
    438 + correct lookahead information, and it depends on the parser not
    439 + to perform extra reductions after fetching a lookahead from the
    440 + scanner and before detecting a syntax error. Thus, state merging
    441 + (from LALR or IELR) and default reductions corrupt the expected
    442 + token list. However, the list is correct for canonical LR with
    443 + one exception: it will still contain any token that will not be
    444 + accepted due to an error action in a later state.
    445 + */
    446 + if (yytoken != YYEMPTY)
    447 + {
    448 + int yyn = yypact[*yyssp];
    449 + yyarg[yycount++] = yytname[yytoken];
    450 + if (!yypact_value_is_default (yyn))
    451 + {
    452 + /* Start YYX at -YYN if negative to avoid negative indexes in
    453 + YYCHECK. In other words, skip the first -YYN actions for
    454 + this state because they are default actions. */
    455 + int yyxbegin = yyn < 0 ? -yyn : 0;
    456 + /* Stay within bounds of both yycheck and yytname. */
    457 + int yychecklim = YYLAST - yyn + 1;
    458 + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
    459 + int yyx;
    460 +
    461 + for (yyx = yyxbegin; yyx < yyxend; ++yyx)
    462 + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
    463 + && !yytable_value_is_error (yytable[yyx + yyn]))
    464 + {
    465 + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
    466 + {
    467 + yycount = 1;
    468 + yysize = yysize0;
    469 + break;
    470 + }
    471 + yyarg[yycount++] = yytname[yyx];
    472 + yysize1 = yysize + yytnamerr (0, yytname[yyx]);
    473 + if (! (yysize <= yysize1
    474 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
    475 + return 2;
    476 + yysize = yysize1;
    477 + }
    478 + }
    479 }
    480 +
    481 + switch (yycount)
    482 + {
    483 +# define YYCASE_(N, S) \
    484 + case N: \
    485 + yyformat = S; \
    486 + break
    487 + YYCASE_(0, YY_("syntax error"));
    488 + YYCASE_(1, YY_("syntax error, unexpected %s"));
    489 + YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
    490 + YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
    491 + YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
    492 + YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
    493 +# undef YYCASE_
    494 + }
    495 +
    496 + yysize1 = yysize + yystrlen (yyformat);
    497 + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
    498 + return 2;
    499 + yysize = yysize1;
    500 +
    501 + if (*yymsg_alloc < yysize)
    502 + {
    503 + *yymsg_alloc = 2 * yysize;
    504 + if (! (yysize <= *yymsg_alloc
    505 + && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
    506 + *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
    507 + return 1;
    508 + }
    509 +
    510 + /* Avoid sprintf, as that infringes on the user's name space.
    511 + Don't have undefined behavior even if the translation
    512 + produced a string with the wrong number of "%s"s. */
    513 + {
    514 + char *yyp = *yymsg;
    515 + int yyi = 0;
    516 + while ((*yyp = *yyformat) != '\0')
    517 + if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
    518 + {
    519 + yyp += yytnamerr (yyp, yyarg[yyi++]);
    520 + yyformat += 2;
    521 + }
    522 + else
    523 + {
    524 + yyp++;
    525 + yyformat++;
    526 + }
    527 + }
    528 + return 0;
    529 }
    530 #endif /* YYERROR_VERBOSE */
    531 -
    532
    533 /*-----------------------------------------------.
    534 | Release the memory associated to this symbol. |
    535 @@ -1488,6 +1520,7 @@
    536 }
    537 }
    538
    539 +
    540 /* Prevent warnings from -Wmissing-prototypes. */
    541 #ifdef YYPARSE_PARAM
    542 #if defined __STDC__ || defined __cplusplus
    543 @@ -1514,10 +1547,9 @@
    544 int yynerrs;
    545
    546
    547 -
    548 -/*-------------------------.
    549 -| yyparse or yypush_parse. |
    550 -`-------------------------*/
    551 +/*----------.
    552 +| yyparse. |
    553 +`----------*/
    554
    555 #ifdef YYPARSE_PARAM
    556 #if (defined __STDC__ || defined __C99__FUNC__ \
    557 @@ -1541,8 +1573,6 @@
    558 #endif
    559 #endif
    560 {
    561 -
    562 -
    563 int yystate;
    564 /* Number of tokens to shift before error messages enabled. */
    565 int yyerrstatus;
    566 @@ -1697,7 +1727,7 @@
    567
    568 /* First try to decide what to do without reference to lookahead token. */
    569 yyn = yypact[yystate];
    570 - if (yyn == YYPACT_NINF)
    571 + if (yypact_value_is_default (yyn))
    572 goto yydefault;
    573
    574 /* Not known => get a lookahead token if don't already have one. */
    575 @@ -1728,8 +1758,8 @@
    576 yyn = yytable[yyn];
    577 if (yyn <= 0)
    578 {
    579 - if (yyn == 0 || yyn == YYTABLE_NINF)
    580 - goto yyerrlab;
    581 + if (yytable_value_is_error (yyn))
    582 + goto yyerrlab;
    583 yyn = -yyn;
    584 goto yyreduce;
    585 }
    586 @@ -1784,49 +1814,49 @@
    587 {
    588 case 2:
    589
    590 -/* Line 1455 of yacc.c */
    591 +/* Line 1806 of yacc.c */
    592 #line 94 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    593 - { KDevPG::globalSystem.decl = (yyvsp[(1) - (1)].str); ;}
    594 + { KDevPG::globalSystem.decl = (yyvsp[(1) - (1)].str); }
    595 break;
    596
    597 case 3:
    598
    599 -/* Line 1455 of yacc.c */
    600 +/* Line 1806 of yacc.c */
    601 #line 97 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    602 - { KDevPG::globalSystem.bits += (yyvsp[(5) - (5)].str); ;}
    603 + { KDevPG::globalSystem.bits += (yyvsp[(5) - (5)].str); }
    604 break;
    605
    606 case 6:
    607
    608 -/* Line 1455 of yacc.c */
    609 +/* Line 1806 of yacc.c */
    610 #line 107 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    611 - { KDevPG::globalSystem.pushParserClassMember((yyvsp[(2) - (2)].item)); ;}
    612 + { KDevPG::globalSystem.pushParserClassMember((yyvsp[(2) - (2)].item)); }
    613 break;
    614
    615 case 7:
    616
    617 -/* Line 1455 of yacc.c */
    618 +/* Line 1806 of yacc.c */
    619 #line 109 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    620 - { KDevPG::globalSystem.bits += (yyvsp[(5) - (5)].str); ;}
    621 + { KDevPG::globalSystem.bits += (yyvsp[(5) - (5)].str); }
    622 break;
    623
    624 case 8:
    625
    626 -/* Line 1455 of yacc.c */
    627 +/* Line 1806 of yacc.c */
    628 #line 111 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    629 - { KDevPG::globalSystem.pushLexerClassMember((yyvsp[(2) - (2)].item)); ;}
    630 + { KDevPG::globalSystem.pushLexerClassMember((yyvsp[(2) - (2)].item)); }
    631 break;
    632
    633 case 9:
    634
    635 -/* Line 1455 of yacc.c */
    636 +/* Line 1806 of yacc.c */
    637 #line 113 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    638 - { KDevPG::globalSystem.lexerBits += (yyvsp[(5) - (5)].str); ;}
    639 + { KDevPG::globalSystem.lexerBits += (yyvsp[(5) - (5)].str); }
    640 break;
    641
    642 case 11:
    643
    644 -/* Line 1455 of yacc.c */
    645 +/* Line 1806 of yacc.c */
    646 #line 116 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    647 { if(KDevPG::globalSystem.hasLexer)
    648 { KDevPG::checkOut << "** ERROR you have to specify the lexer-type (%table_lexer) before any lexer rules"; exit(-1); }
    649 @@ -1840,12 +1870,12 @@
    650 /* case KDevPG::SUcs4: KDevPG::GDFA::type = KDevPG::TUcs4; break; */
    651 default: /* empty */;
    652 }
    653 - ;}
    654 + }
    655 break;
    656
    657 case 12:
    658
    659 -/* Line 1455 of yacc.c */
    660 +/* Line 1806 of yacc.c */
    661 #line 130 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    662 { if(KDevPG::globalSystem.hasLexer)
    663 { KDevPG::checkOut << "** ERROR you have to specify the lexer-type (%sequence_lexer) before any lexer rules"; exit(-1); }
    664 @@ -1859,12 +1889,12 @@
    665 /* case KDevPG::TUcs4: KDevPG::GDFA::type = KDevPG::SUcs4; break; */
    666 default: /* empty */;
    667 }
    668 - ;}
    669 + }
    670 break;
    671
    672 case 13:
    673
    674 -/* Line 1455 of yacc.c */
    675 +/* Line 1806 of yacc.c */
    676 #line 144 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    677 {
    678 if(KDevPG::globalSystem.hasLexer)
    679 @@ -1891,132 +1921,132 @@
    680 exit(-1);
    681 }
    682 KDevPG::GDFA::type = KDevPG::AutomatonType(base);
    683 - ;}
    684 + }
    685 break;
    686
    687 case 14:
    688
    689 -/* Line 1455 of yacc.c */
    690 +/* Line 1806 of yacc.c */
    691 #line 171 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    692 - { KDevPG::globalSystem.tokenStream = (yyvsp[(2) - (3)].str); ;}
    693 + { KDevPG::globalSystem.tokenStream = (yyvsp[(2) - (3)].str); }
    694 break;
    695
    696 case 15:
    697
    698 -/* Line 1455 of yacc.c */
    699 +/* Line 1806 of yacc.c */
    700 #line 173 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    701 - { KDevPG::globalSystem.exportMacro = (yyvsp[(2) - (2)].str); ;}
    702 + { KDevPG::globalSystem.exportMacro = (yyvsp[(2) - (2)].str); }
    703 break;
    704
    705 case 16:
    706
    707 -/* Line 1455 of yacc.c */
    708 +/* Line 1806 of yacc.c */
    709 #line 175 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    710 - { KDevPG::globalSystem.exportMacroHeader = (yyvsp[(2) - (2)].str); ;}
    711 + { KDevPG::globalSystem.exportMacroHeader = (yyvsp[(2) - (2)].str); }
    712 break;
    713
    714 case 17:
    715
    716 -/* Line 1455 of yacc.c */
    717 +/* Line 1806 of yacc.c */
    718 #line 177 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    719 - { KDevPG::globalSystem.namespaceCode = (yyvsp[(2) - (2)].str); ;}
    720 + { KDevPG::globalSystem.namespaceCode = (yyvsp[(2) - (2)].str); }
    721 break;
    722
    723 case 18:
    724
    725 -/* Line 1455 of yacc.c */
    726 +/* Line 1806 of yacc.c */
    727 #line 179 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    728 - { KDevPG::globalSystem.astCode = (yyvsp[(2) - (2)].str); ;}
    729 + { KDevPG::globalSystem.astCode = (yyvsp[(2) - (2)].str); }
    730 break;
    731
    732 case 19:
    733
    734 -/* Line 1455 of yacc.c */
    735 +/* Line 1806 of yacc.c */
    736 #line 181 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    737 - { KDevPG::globalSystem.pushParserDeclarationHeader((yyvsp[(2) - (2)].str)); ;}
    738 + { KDevPG::globalSystem.pushParserDeclarationHeader((yyvsp[(2) - (2)].str)); }
    739 break;
    740
    741 case 20:
    742
    743 -/* Line 1455 of yacc.c */
    744 +/* Line 1806 of yacc.c */
    745 #line 183 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    746 - { KDevPG::globalSystem.pushParserBitsHeader((yyvsp[(2) - (2)].str)); ;}
    747 + { KDevPG::globalSystem.pushParserBitsHeader((yyvsp[(2) - (2)].str)); }
    748 break;
    749
    750 case 21:
    751
    752 -/* Line 1455 of yacc.c */
    753 +/* Line 1806 of yacc.c */
    754 #line 185 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    755 - { KDevPG::globalSystem.pushAstHeader((yyvsp[(2) - (2)].str)); ;}
    756 + { KDevPG::globalSystem.pushAstHeader((yyvsp[(2) - (2)].str)); }
    757 break;
    758
    759 case 22:
    760
    761 -/* Line 1455 of yacc.c */
    762 +/* Line 1806 of yacc.c */
    763 #line 187 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    764 - { KDevPG::globalSystem.pushLexerDeclarationHeader((yyvsp[(2) - (2)].str)); ;}
    765 + { KDevPG::globalSystem.pushLexerDeclarationHeader((yyvsp[(2) - (2)].str)); }
    766 break;
    767
    768 case 23:
    769
    770 -/* Line 1455 of yacc.c */
    771 +/* Line 1806 of yacc.c */
    772 #line 189 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    773 - { KDevPG::globalSystem.inputStream = (yyvsp[(2) - (2)].str); ;}
    774 + { KDevPG::globalSystem.inputStream = (yyvsp[(2) - (2)].str); }
    775 break;
    776
    777 case 24:
    778
    779 -/* Line 1455 of yacc.c */
    780 +/* Line 1806 of yacc.c */
    781 #line 191 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    782 - { KDevPG::globalSystem.pushLexerBitsHeader((yyvsp[(2) - (2)].str)); ;}
    783 + { KDevPG::globalSystem.pushLexerBitsHeader((yyvsp[(2) - (2)].str)); }
    784 break;
    785
    786 case 25:
    787
    788 -/* Line 1455 of yacc.c */
    789 +/* Line 1806 of yacc.c */
    790 #line 193 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    791 - { KDevPG::globalSystem.astBaseClasses[(yyvsp[(2) - (3)].str)] = (yyvsp[(3) - (3)].str); ;}
    792 + { KDevPG::globalSystem.astBaseClasses[(yyvsp[(2) - (3)].str)] = (yyvsp[(3) - (3)].str); }
    793 break;
    794
    795 case 26:
    796
    797 -/* Line 1455 of yacc.c */
    798 +/* Line 1806 of yacc.c */
    799 #line 195 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    800 - { KDevPG::globalSystem.parserBaseClass = (yyvsp[(2) - (2)].str); ;}
    801 + { KDevPG::globalSystem.parserBaseClass = (yyvsp[(2) - (2)].str); }
    802 break;
    803
    804 case 27:
    805
    806 -/* Line 1455 of yacc.c */
    807 +/* Line 1806 of yacc.c */
    808 #line 197 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    809 - { KDevPG::globalSystem.lexerBaseClass = (yyvsp[(2) - (2)].str); ;}
    810 + { KDevPG::globalSystem.lexerBaseClass = (yyvsp[(2) - (2)].str); }
    811 break;
    812
    813 case 28:
    814
    815 -/* Line 1455 of yacc.c */
    816 +/* Line 1806 of yacc.c */
    817 #line 198 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    818 - { 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);"); ;}
    819 + { 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);"); }
    820 break;
    821
    822 case 30:
    823
    824 -/* Line 1455 of yacc.c */
    825 +/* Line 1806 of yacc.c */
    826 #line 199 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    827 - { KDevPG::globalSystem.hasLexer = true; KDevPG::loadUnicodeData(); lexerEnv = "start"; if(KDevPG::globalSystem.lexerActions["start"].empty()) KDevPG::globalSystem.lexerActions["start"].push_back("qDebug() << \"error\"; exit(-1);"); ;}
    828 + { KDevPG::globalSystem.hasLexer = true; KDevPG::loadUnicodeData(); lexerEnv = "start"; if(KDevPG::globalSystem.lexerActions["start"].empty()) KDevPG::globalSystem.lexerActions["start"].push_back("qDebug() << \"error\"; exit(-1);"); }
    829 break;
    830
    831 case 32:
    832
    833 -/* Line 1455 of yacc.c */
    834 +/* Line 1806 of yacc.c */
    835 #line 204 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    836 { KDevPG::globalSystem.regexpById[(yyvsp[(3) - (4)].str)] = (yyvsp[(1) - (4)].nfa);
    837 - ;}
    838 + }
    839 break;
    840
    841 case 34:
    842
    843 -/* Line 1455 of yacc.c */
    844 +/* Line 1806 of yacc.c */
    845 #line 207 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    846 {
    847 if((yyvsp[(1) - (4)].nfa)->acceptsEpsilon())
    848 @@ -2026,12 +2056,12 @@
    849 QString s = QString((yyvsp[(2) - (4)].str)) + QString(r);
    850 KDevPG::globalSystem.lexerEnvs[lexerEnv].push_back((yyvsp[(1) - (4)].nfa));
    851 KDevPG::globalSystem.lexerActions[lexerEnv].push_back(s);
    852 - ;}
    853 + }
    854 break;
    855
    856 case 36:
    857
    858 -/* Line 1455 of yacc.c */
    859 +/* Line 1806 of yacc.c */
    860 #line 217 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    861 {
    862 if((yyvsp[(1) - (8)].nfa)->acceptsEpsilon())
    863 @@ -2063,12 +2093,12 @@
    864 KDevPG::globalSystem.lexerEnvs[lexerEnv].push_back((yyvsp[(1) - (8)].nfa));
    865 KDevPG::globalSystem.lexerActions[lexerEnv].push_back(s);
    866 }
    867 - ;}
    868 + }
    869 break;
    870
    871 case 38:
    872
    873 -/* Line 1455 of yacc.c */
    874 +/* Line 1806 of yacc.c */
    875 #line 249 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    876 {
    877 if((yyvsp[(1) - (8)].nfa)->acceptsEpsilon())
    878 @@ -2110,211 +2140,211 @@
    879 KDevPG::globalSystem.lexerEnvs[lexerEnv].push_back((yyvsp[(1) - (8)].nfa));
    880 KDevPG::globalSystem.lexerActions[lexerEnv].push_back(s);
    881 }
    882 - ;}
    883 + }
    884 break;
    885
    886 case 40:
    887
    888 -/* Line 1455 of yacc.c */
    889 +/* Line 1806 of yacc.c */
    890 #line 291 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    891 {
    892 KDevPG::globalSystem.lexerActions[lexerEnv][0] = QString((yyvsp[(2) - (2)].str));
    893 - ;}
    894 + }
    895 break;
    896
    897 case 42:
    898
    899 -/* Line 1455 of yacc.c */
    900 +/* Line 1806 of yacc.c */
    901 #line 295 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    902 {
    903 KDevPG::globalSystem.enteringCode[lexerEnv] = QString((yyvsp[(2) - (2)].str));
    904 - ;}
    905 + }
    906 break;
    907
    908 case 44:
    909
    910 -/* Line 1455 of yacc.c */
    911 +/* Line 1806 of yacc.c */
    912 #line 299 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    913 {
    914 KDevPG::globalSystem.leavingCode[lexerEnv] = QString((yyvsp[(2) - (2)].str));
    915 - ;}
    916 + }
    917 break;
    918
    919 case 47:
    920
    921 -/* Line 1455 of yacc.c */
    922 +/* Line 1806 of yacc.c */
    923 #line 306 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    924 {
    925 r = "\nlxRETURN(" + QString((yyvsp[(1) - (1)].str)) + ")\n";
    926 - ;}
    927 + }
    928 break;
    929
    930 case 48:
    931
    932 -/* Line 1455 of yacc.c */
    933 +/* Line 1806 of yacc.c */
    934 #line 309 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    935 {
    936 r = "\nlxCONTINUE;\n";
    937 - ;}
    938 + }
    939 break;
    940
    941 case 49:
    942
    943 -/* Line 1455 of yacc.c */
    944 +/* Line 1806 of yacc.c */
    945 #line 312 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    946 { r = "\nlxSKIP\n" ;}
    947 break;
    948
    949 case 50:
    950
    951 -/* Line 1455 of yacc.c */
    952 +/* Line 1806 of yacc.c */
    953 #line 316 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    954 - { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa) |= *(yyvsp[(3) - (3)].nfa)); delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); ;}
    955 + { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa) |= *(yyvsp[(3) - (3)].nfa)); delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); }
    956 break;
    957
    958 case 51:
    959
    960 -/* Line 1455 of yacc.c */
    961 +/* Line 1806 of yacc.c */
    962 #line 317 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    963 - { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
    964 + { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
    965 break;
    966
    967 case 52:
    968
    969 -/* Line 1455 of yacc.c */
    970 +/* Line 1806 of yacc.c */
    971 #line 321 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    972 - { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa) &= *(yyvsp[(3) - (3)].nfa)); delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); ;}
    973 + { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa) &= *(yyvsp[(3) - (3)].nfa)); delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); }
    974 break;
    975
    976 case 53:
    977
    978 -/* Line 1455 of yacc.c */
    979 +/* Line 1806 of yacc.c */
    980 #line 322 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    981 - { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
    982 + { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
    983 break;
    984
    985 case 54:
    986
    987 -/* Line 1455 of yacc.c */
    988 +/* Line 1806 of yacc.c */
    989 #line 326 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    990 - { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa) ^= *(yyvsp[(3) - (3)].nfa)); delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); ;}
    991 + { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa) ^= *(yyvsp[(3) - (3)].nfa)); delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); }
    992 break;
    993
    994 case 55:
    995
    996 -/* Line 1455 of yacc.c */
    997 +/* Line 1806 of yacc.c */
    998 #line 327 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    999 - { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
    1000 + { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
    1001 break;
    1002
    1003 case 56:
    1004
    1005 -/* Line 1455 of yacc.c */
    1006 +/* Line 1806 of yacc.c */
    1007 #line 331 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1008 - { (yyval.nfa) = new KDevPG::GNFA((yyvsp[(2) - (2)].nfa)->negate()); delete (yyvsp[(2) - (2)].nfa); ;}
    1009 + { (yyval.nfa) = new KDevPG::GNFA((yyvsp[(2) - (2)].nfa)->negate()); delete (yyvsp[(2) - (2)].nfa); }
    1010 break;
    1011
    1012 case 57:
    1013
    1014 -/* Line 1455 of yacc.c */
    1015 +/* Line 1806 of yacc.c */
    1016 #line 332 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1017 - { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (2)].nfa) |= KDevPG::GNFA::emptyWord()); delete (yyvsp[(2) - (2)].nfa); ;}
    1018 + { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (2)].nfa) |= KDevPG::GNFA::emptyWord()); delete (yyvsp[(2) - (2)].nfa); }
    1019 break;
    1020
    1021 case 58:
    1022
    1023 -/* Line 1455 of yacc.c */
    1024 +/* Line 1806 of yacc.c */
    1025 #line 333 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1026 - { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
    1027 + { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
    1028 break;
    1029
    1030 case 59:
    1031
    1032 -/* Line 1455 of yacc.c */
    1033 +/* Line 1806 of yacc.c */
    1034 #line 337 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1035 - { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (2)].nfa) <<= *(yyvsp[(2) - (2)].nfa)); delete (yyvsp[(1) - (2)].nfa); delete (yyvsp[(2) - (2)].nfa); ;}
    1036 + { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (2)].nfa) <<= *(yyvsp[(2) - (2)].nfa)); delete (yyvsp[(1) - (2)].nfa); delete (yyvsp[(2) - (2)].nfa); }
    1037 break;
    1038
    1039 case 60:
    1040
    1041 -/* Line 1455 of yacc.c */
    1042 +/* Line 1806 of yacc.c */
    1043 #line 338 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1044 - { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
    1045 + { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
    1046 break;
    1047
    1048 case 61:
    1049
    1050 -/* Line 1455 of yacc.c */
    1051 +/* Line 1806 of yacc.c */
    1052 #line 342 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1053 - { (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); ;}
    1054 + { (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); }
    1055 break;
    1056
    1057 case 62:
    1058
    1059 -/* Line 1455 of yacc.c */
    1060 +/* Line 1806 of yacc.c */
    1061 #line 343 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1062 - { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
    1063 + { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
    1064 break;
    1065
    1066 case 63:
    1067
    1068 -/* Line 1455 of yacc.c */
    1069 +/* Line 1806 of yacc.c */
    1070 #line 347 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1071 - { (yyval.nfa) = new KDevPG::GNFA(**(yyvsp[(1) - (2)].nfa)); delete (yyvsp[(1) - (2)].nfa); ;}
    1072 + { (yyval.nfa) = new KDevPG::GNFA(**(yyvsp[(1) - (2)].nfa)); delete (yyvsp[(1) - (2)].nfa); }
    1073 break;
    1074
    1075 case 64:
    1076
    1077 -/* Line 1455 of yacc.c */
    1078 +/* Line 1806 of yacc.c */
    1079 #line 348 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1080 - { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (2)].nfa)); **(yyval.nfa); *(yyval.nfa) <<= *(yyvsp[(1) - (2)].nfa); delete (yyvsp[(1) - (2)].nfa); ;}
    1081 + { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (2)].nfa)); **(yyval.nfa); *(yyval.nfa) <<= *(yyvsp[(1) - (2)].nfa); delete (yyvsp[(1) - (2)].nfa); }
    1082 break;
    1083
    1084 case 65:
    1085
    1086 -/* Line 1455 of yacc.c */
    1087 +/* Line 1806 of yacc.c */
    1088 #line 349 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1089 - { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
    1090 + { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
    1091 break;
    1092
    1093 case 66:
    1094
    1095 -/* Line 1455 of yacc.c */
    1096 +/* Line 1806 of yacc.c */
    1097 #line 353 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1098 - { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (3)].nfa)); delete (yyvsp[(2) - (3)].nfa); ;}
    1099 + { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (3)].nfa)); delete (yyvsp[(2) - (3)].nfa); }
    1100 break;
    1101
    1102 case 67:
    1103
    1104 -/* Line 1455 of yacc.c */
    1105 +/* Line 1806 of yacc.c */
    1106 #line 354 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1107 - { (yyval.nfa) = (yyvsp[(2) - (3)].nfa); ;}
    1108 + { (yyval.nfa) = (yyvsp[(2) - (3)].nfa); }
    1109 break;
    1110
    1111 case 68:
    1112
    1113 -/* Line 1455 of yacc.c */
    1114 +/* Line 1806 of yacc.c */
    1115 #line 355 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1116 - { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::anyChar()); ;}
    1117 + { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::anyChar()); }
    1118 break;
    1119
    1120 case 69:
    1121
    1122 -/* Line 1455 of yacc.c */
    1123 +/* Line 1806 of yacc.c */
    1124 #line 356 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1125 - { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::word(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); ;}
    1126 + { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::word(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); }
    1127 break;
    1128
    1129 case 70:
    1130
    1131 -/* Line 1455 of yacc.c */
    1132 +/* Line 1806 of yacc.c */
    1133 #line 357 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1134 - { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::word(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); ;}
    1135 + { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::word(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); }
    1136 break;
    1137
    1138 case 71:
    1139
    1140 -/* Line 1455 of yacc.c */
    1141 +/* Line 1806 of yacc.c */
    1142 #line 358 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1143 {
    1144 if(!KDevPG::globalSystem.regexpById.contains((yyvsp[(1) - (1)].str)))
    1145 @@ -2330,152 +2360,152 @@
    1146 *regexp = KDevPG::globalSystem.dfaForNfa[regexp]->nfa();
    1147 }
    1148 (yyval.nfa) = new KDevPG::GNFA(*regexp);
    1149 - ;}
    1150 + }
    1151 break;
    1152
    1153 case 72:
    1154
    1155 -/* Line 1455 of yacc.c */
    1156 +/* Line 1806 of yacc.c */
    1157 #line 373 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1158 - { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::emptyWord()); ;}
    1159 + { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::emptyWord()); }
    1160 break;
    1161
    1162 case 73:
    1163
    1164 -/* Line 1455 of yacc.c */
    1165 +/* Line 1806 of yacc.c */
    1166 #line 377 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1167 - { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa) |= *(yyvsp[(3) - (3)].nfa)); delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); ;}
    1168 + { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa) |= *(yyvsp[(3) - (3)].nfa)); delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); }
    1169 break;
    1170
    1171 case 74:
    1172
    1173 -/* Line 1455 of yacc.c */
    1174 +/* Line 1806 of yacc.c */
    1175 #line 378 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1176 - { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
    1177 + { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
    1178 break;
    1179
    1180 case 75:
    1181
    1182 -/* Line 1455 of yacc.c */
    1183 +/* Line 1806 of yacc.c */
    1184 #line 382 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1185 - { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa) &= *(yyvsp[(3) - (3)].nfa)); delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); ;}
    1186 + { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa) &= *(yyvsp[(3) - (3)].nfa)); delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); }
    1187 break;
    1188
    1189 case 76:
    1190
    1191 -/* Line 1455 of yacc.c */
    1192 +/* Line 1806 of yacc.c */
    1193 #line 383 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1194 - { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
    1195 + { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
    1196 break;
    1197
    1198 case 77:
    1199
    1200 -/* Line 1455 of yacc.c */
    1201 +/* Line 1806 of yacc.c */
    1202 #line 387 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1203 - { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa) ^= *(yyvsp[(3) - (3)].nfa)); delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); ;}
    1204 + { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (3)].nfa) ^= *(yyvsp[(3) - (3)].nfa)); delete (yyvsp[(1) - (3)].nfa); delete (yyvsp[(3) - (3)].nfa); }
    1205 break;
    1206
    1207 case 78:
    1208
    1209 -/* Line 1455 of yacc.c */
    1210 +/* Line 1806 of yacc.c */
    1211 #line 388 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1212 - { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
    1213 + { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
    1214 break;
    1215
    1216 case 79:
    1217
    1218 -/* Line 1455 of yacc.c */
    1219 +/* Line 1806 of yacc.c */
    1220 #line 392 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1221 - { (yyval.nfa) = new KDevPG::GNFA((yyvsp[(2) - (2)].nfa)->negate()); delete (yyvsp[(2) - (2)].nfa); ;}
    1222 + { (yyval.nfa) = new KDevPG::GNFA((yyvsp[(2) - (2)].nfa)->negate()); delete (yyvsp[(2) - (2)].nfa); }
    1223 break;
    1224
    1225 case 80:
    1226
    1227 -/* Line 1455 of yacc.c */
    1228 +/* Line 1806 of yacc.c */
    1229 #line 393 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1230 - { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (2)].nfa) |= KDevPG::GNFA::emptyWord()); delete (yyvsp[(2) - (2)].nfa); ;}
    1231 + { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (2)].nfa) |= KDevPG::GNFA::emptyWord()); delete (yyvsp[(2) - (2)].nfa); }
    1232 break;
    1233
    1234 case 81:
    1235
    1236 -/* Line 1455 of yacc.c */
    1237 +/* Line 1806 of yacc.c */
    1238 #line 394 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1239 - { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
    1240 + { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
    1241 break;
    1242
    1243 case 82:
    1244
    1245 -/* Line 1455 of yacc.c */
    1246 +/* Line 1806 of yacc.c */
    1247 #line 398 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1248 - { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (2)].nfa) |= *(yyvsp[(2) - (2)].nfa)); delete (yyvsp[(1) - (2)].nfa); delete (yyvsp[(2) - (2)].nfa); ;}
    1249 + { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (2)].nfa) |= *(yyvsp[(2) - (2)].nfa)); delete (yyvsp[(1) - (2)].nfa); delete (yyvsp[(2) - (2)].nfa); }
    1250 break;
    1251
    1252 case 84:
    1253
    1254 -/* Line 1455 of yacc.c */
    1255 +/* Line 1806 of yacc.c */
    1256 #line 403 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1257 - { (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); ;}
    1258 + { (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); }
    1259 break;
    1260
    1261 case 85:
    1262
    1263 -/* Line 1455 of yacc.c */
    1264 +/* Line 1806 of yacc.c */
    1265 #line 404 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1266 - { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
    1267 + { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
    1268 break;
    1269
    1270 case 86:
    1271
    1272 -/* Line 1455 of yacc.c */
    1273 +/* Line 1806 of yacc.c */
    1274 #line 408 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1275 - { (yyval.nfa) = new KDevPG::GNFA(**(yyvsp[(1) - (2)].nfa)); delete (yyvsp[(1) - (2)].nfa); ;}
    1276 + { (yyval.nfa) = new KDevPG::GNFA(**(yyvsp[(1) - (2)].nfa)); delete (yyvsp[(1) - (2)].nfa); }
    1277 break;
    1278
    1279 case 87:
    1280
    1281 -/* Line 1455 of yacc.c */
    1282 +/* Line 1806 of yacc.c */
    1283 #line 409 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1284 - { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (2)].nfa)); **(yyval.nfa); *(yyval.nfa) <<= *(yyvsp[(1) - (2)].nfa); delete (yyvsp[(1) - (2)].nfa); ;}
    1285 + { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(1) - (2)].nfa)); **(yyval.nfa); *(yyval.nfa) <<= *(yyvsp[(1) - (2)].nfa); delete (yyvsp[(1) - (2)].nfa); }
    1286 break;
    1287
    1288 case 88:
    1289
    1290 -/* Line 1455 of yacc.c */
    1291 +/* Line 1806 of yacc.c */
    1292 #line 410 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1293 - { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); ;}
    1294 + { (yyval.nfa) = (yyvsp[(1) - (1)].nfa); }
    1295 break;
    1296
    1297 case 89:
    1298
    1299 -/* Line 1455 of yacc.c */
    1300 +/* Line 1806 of yacc.c */
    1301 #line 414 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1302 - { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (3)].nfa)); delete (yyvsp[(2) - (3)].nfa); ;}
    1303 + { (yyval.nfa) = new KDevPG::GNFA(*(yyvsp[(2) - (3)].nfa)); delete (yyvsp[(2) - (3)].nfa); }
    1304 break;
    1305
    1306 case 90:
    1307
    1308 -/* Line 1455 of yacc.c */
    1309 +/* Line 1806 of yacc.c */
    1310 #line 415 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1311 - { (yyval.nfa) = (yyvsp[(2) - (3)].nfa); ;}
    1312 + { (yyval.nfa) = (yyvsp[(2) - (3)].nfa); }
    1313 break;
    1314
    1315 case 91:
    1316
    1317 -/* Line 1455 of yacc.c */
    1318 +/* Line 1806 of yacc.c */
    1319 #line 416 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1320 - { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::anyChar()); ;}
    1321 + { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::anyChar()); }
    1322 break;
    1323
    1324 case 92:
    1325
    1326 -/* Line 1455 of yacc.c */
    1327 +/* Line 1806 of yacc.c */
    1328 #line 417 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1329 - { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::word(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); ;}
    1330 + { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::word(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); }
    1331 break;
    1332
    1333 case 93:
    1334
    1335 -/* Line 1455 of yacc.c */
    1336 +/* Line 1806 of yacc.c */
    1337 #line 418 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1338 {
    1339 quint32 begin, end;
    1340 @@ -2499,19 +2529,19 @@
    1341 end = QChar::surrogateToUcs4(str[3], str[4]);
    1342 }
    1343 (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::range(begin, end+1));
    1344 - ;}
    1345 + }
    1346 break;
    1347
    1348 case 94:
    1349
    1350 -/* Line 1455 of yacc.c */
    1351 +/* Line 1806 of yacc.c */
    1352 #line 441 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1353 - { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::collection(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); ;}
    1354 + { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::collection(KDevPG::unescaped(QByteArray((yyvsp[(1) - (1)].str))))); }
    1355 break;
    1356
    1357 case 95:
    1358
    1359 -/* Line 1455 of yacc.c */
    1360 +/* Line 1806 of yacc.c */
    1361 #line 442 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1362 {
    1363 if(!KDevPG::globalSystem.regexpById.contains((yyvsp[(1) - (1)].str)))
    1364 @@ -2527,335 +2557,335 @@
    1365 *regexp = KDevPG::globalSystem.dfaForNfa[regexp]->nfa();
    1366 }
    1367 (yyval.nfa) = new KDevPG::GNFA(*regexp);
    1368 - ;}
    1369 + }
    1370 break;
    1371
    1372 case 96:
    1373
    1374 -/* Line 1455 of yacc.c */
    1375 +/* Line 1806 of yacc.c */
    1376 #line 457 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1377 - { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::emptyWord()); ;}
    1378 + { (yyval.nfa) = new KDevPG::GNFA(KDevPG::GNFA::emptyWord()); }
    1379 break;
    1380
    1381 case 97:
    1382
    1383 -/* Line 1455 of yacc.c */
    1384 +/* Line 1806 of yacc.c */
    1385 #line 463 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1386 - { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::PublicDeclaration, (yyvsp[(5) - (5)].str)); ;}
    1387 + { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::PublicDeclaration, (yyvsp[(5) - (5)].str)); }
    1388 break;
    1389
    1390 case 98:
    1391
    1392 -/* Line 1455 of yacc.c */
    1393 +/* Line 1806 of yacc.c */
    1394 #line 465 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1395 - { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::ProtectedDeclaration, (yyvsp[(5) - (5)].str)); ;}
    1396 + { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::ProtectedDeclaration, (yyvsp[(5) - (5)].str)); }
    1397 break;
    1398
    1399 case 99:
    1400
    1401 -/* Line 1455 of yacc.c */
    1402 +/* Line 1806 of yacc.c */
    1403 #line 467 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1404 - { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::PrivateDeclaration, (yyvsp[(5) - (5)].str)); ;}
    1405 + { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::PrivateDeclaration, (yyvsp[(5) - (5)].str)); }
    1406 break;
    1407
    1408 case 100:
    1409
    1410 -/* Line 1455 of yacc.c */
    1411 +/* Line 1806 of yacc.c */
    1412 #line 469 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1413 - { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::ConstructorCode, (yyvsp[(4) - (4)].str)); ;}
    1414 + { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::ConstructorCode, (yyvsp[(4) - (4)].str)); }
    1415 break;
    1416
    1417 case 101:
    1418
    1419 -/* Line 1455 of yacc.c */
    1420 +/* Line 1806 of yacc.c */
    1421 #line 471 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1422 - { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::DestructorCode, (yyvsp[(4) - (4)].str)); ;}
    1423 + { (yyval.item) = KDevPG::member(KDevPG::Settings::MemberItem::DestructorCode, (yyvsp[(4) - (4)].str)); }
    1424 break;
    1425
    1426 case 102:
    1427
    1428 -/* Line 1455 of yacc.c */
    1429 +/* Line 1806 of yacc.c */
    1430 #line 475 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1431 - { KDevPG::globalSystem.pushTerminal((yyvsp[(1) - (1)].str),(yyvsp[(1) - (1)].str)); ;}
    1432 + { KDevPG::globalSystem.pushTerminal((yyvsp[(1) - (1)].str),(yyvsp[(1) - (1)].str)); }
    1433 break;
    1434
    1435 case 103:
    1436
    1437 -/* Line 1455 of yacc.c */
    1438 +/* Line 1806 of yacc.c */
    1439 #line 476 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1440 - { KDevPG::globalSystem.pushTerminal((yyvsp[(1) - (4)].str),(yyvsp[(3) - (4)].str)); ;}
    1441 + { KDevPG::globalSystem.pushTerminal((yyvsp[(1) - (4)].str),(yyvsp[(3) - (4)].str)); }
    1442 break;
    1443
    1444 case 104:
    1445
    1446 -/* Line 1455 of yacc.c */
    1447 +/* Line 1806 of yacc.c */
    1448 #line 477 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1449 - { KDevPG::globalSystem.pushTerminal((yyvsp[(3) - (3)].str),(yyvsp[(3) - (3)].str)); ;}
    1450 + { KDevPG::globalSystem.pushTerminal((yyvsp[(3) - (3)].str),(yyvsp[(3) - (3)].str)); }
    1451 break;
    1452
    1453 case 105:
    1454
    1455 -/* Line 1455 of yacc.c */
    1456 +/* Line 1806 of yacc.c */
    1457 #line 479 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1458 - { KDevPG::globalSystem.pushTerminal((yyvsp[(3) - (6)].str),(yyvsp[(5) - (6)].str)); ;}
    1459 + { KDevPG::globalSystem.pushTerminal((yyvsp[(3) - (6)].str),(yyvsp[(5) - (6)].str)); }
    1460 break;
    1461
    1462 case 107:
    1463
    1464 -/* Line 1455 of yacc.c */
    1465 +/* Line 1806 of yacc.c */
    1466 #line 484 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1467 - { KDevPG::globalSystem.pushRule((yyvsp[(2) - (3)].item)); ;}
    1468 + { KDevPG::globalSystem.pushRule((yyvsp[(2) - (3)].item)); }
    1469 break;
    1470
    1471 case 108:
    1472
    1473 -/* Line 1455 of yacc.c */
    1474 +/* Line 1806 of yacc.c */
    1475 #line 488 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1476 - { (yyval.item) = KDevPG::globalSystem.zero(); ;}
    1477 + { (yyval.item) = KDevPG::globalSystem.zero(); }
    1478 break;
    1479
    1480 case 109:
    1481
    1482 -/* Line 1455 of yacc.c */
    1483 +/* Line 1806 of yacc.c */
    1484 #line 489 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1485 - { (yyval.item) = (yyvsp[(2) - (3)].item); ;}
    1486 + { (yyval.item) = (yyvsp[(2) - (3)].item); }
    1487 break;
    1488
    1489 case 110:
    1490
    1491 -/* Line 1455 of yacc.c */
    1492 +/* Line 1806 of yacc.c */
    1493 #line 490 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1494 - { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
    1495 + { (yyval.item) = (yyvsp[(1) - (1)].item); }
    1496 break;
    1497
    1498 case 111:
    1499
    1500 -/* Line 1455 of yacc.c */
    1501 +/* Line 1806 of yacc.c */
    1502 #line 491 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1503 - { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
    1504 + { (yyval.item) = (yyvsp[(1) - (1)].item); }
    1505 break;
    1506
    1507 case 112:
    1508
    1509 -/* Line 1455 of yacc.c */
    1510 +/* Line 1806 of yacc.c */
    1511 #line 492 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1512 - { (yyval.item) = KDevPG::inlinedNonTerminal(KDevPG::globalSystem.pushSymbol((yyvsp[(2) - (2)].str))); ;}
    1513 + { (yyval.item) = KDevPG::inlinedNonTerminal(KDevPG::globalSystem.pushSymbol((yyvsp[(2) - (2)].str))); }
    1514 break;
    1515
    1516 case 113:
    1517
    1518 -/* Line 1455 of yacc.c */
    1519 +/* Line 1806 of yacc.c */
    1520 #line 493 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1521 - { (yyval.item) = KDevPG::annotation((yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].item), false, (yyvsp[(2) - (3)].storageType)); ;}
    1522 + { (yyval.item) = KDevPG::annotation((yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].item), false, (yyvsp[(2) - (3)].storageType)); }
    1523 break;
    1524
    1525 case 114:
    1526
    1527 -/* Line 1455 of yacc.c */
    1528 +/* Line 1806 of yacc.c */
    1529 #line 494 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1530 - { (yyval.item) = KDevPG::annotation((yyvsp[(2) - (4)].str), (yyvsp[(4) - (4)].item), true, (yyvsp[(3) - (4)].storageType)); ;}
    1531 + { (yyval.item) = KDevPG::annotation((yyvsp[(2) - (4)].str), (yyvsp[(4) - (4)].item), true, (yyvsp[(3) - (4)].storageType)); }
    1532 break;
    1533
    1534 case 115:
    1535
    1536 -/* Line 1455 of yacc.c */
    1537 +/* Line 1806 of yacc.c */
    1538 #line 498 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1539 - { (yyval.item) = KDevPG::nonTerminal(KDevPG::globalSystem.pushSymbol((yyvsp[(1) - (2)].str)), (yyvsp[(2) - (2)].str)); ;}
    1540 + { (yyval.item) = KDevPG::nonTerminal(KDevPG::globalSystem.pushSymbol((yyvsp[(1) - (2)].str)), (yyvsp[(2) - (2)].str)); }
    1541 break;
    1542
    1543 case 116:
    1544
    1545 -/* Line 1455 of yacc.c */
    1546 +/* Line 1806 of yacc.c */
    1547 #line 499 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1548 - { (yyval.item) = KDevPG::globalSystem.terminal((yyvsp[(1) - (1)].str)); ;}
    1549 + { (yyval.item) = KDevPG::globalSystem.terminal((yyvsp[(1) - (1)].str)); }
    1550 break;
    1551
    1552 case 117:
    1553
    1554 -/* Line 1455 of yacc.c */
    1555 +/* Line 1806 of yacc.c */
    1556 #line 504 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1557 {
    1558 KDevPG::globalSystem.needStateManagement = true;
    1559 (yyval.item) = KDevPG::tryCatch((yyvsp[(3) - (4)].item), 0);
    1560 - ;}
    1561 + }
    1562 break;
    1563
    1564 case 118:
    1565
    1566 -/* Line 1455 of yacc.c */
    1567 +/* Line 1806 of yacc.c */
    1568 #line 509 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1569 {
    1570 KDevPG::globalSystem.needStateManagement = true;
    1571 (yyval.item) = KDevPG::tryCatch((yyvsp[(3) - (8)].item), (yyvsp[(7) - (8)].item));
    1572 - ;}
    1573 + }
    1574 break;
    1575
    1576 case 119:
    1577
    1578 -/* Line 1455 of yacc.c */
    1579 +/* Line 1806 of yacc.c */
    1580 #line 515 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1581 - { (yyval.str) = const_cast<char*>(""); ;}
    1582 + { (yyval.str) = const_cast<char*>(""); }
    1583 break;
    1584
    1585 case 120:
    1586
    1587 -/* Line 1455 of yacc.c */
    1588 +/* Line 1806 of yacc.c */
    1589 #line 516 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1590 - { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
    1591 + { (yyval.str) = (yyvsp[(1) - (1)].str); }
    1592 break;
    1593
    1594 case 121:
    1595
    1596 -/* Line 1455 of yacc.c */
    1597 +/* Line 1806 of yacc.c */
    1598 #line 520 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1599 - { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
    1600 + { (yyval.str) = (yyvsp[(1) - (1)].str); }
    1601 break;
    1602
    1603 case 122:
    1604
    1605 -/* Line 1455 of yacc.c */
    1606 +/* Line 1806 of yacc.c */
    1607 #line 530 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1608 - { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageAstMember; ;}
    1609 + { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageAstMember; }
    1610 break;
    1611
    1612 case 123:
    1613
    1614 -/* Line 1455 of yacc.c */
    1615 +/* Line 1806 of yacc.c */
    1616 #line 531 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1617 - { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageTemporary; ;}
    1618 + { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageTemporary; }
    1619 break;
    1620
    1621 case 124:
    1622
    1623 -/* Line 1455 of yacc.c */
    1624 +/* Line 1806 of yacc.c */
    1625 #line 535 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1626 - { (yyval.item) = KDevPG::plus((yyvsp[(1) - (2)].item)); ;}
    1627 + { (yyval.item) = KDevPG::plus((yyvsp[(1) - (2)].item)); }
    1628 break;
    1629
    1630 case 125:
    1631
    1632 -/* Line 1455 of yacc.c */
    1633 +/* Line 1806 of yacc.c */
    1634 #line 536 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1635 - { (yyval.item) = KDevPG::star((yyvsp[(1) - (2)].item)); ;}
    1636 + { (yyval.item) = KDevPG::star((yyvsp[(1) - (2)].item)); }
    1637 break;
    1638
    1639 case 126:
    1640
    1641 -/* Line 1455 of yacc.c */
    1642 +/* Line 1806 of yacc.c */
    1643 #line 537 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1644 - { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
    1645 + { (yyval.item) = (yyvsp[(1) - (1)].item); }
    1646 break;
    1647
    1648 case 127:
    1649
    1650 -/* Line 1455 of yacc.c */
    1651 +/* Line 1806 of yacc.c */
    1652 #line 538 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1653 - { (yyval.item) = KDevPG::alternative((yyvsp[(2) - (2)].item), KDevPG::globalSystem.zero()); ;}
    1654 + { (yyval.item) = KDevPG::alternative((yyvsp[(2) - (2)].item), KDevPG::globalSystem.zero()); }
    1655 break;
    1656
    1657 case 128:
    1658
    1659 -/* Line 1455 of yacc.c */
    1660 +/* Line 1806 of yacc.c */
    1661 #line 542 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1662 - { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
    1663 + { (yyval.item) = (yyvsp[(1) - (1)].item); }
    1664 break;
    1665
    1666 case 129:
    1667
    1668 -/* Line 1455 of yacc.c */
    1669 +/* Line 1806 of yacc.c */
    1670 #line 544 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1671 {
    1672 KDevPG::CloneTree cl;
    1673 (yyval.item) = KDevPG::cons((yyvsp[(1) - (3)].item), KDevPG::star(KDevPG::cons(cl.clone((yyvsp[(3) - (3)].item)), cl.clone((yyvsp[(1) - (3)].item)))));
    1674 - ;}
    1675 + }
    1676 break;
    1677
    1678 case 130:
    1679
    1680 -/* Line 1455 of yacc.c */
    1681 +/* Line 1806 of yacc.c */
    1682 #line 548 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1683 - { (yyval.item) = KDevPG::action((yyvsp[(1) - (2)].item), (yyvsp[(2) - (2)].str)); ;}
    1684 + { (yyval.item) = KDevPG::action((yyvsp[(1) - (2)].item), (yyvsp[(2) - (2)].str)); }
    1685 break;
    1686
    1687 case 131:
    1688
    1689 -/* Line 1455 of yacc.c */
    1690 +/* Line 1806 of yacc.c */
    1691 #line 549 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1692 - { (yyval.item) = KDevPG::action(0, (yyvsp[(1) - (1)].str)); ;}
    1693 + { (yyval.item) = KDevPG::action(0, (yyvsp[(1) - (1)].str)); }
    1694 break;
    1695
    1696 case 132:
    1697
    1698 -/* Line 1455 of yacc.c */
    1699 +/* Line 1806 of yacc.c */
    1700 #line 553 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1701 - { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
    1702 + { (yyval.item) = (yyvsp[(1) - (1)].item); }
    1703 break;
    1704
    1705 case 133:
    1706
    1707 -/* Line 1455 of yacc.c */
    1708 +/* Line 1806 of yacc.c */
    1709 #line 554 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1710 - { (yyval.item) = KDevPG::cons((yyvsp[(1) - (2)].item), (yyvsp[(2) - (2)].item)); ;}
    1711 + { (yyval.item) = KDevPG::cons((yyvsp[(1) - (2)].item), (yyvsp[(2) - (2)].item)); }
    1712 break;
    1713
    1714 case 134:
    1715
    1716 -/* Line 1455 of yacc.c */
    1717 +/* Line 1806 of yacc.c */
    1718 #line 558 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1719 - { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
    1720 + { (yyval.item) = (yyvsp[(1) - (1)].item); }
    1721 break;
    1722
    1723 case 135:
    1724
    1725 -/* Line 1455 of yacc.c */
    1726 +/* Line 1806 of yacc.c */
    1727 #line 559 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1728 - { (yyval.item) = KDevPG::condition((yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].item)); ;}
    1729 + { (yyval.item) = KDevPG::condition((yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].item)); }
    1730 break;
    1731
    1732 case 136:
    1733
    1734 -/* Line 1455 of yacc.c */
    1735 +/* Line 1806 of yacc.c */
    1736 #line 563 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1737 - { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
    1738 + { (yyval.item) = (yyvsp[(1) - (1)].item); }
    1739 break;
    1740
    1741 case 137:
    1742
    1743 -/* Line 1455 of yacc.c */
    1744 +/* Line 1806 of yacc.c */
    1745 #line 564 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1746 - { (yyval.item) = KDevPG::alternative((yyvsp[(1) - (3)].item), (yyvsp[(3) - (3)].item)); ;}
    1747 + { (yyval.item) = KDevPG::alternative((yyvsp[(1) - (3)].item), (yyvsp[(3) - (3)].item)); }
    1748 break;
    1749
    1750 case 138:
    1751
    1752 -/* Line 1455 of yacc.c */
    1753 +/* Line 1806 of yacc.c */
    1754 #line 569 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1755 {
    1756 (yyval.item) = KDevPG::evolve((yyvsp[(1) - (7)].item), KDevPG::globalSystem.pushSymbol((yyvsp[(3) - (7)].str)),
    1757 (KDevPG::Model::VariableDeclarationItem*) (yyvsp[(6) - (7)].item), (yyvsp[(4) - (7)].str));
    1758 - ;}
    1759 + }
    1760 break;
    1761
    1762 case 139:
    1763
    1764 -/* Line 1455 of yacc.c */
    1765 +/* Line 1806 of yacc.c */
    1766 #line 574 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1767 {
    1768 (yyval.item) = KDevPG::evolve((yyvsp[(1) - (7)].item), KDevPG::globalSystem.pushSymbol((yyvsp[(3) - (7)].str)),
    1769 (KDevPG::Model::VariableDeclarationItem*) (yyvsp[(5) - (7)].item), (yyvsp[(7) - (7)].str));
    1770 - ;}
    1771 + }
    1772 break;
    1773
    1774 case 140:
    1775
    1776 -/* Line 1455 of yacc.c */
    1777 +/* Line 1806 of yacc.c */
    1778 #line 579 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1779 - { (yyval.item) = KDevPG::evolve((yyvsp[(1) - (4)].item), KDevPG::globalSystem.pushSymbol((yyvsp[(3) - (4)].str)), 0, (yyvsp[(4) - (4)].str)); ;}
    1780 + { (yyval.item) = KDevPG::evolve((yyvsp[(1) - (4)].item), KDevPG::globalSystem.pushSymbol((yyvsp[(3) - (4)].str)), 0, (yyvsp[(4) - (4)].str)); }
    1781 break;
    1782
    1783 case 141:
    1784
    1785 -/* Line 1455 of yacc.c */
    1786 +/* Line 1806 of yacc.c */
    1787 #line 580 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1788 { if(KDevPG::globalSystem.generateAst == false)
    1789 {
    1790 @@ -2863,40 +2893,40 @@
    1791 exit(-1);
    1792 }
    1793 operatorNode = KDevPG::createNode<KDevPG::Model::OperatorItem>();
    1794 - ;}
    1795 + }
    1796 break;
    1797
    1798 case 142:
    1799
    1800 -/* Line 1455 of yacc.c */
    1801 +/* Line 1806 of yacc.c */
    1802 #line 586 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1803 - { KDevPG::globalSystem.needOperatorStack = true; (yyval.item) = (yyvsp[(2) - (2)].item); ;}
    1804 + { KDevPG::globalSystem.needOperatorStack = true; (yyval.item) = (yyvsp[(2) - (2)].item); }
    1805 break;
    1806
    1807 case 143:
    1808
    1809 -/* Line 1455 of yacc.c */
    1810 +/* Line 1806 of yacc.c */
    1811 #line 590 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1812 - { (yyval.str) = const_cast<char*>(""); ;}
    1813 + { (yyval.str) = const_cast<char*>(""); }
    1814 break;
    1815
    1816 case 144:
    1817
    1818 -/* Line 1455 of yacc.c */
    1819 +/* Line 1806 of yacc.c */
    1820 #line 591 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1821 - { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
    1822 + { (yyval.str) = (yyvsp[(1) - (1)].str); }
    1823 break;
    1824
    1825 case 146:
    1826
    1827 -/* Line 1455 of yacc.c */
    1828 +/* Line 1806 of yacc.c */
    1829 #line 597 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1830 - { ; ;}
    1831 + { ; }
    1832 break;
    1833
    1834 case 147:
    1835
    1836 -/* Line 1455 of yacc.c */
    1837 +/* Line 1806 of yacc.c */
    1838 #line 602 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1839 {
    1840 operatorNode->mBase = (KDevPG::Model::NonTerminalItem*)(yyvsp[(2) - (9)].item);
    1841 @@ -2904,12 +2934,12 @@
    1842 if(!KDevPG::globalSystem.astBaseClasses.contains(operatorNode->mBase->mSymbol->mName))
    1843 KDevPG::globalSystem.astBaseClasses[operatorNode->mBase->mSymbol->mName] = KDevPG::capitalized(operatorNode->mName) + "Ast";
    1844 (yyval.item) = KDevPG::evolve(operatorNode, KDevPG::globalSystem.pushSymbol((yyvsp[(5) - (9)].str)), (KDevPG::Model::VariableDeclarationItem*)(yyvsp[(7) - (9)].item), (yyvsp[(9) - (9)].str));
    1845 - ;}
    1846 + }
    1847 break;
    1848
    1849 case 148:
    1850
    1851 -/* Line 1455 of yacc.c */
    1852 +/* Line 1806 of yacc.c */
    1853 #line 610 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1854 {
    1855 operatorNode->mBase = (KDevPG::Model::NonTerminalItem*)(yyvsp[(2) - (9)].item);
    1856 @@ -2917,12 +2947,12 @@
    1857 if(!KDevPG::globalSystem.astBaseClasses.contains(operatorNode->mBase->mSymbol->mName))
    1858 KDevPG::globalSystem.astBaseClasses[operatorNode->mBase->mSymbol->mName] = KDevPG::capitalized(operatorNode->mName) + "Ast";
    1859 (yyval.item) = KDevPG::evolve(operatorNode, KDevPG::globalSystem.pushSymbol((yyvsp[(5) - (9)].str)), (KDevPG::Model::VariableDeclarationItem*)(yyvsp[(8) - (9)].item), (yyvsp[(6) - (9)].str));
    1860 - ;}
    1861 + }
    1862 break;
    1863
    1864 case 149:
    1865
    1866 -/* Line 1455 of yacc.c */
    1867 +/* Line 1806 of yacc.c */
    1868 #line 618 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1869 {
    1870 operatorNode->mBase = (KDevPG::Model::NonTerminalItem*)(yyvsp[(2) - (6)].item);
    1871 @@ -2930,89 +2960,89 @@
    1872 if(!KDevPG::globalSystem.astBaseClasses.contains(operatorNode->mBase->mSymbol->mName))
    1873 KDevPG::globalSystem.astBaseClasses[operatorNode->mBase->mSymbol->mName] = KDevPG::capitalized(operatorNode->mName) + "Ast";
    1874 (yyval.item) = KDevPG::evolve(operatorNode, KDevPG::globalSystem.pushSymbol((yyvsp[(5) - (6)].str)), 0, (yyvsp[(6) - (6)].str));
    1875 - ;}
    1876 + }
    1877 break;
    1878
    1879 case 150:
    1880
    1881 -/* Line 1455 of yacc.c */
    1882 +/* Line 1806 of yacc.c */
    1883 #line 628 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1884 - { operatorNode->pushBin(*(yyvsp[(2) - (4)].operatorInformation), (yyvsp[(4) - (4)].str), (yyvsp[(3) - (4)].str)); free((yyvsp[(2) - (4)].operatorInformation)); ;}
    1885 + { operatorNode->pushBin(*(yyvsp[(2) - (4)].operatorInformation), (yyvsp[(4) - (4)].str), (yyvsp[(3) - (4)].str)); free((yyvsp[(2) - (4)].operatorInformation)); }
    1886 break;
    1887
    1888 case 151:
    1889
    1890 -/* Line 1455 of yacc.c */
    1891 +/* Line 1806 of yacc.c */
    1892 #line 629 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1893 - { 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)); ;}
    1894 + { 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)); }
    1895 break;
    1896
    1897 case 152:
    1898
    1899 -/* Line 1455 of yacc.c */
    1900 +/* Line 1806 of yacc.c */
    1901 #line 630 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1902 - { operatorNode->pushPre(*(yyvsp[(2) - (3)].operatorInformation), (yyvsp[(3) - (3)].str)); free((yyvsp[(2) - (3)].operatorInformation)); ;}
    1903 + { operatorNode->pushPre(*(yyvsp[(2) - (3)].operatorInformation), (yyvsp[(3) - (3)].str)); free((yyvsp[(2) - (3)].operatorInformation)); }
    1904 break;
    1905
    1906 case 153:
    1907
    1908 -/* Line 1455 of yacc.c */
    1909 +/* Line 1806 of yacc.c */
    1910 #line 631 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1911 - { operatorNode->pushPost(*(yyvsp[(2) - (3)].operatorInformation), "0", (yyvsp[(3) - (3)].str)); free((yyvsp[(2) - (3)].operatorInformation)); free((yyvsp[(3) - (3)].str)); ;}
    1912 + { operatorNode->pushPost(*(yyvsp[(2) - (3)].operatorInformation), "0", (yyvsp[(3) - (3)].str)); free((yyvsp[(2) - (3)].operatorInformation)); free((yyvsp[(3) - (3)].str)); }
    1913 break;
    1914
    1915 case 154:
    1916
    1917 -/* Line 1455 of yacc.c */
    1918 +/* Line 1806 of yacc.c */
    1919 #line 632 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1920 - { operatorNode->pushPost(*(yyvsp[(2) - (4)].operatorInformation), (yyvsp[(4) - (4)].str), (yyvsp[(3) - (4)].str)); free((yyvsp[(2) - (4)].operatorInformation)); ;}
    1921 + { operatorNode->pushPost(*(yyvsp[(2) - (4)].operatorInformation), (yyvsp[(4) - (4)].str), (yyvsp[(3) - (4)].str)); free((yyvsp[(2) - (4)].operatorInformation)); }
    1922 break;
    1923
    1924 case 155:
    1925
    1926 -/* Line 1455 of yacc.c */
    1927 +/* Line 1806 of yacc.c */
    1928 #line 633 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1929 - { operatorNode->pushParen(*(yyvsp[(2) - (3)].operatorInformation), *(yyvsp[(3) - (3)].operatorInformation)); free((yyvsp[(2) - (3)].operatorInformation)); free((yyvsp[(3) - (3)].operatorInformation)); ;}
    1930 + { operatorNode->pushParen(*(yyvsp[(2) - (3)].operatorInformation), *(yyvsp[(3) - (3)].operatorInformation)); free((yyvsp[(2) - (3)].operatorInformation)); free((yyvsp[(3) - (3)].operatorInformation)); }
    1931 break;
    1932
    1933 case 156:
    1934
    1935 -/* Line 1455 of yacc.c */
    1936 +/* Line 1806 of yacc.c */
    1937 #line 637 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1938 - { (yyval.str) = (char*)"0"; ;}
    1939 + { (yyval.str) = (char*)"0"; }
    1940 break;
    1941
    1942 case 157:
    1943
    1944 -/* Line 1455 of yacc.c */
    1945 +/* Line 1806 of yacc.c */
    1946 #line 638 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1947 - { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
    1948 + { (yyval.str) = (yyvsp[(1) - (1)].str); }
    1949 break;
    1950
    1951 case 158:
    1952
    1953 -/* Line 1455 of yacc.c */
    1954 +/* Line 1806 of yacc.c */
    1955 #line 639 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1956 - { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
    1957 + { (yyval.str) = (yyvsp[(2) - (2)].str); }
    1958 break;
    1959
    1960 case 159:
    1961
    1962 -/* Line 1455 of yacc.c */
    1963 +/* Line 1806 of yacc.c */
    1964 #line 643 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1965 - { (yyval.str) = (char*)"1"; ;}
    1966 + { (yyval.str) = (char*)"1"; }
    1967 break;
    1968
    1969 case 160:
    1970
    1971 -/* Line 1455 of yacc.c */
    1972 +/* Line 1806 of yacc.c */
    1973 #line 644 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1974 - { (yyval.str) = (char*)"0"; ;}
    1975 + { (yyval.str) = (char*)"0"; }
    1976 break;
    1977
    1978 case 161:
    1979
    1980 -/* Line 1455 of yacc.c */
    1981 +/* Line 1806 of yacc.c */
    1982 #line 645 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1983 { uint yyleng = strlen((yyvsp[(2) - (2)].str));
    1984 char *tmp = (char*)calloc(yyleng+7, sizeof(char));
    1985 @@ -3020,12 +3050,12 @@
    1986 strcpy(tmp+1, (yyvsp[(2) - (2)].str));
    1987 strcpy(tmp+yyleng+6-6+1, "?1:0)");
    1988 (yyval.str) = tmp;
    1989 - ;}
    1990 + }
    1991 break;
    1992
    1993 case 162:
    1994
    1995 -/* Line 1455 of yacc.c */
    1996 +/* Line 1806 of yacc.c */
    1997 #line 652 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    1998 { uint yyleng = strlen((yyvsp[(2) - (2)].str));
    1999 char *tmp = (char*)calloc(yyleng+7, sizeof(char));
    2000 @@ -3033,47 +3063,47 @@
    2001 strcpy(tmp+1, (yyvsp[(2) - (2)].str));
    2002 strcpy(tmp+yyleng+6-6+1, "?0:1)");
    2003 (yyval.str) = tmp;
    2004 - ;}
    2005 + }
    2006 break;
    2007
    2008 case 163:
    2009
    2010 -/* Line 1455 of yacc.c */
    2011 +/* Line 1806 of yacc.c */
    2012 #line 662 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2013 - { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(3) - (4)].str)), (yyvsp[(2) - (4)].str), (yyvsp[(4) - (4)].str)); ;}
    2014 + { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(3) - (4)].str)), (yyvsp[(2) - (4)].str), (yyvsp[(4) - (4)].str)); }
    2015 break;
    2016
    2017 case 164:
    2018
    2019 -/* Line 1455 of yacc.c */
    2020 +/* Line 1806 of yacc.c */
    2021 #line 663 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2022 - { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(3) - (3)].str)), (yyvsp[(2) - (3)].str), ""); ;}
    2023 + { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(3) - (3)].str)), (yyvsp[(2) - (3)].str), ""); }
    2024 break;
    2025
    2026 case 165:
    2027
    2028 -/* Line 1455 of yacc.c */
    2029 +/* Line 1806 of yacc.c */
    2030 #line 664 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2031 - { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(1) - (2)].str)), "", (yyvsp[(2) - (2)].str)); ;}
    2032 + { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(1) - (2)].str)), "", (yyvsp[(2) - (2)].str)); }
    2033 break;
    2034
    2035 case 166:
    2036
    2037 -/* Line 1455 of yacc.c */
    2038 +/* Line 1806 of yacc.c */
    2039 #line 665 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2040 - { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(1) - (1)].str)), "", ""); ;}
    2041 + { (yyval.operatorInformation) = KDevPG::makeOperator(KDevPG::globalSystem.terminal((yyvsp[(1) - (1)].str)), "", ""); }
    2042 break;
    2043
    2044 case 167:
    2045
    2046 -/* Line 1455 of yacc.c */
    2047 +/* Line 1806 of yacc.c */
    2048 #line 669 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2049 - { (yyval.item) = (yyvsp[(1) - (1)].item); ;}
    2050 + { (yyval.item) = (yyvsp[(1) - (1)].item); }
    2051 break;
    2052
    2053 case 168:
    2054
    2055 -/* Line 1455 of yacc.c */
    2056 +/* Line 1806 of yacc.c */
    2057 #line 671 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2058 {
    2059 KDevPG::Model::VariableDeclarationItem *last = (KDevPG::Model::VariableDeclarationItem*) (yyvsp[(1) - (2)].item);
    2060 @@ -3082,85 +3112,96 @@
    2061 }
    2062 last->mNext = (KDevPG::Model::VariableDeclarationItem*) (yyvsp[(2) - (2)].item);
    2063 (yyval.item) = (yyvsp[(1) - (2)].item);
    2064 - ;}
    2065 + }
    2066 break;
    2067
    2068 case 169:
    2069
    2070 -/* Line 1455 of yacc.c */
    2071 +/* Line 1806 of yacc.c */
    2072 #line 683 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2073 - { (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)); ;}
    2074 + { (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)); }
    2075 break;
    2076
    2077 case 170:
    2078
    2079 -/* Line 1455 of yacc.c */
    2080 +/* Line 1806 of yacc.c */
    2081 #line 685 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2082 - { (yyval.item) = KDevPG::variableDeclaration((yyvsp[(1) - (5)].declarationType), (yyvsp[(2) - (5)].storageType), KDevPG::Model::VariableDeclarationItem::TypeToken, false, (yyvsp[(4) - (5)].str), ""); ;}
    2083 + { (yyval.item) = KDevPG::variableDeclaration((yyvsp[(1) - (5)].declarationType), (yyvsp[(2) - (5)].storageType), KDevPG::Model::VariableDeclarationItem::TypeToken, false, (yyvsp[(4) - (5)].str), ""); }
    2084 break;
    2085
    2086 case 171:
    2087
    2088 -/* Line 1455 of yacc.c */
    2089 +/* Line 1806 of yacc.c */
    2090 #line 687 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2091 - { (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)); ;}
    2092 + { (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)); }
    2093 break;
    2094
    2095 case 172:
    2096
    2097 -/* Line 1455 of yacc.c */
    2098 +/* Line 1806 of yacc.c */
    2099 #line 689 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2100 - { (yyval.item) = KDevPG::variableDeclaration((yyvsp[(1) - (6)].declarationType), (yyvsp[(2) - (6)].storageType), KDevPG::Model::VariableDeclarationItem::TypeToken, true, (yyvsp[(5) - (6)].str), ""); ;}
    2101 + { (yyval.item) = KDevPG::variableDeclaration((yyvsp[(1) - (6)].declarationType), (yyvsp[(2) - (6)].storageType), KDevPG::Model::VariableDeclarationItem::TypeToken, true, (yyvsp[(5) - (6)].str), ""); }
    2102 break;
    2103
    2104 case 173:
    2105
    2106 -/* Line 1455 of yacc.c */
    2107 +/* Line 1806 of yacc.c */
    2108 #line 693 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2109 - { (yyval.declarationType) = KDevPG::Model::VariableDeclarationItem::DeclarationLocal; ;}
    2110 + { (yyval.declarationType) = KDevPG::Model::VariableDeclarationItem::DeclarationLocal; }
    2111 break;
    2112
    2113 case 174:
    2114
    2115 -/* Line 1455 of yacc.c */
    2116 +/* Line 1806 of yacc.c */
    2117 #line 694 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2118 - { (yyval.declarationType) = KDevPG::Model::VariableDeclarationItem::DeclarationArgument; ;}
    2119 + { (yyval.declarationType) = KDevPG::Model::VariableDeclarationItem::DeclarationArgument; }
    2120 break;
    2121
    2122 case 175:
    2123
    2124 -/* Line 1455 of yacc.c */
    2125 +/* Line 1806 of yacc.c */
    2126 #line 698 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2127 - { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageAstMember; ;}
    2128 + { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageAstMember; }
    2129 break;
    2130
    2131 case 176:
    2132
    2133 -/* Line 1455 of yacc.c */
    2134 +/* Line 1806 of yacc.c */
    2135 #line 699 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2136 - { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageTemporary; ;}
    2137 + { (yyval.storageType) = KDevPG::Model::VariableDeclarationItem::StorageTemporary; }
    2138 break;
    2139
    2140 case 177:
    2141
    2142 -/* Line 1455 of yacc.c */
    2143 +/* Line 1806 of yacc.c */
    2144 #line 703 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2145 - { (yyval.variableType) = KDevPG::Model::VariableDeclarationItem::TypeNode; ;}
    2146 + { (yyval.variableType) = KDevPG::Model::VariableDeclarationItem::TypeNode; }
    2147 break;
    2148
    2149 case 178:
    2150
    2151 -/* Line 1455 of yacc.c */
    2152 +/* Line 1806 of yacc.c */
    2153 #line 704 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2154 - { (yyval.variableType) = KDevPG::Model::VariableDeclarationItem::TypeVariable; ;}
    2155 - break;
    2156 -
    2157 -
    2158 -
    2159 -/* Line 1455 of yacc.c */
    2160 -#line 3162 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
    2161 + { (yyval.variableType) = KDevPG::Model::VariableDeclarationItem::TypeVariable; }
    2162 + break;
    2163 +
    2164 +
    2165 +
    2166 +/* Line 1806 of yacc.c */
    2167 +#line 3192 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.cc"
    2168 default: break;
    2169 }
    2170 + /* User semantic actions sometimes alter yychar, and that requires
    2171 + that yytoken be updated with the new translation. We take the
    2172 + approach of translating immediately before every use of yytoken.
    2173 + One alternative is translating here after every semantic action,
    2174 + but that translation would be missed if the semantic action invokes
    2175 + YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
    2176 + if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an
    2177 + incorrect destructor might then be invoked immediately. In the
    2178 + case of YYERROR or YYBACKUP, subsequent parser actions might lead
    2179 + to an incorrect destructor call or verbose syntax error message
    2180 + before the lookahead is translated. */
    2181 YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
    2182
    2183 YYPOPSTACK (yylen);
    2184 @@ -3188,6 +3229,10 @@
    2185 | yyerrlab -- here on detecting error |
    2186 `------------------------------------*/
    2187 yyerrlab:
    2188 + /* Make sure we have latest lookahead translation. See comments at
    2189 + user semantic actions for why this is necessary. */
    2190 + yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
    2191 +
    2192 /* If not already recovering from an error, report this error. */
    2193 if (!yyerrstatus)
    2194 {
    2195 @@ -3195,37 +3240,36 @@
    2196 #if ! YYERROR_VERBOSE
    2197 yyerror (YY_("syntax error"));
    2198 #else
    2199 +# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
    2200 + yyssp, yytoken)
    2201 {
    2202 - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
    2203 - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
    2204 - {
    2205 - YYSIZE_T yyalloc = 2 * yysize;
    2206 - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
    2207 - yyalloc = YYSTACK_ALLOC_MAXIMUM;
    2208 - if (yymsg != yymsgbuf)
    2209 - YYSTACK_FREE (yymsg);
    2210 - yymsg = (char *) YYSTACK_ALLOC (yyalloc);
    2211 - if (yymsg)
    2212 - yymsg_alloc = yyalloc;
    2213 - else
    2214 - {
    2215 - yymsg = yymsgbuf;
    2216 - yymsg_alloc = sizeof yymsgbuf;
    2217 - }
    2218 - }
    2219 -
    2220 - if (0 < yysize && yysize <= yymsg_alloc)
    2221 - {
    2222 - (void) yysyntax_error (yymsg, yystate, yychar);
    2223 - yyerror (yymsg);
    2224 - }
    2225 - else
    2226 - {
    2227 - yyerror (YY_("syntax error"));
    2228 - if (yysize != 0)
    2229 - goto yyexhaustedlab;
    2230 - }
    2231 + char const *yymsgp = YY_("syntax error");
    2232 + int yysyntax_error_status;
    2233 + yysyntax_error_status = YYSYNTAX_ERROR;
    2234 + if (yysyntax_error_status == 0)
    2235 + yymsgp = yymsg;
    2236 + else if (yysyntax_error_status == 1)
    2237 + {
    2238 + if (yymsg != yymsgbuf)
    2239 + YYSTACK_FREE (yymsg);
    2240 + yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
    2241 + if (!yymsg)
    2242 + {
    2243 + yymsg = yymsgbuf;
    2244 + yymsg_alloc = sizeof yymsgbuf;
    2245 + yysyntax_error_status = 2;
    2246 + }
    2247 + else
    2248 + {
    2249 + yysyntax_error_status = YYSYNTAX_ERROR;
    2250 + yymsgp = yymsg;
    2251 + }
    2252 + }
    2253 + yyerror (yymsgp);
    2254 + if (yysyntax_error_status == 2)
    2255 + goto yyexhaustedlab;
    2256 }
    2257 +# undef YYSYNTAX_ERROR
    2258 #endif
    2259 }
    2260
    2261 @@ -3284,7 +3328,7 @@
    2262 for (;;)
    2263 {
    2264 yyn = yypact[yystate];
    2265 - if (yyn != YYPACT_NINF)
    2266 + if (!yypact_value_is_default (yyn))
    2267 {
    2268 yyn += YYTERROR;
    2269 if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
    2270 @@ -3343,8 +3387,13 @@
    2271
    2272 yyreturn:
    2273 if (yychar != YYEMPTY)
    2274 - yydestruct ("Cleanup: discarding lookahead",
    2275 - yytoken, &yylval);
    2276 + {
    2277 + /* Make sure we have latest lookahead translation. See comments at
    2278 + user semantic actions for why this is necessary. */
    2279 + yytoken = YYTRANSLATE (yychar);
    2280 + yydestruct ("Cleanup: discarding lookahead",
    2281 + yytoken, &yylval);
    2282 + }
    2283 /* Do not reclaim the symbols of the rule which action triggered
    2284 this YYABORT or YYACCEPT. */
    2285 YYPOPSTACK (yylen);
    2286 @@ -3369,7 +3418,7 @@
    2287
    2288
    2289
    2290 -/* Line 1675 of yacc.c */
    2291 +/* Line 2067 of yacc.c */
    2292 #line 707 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2293
    2294
    2295
    2296 --- a/kdev-pg/kdev-pg-parser.hh
    2297 +++ b/kdev-pg/kdev-pg-parser.hh
    2298 @@ -1,10 +1,8 @@
    2299 +/* A Bison parser, made by GNU Bison 2.5. */
    2300
    2301 -/* A Bison parser, made by GNU Bison 2.4.1. */
    2302 -
    2303 -/* Skeleton interface for Bison's Yacc-like parsers in C
    2304 +/* Bison interface for Yacc-like parsers in C
    2305
    2306 - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    2307 - Free Software Foundation, Inc.
    2308 + Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
    2309
    2310 This program is free software: you can redistribute it and/or modify
    2311 it under the terms of the GNU General Public License as published by
    2312 @@ -115,7 +113,7 @@
    2313 typedef union YYSTYPE
    2314 {
    2315
    2316 -/* Line 1676 of yacc.c */
    2317 +/* Line 2068 of yacc.c */
    2318 #line 49 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2319
    2320 KDevPG::Model::Node *item;
    2321 @@ -128,8 +126,8 @@
    2322
    2323
    2324
    2325 -/* Line 1676 of yacc.c */
    2326 -#line 133 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.hh"
    2327 +/* Line 2068 of yacc.c */
    2328 +#line 131 "/home/jonathan/gitKDE/kdevelop-pg-qt/build/kdev-pg/kdev-pg-parser.hh"
    2329 } YYSTYPE;
    2330 # define YYSTYPE_IS_TRIVIAL 1
    2331 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
    2332
    2333 From: Milian Wolff <mail@milianw.de>
    2334 Date: Thu, 29 Nov 2012 14:56:40 +0000
    2335 Subject: fix some warnings
    2336 X-Git-Url: http://quickgit.kde.org/?p=kdevelop-pg-qt.git&a=commitdiff&h=ac587957cd0cabbc668604507e2cfebb6810ed09
    2337 ---
    2338 fix some warnings
    2339 ---
    2340
    2341
    2342 --- a/kdev-pg/kdev-pg-code-gen.cpp
    2343 +++ b/kdev-pg/kdev-pg-code-gen.cpp
    2344 @@ -51,7 +51,7 @@
    2345
    2346 void generateCondition(const World::NodeSet& s, QTextStream& out)
    2347 {
    2348 - if(s.size() == 0 || s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0)
    2349 + if(s.size() == 0 || (s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0))
    2350 {
    2351 out << "true /*epsilon*/";
    2352 return;
    2353
    2354 --- a/kdev-pg/kdev-pg-lexer.ll
    2355 +++ b/kdev-pg/kdev-pg-lexer.ll
    2356 @@ -425,7 +425,7 @@
    2357 strcpy(yyTextLine+currentOffset, yytext + (yymoreFlag ? lastTextLeng : 0)); /* append current */
    2358 /* strcpy is faster than strcat */
    2359
    2360 - Q_ASSERT(strlen(yyTextLine) < yyTextLineLeng);
    2361 + Q_ASSERT(strlen(yyTextLine) < size_t(yyTextLineLeng));
    2362
    2363 lastTextLeng = strlen(yytext);
    2364 yymoreFlag = false;
    2365
    2366 --- a/kdev-pg/kdev-pg-parser.yy
    2367 +++ b/kdev-pg/kdev-pg-parser.yy
    2368 @@ -309,7 +309,7 @@
    2369 | T_CONTINUE {
    2370 r = "\nlxCONTINUE;\n";
    2371 }
    2372 - | /* empty */ { r = "\nlxSKIP\n" }
    2373 + | /* empty */ { r = "\nlxSKIP\n"; }
    2374 ;
    2375
    2376 regexp
    2377
    2378 From: Jonathan Schmidt-Dominé <git@the-user.org>
    2379 Date: Thu, 29 Nov 2012 15:02:28 +0000
    2380 Subject: updated generated files
    2381 X-Git-Url: http://quickgit.kde.org/?p=kdevelop-pg-qt.git&a=commitdiff&h=97e140477e7247ec8c823cdc54500b5691d9a896
    2382 ---
    2383 updated generated files
    2384 ---
    2385
    2386
    2387 --- a/kdev-pg/kdev-pg-lexer.cc
    2388 +++ b/kdev-pg/kdev-pg-lexer.cc
    2389 @@ -3423,7 +3423,7 @@
    2390 strcpy(yyTextLine+currentOffset, yytext + (yymoreFlag ? lastTextLeng : 0)); /* append current */
    2391 /* strcpy is faster than strcat */
    2392
    2393 - Q_ASSERT(strlen(yyTextLine) < yyTextLineLeng);
    2394 + Q_ASSERT(strlen(yyTextLine) < size_t(yyTextLineLeng));
    2395
    2396 lastTextLeng = strlen(yytext);
    2397 yymoreFlag = false;
    2398
    2399 --- a/kdev-pg/kdev-pg-parser.cc
    2400 +++ b/kdev-pg/kdev-pg-parser.cc
    2401 @@ -2192,7 +2192,7 @@
    2402
    2403 /* Line 1806 of yacc.c */
    2404 #line 312 "/home/jonathan/gitKDE/kdevelop-pg-qt/kdev-pg/kdev-pg-parser.yy"
    2405 - { r = "\nlxSKIP\n" ;}
    2406 + { r = "\nlxSKIP\n"; }
    2407 break;
    2408
    2409 case 50:
    2410