[BACK]Return to zend_ini_parser.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / Zend

Diff for /embedaddon/php/Zend/zend_ini_parser.c between versions 1.1.1.1 and 1.1.1.4

version 1.1.1.1, 2012/02/21 23:47:52 version 1.1.1.4, 2013/10/14 08:02:48
Line 1 Line 1
   /* A Bison parser, made by GNU Bison 2.7.  */
   
/* A Bison parser, made by GNU Bison 2.4.1.  *//* Bison implementation for Yacc-like parsers in C
 
/* Skeleton implementation for Bison's Yacc-like parsers in C 
         
      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
   Free Software Foundation, Inc. 
         
    This program is free software: you can redistribute it and/or modify     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     it under the terms of the GNU General Public License as published by
Line 46 Line 44
 #define YYBISON 1  #define YYBISON 1
   
 /* Bison version.  */  /* Bison version.  */
#define YYBISON_VERSION "2.4.1"#define YYBISON_VERSION "2.7"
   
 /* Skeleton name.  */  /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"  #define YYSKELETON_NAME "yacc.c"
Line 60 Line 58
 /* Pull parsers.  */  /* Pull parsers.  */
 #define YYPULL 1  #define YYPULL 1
   
 /* Using locations.  */  
 #define YYLSP_NEEDED 0  
   
 /* Substitute the variable and function names.  */  /* Substitute the variable and function names.  */
 #define yyparse         ini_parse  #define yyparse         ini_parse
Line 72 Line 68
 #define yydebug         ini_debug  #define yydebug         ini_debug
 #define yynerrs         ini_nerrs  #define yynerrs         ini_nerrs
   
   
 /* Copy the first part of user declarations.  */  /* Copy the first part of user declarations.  */
   
   
