Use customized bison skeleton to change cpp guard

Author: bukka

Makefile.frag

@@ -4,4 +4,4 @@ $(srcdir)/jsond_scanner.c: $(srcdir)/jsond_scanner.re
 	$(RE2C) -t $(srcdir)/php_jsond_scanner_defs.h --no-generation-date -bci -o $@ $(srcdir)/jsond_scanner.re
 
 $(srcdir)/jsond_parser.tab.c: $(srcdir)/jsond_parser.y
-	$(YACC) --defines -l $(srcdir)/jsond_parser.y -o $@
+	$(YACC) --defines --skeleton=$(srcdir)/jsond_yacc.c -l $(srcdir)/jsond_parser.y -o $@

jsond_parser.tab.c

@@ -47,7 +47,7 @@
 #define YYBISON_VERSION "3.0.4"
 
 /* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
+#define YYSKELETON_NAME "jsond_yacc.c"
 
 /* Pure parsers.  */
 #define YYPURE 1
@@ -126,8 +126,8 @@ int json_yydebug = 1;
 
 /* In a future release of Bison, this section will be replaced
    by #include "jsond_parser.tab.h".  */
-#ifndef YY_PHP_JSON_YY_HOME_JAKUB_PROG_PHP_EXT_JSOND_JSOND_PARSER_TAB_H_INCLUDED
-# define YY_PHP_JSON_YY_HOME_JAKUB_PROG_PHP_EXT_JSOND_JSOND_PARSER_TAB_H_INCLUDED
+#ifndef YY_PHP_JSON_YY_PARSER_INCLUDED
+# define YY_PHP_JSON_YY_PARSER_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -189,7 +189,7 @@ typedef union YYSTYPE YYSTYPE;
 
 int php_json_yyparse (php_json_parser *parser);
 
-#endif /* !YY_PHP_JSON_YY_HOME_JAKUB_PROG_PHP_EXT_JSOND_JSOND_PARSER_TAB_H_INCLUDED  */
+#endif /* !YY_PHP_JSON_YY_PARSER_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
 
@@ -718,10 +718,6 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue
   YYUSE (parser);
   if (!yyvaluep)
     return;
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
   YYUSE (yytype);
 }
 

jsond_parser.tab.h

@@ -30,8 +30,8 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef YY_PHP_JSON_YY_HOME_JAKUB_PROG_PHP_EXT_JSOND_JSOND_PARSER_TAB_H_INCLUDED
-# define YY_PHP_JSON_YY_HOME_JAKUB_PROG_PHP_EXT_JSOND_JSOND_PARSER_TAB_H_INCLUDED
+#ifndef YY_PHP_JSON_YY_PARSER_INCLUDED
+# define YY_PHP_JSON_YY_PARSER_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -93,4 +93,4 @@ typedef union YYSTYPE YYSTYPE;
 
 int php_json_yyparse (php_json_parser *parser);
 
-#endif /* !YY_PHP_JSON_YY_HOME_JAKUB_PROG_PHP_EXT_JSOND_JSOND_PARSER_TAB_H_INCLUDED  */
+#endif /* !YY_PHP_JSON_YY_PARSER_INCLUDED  */

jsond_yacc.c

@@ -285,20 +285,43 @@ m4_define([b4_declare_yyparse],
 # Declaration that might either go into the header (if --defines)
 # or open coded in the parser body.
 m4_define([b4_shared_declarations],
-[b4_cpp_guard_open([b4_spec_defines_file])[
+[b4_cpp_guard_open([parser])[
 ]b4_declare_yydebug[
 ]b4_percent_code_get([[requires]])[
 ]b4_token_enums_defines[
 ]b4_declare_yylstype[
 ]b4_declare_yyparse[
 ]b4_percent_code_get([[provides]])[
-]b4_cpp_guard_close([b4_spec_defines_file])[]dnl
+]b4_cpp_guard_close([parser])[]dnl
 ])
 
 ## -------------- ##
 ## Output files.  ##
 ## -------------- ##
 
+# b4_json_identification
+# -----------------
+# Customized identification for jsond parser
+m4_define([b4_jsond_identification],
+[[/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "]b4_version["
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME ]["jsond_yacc.c"][]m4_ifdef([b4_pure_flag], [[
+
+/* Pure parsers.  */
+#define YYPURE ]b4_pure_flag])[]m4_ifdef([b4_push_flag], [[
+
+/* Push parsers.  */
+#define YYPUSH ]b4_push_flag])[]m4_ifdef([b4_pull_flag], [[
+
+/* Pull parsers.  */
+#define YYPULL ]b4_pull_flag])[
+]])
+
 b4_output_begin([b4_parser_file_name])
 b4_copyright([Bison implementation for Yacc-like parsers in C])[
 
@@ -312,7 +335,7 @@ b4_copyright([Bison implementation for Yacc-like parsers in C])[
    define necessary library symbols; they are noted "INFRINGES ON
    USER NAME SPACE" below.  */
 
-]b4_identification
+]b4_jsond_identification
 b4_percent_code_get([[top]])[]dnl
 m4_if(b4_api_prefix, [yy], [],
 [[/* Substitute the type names.  */