Replace multiple 'use vars' by 'our' in regen.

then run ./regen_perly.pl to update perly files

6 files changed, 16 insertions, 13 deletions

diff --git a/perly.act b/perly.act
index e5baa09042..a201902748 100644
--- a/perly.act
+++ b/perly.act
@@ -1,6 +1,6 @@
 /* -*- buffer-read-only: t -*-
    !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-   This file is built by regen_perly.pl from perly.y.
+   This file is built by ./regen_perly.pl from perly.y.
    Any changes made here will be lost!
  */
 
@@ -1984,5 +1984,5 @@ case 2:
 
 /* Generated from:
  * 4667736d3c31a5169bab73c89d70a27dbce5ea4fe7e3c332a236f8a210aafdc2 perly.y
- * 153cba5d215c1a083a0459c43f4d55c45fd0a7093c197d7247a456dcde21ea53 regen_perly.pl
+ * b6fae5748f9bef6db4740aa5e122b84ac5181852d42474d0ecad621fa4253306 regen_perly.pl
  * ex: set ro: */
diff --git a/perly.h b/perly.h
index 43b8885f13..eb14b421c7 100644
--- a/perly.h
+++ b/perly.h
@@ -1,17 +1,17 @@
 /* -*- buffer-read-only: t -*-
    !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-   This file is built by regen_perly.pl from perly.y.
+   This file is built by ./regen_perly.pl from perly.y.
    Any changes made here will be lost!
  */
 
 #define PERL_BISON_VERSION  30000
 
 #ifdef PERL_CORE
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* 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-2015 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
@@ -160,7 +160,7 @@ S_is_opval_token(int type) {
 #endif /* PERL_IN_TOKE_C */
 #endif /* PERL_CORE */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE YYSTYPE;
+
 union YYSTYPE
 {
 
@@ -171,6 +171,8 @@ union YYSTYPE
     GV *gvval;
 
 };
+
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
 #endif
@@ -182,5 +184,5 @@ int yyparse (void);
 
 /* Generated from:
  * 4667736d3c31a5169bab73c89d70a27dbce5ea4fe7e3c332a236f8a210aafdc2 perly.y
- * 153cba5d215c1a083a0459c43f4d55c45fd0a7093c197d7247a456dcde21ea53 regen_perly.pl
+ * b6fae5748f9bef6db4740aa5e122b84ac5181852d42474d0ecad621fa4253306 regen_perly.pl
  * ex: set ro: */
diff --git a/perly.tab b/perly.tab
index bf47bc3815..9ca5ae8916 100644
--- a/perly.tab
+++ b/perly.tab
@@ -1,6 +1,6 @@
 /* -*- buffer-read-only: t -*-
    !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-   This file is built by regen_perly.pl from perly.y.
+   This file is built by ./regen_perly.pl from perly.y.
    Any changes made here will be lost!
  */
 
@@ -1112,5 +1112,5 @@ static const toketypes yy_type_tab[] =
 
 /* Generated from:
  * 4667736d3c31a5169bab73c89d70a27dbce5ea4fe7e3c332a236f8a210aafdc2 perly.y
- * 153cba5d215c1a083a0459c43f4d55c45fd0a7093c197d7247a456dcde21ea53 regen_perly.pl
+ * b6fae5748f9bef6db4740aa5e122b84ac5181852d42474d0ecad621fa4253306 regen_perly.pl
  * ex: set ro: */
diff --git a/regen/lib_cleanup.pl b/regen/lib_cleanup.pl
index 6caf74a563..d381269b7a 100644
--- a/regen/lib_cleanup.pl
+++ b/regen/lib_cleanup.pl
@@ -2,7 +2,7 @@
 use strict;
 require './regen/regen_lib.pl';
 require './Porting/pod_lib.pl';
-use vars qw($TAP $Verbose);
+our ($TAP, $Verbose);
 
 # For processing later
 my @ext;
diff --git a/regen/regen_lib.pl b/regen/regen_lib.pl
index 571f5195af..cbe51eda71 100644
--- a/regen/regen_lib.pl
+++ b/regen/regen_lib.pl
@@ -1,15 +1,15 @@
 #!/usr/bin/perl -w
 use strict;
-use vars qw($Needs_Write $Verbose @Changed $TAP);
+our (@Changed, $TAP);
 use File::Compare;
 use Symbol;
 use Text::Wrap();
 
 # Common functions needed by the regen scripts
 
-$Needs_Write = $^O eq 'cygwin' || $^O eq 'os2' || $^O eq 'MSWin32';
+our $Needs_Write = $^O eq 'cygwin' || $^O eq 'os2' || $^O eq 'MSWin32';
 
-$Verbose = 0;
+our $Verbose = 0;
 @ARGV = grep { not($_ eq '-q' and $Verbose = -1) }
   grep { not($_ eq '--tap' and $TAP = 1) }
   grep { not($_ eq '-v' and $Verbose = 1) } @ARGV;
diff --git a/regen_perly.pl b/regen_perly.pl
index b8fb5d7004..2abe8e74ea 100644
--- a/regen_perly.pl
+++ b/regen_perly.pl
@@ -35,6 +35,7 @@ sub usage { die "usage: $0 [ -b bison_executable ] [ file.y ]\n" }
 use warnings;
 use strict;
 
+our $Verbose;
 BEGIN { require './regen/regen_lib.pl'; }
 
 my $bison = 'bison';