Line 80 Line 75
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | Zend Engine                                                          |     | Zend Engine                                                          |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |   | Copyright (c) 1998-2013 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |     | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |     | that is bundled with this package in the file LICENSE, and is        |
Line 324  ZEND_API int zend_parse_ini_string(char *str, zend_boo Line 319  ZEND_API int zend_parse_ini_string(char *str, zend_boo
   
   
   
/* Enabling traces.  */# ifndef YY_NULL
#ifndef YYDEBUG#  if defined __cplusplus && 201103L <= __cplusplus
# define YYDEBUG 0#   define YY_NULL nullptr
#endif#  else
 #   define YY_NULL 0
 #  endif
 # endif
   
 /* Enabling verbose error messages.  */  /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE  #ifdef YYERROR_VERBOSE
Line 337  ZEND_API int zend_parse_ini_string(char *str, zend_boo Line 335  ZEND_API int zend_parse_ini_string(char *str, zend_boo
 # define YYERROR_VERBOSE 0  # define YYERROR_VERBOSE 0
 #endif  #endif
   
/* Enabling the token table.  *//* In a future release of Bison, this section will be replaced
#ifndef YYTOKEN_TABLE   by #include "zend_ini_parser.h".  */
# define YYTOKEN_TABLE 0#ifndef YY_INI_ZEND_ZEND_INI_PARSER_H_INCLUDED
 # define YY_INI_ZEND_ZEND_INI_PARSER_H_INCLUDED
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
 #endif  #endif
   #if YYDEBUG
   extern int ini_debug;
   #endif
   
   
 /* Tokens.  */  /* Tokens.  */
 #ifndef YYTOKENTYPE  #ifndef YYTOKENTYPE
 # define YYTOKENTYPE  # define YYTOKENTYPE
Line 383  ZEND_API int zend_parse_ini_string(char *str, zend_boo Line 387  ZEND_API int zend_parse_ini_string(char *str, zend_boo
   
   
   
   
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED  #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;  typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1  # define YYSTYPE_IS_TRIVIAL 1
Line 392  typedef int YYSTYPE; Line 395  typedef int YYSTYPE;
 #endif  #endif
   
   
   #ifdef YYPARSE_PARAM
   #if defined __STDC__ || defined __cplusplus
   int ini_parse (void *YYPARSE_PARAM);
   #else
   int ini_parse ();
   #endif
   #else /* ! YYPARSE_PARAM */
   #if defined __STDC__ || defined __cplusplus
   int ini_parse (void);
   #else
   int ini_parse ();
   #endif
   #endif /* ! YYPARSE_PARAM */
   
   #endif /* !YY_INI_ZEND_ZEND_INI_PARSER_H_INCLUDED  */
   
 /* Copy the second part of user declarations.  */  /* Copy the second part of user declarations.  */
   
   
Line 444  typedef short int yytype_int16; Line 463  typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)  #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
   
 #ifndef YY_  #ifndef YY_
# if YYENABLE_NLS# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS  #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */  #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
#   define YY_(msgid) dgettext ("bison-runtime", msgid)#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
 #  endif  #  endif
 # endif  # endif
 # ifndef YY_  # ifndef YY_
#  define YY_(msgid) msgid#  define YY_(Msgid) Msgid
 # endif  # endif
 #endif  #endif
   
 /* Suppress unused-variable warnings by "using" E.  */  /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__  #if ! defined lint || defined __GNUC__
# define YYUSE(e) ((void) (e))# define YYUSE(E) ((void) (E))
 #else  #else
# define YYUSE(e) /* empty */# define YYUSE(E) /* empty */
 #endif  #endif
   
 /* Identity function, used to suppress warnings about constant conditions.  */  /* Identity function, used to suppress warnings about constant conditions.  */
 #ifndef lint  #ifndef lint
# define YYID(n) (n)# define YYID(N) (N)
 #else  #else
 #if (defined __STDC__ || defined __C99__FUNC__ \  #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)       || defined __cplusplus || defined _MSC_VER)
Line 497  YYID (yyi) Line 516  YYID (yyi)
 #    define alloca _alloca  #    define alloca _alloca
 #   else  #   else
 #    define YYSTACK_ALLOC alloca  #    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)       || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */  #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
#     ifndef _STDLIB_H      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
#      define _STDLIB_H 1#     ifndef EXIT_SUCCESS
 #      define EXIT_SUCCESS 0
 #     endif  #     endif
 #    endif  #    endif
 #   endif  #   endif
Line 524  YYID (yyi) Line 544  YYID (yyi)
 #  ifndef YYSTACK_ALLOC_MAXIMUM  #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM  #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif  #  endif
#  if (defined __cplusplus && ! defined _STDLIB_H \#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \         && ! ((defined YYMALLOC || defined malloc) \
              && (defined YYFREE || defined free)))               && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */  #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
#   ifndef _STDLIB_H#   ifndef EXIT_SUCCESS
#    define _STDLIB_H 1#    define EXIT_SUCCESS 0
 #   endif  #   endif
 #  endif  #  endif
 #  ifndef YYMALLOC  #  ifndef YYMALLOC
 #   define YYMALLOC malloc  #   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)       || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */  void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif  #   endif
 #  endif  #  endif
 #  ifndef YYFREE  #  ifndef YYFREE
 #   define YYFREE free  #   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)       || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */  void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif  #   endif
Line 570  union yyalloc Line 590  union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \       ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)        + YYSTACK_GAP_MAXIMUM)
   
/* Copy COUNT objects from FROM to TO.  The source and destination do# define YYCOPY_NEEDED 1
   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 
   
 /* Relocate STACK from its old location to the new one.  The  /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of     local variables YYSIZE and YYSTACKSIZE give the old and new number of
Line 606  union yyalloc Line 610  union yyalloc
   
 #endif  #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.  */  /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2  #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */  /* YYLAST -- Last index in YYTABLE.  */
Line 701  static const yytype_uint16 yyrline[] = Line 725  static const yytype_uint16 yyrline[] =
 };  };
 #endif  #endif
   
