Revert "Make instr() a macro"

[perl5.git] / perly.h

diff --git a/perly.h b/perly.h
index 2886bd3..acbdaae 100644 (file)
--- a/perly.h
+++ b/perly.h
@@ -4,12 +4,14 @@
    Any changes made here will be lost!
  */
 
+#define PERL_BISON_VERSION  20007
+
 #ifdef PERL_CORE
-/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
+/* A Bison parser, made by GNU Bison 2.7.  */
 
 /* Bison interface for Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989-1990, 2000-2013 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
@@ -130,8 +132,7 @@ extern int yydebug;
      POSTINC = 334,
      PREDEC = 335,
      PREINC = 336,
-     ARROW = 337,
-     PEG = 338
+     ARROW = 337
    };
 #endif
 
@@ -216,7 +217,6 @@ extern int yydebug;
 #define PREDEC 335
 #define PREINC 336
 #define ARROW 337
-#define PEG 338
 
 
 #ifdef PERL_IN_TOKE_C
@@ -245,26 +245,16 @@ S_is_opval_token(int type) {
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-/* Line 2053 of yacc.c  */
+/* Line 2058 of yacc.c  */
 
     I32        ival; /* __DEFAULT__ (marker for regen_perly.pl;
                                must always be 1st union member) */
     char *pval;
     OP *opval;
     GV *gvval;
-#ifdef PERL_IN_MADLY_C
-    TOKEN* p_tkval;
-    TOKEN* i_tkval;
-#else
-    char *p_tkval;
-    I32        i_tkval;
-#endif
-#ifdef PERL_MAD
-    TOKEN* tkval;
-#endif
 
 
-/* Line 2053 of yacc.c  */
+/* Line 2058 of yacc.c  */
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -288,6 +278,6 @@ int yyparse ();
 
 
 /* Generated from:
- * 911fbbcab275e0f9645397ee5b80a7c2384e6b24f793c15e6d6e918ebfd4e384 perly.y
- * 5c9d2a0262457fe9b70073fc8ad6c188f812f38ad57712b7e2f53daa01b297cc regen_perly.pl
+ * 703ebd267cf8ca45f9dee9bc0f4b21511117a0c1dca1c8bc9438ce91950217ae perly.y
+ * a4923588f219644801577c514014847e1e5240f49413fa3b89d3306fa4874d07 regen_perly.pl
  * ex: set ro: */