(YYPARSE_PARAM_DECL): In C++, make it always null.

(YYPARSE_PARAM_ARG): New macro.
(yyparse): Use YYPARSE_PARAM_ARG.

diff --git a/bison.simple b/bison.simple
index 0fb74ce714ca9d8bfc43769acf87ea09d07c5567..51ab0f2add89520e88ffe7d39ad696de5871aa34 100644 (file)
--- a/bison.simple
+++ b/bison.simple
@@ -201,14 +201,20 @@ __yy_memcpy (char *from, char *to, int count)
    to the proper pointer type.  */
 
 #ifdef YYPARSE_PARAM
+#ifdef __cplusplus
+#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+#define YYPARSE_PARAM_DECL
+#else /* not __cplusplus */
+#define YYPARSE_PARAM_ARG YYPARSE_PARAM
 #define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#else
-#define YYPARSE_PARAM
+#endif /* not __cplusplus */
+#else /* not YYPARSE_PARAM */
+#define YYPARSE_PARAM_ARG
 #define YYPARSE_PARAM_DECL
-#endif
+#endif /* not YYPARSE_PARAM */
 
 int
-yyparse(YYPARSE_PARAM)
+yyparse(YYPARSE_PARAM_ARG)
      YYPARSE_PARAM_DECL
 {
   register int yystate;

diff --git a/src/bison.s1 b/src/bison.s1
index 0fb74ce714ca9d8bfc43769acf87ea09d07c5567..51ab0f2add89520e88ffe7d39ad696de5871aa34 100644 (file)
--- a/src/bison.s1
+++ b/src/bison.s1
@@ -201,14 +201,20 @@ __yy_memcpy (char *from, char *to, int count)
    to the proper pointer type.  */
 
 #ifdef YYPARSE_PARAM
+#ifdef __cplusplus
+#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+#define YYPARSE_PARAM_DECL
+#else /* not __cplusplus */
+#define YYPARSE_PARAM_ARG YYPARSE_PARAM
 #define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#else
-#define YYPARSE_PARAM
+#endif /* not __cplusplus */
+#else /* not YYPARSE_PARAM */
+#define YYPARSE_PARAM_ARG
 #define YYPARSE_PARAM_DECL
-#endif
+#endif /* not YYPARSE_PARAM */
 
 int
-yyparse(YYPARSE_PARAM)
+yyparse(YYPARSE_PARAM_ARG)
      YYPARSE_PARAM_DECL
 {
   register int yystate;

diff --git a/src/bison.simple b/src/bison.simple
index 0fb74ce714ca9d8bfc43769acf87ea09d07c5567..51ab0f2add89520e88ffe7d39ad696de5871aa34 100644 (file)
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -201,14 +201,20 @@ __yy_memcpy (char *from, char *to, int count)
    to the proper pointer type.  */
 
 #ifdef YYPARSE_PARAM
+#ifdef __cplusplus
+#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+#define YYPARSE_PARAM_DECL
+#else /* not __cplusplus */
+#define YYPARSE_PARAM_ARG YYPARSE_PARAM
 #define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#else
-#define YYPARSE_PARAM
+#endif /* not __cplusplus */
+#else /* not YYPARSE_PARAM */
+#define YYPARSE_PARAM_ARG
 #define YYPARSE_PARAM_DECL
-#endif
+#endif /* not YYPARSE_PARAM */
 
 int
-yyparse(YYPARSE_PARAM)
+yyparse(YYPARSE_PARAM_ARG)
      YYPARSE_PARAM_DECL
 {
   register int yystate;