#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE#if YYDEBUG || YYERROR_VERBOSE || 0
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.  /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */     First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =  static const char *const yytname[] =
Line 715  static const char *const yytname[] = Line 739  static const char *const yytname[] =
   "$accept", "statement_list", "statement", "section_string_or_value",    "$accept", "statement_list", "statement", "section_string_or_value",
   "string_or_value", "option_offset", "encapsed_list",    "string_or_value", "option_offset", "encapsed_list",
   "var_string_list_section", "var_string_list", "expr", "cfg_var_ref",    "var_string_list_section", "var_string_list", "expr", "cfg_var_ref",
  "constant_literal", "constant_string", 0  "constant_literal", "constant_string", YY_NULL
 };  };
 #endif  #endif
   
Line 752  static const yytype_uint8 yyr2[] = Line 776  static const yytype_uint8 yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1         1,     1,     1,     1,     1,     1,     1,     1,     1
 };  };
   
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero   Performed when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */     means the default is an error.  */
 static const yytype_uint8 yydefact[] =  static const yytype_uint8 yydefact[] =
 {  {
Line 796  static const yytype_int8 yypgoto[] = Line 820  static const yytype_int8 yypgoto[] =
   
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If  /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which     positive, shift that token.  If negative, reduce the rule which
   number is the opposite.  If zero, do what YYDEFACT says.   number is the opposite.  If YYTABLE_NINF, syntax error.  */
   If YYTABLE_NINF, syntax error.  */ 
 #define YYTABLE_NINF -1  #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =  static const yytype_uint8 yytable[] =
 {  {
Line 814  static const yytype_uint8 yytable[] = Line 837  static const yytype_uint8 yytable[] =
        0,     0,     4,     5,     0,    47,     0,    68,     0,     6         0,     0,     4,     5,     0,    47,     0,    68,     0,     6
 };  };
   
   #define yypact_value_is_default(Yystate) \
     (!!((Yystate) == (-36)))
   
   #define yytable_value_is_error(Yytable_value) \
     YYID (0)
   
 static const yytype_int8 yycheck[] =  static const yytype_int8 yycheck[] =
 {  {
        3,    25,    37,    38,     4,     5,     6,     7,     8,    33,         3,    25,    37,    38,     4,     5,     6,     7,     8,    33,
Line 854  static const yytype_uint8 yystos[] = Line 883  static const yytype_uint8 yystos[] =
   
 /* Like YYERROR except do call yyerror.  This remains here temporarily  /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.     to ease the transition to the new meaning of YYERROR, for GCC.
   Once GCC version 2 has supplanted version 1, this can go.  */   Once GCC version 2 has supplanted version 1, this can go.  However,
    YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
    in Bison 2.4.2's NEWS entry, where a plan to phase it out is
    discussed.  */
   
 #define YYFAIL          goto yyerrlab  #define YYFAIL          goto yyerrlab
   #if defined YYFAIL
     /* This is here to suppress warnings from the GCC cpp's
        -Wunused-macros.  Normally we don't worry about that warning, but
        some users do, and we want to make it easy for users to remove
        YYFAIL uses, which will produce warnings from Bison 2.5.  */
   #endif
   
 #define YYRECOVERING()  (!!yyerrstatus)  #define YYRECOVERING()  (!!yyerrstatus)
   
#define YYBACKUP(Token, Value)                                  \#define YYBACKUP(Token, Value)                                  \
do                                                                \do                                                              \
  if (yychar == YYEMPTY && yylen == 1)                          \  if (yychar == YYEMPTY)                                        \
    {                                                                \    {                                                           \
      yychar = (Token);                                         \      yychar = (Token);                                         \
      yylval = (Value);                                         \      yylval = (Value);                                         \
      yytoken = YYTRANSLATE (yychar);                                \      YYPOPSTACK (yylen);                                       \
      YYPOPSTACK (1);                                                \      yystate = *yyssp;                                         \
      goto yybackup;                                            \      goto yybackup;                                            \
    }                                                                \    }                                                           \
  else                                                          \  else                                                          \
    {                                                           \    {                                                           \
       yyerror (YY_("syntax error: cannot back up")); \        yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;                                                  \        YYERROR;                                                  \
     }                                                           \      }                                                           \
 while (YYID (0))  while (YYID (0))
   
/* Error token number */
 #define YYTERROR        1  #define YYTERROR        1
 #define YYERRCODE       256  #define YYERRCODE       256
   
   
/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]./* This macro is provided for backward compatibility. */
   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;                              \ 
        }                                                               \ 
    while (YYID (0)) 
#endif 
 
 
/* YY_LOCATION_PRINT -- Print the location on the stream. 
   This macro was not mandated originally: define only if we know 
   we won't break user code: when these are the locations we know.  */ 
 
 #ifndef YY_LOCATION_PRINT  #ifndef YY_LOCATION_PRINT
# if YYLTYPE_IS_TRIVIAL# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
#  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 
 #endif  #endif
   
   
 /* YYLEX -- calling `yylex' with the right arguments.  */  /* YYLEX -- calling `yylex' with the right arguments.  */
   
 #ifdef YYLEX_PARAM  #ifdef YYLEX_PARAM
 # define YYLEX yylex (&yylval, YYLEX_PARAM)  # define YYLEX yylex (&yylval, YYLEX_PARAM)
 #else  #else
Line 975  yy_symbol_value_print (yyoutput, yytype, yyvaluep) Line 976  yy_symbol_value_print (yyoutput, yytype, yyvaluep)
     YYSTYPE const * const yyvaluep;      YYSTYPE const * const yyvaluep;
 #endif  #endif
 {  {
     FILE *yyo = yyoutput;
     YYUSE (yyo);
   if (!yyvaluep)    if (!yyvaluep)
     return;      return;
 # ifdef YYPRINT  # ifdef YYPRINT
Line 986  yy_symbol_value_print (yyoutput, yytype, yyvaluep) Line 989  yy_symbol_value_print (yyoutput, yytype, yyvaluep)
   switch (yytype)    switch (yytype)
     {      {
       default:        default:
        break;        break;
     }      }
 }  }
   
Line 1112  int yydebug; Line 1115  int yydebug;
 # define YYMAXDEPTH 10000  # define YYMAXDEPTH 10000
 #endif  #endif
   
   
   
 #if YYERROR_VERBOSE  #if YYERROR_VERBOSE
   
Line 1215  yytnamerr (char *yyres, const char *yystr) Line 1217  yytnamerr (char *yyres, const char *yystr)
 }  }
 # endif  # endif
   
/* Copy into YYRESULT an error message about the unexpected token/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
   YYCHAR while in state YYSTATE.  Return the number of bytes copied,   about the unexpected token YYTOKEN for the state stack whose top is
   including the terminating null byte.  If YYRESULT is null, do not   YYSSP.
   copy anything; just return the number of bytes that would be
   copied.  As a special case, return 0 if an ordinary "syntax error"   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during   not large enough to hold the message.  In that case, also set
   size calculation.  */   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
static YYSIZE_T   required number of bytes is too large to store.  */
yysyntax_error (char *yyresult, int yystate, int yychar)static int
 yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                 yytype_int16 *yyssp, int yytoken)
 {  {
  int yyn = yypact[yystate];  YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
   YYSIZE_T yysize = yysize0;
   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;
   
  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))  /* There are many possibilities here to consider:
    return 0;     - Assume YYFAIL is not used.  It's too flawed to consider.  See
  else       <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);      int yyn = yypact[*yyssp];
      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);      yyarg[yycount++] = yytname[yytoken];
      YYSIZE_T yysize = yysize0;      if (!yypact_value_is_default (yyn))
      YYSIZE_T yysize1;        {
      int yysize_overflow = 0;          /* Start YYX at -YYN if negative to avoid negative indexes in
      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };             YYCHECK.  In other words, skip the first -YYN actions for
      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];             this state because they are default actions.  */
      int yyx;          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;
   
