(YYSTD): Remove.

(YYSIZE_T, YYFPRINTF, YYPARSE_PARAM_ARG, YYPARSE_PARAM_DECL):
Treat C++ just like Standard C instead of trying to support
namespace cleanliness.
This commit is contained in:
Paul Eggert
2002-02-14 20:27:45 +00:00
parent e4e1a4dcb4
commit 45119af166

View File

@@ -125,12 +125,6 @@ typedef struct yyltype
define necessary library symbols; they are noted "INFRINGES ON define necessary library symbols; they are noted "INFRINGES ON
USER NAME SPACE" below. */ USER NAME SPACE" below. */
#ifdef __cplusplus
# define YYSTD(x) std::x
#else
# define YYSTD(x) x
#endif
#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE) #if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
/* The parser invokes alloca or malloc; define the necessary symbols. */ /* The parser invokes alloca or malloc; define the necessary symbols. */
@@ -153,17 +147,12 @@ typedef struct yyltype
/* Pacify GCC's `empty if-body' warning. */ /* Pacify GCC's `empty if-body' warning. */
# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
# else # else
# ifdef __cplusplus # if defined (__STDC__) || defined (__cplusplus)
# include <cstdlib> /* INFRINGES ON USER NAME SPACE */ # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
# define YYSIZE_T std::size_t # define YYSIZE_T size_t
# else
# ifdef __STDC__
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
# define YYSIZE_T size_t
# endif
# endif # endif
# define YYSTACK_ALLOC YYSTD (malloc) # define YYSTACK_ALLOC malloc
# define YYSTACK_FREE YYSTD (free) # define YYSTACK_FREE free
# endif # endif
/* A type that is properly aligned for any stack member. */ /* A type that is properly aligned for any stack member. */
@@ -333,14 +322,9 @@ static const short yycheck[[]] =
# define YYSIZE_T size_t # define YYSIZE_T size_t
#endif #endif
#if ! defined (YYSIZE_T) #if ! defined (YYSIZE_T)
# ifdef __cplusplus # if defined (__STDC__) || defined (__cplusplus)
# include <cstddef> /* INFRINGES ON USER NAME SPACE */ # include <stddef.h> /* INFRINGES ON USER NAME SPACE */
# define YYSIZE_T std::size_t # define YYSIZE_T size_t
# else
# ifdef __STDC__
# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
# define YYSIZE_T size_t
# endif
# endif # endif
#endif #endif
#if ! defined (YYSIZE_T) #if ! defined (YYSIZE_T)
@@ -421,12 +405,8 @@ while (0)
#if YYDEBUG #if YYDEBUG
# ifndef YYFPRINTF # ifndef YYFPRINTF
# ifdef __cplusplus # include <stdio.h> /* INFRINGES ON USER NAME SPACE */
# include <cstdio> /* INFRINGES ON USER NAME SPACE */ # define YYFPRINTF fprintf
# else
# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
# endif
# define YYFPRINTF YYSTD (fprintf)
# endif # endif
# define YYDPRINTF(Args) \ # define YYDPRINTF(Args) \
@@ -552,13 +532,13 @@ yystpcpy (yydest, yysrc)
to the proper pointer type. */ to the proper pointer type. */
#ifdef YYPARSE_PARAM #ifdef YYPARSE_PARAM
# ifdef __cplusplus # if defined (__STDC__) || defined (__cplusplus)
# define YYPARSE_PARAM_ARG void *YYPARSE_PARAM # define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
# define YYPARSE_PARAM_DECL # define YYPARSE_PARAM_DECL
# else /* !__cplusplus */ # else
# define YYPARSE_PARAM_ARG YYPARSE_PARAM # define YYPARSE_PARAM_ARG YYPARSE_PARAM
# define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; # define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
# endif /* !__cplusplus */ # endif
#else /* !YYPARSE_PARAM */ #else /* !YYPARSE_PARAM */
# define YYPARSE_PARAM_ARG # define YYPARSE_PARAM_ARG
# define YYPARSE_PARAM_DECL # define YYPARSE_PARAM_DECL