From: Jesse Vincent <jesse@bestpractical.com>
Date: Wed, 3 Feb 2010 17:43:08 +0000 (-0800)
Subject: Allow arbitrary whitespace between NAME and VERSION in "package NAME VERSION;" statements
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=14a86d0ccd20f01e74c8b4605e1dc764acc06a35;p=p5sagit%2Fp5-mst-13.2.git

Allow arbitrary whitespace between NAME and VERSION in "package NAME VERSION;" statements

Fixes [perl #72432]
---

diff --git a/perly.act b/perly.act
index 7319076..6d20c29 100644
--- a/perly.act
+++ b/perly.act
@@ -1627,8 +1627,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 5d591fa..b40a968 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
@@ -113,6 +113,7 @@
      PEG = 328
    };
 #endif
+
 /* Tokens.  */
 #define WORD 258
 #define METHOD 259
@@ -188,11 +189,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;
@@ -208,13 +211,16 @@ typedef union YYSTYPE
 #ifdef PERL_MAD
     TOKEN* tkval;
 #endif
-}
-/* Line 1529 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 d5d0169..34096e1 100644
--- a/perly.tab
+++ b/perly.tab
@@ -216,7 +216,7 @@ static const char *const yytname[] =
   "mexpr", "mnexpr", "miexpr", "label", "decl", "peg", "format",
   "formname", "mysubrout", "subrout", "startsub", "startanonsub",
   "startformsub", "subname", "proto", "subattrlist", "myattrlist",
-  "subbody", "package", "use", "@1", "expr", "argexpr", "listop", "@2",
+  "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", "arylen", "star", "indirob", 0
diff --git a/toke.c b/toke.c
index 2d383b3..9df0ff2 100644
--- a/toke.c
+++ b/toke.c
@@ -7014,6 +7014,7 @@ Perl_yylex(pTHX)
 
 	case KEY_package:
 	    s = force_word(s,WORD,FALSE,TRUE,FALSE);
+	    s = SKIPSPACE1(s);
 	    s = force_strict_version(s);
 	    OPERATOR(PACKAGE);