# if 0          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
      /* This is so xgettext sees the translatable formats that are            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
         constructed on the fly.  */                && !yytable_value_is_error (yytable[yyx + yyn]))
      YY_("syntax error, unexpected %s");              {
      YY_("syntax error, unexpected %s, expecting %s");                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
      YY_("syntax error, unexpected %s, expecting %s or %s");                  {
      YY_("syntax error, unexpected %s, expecting %s or %s or %s");                    yycount = 1;
      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");                    yysize = yysize0;
# endif                    break;
      char *yyfmt;                  }
      char const *yyf;                yyarg[yycount++] = yytname[yyx];
      static char const yyunexpected[] = "syntax error, unexpected %s";                {
      static char const yyexpecting[] = ", expecting %s";                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
      static char const yyor[] = " or %s";                  if (! (yysize <= yysize1
      char yyformat[sizeof yyunexpected                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
                    + sizeof yyexpecting - 1                    return 2;
                    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)                  yysize = yysize1;
                       * (sizeof yyor - 1))];                }
      char const *yyprefix = yyexpecting;              }
         }
     }
   
      /* Start YYX at -YYN if negative to avoid negative indexes in  switch (yycount)
         YYCHECK.  */    {
      int yyxbegin = yyn < 0 ? -yyn : 0;# 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_
     }
   
      /* Stay within bounds of both yycheck and yytname.  */  {
      int yychecklim = YYLAST - yyn + 1;    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
      int yycount = 1;      return 2;
     yysize = yysize1;
   }
   
      yyarg[0] = yytname[yytype];  if (*yymsg_alloc < yysize)
      yyfmt = yystpcpy (yyformat, yyunexpected);    {
      *yymsg_alloc = 2 * yysize;
      for (yyx = yyxbegin; yyx < yyxend; ++yyx)      if (! (yysize <= *yymsg_alloc
        if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
          {        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
            if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)      return 1;
              { 
                yycount = 1; 
                yysize = yysize0; 
                yyformat[sizeof yyunexpected - 1] = '\0'; 
                break; 
              } 
            yyarg[yycount++] = yytname[yyx]; 
            yysize1 = yysize + yytnamerr (0, yytname[yyx]); 
            yysize_overflow |= (yysize1 < yysize); 
            yysize = yysize1; 
            yyfmt = yystpcpy (yyfmt, yyprefix); 
            yyprefix = yyor; 
          } 
 
      yyf = YY_(yyformat); 
      yysize1 = yysize + yystrlen (yyf); 
      yysize_overflow |= (yysize1 < yysize); 
      yysize = yysize1; 
 
      if (yysize_overflow) 
        return YYSIZE_MAXIMUM; 
 
      if (yyresult) 
        { 
          /* Avoid sprintf, as that infringes on the user's name space. 
             Don't have undefined behavior even if the translation 
             produced a string with the wrong number of "%s"s.  */ 
          char *yyp = yyresult; 
          int yyi = 0; 
          while ((*yyp = *yyf) != '\0') 
            { 
              if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) 
                { 
                  yyp += yytnamerr (yyp, yyarg[yyi++]); 
                  yyf += 2; 
                } 
              else 
                { 
                  yyp++; 
                  yyf++; 
                } 
            } 
        } 
      return yysize; 
     }      }
   
     /* 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 */  #endif /* YYERROR_VERBOSE */
   
   
 /*-----------------------------------------------.  /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |  | Release the memory associated to this symbol.  |
Line 1352  yydestruct (yymsg, yytype, yyvaluep) Line 1384  yydestruct (yymsg, yytype, yyvaluep)
     {      {
   
       default:        default:
        break;        break;
     }      }
 }  }
   
 /* 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 */  
   
   
   
   /*----------.
   | yyparse.  |
   `----------*/
   
   
 /*-------------------------.  
 | yyparse or yypush_parse.  |  
 `-------------------------*/  
   
 #ifdef YYPARSE_PARAM  #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \  #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)       || defined __cplusplus || defined _MSC_VER)
