[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kipi-plugins/panorama-dev] panorama/ptoparser/precompiled: Panorama: precompiled parser update
From: Benjamin Girault <benjamin.girault () gmail ! com>
Date: 2012-10-23 17:17:38
Message-ID: 20121023171738.F0807A6078 () git ! kde ! org
[Download RAW message or body]
Git commit 37dcb0273dc398f7e8fce0c6ce5c750b61c9de54 by Benjamin Girault.
Committed on 23/10/2012 at 10:24.
Pushed by girault into branch 'panorama-dev'.
Panorama: precompiled parser update
M +391 -384 panorama/ptoparser/precompiled/panoParser.c
M +29 -10 panorama/ptoparser/precompiled/panoParser.h
M +28 -45 panorama/ptoparser/precompiled/panoScanner.c
http://commits.kde.org/kipi-plugins/37dcb0273dc398f7e8fce0c6ce5c750b61c9de54
diff --git a/panorama/ptoparser/precompiled/panoParser.c \
b/panorama/ptoparser/precompiled/panoParser.c index db9236f..4147429 100644
--- a/panorama/ptoparser/precompiled/panoParser.c
+++ b/panorama/ptoparser/precompiled/panoParser.c
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.3. */
+/* A Bison parser, made by GNU Bison 2.6.2. */
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -45,7 +44,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.3"
+#define YYBISON_VERSION "2.6.2"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -59,14 +58,11 @@
/* Pull parsers. */
#define YYPULL 1
-/* Using locations. */
-#define YYLSP_NEEDED 0
/* Copy the first part of user declarations. */
-
-/* Line 189 of yacc.c */
+/* Line 336 of yacc.c */
#line 27 "ptoparser/panoParser.y"
#include <stdio.h>
@@ -107,14 +103,16 @@ static void ParserStringCopy(char **dest, const char *from)
+/* Line 336 of yacc.c */
+#line 108 "/tmp/build/extra/kipi-plugins/panorama/panoParser.c"
-/* Line 189 of yacc.c */
-#line 113 "/home/neb/GSoC/digikam-software-compilation/build/extra/kipi-plugins/panorama/panoParser.c"
-
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
+# ifndef YY_NULL
+# if defined __cplusplus && 201103L <= __cplusplus
+# define YY_NULL nullptr
+# else
+# define YY_NULL 0
+# endif
+# endif
/* Enabling verbose error messages. */
#ifdef YYERROR_VERBOSE
@@ -124,11 +122,17 @@ static void ParserStringCopy(char **dest, const char *from)
# define YYERROR_VERBOSE 0
#endif
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
+/* In a future release of Bison, this section will be replaced
+ by #include "panoParser.h". */
+#ifndef YY_TMP_BUILD_EXTRA_KIPI_PLUGINS_PANORAMA_PANOPARSER_H
+# define YY_TMP_BUILD_EXTRA_KIPI_PLUGINS_PANORAMA_PANOPARSER_H
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
#endif
-
/* Tokens. */
#ifndef YYTOKENTYPE
@@ -162,12 +166,10 @@ static void ParserStringCopy(char **dest, const char *from)
#endif
-
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
{
-
-/* Line 214 of yacc.c */
+/* Line 350 of yacc.c */
#line 69 "ptoparser/panoParser.y"
int iVal;
@@ -176,21 +178,36 @@ typedef union YYSTYPE
char cVal;
-
-/* Line 214 of yacc.c */
-#line 182 "/home/neb/GSoC/digikam-software-compilation/build/extra/kipi-plugins/panorama/panoParser.c"
+/* Line 350 of yacc.c */
+#line 183 "/tmp/build/extra/kipi-plugins/panorama/panoParser.c"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
#endif
+extern YYSTYPE yylval;
-/* Copy the second part of user declarations. */
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+#endif /* !YY_TMP_BUILD_EXTRA_KIPI_PLUGINS_PANORAMA_PANOPARSER_H */
+/* Copy the second part of user declarations. */
-/* Line 264 of yacc.c */
-#line 194 "/home/neb/GSoC/digikam-software-compilation/build/extra/kipi-plugins/panorama/panoParser.c"
+/* Line 353 of yacc.c */
+#line 211 "/tmp/build/extra/kipi-plugins/panorama/panoParser.c"
#ifdef short
# undef short
@@ -293,11 +310,12 @@ YYID (yyi)
# define alloca _alloca
# else
# define YYSTACK_ALLOC alloca
-# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined \
__C99__FUNC__ \ +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined \
__STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER)
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+ /* Use EXIT_SUCCESS as a witness for stdlib.h. */
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# endif
@@ -320,24 +338,24 @@ YYID (yyi)
# ifndef YYSTACK_ALLOC_MAXIMUM
# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
# endif
-# if (defined __cplusplus && ! defined _STDLIB_H \
+# if (defined __cplusplus && ! defined EXIT_SUCCESS \
&& ! ((defined YYMALLOC || defined malloc) \
&& (defined YYFREE || defined free)))
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# ifndef YYMALLOC
# define YYMALLOC malloc
-# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined \
__C99__FUNC__ \ +# if ! defined malloc && ! defined EXIT_SUCCESS && (defined \
__STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER)
void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
# ifndef YYFREE
# define YYFREE free
-# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined \
__C99__FUNC__ \ +# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ \
|| defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER)
void free (void *); /* INFRINGES ON USER NAME SPACE */
# endif
@@ -366,23 +384,7 @@ union yyalloc
((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+ YYSTACK_GAP_MAXIMUM)
-/* Copy COUNT objects from FROM to TO. The source and destination do
- not overlap. */
-# ifndef YYCOPY
-# if defined __GNUC__ && 1 < __GNUC__
-# define YYCOPY(To, From, Count) \
- __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-# else
-# define YYCOPY(To, From, Count) \
- do \
- { \
- YYSIZE_T yyi; \
- for (yyi = 0; yyi < (Count); yyi++) \
- (To)[yyi] = (From)[yyi]; \
- } \
- while (YYID (0))
-# endif
-# endif
+# define YYCOPY_NEEDED 1
/* Relocate STACK from its old location to the new one. The
local variables YYSIZE and YYSTACKSIZE give the old and new number of
@@ -402,6 +404,26 @@ union yyalloc
#endif
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST. The source and destination do
+ not overlap. */
+# ifndef YYCOPY
+# if defined __GNUC__ && 1 < __GNUC__
+# define YYCOPY(Dst, Src, Count) \
+ __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+# else
+# define YYCOPY(Dst, Src, Count) \
+ do \
+ { \
+ YYSIZE_T yyi; \
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (Dst)[yyi] = (Src)[yyi]; \
+ } \
+ while (YYID (0))
+# endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 5
/* YYLAST -- Last index in YYTABLE. */
@@ -508,7 +530,7 @@ static const yytype_uint16 yyrline[] =
};
#endif
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] =
@@ -528,7 +550,7 @@ static const char *const yytname[] =
"eoln", "varsOpt", "varOpt", "varsinput", "vars", "varinput", "var",
"varsparms", "varsparmsmask", "varparmmask", "mask", "maskpoint",
"varcropping", "varreference", "varparameter", "varonly", "projparams",
- "float", "int", "intorfloat", 0
+ "float", "int", "intorfloat", YY_NULL
};
#endif
@@ -567,8 +589,8 @@ static const yytype_uint8 yyr2[] =
1, 1, 3, 1, 1, 1, 1
};
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
- STATE-NUM when YYTABLE doesn't specify something else to do. Zero
+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
+ Performed when YYTABLE doesn't specify something else to do. Zero
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
@@ -625,8 +647,7 @@ static const yytype_int8 yypgoto[] =
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
- number is the opposite. If zero, do what YYDEFACT says.
- If YYTABLE_NINF, syntax error. */
+ number is the opposite. If YYTABLE_NINF, syntax error. */
#define YYTABLE_NINF -1
static const yytype_uint8 yytable[] =
{
@@ -641,6 +662,12 @@ static const yytype_uint8 yytable[] =
110, 112, 7, 99, 105, 62, 100, 108
};
+#define yypact_value_is_default(yystate) \
+ ((yystate) == (-46))
+
+#define yytable_value_is_error(yytable_value) \
+ YYID (0)
+
static const yytype_uint8 yycheck[] =
{
45, 37, 46, 39, 37, 0, 3, 4, 5, 3,
@@ -699,18 +726,18 @@ static const yytype_uint8 yystos[] =
#define YYRECOVERING() (!!yyerrstatus)
-#define YYBACKUP(Token, Value) \
-do \
- if (yychar == YYEMPTY && yylen == 1) \
- { \
- yychar = (Token); \
- yylval = (Value); \
- yytoken = YYTRANSLATE (yychar); \
- YYPOPSTACK (1); \
- goto yybackup; \
- } \
- else \
- { \
+#define YYBACKUP(Token, Value) \
+do \
+ if (yychar == YYEMPTY) \
+ { \
+ yychar = (Token); \
+ yylval = (Value); \
+ YYPOPSTACK (yylen); \
+ yystate = *yyssp; \
+ goto yybackup; \
+ } \
+ else \
+ { \
yyerror (YY_("syntax error: cannot back up")); \
YYERROR; \
} \
@@ -720,46 +747,38 @@ while (YYID (0))
#define YYTERROR 1
#define YYERRCODE 256
-
/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
If N is 0, then set CURRENT to the empty location which ends
the previous symbol: RHS[0] (always defined). */
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
- do \
- if (YYID (N)) \
- { \
- (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
- (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
- (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
- (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
- } \
- else \
- { \
- (Current).first_line = (Current).last_line = \
- YYRHSLOC (Rhs, 0).last_line; \
- (Current).first_column = (Current).last_column = \
- YYRHSLOC (Rhs, 0).last_column; \
- } \
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ do \
+ if (YYID (N)) \
+ { \
+ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
+ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
+ (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
+ (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
+ } \
+ else \
+ { \
+ (Current).first_line = (Current).last_line = \
+ YYRHSLOC (Rhs, 0).last_line; \
+ (Current).first_column = (Current).last_column = \
+ YYRHSLOC (Rhs, 0).last_column; \
+ } \
while (YYID (0))
#endif
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+
-/* YY_LOCATION_PRINT -- Print the location on the stream.
- This macro was not mandated originally: define only if we know
- we won't break user code: when these are the locations we know. */
+
+/* This macro is provided for backward compatibility. */
#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-# define YY_LOCATION_PRINT(File, Loc) \
- fprintf (File, "%d.%d-%d.%d", \
- (Loc).first_line, (Loc).first_column, \
- (Loc).last_line, (Loc).last_column)
-# else
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
#endif
@@ -814,6 +833,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
YYSTYPE const * const yyvaluep;
#endif
{
+ FILE *yyo = yyoutput;
+ YYUSE (yyo);
if (!yyvaluep)
return;
# ifdef YYPRINT
@@ -951,7 +972,6 @@ int yydebug;
# define YYMAXDEPTH 10000
#endif
-
#if YYERROR_VERBOSE
@@ -1054,115 +1074,142 @@ yytnamerr (char *yyres, const char *yystr)
}
# endif
-/* Copy into YYRESULT an error message about the unexpected token
- YYCHAR while in state YYSTATE. Return the number of bytes copied,
- including the terminating null byte. If YYRESULT is null, do not
- copy anything; just return the number of bytes that would be
- copied. As a special case, return 0 if an ordinary "syntax error"
- message will do. Return YYSIZE_MAXIMUM if overflow occurs during
- size calculation. */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
- int yyn = yypact[yystate];
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+ about the unexpected token YYTOKEN for the state stack whose top is
+ YYSSP.
- if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
- return 0;
- else
+ Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is
+ not large enough to hold the message. In that case, also set
+ *YYMSG_ALLOC to the required number of bytes. Return 2 if the
+ required number of bytes is too large to store. */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+ yytype_int16 *yyssp, int yytoken)
+{
+ YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
+ YYSIZE_T yysize = yysize0;
+ YYSIZE_T yysize1;
+ enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+ /* Internationalized format string. */
+ const char *yyformat = YY_NULL;
+ /* Arguments of yyformat. */
+ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+ /* Number of reported tokens (one for the "unexpected", one per
+ "expected"). */
+ int yycount = 0;
+
+ /* There are many possibilities here to consider:
+ - Assume YYFAIL is not used. It's too flawed to consider. See
+ <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
+ for details. YYERROR is fine as it does not invoke this
+ function.
+ - If this state is a consistent state with a default action, then
+ the only way this function was invoked is if the default action
+ is an error action. In that case, don't check for expected
+ tokens because there are none.
+ - The only way there can be no lookahead present (in yychar) is if
+ this state is a consistent state with a default action. Thus,
+ detecting the absence of a lookahead is sufficient to determine
+ that there is no unexpected or expected token to report. In that
+ case, just report a simple "syntax error".
+ - Don't assume there isn't a lookahead just because this state is a
+ consistent state with a default action. There might have been a
+ previous inconsistent state, consistent state with a non-default
+ action, or user semantic action that manipulated yychar.
+ - Of course, the expected token list depends on states to have
+ correct lookahead information, and it depends on the parser not
+ to perform extra reductions after fetching a lookahead from the
+ scanner and before detecting a syntax error. Thus, state merging
+ (from LALR or IELR) and default reductions corrupt the expected
+ token list. However, the list is correct for canonical LR with
+ one exception: it will still contain any token that will not be
+ accepted due to an error action in a later state.
+ */
+ if (yytoken != YYEMPTY)
{
- int yytype = YYTRANSLATE (yychar);
- YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
- YYSIZE_T yysize = yysize0;
- YYSIZE_T yysize1;
- int yysize_overflow = 0;
- enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
- char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
- int yyx;
-
-# if 0
- /* This is so xgettext sees the translatable formats that are
- constructed on the fly. */
- YY_("syntax error, unexpected %s");
- YY_("syntax error, unexpected %s, expecting %s");
- YY_("syntax error, unexpected %s, expecting %s or %s");
- YY_("syntax error, unexpected %s, expecting %s or %s or %s");
- YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
- char *yyfmt;
- char const *yyf;
- static char const yyunexpected[] = "syntax error, unexpected %s";
- static char const yyexpecting[] = ", expecting %s";
- static char const yyor[] = " or %s";
- char yyformat[sizeof yyunexpected
- + sizeof yyexpecting - 1
- + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
- * (sizeof yyor - 1))];
- char const *yyprefix = yyexpecting;
-
- /* Start YYX at -YYN if negative to avoid negative indexes in
- YYCHECK. */
- int yyxbegin = yyn < 0 ? -yyn : 0;
-
- /* Stay within bounds of both yycheck and yytname. */
- int yychecklim = YYLAST - yyn + 1;
- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
- int yycount = 1;
-
- yyarg[0] = yytname[yytype];
- yyfmt = yystpcpy (yyformat, yyunexpected);
-
- for (yyx = yyxbegin; yyx < yyxend; ++yyx)
- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
- {
- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
- {
- yycount = 1;
- yysize = yysize0;
- yyformat[sizeof yyunexpected - 1] = '\0';
- break;
- }
- yyarg[yycount++] = yytname[yyx];
- yysize1 = yysize + yytnamerr (0, yytname[yyx]);
- yysize_overflow |= (yysize1 < yysize);
- yysize = yysize1;
- yyfmt = yystpcpy (yyfmt, yyprefix);
- yyprefix = yyor;
- }
+ int yyn = yypact[*yyssp];
+ yyarg[yycount++] = yytname[yytoken];
+ if (!yypact_value_is_default (yyn))
+ {
+ /* Start YYX at -YYN if negative to avoid negative indexes in
+ YYCHECK. In other words, skip the first -YYN actions for
+ this state because they are default actions. */
+ int yyxbegin = yyn < 0 ? -yyn : 0;
+ /* Stay within bounds of both yycheck and yytname. */
+ int yychecklim = YYLAST - yyn + 1;
+ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+ int yyx;
+
+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+ && !yytable_value_is_error (yytable[yyx + yyn]))
+ {
+ if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+ {
+ yycount = 1;
+ yysize = yysize0;
+ break;
+ }
+ yyarg[yycount++] = yytname[yyx];
+ yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
+ if (! (yysize <= yysize1
+ && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
+ }
+ }
+ }
- yyf = YY_(yyformat);
- yysize1 = yysize + yystrlen (yyf);
- yysize_overflow |= (yysize1 < yysize);
- yysize = yysize1;
+ switch (yycount)
+ {
+# define YYCASE_(N, S) \
+ case N: \
+ yyformat = S; \
+ break
+ YYCASE_(0, YY_("syntax error"));
+ YYCASE_(1, YY_("syntax error, unexpected %s"));
+ YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+ YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+ YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+ YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or \
%s")); +# undef YYCASE_
+ }
- if (yysize_overflow)
- return YYSIZE_MAXIMUM;
+ yysize1 = yysize + yystrlen (yyformat);
+ if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
- if (yyresult)
- {
- /* Avoid sprintf, as that infringes on the user's name space.
- Don't have undefined behavior even if the translation
- produced a string with the wrong number of "%s"s. */
- char *yyp = yyresult;
- int yyi = 0;
- while ((*yyp = *yyf) != '\0')
- {
- if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
- {
- yyp += yytnamerr (yyp, yyarg[yyi++]);
- yyf += 2;
- }
- else
- {
- yyp++;
- yyf++;
- }
- }
- }
- return yysize;
+ if (*yymsg_alloc < yysize)
+ {
+ *yymsg_alloc = 2 * yysize;
+ if (! (yysize <= *yymsg_alloc
+ && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+ *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+ return 1;
}
+
+ /* Avoid sprintf, as that infringes on the user's name space.
+ Don't have undefined behavior even if the translation
+ produced a string with the wrong number of "%s"s. */
+ {
+ char *yyp = *yymsg;
+ int yyi = 0;
+ while ((*yyp = *yyformat) != '\0')
+ if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+ {
+ yyp += yytnamerr (yyp, yyarg[yyi++]);
+ yyformat += 2;
+ }
+ else
+ {
+ yyp++;
+ yyformat++;
+ }
+ }
+ return 0;
}
#endif /* YYERROR_VERBOSE */
-
/*-----------------------------------------------.
| Release the memory associated to this symbol. |
@@ -1195,20 +1242,7 @@ yydestruct (yymsg, yytype, yyvaluep)
}
}
-/* Prevent warnings from -Wmissing-prototypes. */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
+
/* The lookahead symbol. */
@@ -1221,10 +1255,9 @@ YYSTYPE yylval;
int yynerrs;
-
-/*-------------------------.
-| yyparse or yypush_parse. |
-`-------------------------*/
+/*----------.
+| yyparse. |
+`----------*/
#ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1248,8 +1281,6 @@ yyparse ()
#endif
#endif
{
-
-
int yystate;
/* Number of tokens to shift before error messages enabled. */
int yyerrstatus;
@@ -1258,7 +1289,7 @@ yyparse ()
`yyss': related to states.
`yyvs': related to semantic values.
- Refer to the stacks thru separate pointers, to allow yyoverflow
+ Refer to the stacks through separate pointers, to allow yyoverflow
to reallocate them elsewhere. */
/* The state stack. */
@@ -1312,7 +1343,6 @@ yyparse ()
The wasted elements are never initialized. */
yyssp = yyss;
yyvsp = yyvs;
-
goto yysetstate;
/*------------------------------------------------------------.
@@ -1404,7 +1434,7 @@ yybackup:
/* First try to decide what to do without reference to lookahead token. */
yyn = yypact[yystate];
- if (yyn == YYPACT_NINF)
+ if (yypact_value_is_default (yyn))
goto yydefault;
/* Not known => get a lookahead token if don't already have one. */
@@ -1435,8 +1465,8 @@ yybackup:
yyn = yytable[yyn];
if (yyn <= 0)
{
- if (yyn == 0 || yyn == YYTABLE_NINF)
- goto yyerrlab;
+ if (yytable_value_is_error (yyn))
+ goto yyerrlab;
yyn = -yyn;
goto yyreduce;
}
@@ -1490,28 +1520,25 @@ yyreduce:
switch (yyn)
{
case 2:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 111 "ptoparser/panoParser.y"
{
script.iEndingCommentsCount = nbCommentLine;
script.endingComments = commentLines;
- ;}
+ }
break;
case 5:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 120 "ptoparser/panoParser.y"
{
nbCommentLine = 0;
commentLines = NULL;
- ;}
+ }
break;
case 8:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 129 "ptoparser/panoParser.y"
{
char** curComment = (char**) panoScriptReAlloc((void**) &commentLines,
@@ -1524,12 +1551,11 @@ yyreduce:
}
*curComment = strdup((yyvsp[(1) - (2)].strVal));
- ;}
+ }
break;
case 9:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 143 "ptoparser/panoParser.y"
{
int prevNbImages = script.iInputImagesCount - 1;
@@ -1543,32 +1569,29 @@ yyreduce:
sizeof(char**),
&prevNbImages);
*curImageComments = commentLines;
- ;}
+ }
break;
case 10:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 157 "ptoparser/panoParser.y"
{
script.iPano_prevCommentsCount = nbCommentLine;
script.pano_prevComments = commentLines;
- ;}
+ }
break;
case 11:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 162 "ptoparser/panoParser.y"
{
script.iOptimize_prevCommentsCount = nbCommentLine;
script.optimize_prevComments = commentLines;
- ;}
+ }
break;
case 12:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 167 "ptoparser/panoParser.y"
{
int prevNbVars = script.iVarsToOptimizeCount - 1;
@@ -1582,12 +1605,11 @@ yyreduce:
sizeof(char**),
&prevNbVars);
*curVarComments = commentLines;
- ;}
+ }
break;
case 13:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 181 "ptoparser/panoParser.y"
{
int prevNbCP = script.iCtrlPointsCount - 1;
@@ -1601,12 +1623,11 @@ yyreduce:
sizeof(char**),
&prevNbCP);
*curCPComments = commentLines;
- ;}
+ }
break;
case 14:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 195 "ptoparser/panoParser.y"
{
int prevNbMasks = script.iCtrlPointsCount - 1;
@@ -1620,12 +1641,11 @@ yyreduce:
sizeof(char**),
&prevNbMasks);
*curMaskComments = commentLines;
- ;}
+ }
break;
case 15:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 211 "ptoparser/panoParser.y"
{
currentLine = PT_TOKEN_INPUT_LINE;
@@ -1638,39 +1658,35 @@ yyreduce:
yyerror("Not enough memory");
return -1;
}
- ;}
+ }
break;
case 17:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 226 "ptoparser/panoParser.y"
{
currentLine = PT_TOKEN_PANO_LINE;
- ;}
+ }
break;
case 19:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 232 "ptoparser/panoParser.y"
{
currentLine = PT_TOKEN_OPTIMIZE_OPT_LINE;
- ;}
+ }
break;
case 21:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 240 "ptoparser/panoParser.y"
{
currentLine = PT_TOKEN_OPTIMIZE_VARS_LINE;
- ;}
+ }
break;
case 24:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 246 "ptoparser/panoParser.y"
{
currentLine = PT_TOKEN_CONTROL_PT_LINE;
@@ -1681,12 +1697,11 @@ yyreduce:
yyerror("Not enough memory");
return -1;
}
- ;}
+ }
break;
case 26:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 259 "ptoparser/panoParser.y"
{
currentLine = PT_TOKEN_MASK_PT_LINE;
@@ -1695,12 +1710,11 @@ yyreduce:
yyerror("Not enough memory");
return -1;
}
- ;}
+ }
break;
case 27:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 268 "ptoparser/panoParser.y"
{
if ((yyvsp[(4) - (4)].iVal) == -1) {
@@ -1720,22 +1734,20 @@ yyreduce:
return -1;
}
*maskPtr = mask;
- ;}
+ }
break;
case 28:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 289 "ptoparser/panoParser.y"
{
DEBUG_1("ENDOFLINE");
currentLine = -1; /* This says we don't know the type of line being \
processed */
- ;}
+ }
break;
case 31:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 304 "ptoparser/panoParser.y"
{
pt_script_optimize_var* varToOptimize = (pt_script_optimize_var*) \
panoScriptReAlloc((void**) &script.varsToOptimize, @@ -1748,12 +1760,11 @@ yyreduce:
varToOptimize->varName = strdup((yyvsp[(1) - (2)].strVal));
varToOptimize->varIndex = (yyvsp[(2) - (2)].iVal);
- ;}
+ }
break;
case 32:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 317 "ptoparser/panoParser.y"
{
pt_script_optimize_var* varToOptimize = (pt_script_optimize_var*) \
panoScriptReAlloc((void**) &script.varsToOptimize, @@ -1770,33 +1781,30 @@ yyreduce:
varToOptimize->varName = strdup(keyword);
varToOptimize->varIndex = (yyvsp[(2) - (2)].iVal);
- ;}
+ }
break;
case 45:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 354 "ptoparser/panoParser.y"
{
(yyval.iVal) = (yyvsp[(1) - (1)].iVal);
- ;}
+ }
break;
case 46:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 358 "ptoparser/panoParser.y"
{
if ((yyvsp[(1) - (3)].iVal) != -1)
(yyval.iVal) = (yyvsp[(1) - (3)].iVal);
else
(yyval.iVal) = (yyvsp[(3) - (3)].iVal);
- ;}
+ }
break;
case 47:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 366 "ptoparser/panoParser.y"
{
(yyval.iVal) = -1;
@@ -1812,23 +1820,21 @@ yyreduce:
panoScriptParserError("Invalid variable name [%c] in mask line.\n", \
(yyvsp[(1) - (2)].cVal)); return -1;
}
- ;}
+ }
break;
case 48:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 382 "ptoparser/panoParser.y"
{
(yyval.iVal) = -1;
mask->points = NULL;
mask->iPointsCount = 0;
- ;}
+ }
break;
case 51:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 392 "ptoparser/panoParser.y"
{
pt_point* maskPointPtr = (pt_point*) panoScriptReAlloc((void**) \
&mask->points, @@ -1841,12 +1847,11 @@ yyreduce:
}
maskPointPtr->x = (yyvsp[(1) - (3)].iVal);
maskPointPtr->y = (yyvsp[(3) - (3)].iVal);
- ;}
+ }
break;
case 52:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 407 "ptoparser/panoParser.y"
{
if (currentLine != PT_TOKEN_PANO_LINE && currentLine != PT_TOKEN_INPUT_LINE) \
{ @@ -1865,12 +1870,11 @@ yyreduce:
panoScriptParserError("Invalid variable name- [%c] in image line\n", \
(yyvsp[(1) - (8)].cVal)); return -1;
}
- ;}
+ }
break;
case 53:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 428 "ptoparser/panoParser.y"
{
if (currentLine != PT_TOKEN_INPUT_LINE) {
@@ -1973,12 +1977,11 @@ yyreduce:
panoScriptParserError("Invalid variable name [%s]\n", keyword);
return -1;
}
- ;}
+ }
break;
case 54:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 531 "ptoparser/panoParser.y"
{
int imageRef = (yyvsp[(3) - (3)].iVal);
@@ -2020,12 +2023,11 @@ yyreduce:
panoScriptParserError("Invalid variable name [%c=] in input line.\n", \
(yyvsp[(1) - (3)].cVal)); return -1;
}
- ;}
+ }
break;
case 55:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 576 "ptoparser/panoParser.y"
{
/* For the case where the keyword is one char, followed by a string */
@@ -2072,12 +2074,11 @@ yyreduce:
panoScriptParserError("Error Not handled case [%c]\n", (yyvsp[(1) - \
(2)].cVal)); return -1;
}
- ;}
+ }
break;
case 56:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 623 "ptoparser/panoParser.y"
{
if (currentLine != PT_TOKEN_PANO_LINE) {
@@ -2085,12 +2086,11 @@ yyreduce:
}
nbProjParms = 0;
projParms = NULL;
- ;}
+ }
break;
case 57:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 631 "ptoparser/panoParser.y"
{
/* Processing of int variables with keyword of one character only */
@@ -2224,12 +2224,11 @@ yyreduce:
panoScriptParserError("Error. Not handled (token int [%c])\n", \
(yyvsp[(1) - (2)].cVal)); return -1;
}
- ;}
+ }
break;
case 58:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 765 "ptoparser/panoParser.y"
{
/* Processing of int variables with keyword of one character only */
@@ -2324,12 +2323,11 @@ yyreduce:
panoScriptParserError("Error. Not handled (token int [%c])\n", \
(yyvsp[(1) - (2)].cVal)); return -1;
}
- ;}
+ }
break;
case 59:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 860 "ptoparser/panoParser.y"
{
char *keyword = (yyvsp[(1) - (2)].strVal);
@@ -2427,12 +2425,11 @@ yyreduce:
panoScriptParserError("Invalid variable name [%s]\n", keyword);
return -1;
}
- ;}
+ }
break;
case 60:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 961 "ptoparser/panoParser.y"
{
switch (currentLine) {
@@ -2450,67 +2447,71 @@ yyreduce:
panoScriptParserError("Error Not handled 3\n");
return -1;
}
- ;}
+ }
break;
case 61:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 980 "ptoparser/panoParser.y"
{
float* param = (float*) panoScriptReAlloc((void**) &projParms,
sizeof(float),
&nbProjParms);
*param = (yyvsp[(1) - (1)].fVal);
- ;}
+ }
break;
case 62:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 987 "ptoparser/panoParser.y"
{
float* param = (float*) panoScriptReAlloc((void**) &projParms,
sizeof(float),
&nbProjParms);
*param = (yyvsp[(3) - (3)].fVal);
- ;}
+ }
break;
case 63:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 994 "ptoparser/panoParser.y"
- {(yyval.fVal) = (yyvsp[(1) - (1)].fVal);;}
+ {(yyval.fVal) = (yyvsp[(1) - (1)].fVal);}
break;
case 64:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 996 "ptoparser/panoParser.y"
- {(yyval.iVal) = (yyvsp[(1) - (1)].iVal);;}
+ {(yyval.iVal) = (yyvsp[(1) - (1)].iVal);}
break;
case 65:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 998 "ptoparser/panoParser.y"
- {(yyval.fVal) = (yyvsp[(1) - (1)].fVal);;}
+ {(yyval.fVal) = (yyvsp[(1) - (1)].fVal);}
break;
case 66:
-
-/* Line 1464 of yacc.c */
+/* Line 1787 of yacc.c */
#line 999 "ptoparser/panoParser.y"
- {(yyval.fVal) = (yyvsp[(1) - (1)].iVal);;}
+ {(yyval.fVal) = (yyvsp[(1) - (1)].iVal);}
break;
-
-/* Line 1464 of yacc.c */
-#line 2512 "/home/neb/GSoC/digikam-software-compilation/build/extra/kipi-plugins/panorama/panoParser.c"
+/* Line 1787 of yacc.c */
+#line 2502 "/tmp/build/extra/kipi-plugins/panorama/panoParser.c"
default: break;
}
+ /* User semantic actions sometimes alter yychar, and that requires
+ that yytoken be updated with the new translation. We take the
+ approach of translating immediately before every use of yytoken.
+ One alternative is translating here after every semantic action,
+ but that translation would be missed if the semantic action invokes
+ YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+ if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an
+ incorrect destructor might then be invoked immediately. In the
+ case of YYERROR or YYBACKUP, subsequent parser actions might lead
+ to an incorrect destructor call or verbose syntax error message
+ before the lookahead is translated. */
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
YYPOPSTACK (yylen);
@@ -2538,6 +2539,10 @@ yyreduce:
| yyerrlab -- here on detecting error |
`------------------------------------*/
yyerrlab:
+ /* Make sure we have latest lookahead translation. See comments at
+ user semantic actions for why this is necessary. */
+ yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
/* If not already recovering from an error, report this error. */
if (!yyerrstatus)
{
@@ -2545,37 +2550,36 @@ yyerrlab:
#if ! YYERROR_VERBOSE
yyerror (YY_("syntax error"));
#else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+ yyssp, yytoken)
{
- YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
- if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
- {
- YYSIZE_T yyalloc = 2 * yysize;
- if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
- yyalloc = YYSTACK_ALLOC_MAXIMUM;
- if (yymsg != yymsgbuf)
- YYSTACK_FREE (yymsg);
- yymsg = (char *) YYSTACK_ALLOC (yyalloc);
- if (yymsg)
- yymsg_alloc = yyalloc;
- else
- {
- yymsg = yymsgbuf;
- yymsg_alloc = sizeof yymsgbuf;
- }
- }
-
- if (0 < yysize && yysize <= yymsg_alloc)
- {
- (void) yysyntax_error (yymsg, yystate, yychar);
- yyerror (yymsg);
- }
- else
- {
- yyerror (YY_("syntax error"));
- if (yysize != 0)
- goto yyexhaustedlab;
- }
+ char const *yymsgp = YY_("syntax error");
+ int yysyntax_error_status;
+ yysyntax_error_status = YYSYNTAX_ERROR;
+ if (yysyntax_error_status == 0)
+ yymsgp = yymsg;
+ else if (yysyntax_error_status == 1)
+ {
+ if (yymsg != yymsgbuf)
+ YYSTACK_FREE (yymsg);
+ yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+ if (!yymsg)
+ {
+ yymsg = yymsgbuf;
+ yymsg_alloc = sizeof yymsgbuf;
+ yysyntax_error_status = 2;
+ }
+ else
+ {
+ yysyntax_error_status = YYSYNTAX_ERROR;
+ yymsgp = yymsg;
+ }
+ }
+ yyerror (yymsgp);
+ if (yysyntax_error_status == 2)
+ goto yyexhaustedlab;
}
+# undef YYSYNTAX_ERROR
#endif
}
@@ -2634,7 +2638,7 @@ yyerrlab1:
for (;;)
{
yyn = yypact[yystate];
- if (yyn != YYPACT_NINF)
+ if (!yypact_value_is_default (yyn))
{
yyn += YYTERROR;
if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -2681,7 +2685,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#if !defined yyoverflow || YYERROR_VERBOSE
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -2693,8 +2697,13 @@ yyexhaustedlab:
yyreturn:
if (yychar != YYEMPTY)
- yydestruct ("Cleanup: discarding lookahead",
- yytoken, &yylval);
+ {
+ /* Make sure we have latest lookahead translation. See comments at
+ user semantic actions for why this is necessary. */
+ yytoken = YYTRANSLATE (yychar);
+ yydestruct ("Cleanup: discarding lookahead",
+ yytoken, &yylval);
+ }
/* Do not reclaim the symbols of the rule which action triggered
this YYABORT or YYACCEPT. */
YYPOPSTACK (yylen);
@@ -2718,9 +2727,7 @@ yyreturn:
}
-
-/* Line 1684 of yacc.c */
+/* Line 2048 of yacc.c */
#line 1002 "ptoparser/panoParser.y"
-
diff --git a/panorama/ptoparser/precompiled/panoParser.h \
b/panorama/ptoparser/precompiled/panoParser.h index 8600e26..c3117db 100644
--- a/panorama/ptoparser/precompiled/panoParser.h
+++ b/panorama/ptoparser/precompiled/panoParser.h
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.3. */
+/* A Bison parser, made by GNU Bison 2.6.2. */
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* Bison interface for Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -31,6 +30,15 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
+#ifndef YY_TMP_BUILD_EXTRA_KIPI_PLUGINS_PANORAMA_PANOPARSER_H
+# define YY_TMP_BUILD_EXTRA_KIPI_PLUGINS_PANORAMA_PANOPARSER_H
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
/* Tokens. */
#ifndef YYTOKENTYPE
@@ -64,12 +72,10 @@
#endif
-
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
{
-
-/* Line 1685 of yacc.c */
+/* Line 2049 of yacc.c */
#line 69 "ptoparser/panoParser.y"
int iVal;
@@ -78,9 +84,8 @@ typedef union YYSTYPE
char cVal;
-
-/* Line 1685 of yacc.c */
-#line 84 "/home/neb/GSoC/digikam-software-compilation/build/extra/kipi-plugins/panorama/panoParser.h"
+/* Line 2049 of yacc.c */
+#line 89 "/tmp/build/extra/kipi-plugins/panorama/panoParser.h"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -89,4 +94,18 @@ typedef union YYSTYPE
extern YYSTYPE yylval;
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+#endif /* !YY_TMP_BUILD_EXTRA_KIPI_PLUGINS_PANORAMA_PANOPARSER_H */
diff --git a/panorama/ptoparser/precompiled/panoScanner.c \
b/panorama/ptoparser/precompiled/panoScanner.c index 30fd53c..deac4cd 100644
--- a/panorama/ptoparser/precompiled/panoScanner.c
+++ b/panorama/ptoparser/precompiled/panoScanner.c
@@ -1,6 +1,6 @@
-#line 2 "/home/neb/GSoC/digikam-software-compilation/build/extra/kipi-plugins/panorama/panoScanner.c"
+#line 2 "/tmp/build/extra/kipi-plugins/panorama/panoScanner.c"
-#line 4 "/home/neb/GSoC/digikam-software-compilation/build/extra/kipi-plugins/panorama/panoScanner.c"
+#line 4 "/tmp/build/extra/kipi-plugins/panorama/panoScanner.c"
#define YY_INT_ALIGNED short int
@@ -9,7 +9,7 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
+#define YY_FLEX_SUBMINOR_VERSION 37
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -142,15 +142,7 @@ typedef unsigned int flex_uint32_t;
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
#define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the main \
buffer. @@ -162,7 +154,12 @@ typedef unsigned int flex_uint32_t;
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
-extern int yyleng;
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t yyleng;
extern FILE *yyin, *yyout;
@@ -188,11 +185,6 @@ extern FILE *yyin, *yyout;
#define unput(c) yyunput( c, (yytext_ptr) )
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
@@ -210,7 +202,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
- int yy_n_chars;
+ yy_size_t yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@@ -280,8 +272,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an \
array. */
/* yy_hold_char holds the character lost when yytext is formed. */
static char yy_hold_char;
-static int yy_n_chars; /* number of characters read into yy_ch_buf */
-int yyleng;
+static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
+yy_size_t yyleng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
@@ -309,7 +301,7 @@ static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file );
YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size );
YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len );
void *yyalloc (yy_size_t );
void *yyrealloc (void *,yy_size_t );
@@ -341,7 +333,7 @@ void yyfree (void * );
/* Begin user sect3 */
-#define yywrap(n) 1
+#define yywrap() 1
#define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR;
@@ -578,7 +570,7 @@ char *yytext;
#include "tparserdebug.h"
#include "tparserprivate.h"
-#include "parser.h"
+#include "panoParser.h"
char strBuffer[PT_TOKEN_MAX_LEN + 1];
char *strBuffer_ptr;
@@ -598,7 +590,7 @@ int first_eof;
-#line 602 "/home/neb/GSoC/digikam-software-compilation/build/extra/kipi-plugins/panorama/panoScanner.c"
+#line 594 "/tmp/build/extra/kipi-plugins/panorama/panoScanner.c"
#define INITIAL 0
#define str 1
@@ -643,7 +635,7 @@ FILE *yyget_out (void );
void yyset_out (FILE * out_str );
-int yyget_leng (void );
+yy_size_t yyget_leng (void );
char *yyget_text (void );
@@ -683,12 +675,7 @@ static int input (void );
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
#define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -797,7 +784,7 @@ YY_DECL
/* Simple rules for all purpose */
-#line 801 "/home/neb/GSoC/digikam-software-compilation/build/extra/kipi-plugins/panorama/panoScanner.c"
+#line 788 "/tmp/build/extra/kipi-plugins/panorama/panoScanner.c"
if ( !(yy_init) )
{
@@ -1239,7 +1226,7 @@ YY_RULE_SETUP
#line 317 "ptoparser/panoScanner.l"
ECHO;
YY_BREAK
-#line 1243 "/home/neb/GSoC/digikam-software-compilation/build/extra/kipi-plugins/panorama/panoScanner.c"
+#line 1230 "/tmp/build/extra/kipi-plugins/panorama/panoScanner.c"
case YY_END_OF_BUFFER:
{
@@ -1423,21 +1410,21 @@ static int yy_get_next_buffer (void)
else
{
- int num_to_read =
+ yy_size_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
{ /* Not enough room in the buffer - grow it. */
/* just a shorter name for the current buffer */
- YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+ YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
int yy_c_buf_p_offset =
(int) ((yy_c_buf_p) - b->yy_ch_buf);
if ( b->yy_is_our_buffer )
{
- int new_size = b->yy_buf_size * 2;
+ yy_size_t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
@@ -1468,7 +1455,7 @@ static int yy_get_next_buffer (void)
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- (yy_n_chars), (size_t) num_to_read );
+ (yy_n_chars), num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
}
@@ -1564,7 +1551,7 @@ static int yy_get_next_buffer (void)
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_is_jam = (yy_current_state == 88);
- return yy_is_jam ? 0 : yy_current_state;
+ return yy_is_jam ? 0 : yy_current_state;
}
#ifndef YY_NO_INPUT
@@ -1591,7 +1578,7 @@ static int yy_get_next_buffer (void)
else
{ /* need more input */
- int offset = (yy_c_buf_p) - (yytext_ptr);
+ yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
++(yy_c_buf_p);
switch ( yy_get_next_buffer( ) )
@@ -1753,10 +1740,6 @@ static void yy_load_buffer_state (void)
yyfree((void *) b );
}
-#ifndef __cplusplus
-extern int isatty (int );
-#endif /* __cplusplus */
-
/* Initializes or reinitializes a buffer.
* This function is sometimes called more than once on the same buffer,
* such as during a yyrestart() or at EOF.
@@ -1869,7 +1852,7 @@ void yypop_buffer_state (void)
*/
static void yyensure_buffer_stack (void)
{
- int num_to_alloc;
+ yy_size_t num_to_alloc;
if (!(yy_buffer_stack)) {
@@ -1966,7 +1949,7 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
*
* @return the newly allocated buffer state object.
*/
-YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len )
+YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
{
YY_BUFFER_STATE b;
char *buf;
@@ -2053,7 +2036,7 @@ FILE *yyget_out (void)
/** Get the length of the current token.
*
*/
-int yyget_leng (void)
+yy_size_t yyget_leng (void)
{
return yyleng;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic