In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/368f9a849b13b35288cb676873ce7fe589968477?hp=7360c6b444ea6e19b6583f9530f845bee19c7921>
- Log ----------------------------------------------------------------- commit 368f9a849b13b35288cb676873ce7fe589968477 Author: Jesse Vincent <[email protected]> Date: Tue Oct 20 11:35:09 2009 -0400 make regen; make regen_perly ----------------------------------------------------------------------- Summary of changes: perly.act | 3 --- perly.h | 42 ++++++++++++++++++++++++------------------ perly.tab | 2 +- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/perly.act b/perly.act index 9573e5c..a74e3d3 100644 --- a/perly.act +++ b/perly.act @@ -1616,8 +1616,5 @@ case 2: { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - -/* Line 1267 of yacc.c. */ - default: break; diff --git a/perly.h b/perly.h index 802da29..a8c7f04 100644 --- a/perly.h +++ b/perly.h @@ -1,25 +1,24 @@ #ifdef PERL_CORE -/* A Bison parser, made by GNU Bison 2.3. */ -/* Skeleton interface for Bison's Yacc-like parsers in C +/* A Bison parser, made by GNU Bison 2.4.1. */ - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +/* Skeleton interface for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 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 - the Free Software Foundation; either version 2, or (at your option) - any later version. - + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -30,10 +29,11 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ + /* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE @@ -111,6 +111,7 @@ PEG = 326 }; #endif + /* Tokens. */ #define WORD 258 #define METHOD 259 @@ -184,11 +185,13 @@ - #endif /* PERL_CORE */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { + +/* Line 1676 of yacc.c */ + I32 ival; /* __DEFAULT__ (marker for regen_perly.pl; must always be 1st union member) */ char *pval; @@ -204,13 +207,16 @@ typedef union YYSTYPE #ifdef PERL_MAD TOKEN* tkval; #endif -} -/* Line 1489 of yacc.c. */ - YYSTYPE; + + + +/* Line 1676 of yacc.c */ +} YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 #endif + diff --git a/perly.tab b/perly.tab index 18babb6..c8c88c1 100644 --- a/perly.tab +++ b/perly.tab @@ -214,7 +214,7 @@ static const char *const yytname[] = "loop", "switch", "mintro", "nexpr", "texpr", "iexpr", "mexpr", "mnexpr", "miexpr", "label", "decl", "peg", "format", "formname", "mysubrout", "subrout", "startsub", "startanonsub", "startformsub", "subname", - "proto", "subattrlist", "myattrlist", "subbody", "package", "use", "@1", + "proto", "subattrlist", "myattrlist", "subbody", "package", "use", "$...@1", "expr", "argexpr", "listop", "@2", "method", "subscripted", "termbinop", "termunop", "anonymous", "termdo", "term", "myattrterm", "myterm", "listexpr", "listexprcom", "my_scalar", "amper", "scalar", "ary", "hsh", -- Perl5 Master Repository