Line 1404  yyparse () Line 1420  yyparse ()
 /* The lookahead symbol.  */  /* The lookahead symbol.  */
 int yychar;  int yychar;
   
   
   #if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
   /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
   # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
       _Pragma ("GCC diagnostic push") \
       _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
       _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
   # define YY_IGNORE_MAYBE_UNINITIALIZED_END \
       _Pragma ("GCC diagnostic pop")
   #else
   /* Default value used for initialization, for pacifying older GCCs
      or non-GCC compilers.  */
   static YYSTYPE yyval_default;
   # define YY_INITIAL_VALUE(Value) = Value
   #endif
   #ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   # define YY_IGNORE_MAYBE_UNINITIALIZED_END
   #endif
   #ifndef YY_INITIAL_VALUE
   # define YY_INITIAL_VALUE(Value) /* Nothing. */
   #endif
   
 /* The semantic value of the lookahead symbol.  */  /* The semantic value of the lookahead symbol.  */
YYSTYPE yylval;YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
   
     /* Number of syntax errors so far.  */      /* Number of syntax errors so far.  */
     int yynerrs;      int yynerrs;
Line 1418  YYSTYPE yylval; Line 1457  YYSTYPE yylval;
        `yyss': related to states.         `yyss': related to states.
        `yyvs': related to semantic values.         `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.  */         to reallocate them elsewhere.  */
   
     /* The state stack.  */      /* The state stack.  */
Line 1436  YYSTYPE yylval; Line 1475  YYSTYPE yylval;
   int yyn;    int yyn;
   int yyresult;    int yyresult;
   /* Lookahead token as an internal (translated) token number.  */    /* Lookahead token as an internal (translated) token number.  */
  int yytoken;  int yytoken = 0;
   /* The variables used to return semantic value and location from the    /* The variables used to return semantic value and location from the
      action routines.  */       action routines.  */
   YYSTYPE yyval;    YYSTYPE yyval;
Line 1454  YYSTYPE yylval; Line 1493  YYSTYPE yylval;
      Keep to zero when no symbol should be popped.  */       Keep to zero when no symbol should be popped.  */
   int yylen = 0;    int yylen = 0;
   
  yytoken = 0;  yyssp = yyss = yyssa;
  yyss = yyssa;  yyvsp = yyvs = yyvsa;
  yyvs = yyvsa; 
   yystacksize = YYINITDEPTH;    yystacksize = YYINITDEPTH;
   
   YYDPRINTF ((stderr, "Starting parse\n"));    YYDPRINTF ((stderr, "Starting parse\n"));
Line 1465  YYSTYPE yylval; Line 1503  YYSTYPE yylval;
   yyerrstatus = 0;    yyerrstatus = 0;
   yynerrs = 0;    yynerrs = 0;
   yychar = YYEMPTY; /* Cause a token to be read.  */    yychar = YYEMPTY; /* Cause a token to be read.  */
   
   /* Initialize stack pointers.  
      Waste one element of value and location stack  
      so that they stay on the same level as the state stack.  
      The wasted elements are never initialized.  */  
   yyssp = yyss;  
   yyvsp = yyvs;  
   
   goto yysetstate;    goto yysetstate;
   
 /*------------------------------------------------------------.  /*------------------------------------------------------------.
Line 1564  yybackup: Line 1594  yybackup:
   
   /* First try to decide what to do without reference to lookahead token.  */    /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];    yyn = yypact[yystate];
  if (yyn == YYPACT_NINF)  if (yypact_value_is_default (yyn))
     goto yydefault;      goto yydefault;
   
   /* Not known => get a lookahead token if don't already have one.  */    /* Not known => get a lookahead token if don't already have one.  */
Line 1595  yybackup: Line 1625  yybackup:
   yyn = yytable[yyn];    yyn = yytable[yyn];
   if (yyn <= 0)    if (yyn <= 0)
     {      {
      if (yyn == 0 || yyn == YYTABLE_NINF)      if (yytable_value_is_error (yyn))
        goto yyerrlab;        goto yyerrlab;
       yyn = -yyn;        yyn = -yyn;
       goto yyreduce;        goto yyreduce;
     }      }
Line 1613  yybackup: Line 1643  yybackup:
   yychar = YYEMPTY;    yychar = YYEMPTY;
   
   yystate = yyn;    yystate = yyn;
     YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;    *++yyvsp = yylval;
     YY_IGNORE_MAYBE_UNINITIALIZED_END
   
   goto yynewstate;    goto yynewstate;
   
Line 1894  yyreduce: Line 1926  yyreduce:
   
       default: break;        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);    YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
   
   YYPOPSTACK (yylen);    YYPOPSTACK (yylen);
Line 1921  yyreduce: Line 1964  yyreduce:
 | yyerrlab -- here on detecting error |  | yyerrlab -- here on detecting error |
 `------------------------------------*/  `------------------------------------*/
 yyerrlab:  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 not already recovering from an error, report this error.  */
   if (!yyerrstatus)    if (!yyerrstatus)
     {      {
Line 1928  yyerrlab: Line 1975  yyerrlab:
 #if ! YYERROR_VERBOSE  #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));        yyerror (YY_("syntax error"));
 #else  #else
   # define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
                                           yyssp, yytoken)
       {        {
        YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);        char const *yymsgp = YY_("syntax error");
        if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)        int yysyntax_error_status;
          {        yysyntax_error_status = YYSYNTAX_ERROR;
            YYSIZE_T yyalloc = 2 * yysize;        if (yysyntax_error_status == 0)
            if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))          yymsgp = yymsg;
              yyalloc = YYSTACK_ALLOC_MAXIMUM;        else if (yysyntax_error_status == 1)
            if (yymsg != yymsgbuf)          {
              YYSTACK_FREE (yymsg);            if (yymsg != yymsgbuf)
            yymsg = (char *) YYSTACK_ALLOC (yyalloc);              YYSTACK_FREE (yymsg);
            if (yymsg)            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
              yymsg_alloc = yyalloc;            if (!yymsg)
            else              {
              {                yymsg = yymsgbuf;
                yymsg = yymsgbuf;                yymsg_alloc = sizeof yymsgbuf;
                yymsg_alloc = sizeof yymsgbuf;                yysyntax_error_status = 2;
              }              }
          }            else
              {
        if (0 < yysize && yysize <= yymsg_alloc)                yysyntax_error_status = YYSYNTAX_ERROR;
          {                yymsgp = yymsg;
            (void) yysyntax_error (yymsg, yystate, yychar);              }
            yyerror (yymsg);          }
          }        yyerror (yymsgp);
        else        if (yysyntax_error_status == 2)
          {          goto yyexhaustedlab;
            yyerror (YY_("syntax error")); 
            if (yysize != 0) 
              goto yyexhaustedlab; 
          } 
       }        }
   # undef YYSYNTAX_ERROR
 #endif  #endif
     }      }
   
Line 2017  yyerrlab1: Line 2063  yyerrlab1:
   for (;;)    for (;;)
     {      {
       yyn = yypact[yystate];        yyn = yypact[yystate];
      if (yyn != YYPACT_NINF)      if (!yypact_value_is_default (yyn))
         {          {
           yyn += YYTERROR;            yyn += YYTERROR;
           if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)            if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
Line 2040  yyerrlab1: Line 2086  yyerrlab1:
       YY_STACK_PRINT (yyss, yyssp);        YY_STACK_PRINT (yyss, yyssp);
     }      }
   
     YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;    *++yyvsp = yylval;
     YY_IGNORE_MAYBE_UNINITIALIZED_END
   
   
   /* Shift the error token.  */    /* Shift the error token.  */
Line 2064  yyabortlab: Line 2112  yyabortlab:
   yyresult = 1;    yyresult = 1;
   goto yyreturn;    goto yyreturn;
   
#if !defined(yyoverflow) || YYERROR_VERBOSE#if !defined yyoverflow || YYERROR_VERBOSE
 /*-------------------------------------------------.  /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |  | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/  `-------------------------------------------------*/
Line 2076  yyexhaustedlab: Line 2124  yyexhaustedlab:
   
 yyreturn:  yyreturn:
   if (yychar != YYEMPTY)    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    /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */       this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);    YYPOPSTACK (yylen);
Line 2099  yyreturn: Line 2152  yyreturn:
   /* Make sure YYID is used.  */    /* Make sure YYID is used.  */
   return YYID (yyresult);    return YYID (yyresult);
 }  }
   
   
   
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>