[Midnightbsd-cvs] src [6443] U trunk/contrib/perl: perl 5.18.1 merge

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Dec 2 16:28:58 EST 2013


Revision: 6443
          http://svnweb.midnightbsd.org/src/?rev=6443
Author:   laffer1
Date:     2013-12-02 16:28:58 -0500 (Mon, 02 Dec 2013)
Log Message:
-----------
perl 5.18.1 merge

Modified Paths:
--------------
    trunk/contrib/perl/h2pl/tcbreak
    trunk/contrib/perl/h2pl/tcbreak2
    trunk/contrib/perl/installhtml
    trunk/contrib/perl/installman
    trunk/contrib/perl/installperl
    trunk/contrib/perl/perly.act
    trunk/contrib/perl/perly.tab
    trunk/contrib/perl/perly.y

Property Changed:
----------------
    trunk/contrib/perl/h2pl/README
    trunk/contrib/perl/h2pl/cbreak.pl
    trunk/contrib/perl/h2pl/cbreak2.pl
    trunk/contrib/perl/h2pl/eg/sizeof.ph
    trunk/contrib/perl/h2pl/eg/sys/errno.pl
    trunk/contrib/perl/h2pl/eg/sys/ioctl.pl
    trunk/contrib/perl/h2pl/eg/sysexits.pl
    trunk/contrib/perl/h2pl/getioctlsizes
    trunk/contrib/perl/h2pl/mksizes
    trunk/contrib/perl/h2pl/mkvars
    trunk/contrib/perl/h2pl/tcbreak
    trunk/contrib/perl/h2pl/tcbreak2
    trunk/contrib/perl/installhtml
    trunk/contrib/perl/installman
    trunk/contrib/perl/installperl
    trunk/contrib/perl/perlsh
    trunk/contrib/perl/perly.act
    trunk/contrib/perl/perly.tab
    trunk/contrib/perl/perly.y

Index: trunk/contrib/perl/h2pl/README
===================================================================
--- trunk/contrib/perl/h2pl/README	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/h2pl/README	2013-12-02 21:28:58 UTC (rev 6443)

Property changes on: trunk/contrib/perl/h2pl/README
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.1
\ No newline at end of property
Index: trunk/contrib/perl/h2pl/cbreak.pl
===================================================================
--- trunk/contrib/perl/h2pl/cbreak.pl	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/h2pl/cbreak.pl	2013-12-02 21:28:58 UTC (rev 6443)

Property changes on: trunk/contrib/perl/h2pl/cbreak.pl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.1
\ No newline at end of property
Index: trunk/contrib/perl/h2pl/cbreak2.pl
===================================================================
--- trunk/contrib/perl/h2pl/cbreak2.pl	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/h2pl/cbreak2.pl	2013-12-02 21:28:58 UTC (rev 6443)

Property changes on: trunk/contrib/perl/h2pl/cbreak2.pl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.1
\ No newline at end of property
Index: trunk/contrib/perl/h2pl/eg/sizeof.ph
===================================================================
--- trunk/contrib/perl/h2pl/eg/sizeof.ph	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/h2pl/eg/sizeof.ph	2013-12-02 21:28:58 UTC (rev 6443)

Property changes on: trunk/contrib/perl/h2pl/eg/sizeof.ph
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.1
\ No newline at end of property
Index: trunk/contrib/perl/h2pl/eg/sys/errno.pl
===================================================================
--- trunk/contrib/perl/h2pl/eg/sys/errno.pl	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/h2pl/eg/sys/errno.pl	2013-12-02 21:28:58 UTC (rev 6443)

Property changes on: trunk/contrib/perl/h2pl/eg/sys/errno.pl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.1
\ No newline at end of property
Index: trunk/contrib/perl/h2pl/eg/sys/ioctl.pl
===================================================================
--- trunk/contrib/perl/h2pl/eg/sys/ioctl.pl	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/h2pl/eg/sys/ioctl.pl	2013-12-02 21:28:58 UTC (rev 6443)

Property changes on: trunk/contrib/perl/h2pl/eg/sys/ioctl.pl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.1
\ No newline at end of property
Index: trunk/contrib/perl/h2pl/eg/sysexits.pl
===================================================================
--- trunk/contrib/perl/h2pl/eg/sysexits.pl	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/h2pl/eg/sysexits.pl	2013-12-02 21:28:58 UTC (rev 6443)

Property changes on: trunk/contrib/perl/h2pl/eg/sysexits.pl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.1
\ No newline at end of property
Index: trunk/contrib/perl/h2pl/getioctlsizes
===================================================================
--- trunk/contrib/perl/h2pl/getioctlsizes	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/h2pl/getioctlsizes	2013-12-02 21:28:58 UTC (rev 6443)

Property changes on: trunk/contrib/perl/h2pl/getioctlsizes
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.1
\ No newline at end of property
Index: trunk/contrib/perl/h2pl/mksizes
===================================================================
--- trunk/contrib/perl/h2pl/mksizes	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/h2pl/mksizes	2013-12-02 21:28:58 UTC (rev 6443)

Property changes on: trunk/contrib/perl/h2pl/mksizes
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.1
\ No newline at end of property
Index: trunk/contrib/perl/h2pl/mkvars
===================================================================
--- trunk/contrib/perl/h2pl/mkvars	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/h2pl/mkvars	2013-12-02 21:28:58 UTC (rev 6443)

Property changes on: trunk/contrib/perl/h2pl/mkvars
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.1
\ No newline at end of property
Modified: trunk/contrib/perl/h2pl/tcbreak
===================================================================
--- trunk/contrib/perl/h2pl/tcbreak	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/h2pl/tcbreak	2013-12-02 21:28:58 UTC (rev 6443)
@@ -12,6 +12,6 @@
 
 print "$c\n";
 
-printf "you gave me `%s', which is 0x%02x\n", $c, ord($c);
+printf "you gave me '%s', which is 0x%02x\n", $c, ord($c);
 
 &cooked;


Property changes on: trunk/contrib/perl/h2pl/tcbreak
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.1
\ No newline at end of property
Modified: trunk/contrib/perl/h2pl/tcbreak2
===================================================================
--- trunk/contrib/perl/h2pl/tcbreak2	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/h2pl/tcbreak2	2013-12-02 21:28:58 UTC (rev 6443)
@@ -12,6 +12,6 @@
 
 print "$c\n";
 
-printf "you gave me `%s', which is 0x%02x\n", $c, ord($c);
+printf "you gave me '%s', which is 0x%02x\n", $c, ord($c);
 
 &cooked;


Property changes on: trunk/contrib/perl/h2pl/tcbreak2
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.1
\ No newline at end of property
Modified: trunk/contrib/perl/installhtml
===================================================================
--- trunk/contrib/perl/installhtml	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/installhtml	2013-12-02 21:28:58 UTC (rev 6443)
@@ -4,7 +4,7 @@
 
 use strict;
 use Config;		# for config options in the makefile
-use File::Spec;
+use File::Spec::Functions qw(rel2abs no_upwards);
 use Getopt::Long;	# for command-line parsing
 use Cwd;
 use Pod::Html 'anchorify';
@@ -18,8 +18,7 @@
     installhtml  [--help] [--podpath=<name>:...:<name>] [--podroot=<name>]
          [--htmldir=<name>] [--htmlroot=<name>]  [--norecurse] [--recurse]
          [--splithead=<name>,...,<name>]   [--splititem=<name>,...,<name>]
-         [--libpods=<name>,...,<name>]        [--ignore=<name>,...,<name>]
-         [--verbose]
+         [--ignore=<name>,...,<name>]  [--verbose]
 
 =head1 DESCRIPTION
 
@@ -77,11 +76,6 @@
 
 The directory containing the splitpod program. The default is 'podroot/pod'.
 
-=item B<--libpods> library PODs for LE<lt>E<gt> links
-
-Comma-separated list of "library" pod files.  This is the same list that
-will be passed to pod2html when any pod is converted.
-
 =item B<--ignore> files to be ignored
 
 Comma-separated of files that shouldn't be installed, given relative
@@ -104,7 +98,6 @@
 			--htmlroot=/perl/nmanual    \
 			--splithead=pod/perlipc     \
 			--splititem=pod/perlfunc    \
-			--libpods=perlfunc,perlguts,perlvar,perlrun,perlop \
 			--recurse \
 			--verbose
 
@@ -120,7 +113,7 @@
 Usage: $0 --help --podpath=<name>:...:<name> --podroot=<name>
          --htmldir=<name> --htmlroot=<name> --norecurse --recurse
          --splithead=<name>,...,<name> --splititem=<name>,...,<name>
-         --libpods=<name>,...,<name> --ignore=<name>,...,<name> --verbose
+         --ignore=<name>,...,<name> --verbose
 
     --help      - this message
     --podpath   - colon-separated list of directories containing .pod and
@@ -131,9 +124,6 @@
                   to the filesystem (\$podroot/html by default).
     --htmlroot  - http-server base directory from which all relative paths
                   in podpath stem (default is /).
-    --libpods   - comma-separated list of files to search for =item pod
-                  directives in as targets of C<> and implicit links (empty
-                  by default).
     --norecurse - don't recurse on those subdirectories listed in podpath.
                   (default behavior).
     --recurse   - recurse on those subdirectories listed in podpath
@@ -149,10 +139,9 @@
 
 END_OF_USAGE
 
-my (@libpods, @podpath, $podroot, $htmldir, $htmlroot, $recurse, @splithead,
+my (@podpath, $podroot, $htmldir, $htmlroot, $recurse, @splithead,
     @splititem, $splitpod, $verbose, $pod2html, @ignore);
 
- at libpods = ();
 @podpath = ( "." );	# colon-separated list of directories containing .pod
 			# and .pm files to be converted.
 $podroot = ".";		# assume the pods we want are here
@@ -182,7 +171,6 @@
 	podroot=s
 	htmldir=s
 	htmlroot=s
-	libpods=s
 	ignore=s
 	recurse!
 	splithead=s
@@ -287,7 +275,6 @@
     # lists of files
     @splithead = split(",", $Options{splithead}) if defined $Options{splithead};
     @splititem = split(",", $Options{splititem}) if defined $Options{splititem};
-    @libpods   = split(",", $Options{libpods}) if defined $Options{libpods};
 
     $htmldir  = $Options{htmldir}	    if defined $Options{htmldir};
     $htmlroot = $Options{htmlroot}	    if defined $Options{htmlroot};
@@ -304,14 +291,11 @@
 sub create_index {
     my($html, $dir) = @_;
     (my $pod = $dir) =~ s,^.*/,,;
-    my(@files, @filedata, @index, $file);
-    my($lcp1,$lcp2);
 
-
     # get the list of .html files in this directory
     opendir(DIR, $dir) ||
 	die "$0: error opening directory $dir for reading: $!\n";
-    @files = sort(grep(/\.html?$/, readdir(DIR)));
+    my @files = sort(grep(/\.html?$/, readdir(DIR)));
     closedir(DIR);
 
     open(HTML, ">$html") ||
@@ -320,40 +304,28 @@
     # for each .html file in the directory, extract the index
     #	embedded in the file and throw it into the big index.
     print HTML "<DL COMPACT>\n";
-    foreach $file (@files) {
-	$/ = "";
+    foreach my $file (@files) {
 
-	open(IN, "<$dir/$file") ||
-	    die "$0: error opening $dir/$file for input: $!\n";
-	@filedata = <IN>;
-	close(IN);
+	my $filedata = do {
+	    open(my $in, "<$dir/$file") ||
+		die "$0: error opening $dir/$file for input: $!\n";
+	    local $/ = undef;
+	    <$in>;
+	};
 
 	# pull out the NAME section
-	my $name;
-	($name) = grep(/name="name"/i, @filedata);
-	($lcp1,$lcp2) = ($name =~ m,/H1>\s(\S+)\s[\s-]*(.*?)\s*$,smi);
-	if (defined $lcp1 and $lcp1 =~ m,^<P>$,i) { # Uninteresting.  Try again.
-	    ($lcp1,$lcp2) = ($name =~ m,/H1>\s<P>\s*(\S+)\s[\s-]*(.*?)\s*$,smi);
-	}
+	my($lcp1, $lcp2) =
+	    ($filedata =~
+		m#<h1 id="NAME">NAME</h1>\s*<p>\s*(\S+)\s+-\s+(\S.*?\S)</p>#);
+	defined $lcp1 or die "$0: can't find NAME section in $dir/$file\n";
+
 	my $url= "$pod/$file" ;
 	if ( ! defined $Options{htmlroot} || $Options{htmlroot} eq '' ) {
 	    $url = Pod::Html::relativize_url( "$pod/$file", $html ) ;
 	}
 
-	if (defined $lcp1) {
-	    print HTML qq(<DT><A HREF="$url">);
-	    print HTML "$lcp1</A></DT><DD>$lcp2</DD>\n";
-	}
-
-	next;
-
-	@index = grep(/<!-- INDEX BEGIN -->.*<!-- INDEX END -->/s,
-		    @filedata);
-	for (@index) {
-	    s/<!-- INDEX BEGIN -->(\s*<!--)(.*)(-->\s*)<!-- INDEX END -->/$lcp2/s;
-	    s,#,$dir/$file#,g;
-	    print HTML "$_\n<P><HR><P>\n";
-	}
+	print HTML qq(<DT><A HREF="$url">);
+	print HTML "$lcp1</A></DT><DD>$lcp2</DD>\n";
     }
     print HTML "</DL>\n";
 
@@ -390,8 +362,8 @@
 
     print "splitting files by item.\n" if $verbose && $#splititem >= 0;
     $pwd = getcwd();
-    my $splitter = File::Spec->rel2abs("$splitpod/splitpod", $pwd);
-    my $perl = File::Spec->rel2abs($^X, $pwd);
+    my $splitter = rel2abs("$splitpod/splitpod", $pwd);
+    my $perl = rel2abs($^X, $pwd);
     foreach my $pod (@splititem) {
 	# figure out the directory to split into
 	$pod      =~ s,^([^/]*)$,/$1,;
@@ -513,34 +485,34 @@
 #
 sub installdir {
     my($dir, $recurse, $podroot, $splitdirs, $ignore) = @_;
-    my(@dirlist, @podlist, @pmlist, $doindex);
 
-    @dirlist = ();	# directories to recurse on
-    @podlist = ();	# .pod files to install
-    @pmlist  = ();	# .pm files to install
+    my @dirlist; # directories to recurse on
+    my @podlist; # .pod files to install
+    my @pmlist;  # .pm files to install
 
     # should files in this directory get an index?
-    $doindex = (grep($_ eq "$podroot/$dir", @$splitdirs) ? 0 : 1);
+    my $doindex = (grep($_ eq "$podroot/$dir", @$splitdirs) ? 0 : 1);
 
     opendir(DIR, "$podroot/$dir")
 	|| die "$0: error opening directory $podroot/$dir: $!\n";
 
-    # find the directories to recurse on
-    @dirlist = map { if ($^O eq 'VMS') {/^(.*)\.dir$/i; "$dir/$1";} else {"$dir/$_";}}
-	grep(-d "$podroot/$dir/$_" && !/^\.{1,2}/, readdir(DIR)) if $recurse;
-    rewinddir(DIR);
+    while(readdir DIR) {
+	no_upwards($_) or next;
+	my $is_dir = -d "$podroot/$dir/$_";
+	next if $is_dir and not $recurse;
+	my $target = (
+	    $is_dir    ? \@dirlist :
+	    s/\.pod$// ? \@podlist :
+	    s/\.pm$//  ? \@pmlist  :
+	    undef
+	);
+	push @$target, "$dir/$_" if $target;
+    }
 
-    # find all the .pod files within the directory
-    @podlist = map { /^(.*)\.pod$/; "$dir/$1" }
-	grep(! -d "$podroot/$dir/$_" && /\.pod$/, readdir(DIR));
-    rewinddir(DIR);
+    closedir(DIR);
 
-    # find all the .pm files within the directory
-    @pmlist = map { /^(.*)\.pm$/; "$dir/$1" }
-	grep(! -d "$podroot/$dir/$_" && /\.pm$/, readdir(DIR));
+    if ($^O eq 'VMS') { s/\.dir$//i for @dirlist }
 
-    closedir(DIR);
-
     # recurse on all subdirectories we kept track of
     foreach $dir (@dirlist) {
 	installdir($dir, $recurse, $podroot, $splitdirs, $ignore);
@@ -600,11 +572,10 @@
         "--htmldir=$htmldir",
 	"--htmlroot=$htmlroot",
 	"--podpath=".join(":", @podpath),
-	"--podroot=$podroot", "--netscape",
+	"--podroot=$podroot",
 	"--header",
 	($doindex ? "--index" : "--noindex"),
 	"--" . ($recurse ? "" : "no") . "recurse",
-	($#libpods >= 0) ? "--libpods=" . join(":", @libpods) : "",
 	"--infile=$podroot/$pod", "--outfile=$htmldir/$html");
     die "$0: error running $pod2html: $!\n" if $?;
 }


Property changes on: trunk/contrib/perl/installhtml
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.2
\ No newline at end of property
Modified: trunk/contrib/perl/installman
===================================================================
--- trunk/contrib/perl/installman	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/installman	2013-12-02 21:28:58 UTC (rev 6443)
@@ -8,14 +8,14 @@
 use strict;
 
 use Getopt::Long;
-use File::Find;
-use File::Copy;
-use File::Path qw(mkpath);
+require File::Path;
 use ExtUtils::Packlist;
 use Pod::Man;
-use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_Cygwin $Is_Darwin $Is_NetWare
-	    %opts $packlist);
+use vars qw(%opts $packlist);
 
+require './Porting/pod_lib.pl';
+my %man1 = (map {($_->[0], $_->[1])} @{get_pod_metadata()->{master}});
+
 $ENV{SHELL} = 'sh' if $^O eq 'os2';
 
 my $patchlevel = substr($],3,2);
@@ -26,7 +26,6 @@
 my $usage =
 "Usage:  installman --man1dir=/usr/wherever --man1ext=1
                    --man3dir=/usr/wherever --man3ext=3
-		   --batchlimit=40
 	           --notify --verbose --silent --help
 	Defaults are:
 	man1dir = $Config{'installman1dir'};
@@ -38,7 +37,7 @@
         --silent  (or -S) be silent. Only report errors.\n";
 
 GetOptions( \%opts,
-            qw( man1dir=s man1ext=s man3dir=s man3ext=s batchlimit=i
+            qw( man1dir=s man1ext=s man3dir=s man3ext=s
                 destdir:s notify n help silent S verbose V))
 	|| die $usage;
 die $usage if $opts{help};
@@ -64,125 +63,92 @@
 
 $packlist = ExtUtils::Packlist->new("$opts{destdir}$Config{installarchlib}/.packlist");
 
-# manpages not to be installed
-my %do_not_install = map { ($_ => 1) } qw(
-    Pod/Functions.pm
-    XS/APItest.pm
-);
-
 # Install the main pod pages.
-pod2man('pod', $opts{man1dir}, $opts{man1ext});
+pod2man(\%man1, $opts{man1dir}, $opts{man1ext}, 'pod');
 
 # Install the pods for library modules.
-pod2man('lib', $opts{man3dir}, $opts{man3ext});
+{
+    my $found = pods_to_install();
+    pod2man($found->{$_}, $opts{man3dir}, $opts{man3ext}, 'lib')
+        foreach qw(MODULE PRAGMA);
+}
 
 # Install the pods embedded in the installed scripts
 my $has_man1dir = $opts{man1dir} ne '' && -d $opts{man1dir};
-open UTILS, "utils.lst" or die "Can't open 'utils.lst': $!";
-while (<UTILS>) {
+my $fh = open_or_die('utils.lst');
+while (<$fh>) {
     next if /^#/;
     chomp;
-    $_ = $1 if /#.*pod\s*=\s*(\S+)/;
-    my ($where, $what) = m|^(\S*)/(\S+)|;
-    pod2man($where, $opts{man1dir}, $opts{man1ext}, $what);
+    my ($path, $leaf) = m|^(\S*/(\S+))|;
+    # Have we already installed the manpage for this? (eg perldoc, a2p)
+    next if $man1{$leaf};
+    pod2man({$leaf, $path}, $opts{man1dir}, $opts{man1ext});
     if ($has_man1dir) {
-	if (my ($where2, $what2) = m|#.*link\s*=\s*(\S+)/(\S+)|) {
-	    my $old = "$opts{man1dir}/$what.$opts{man1ext}";
-	    my $new = "$opts{man1dir}/$what2.$opts{man1ext}";
+        if (my ($link) = m|#.*link\s*=\s*\S+/(\S+)|) {
+            my $old = "$opts{man1dir}/$leaf.$opts{man1ext}";
+            my $new = "$opts{man1dir}/$link.$opts{man1ext}";
 	    unlink($new);
 	    link($old, $new);
-	    my $xold = $old;
-	    $xold =~ s/^\Q$opts{'destdir'}\E// if $opts{'destdir'};
-	    my $xnew = $new;
-	    $xnew =~ s/^\Q$opts{'destdir'}\E// if $opts{'destdir'};
-	    $packlist->{$xnew} = { from => $xold, type => 'link' };
+            $old =~ s/^\Q$opts{destdir}\E// if $opts{destdir};
+            $new =~ s/^\Q$opts{destdir}\E// if $opts{destdir};
+            $packlist->{$new} = { from => $old, type => 'link' };
 	}
     }
 }
+close $fh or my_die("close 'utils.lst': $!");
 
 sub pod2man {
-    # @script is scripts names if we are installing manpages embedded
-    # in scripts, () otherwise
-    my($poddir, $mandir, $manext, @script) = @_;
+    my($modpods, $mandir, $manext, $where) = @_;
     if ($mandir eq ' ' or $mandir eq '') {
-	if (@script) {
-	    warn "Skipping installation of $poddir/$_ man page.\n"
-		foreach @script;
-	} else {
-	    warn "Skipping installation of $poddir man pages.\n";
-	}
-	return;
+        if ($where) {
+            warn "Skipping installation of $where man pages.\n"
+        } else {
+            warn "Skipping installation of $_ man page.\n"
+                foreach values %$modpods;
+        }
+        return;
     }
 
-    print "installing from $poddir\n" if $opts{verbose};
-
-    mkpath($mandir, $opts{verbose}, 0777) unless $opts{notify};  # In File::Path
-    # Make a list of all the .pm and .pod files in the directory.  We avoid
-    # chdir because we are running with @INC = '../lib', and modules may wish
-    # to dynamically require Carp::Heavy or other diagnostics warnings.
-    # Hash the names of files we find, keys are names relative to perl build
-    # dir ('.'), values are names relative to $poddir.
-    my %modpods;
-    if (@script) {
-	%modpods = (map {+"$poddir/$_", $_} @script);
+    if ($opts{verbose}) {
+        if ($where) {
+            print "installing from $where\n";
+        } else {
+            print "installing $_\n"
+                foreach sort keys %$modpods;
+        }
     }
-    else {
-	File::Find::find({no_chdir=>1,
-                          wanted => sub {
-                              # $_ is $File::Find::name when using no_chdir
-                              if (-f $_ and /\.p(?:m|od)$/) {
-                                  my $fullname = $_;
-                                  s!^\Q$poddir\E/!!;
-                                  $modpods{$fullname} = $_;
-                              }
-                          }},
-                         $poddir);
-    }
-    my @to_process;
-    foreach my $mod (sort keys %modpods) {
-        my $manpage = $modpods{$mod};
-	my $tmp;
-	# Skip .pm files that have corresponding .pod files, and Functions.pm.
-	next if (($tmp = $mod) =~ s/\.pm$/.pod/ && -f $tmp);
-	next if $mod =~ m:/t/:; # no pods from test directories
-	next if $do_not_install{$manpage};
 
+    File::Path::mkpath($mandir, $opts{verbose}, 0777) unless $opts{notify};
+
+    foreach my $manpage (sort keys %$modpods) {
+        my $mod = $modpods->{$manpage};
+
 	# Skip files without pod docs
 	my $has_pod;
-	if (open T, $mod)
-	{
-	    local $_;
-	    while (<T>)
-	    {
-		++$has_pod and last if /^=(?:head\d+|item|pod)\b/;
-	    }
+        my $fh = open_or_die($mod);
+        while (my $line = <$fh>) {
+            if ($line =~ /^=head1\b/) {
+                ++$has_pod;
+                last;
+            }
+        }
+	close $fh or my_die("close '$mod': $!");
+        # Sadly it doesn't seem possible to re-use this handle for the call
+        # to parse_from_file() below, as Pod::Man relies on source_filename(),
+        # which Pod::Simple only sets accurately if it opens the file itself.
 
-	    close T;
-	}
-
 	unless ($has_pod)
 	{
-	    warn "no documentation in $mod\n";
+	    warn "no documentation in $mod\n" unless $opts{silent};
 	    next;
 	}
 
-	# Convert name from  File/Basename.pm to File::Basename.3 format,
-	# if necessary.
-	$manpage =~ s#\.p(m|od)$##;
 	if ($^O eq 'os2' || $^O eq 'amigaos' || $^O eq 'uwin' || $^O eq 'cygwin') {
-	  $manpage =~ s#/#.#g;
+            $manpage =~ s#::#.#g;
 	}
-	else {
-	  $manpage =~ s#/#::#g;
-	}
-	$tmp = "${mandir}/${manpage}.tmp";
+        my $tmp = "${mandir}/${manpage}.tmp";
 	$manpage = "${mandir}/${manpage}.${manext}";
-	push @to_process, [$mod, $tmp, $manpage];
-    }
 
-    foreach my $page (@to_process) {
-	my($pod, $tmp, $manpage) = @$page;
-
         my $parser = Pod::Man->new( section => $manext,
                                     official=> 1,
                                     center  => 'Perl Programmers Reference Guide'
@@ -189,8 +155,8 @@
                                   );
 	my $xmanpage = $manpage;
 	$xmanpage =~ s/^\Q$opts{'destdir'}\E// if $opts{'destdir'};
-        print "  $xmanpage\n";
-	if (!$opts{notify} && $parser->parse_from_file($pod, $tmp)) {
+        print "  $xmanpage\n" unless $opts{silent};
+        if (!$opts{notify} && $parser->parse_from_file($mod, $tmp)) {
             if (-s $tmp) {
                 if (rename($tmp, $manpage)) {
                     $packlist->{$xmanpage} = { type => 'file' };
@@ -205,8 +171,6 @@
 $packlist->write() unless $opts{notify};
 print "  Installation complete\n" if $opts{verbose};
 
-exit 0;
-
 sub rename {
     my($from,$to) = @_;
     if (-f $to and not unlink($to)) {
@@ -214,9 +178,16 @@
 	for ($i = 1; $i < 50; $i++) {
 	    last if CORE::rename($to, "$to.$i");
 	}
-	warn("Cannot rename to `$to.$i': $!"), return 0
+	warn("Cannot rename to '$to.$i': $!"), return 0
 	    if $i >= 50;	# Give up!
     }
     link($from,$to) || return 0;
     unlink($from);
 }
+
+# Local variables:
+# cperl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
+#
+# ex: set ts=8 sts=4 sw=4 et:


Property changes on: trunk/contrib/perl/installman
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.3
\ No newline at end of property
Modified: trunk/contrib/perl/installperl
===================================================================
--- trunk/contrib/perl/installperl	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/installperl	2013-12-02 21:28:58 UTC (rev 6443)
@@ -15,9 +15,6 @@
 	    %opts $packlist);
 my ($dostrip, $versiononly, $force,
     $otherperls, $archname, $nwinstall, $nopods);
-# Not sure how easy it would be to refactor to remove the need for local $depth
-# below
-use vars qw /$depth/;
 
 BEGIN {
     if ($Is_VMS) { eval 'use VMS::Filespec;' }
@@ -32,6 +29,8 @@
 use ExtUtils::Packlist;
 use Cwd;
 
+require './Porting/pod_lib.pl';
+
 if ($Is_NetWare) {
     $Is_W32 = 0;
     $scr_ext = '.pl';
@@ -116,7 +115,6 @@
 open SCRIPTS, "utils.lst" or die "Can't open utils.lst: $!";
 while (<SCRIPTS>) {
     next if /^#/;
-    s/\s*#\s*pod\s*=.*//; # install script regardless of pod location
     next if /a2p/; # a2p is binary, to be installed separately
     chomp;
     if (/(\S*)\s*#\s*link\s*=\s*(\S*)/) {
@@ -130,8 +128,6 @@
 
 if ($scr_ext) { @scripts = map { "$_$scr_ext" } @scripts; }
 
-my @pods = $nopods ? () : (<pod/*.pod>, 'x2p/a2p.pod');
-
 # Specify here any .pm files that are actually architecture-dependent.
 # (Those included with XS extensions under ext/ are automatically
 # added later.)
@@ -303,16 +299,6 @@
 	chmod(0755, "$installbin/${dbg}a2p$exe_ext");
     }
 }
-elsif ($^O eq 'mpeix') {
-    # MPE lacks hard links and requires that executables with special
-    # capabilities reside in the MPE namespace.
-    safe_unlink("$installbin/perl$ver$exe_ext", $Config{perlpath});
-    # Install the primary executable into the MPE namespace as perlpath.
-    copy("perl$exe_ext", $Config{perlpath});
-    chmod(0755, $Config{perlpath});
-    # Create a backup copy with the version number.
-    link($Config{perlpath}, "$installbin/perl$ver$exe_ext");
-}
 elsif ($^O ne 'dos') {
     if (!$Is_NetWare) {
 	safe_unlink("$installbin/$perl_verbase$ver$exe_ext");
@@ -324,13 +310,13 @@
 	# If installing onto a NetWare server
 	if ($nwinstall) {
 	    # Copy perl.nlm, echo.nlm, type.nlm, a2p.nlm & cgi2perl.nlm
-	    mkpath($Config{installnwsystem}, 1, 0777);
+            mkpath($Config{installnwsystem}, $opts{verbose}, 0777);
 	    copy("netware\\".$ENV{'MAKE_TYPE'}."\\perl.nlm", $Config{installnwsystem});
 	    copy("netware\\testnlm\\echo\\echo.nlm", $Config{installnwsystem});
 	    copy("netware\\testnlm\\type\\type.nlm", $Config{installnwsystem});
 	    copy("x2p\\a2p.nlm", $Config{installnwsystem});
 	    chmod(0755, "$Config{installnwsystem}\\perl.nlm");
-	    mkpath($Config{installnwlcgi}, 1, 0777);
+            mkpath($Config{installnwlcgi}, $opts{verbose}, 0777);
 	    copy("lib\\auto\\cgi2perl\\cgi2perl.nlm", $Config{installnwlcgi});
 	}
     } #if (!$Is_NetWare)
@@ -342,8 +328,10 @@
 
 # Install library files.
 
-my ($do_installarchlib, $do_installprivlib) = (0, 0);
+my $do_installarchlib = !samepath($installarchlib, 'lib');
+my $do_installprivlib = !samepath($installprivlib, 'lib');
 my $vershort = ($Is_Cygwin and !$Config{usedevel}) ? substr($ver,0,-2) : $ver;
+$do_installprivlib = 0 if $versiononly && !($installprivlib =~ m/\Q$vershort/);
 
 mkpath($installprivlib, $opts{verbose}, 0777);
 mkpath($installarchlib, $opts{verbose}, 0777);
@@ -350,18 +338,12 @@
 mkpath($installsitelib, $opts{verbose}, 0777) if ($installsitelib);
 mkpath($installsitearch, $opts{verbose}, 0777) if ($installsitearch);
 
-if (chdir "lib") {
-    $do_installarchlib = ! samepath($installarchlib, '.');
-    $do_installprivlib = ! samepath($installprivlib, '.');
-    $do_installprivlib = 0 if $versiononly && !($installprivlib =~ m/\Q$vershort/);
-
-    if ($do_installarchlib || $do_installprivlib) {
-	find(\&installlib, '.');
-    }
-    chdir ".." || die "Can't cd back to source directory: $!\n";
+if (-d 'lib') {
+    find({no_chdir => 1, wanted => \&installlib}, 'lib')
+        if $do_installarchlib || $do_installprivlib;
 }
 else {
-    warn "Can't cd to lib to install lib files: $!\n";
+    warn "Can't install lib files - 'lib/' does not exist";
 }
 
 # Install header files and libraries.
@@ -397,13 +379,6 @@
 
     # AIX needs perl.exp installed as well.
     push(@corefiles,'perl.exp') if $^O eq 'aix';
-    if ($^O eq 'mpeix') {
-	# MPE needs mpeixish.h installed as well.
-	mkpath("$installarchlib/CORE/mpeix", $opts{verbose}, 0777);
-	push(@corefiles,'mpeix/mpeixish.h');
-    }
-    # If they have built sperl.o...
-    push(@corefiles,'sperl.o') if -f 'sperl.o';
 }
 foreach my $file (@corefiles) {
     # HP-UX (at least) needs to maintain execute permissions
@@ -410,7 +385,7 @@
     # on dynamically-loadable libraries. So we do it for all.
     if (copy_if_diff($file,"$installarchlib/CORE/$file")) {
 	if ($file =~ /\.(\Q$so\E|\Q$dlext\E)$/) {
-	    strip("-S", "$installarchlib/CORE/$file") if $^O =~ /^(rhapsody|darwin)$/;
+	    strip("-S", "$installarchlib/CORE/$file") if $^O eq 'darwin';
 	    chmod(0555, "$installarchlib/CORE/$file");
 	} else {
 	    chmod(0444, "$installarchlib/CORE/$file");
@@ -423,11 +398,7 @@
 
 if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS && ! $Is_NetWare) {
     safe_unlink("$installbin/$perl$exe_ext", "$installbin/suid$perl$exe_ext");
-    if ($^O eq 'mpeix') {
-	# MPE doesn't support hard links, so use a symlink.
-	# We don't want another cloned copy.
-	symlink($Config{perlpath}, "$installbin/perl$exe_ext");
-    } elsif ($^O eq 'vos') {
+    if ($^O eq 'vos') {
 	# VOS doesn't support hard links, so use a symlink.
 	symlink("$installbin/$perl_verbase$ver$exe_ext",
 		"$installbin/$perl$exe_ext");
@@ -442,11 +413,7 @@
 if ($archname && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS) {
     my $archperl = "$perl_verbase$ver-$Config{archname}$exe_ext";
     safe_unlink("$installbin/$archperl");
-    if ($^O eq 'mpeix') {
-	# MPE doesn't support hard links, so use a symlink.
-	# We don't want another cloned copy.
-	symlink($Config{perlpath}, "$installbin/$archperl");
-    } elsif ($^O eq 'vos') {
+    if ($^O eq 'vos') {
 	# VOS doesn't support hard links, so use a symlink.
 	symlink("$installbin/$perl_verbase$ver$exe_ext",
 		"$installbin/$archperl");
@@ -560,15 +527,15 @@
 
 # Install pod pages.  Where? I guess in $installprivlib/pod
 # ($installprivlib/pods for cygwin).
-
-my $pod = ($Is_Cygwin || $Is_Darwin || $Is_VMS || $Is_W32) ? 'pods' : 'pod';
-if ( !$versiononly || ($installprivlib =~ m/\Q$vershort/)) {
+if (!$nopods && (!$versiononly || ($installprivlib =~ m/\Q$vershort/))) {
+    my $pod = ($Is_Cygwin || $Is_Darwin || $Is_VMS || $Is_W32) ? 'pods' : 'pod';
     mkpath("${installprivlib}/$pod", $opts{verbose}, 0777);
 
-    for (@pods) {
+    for (map {$_->[1]} @{get_pod_metadata()->{master}}) {
 	# $_ is a name like  pod/perl.pod
 	(my $base = $_) =~ s#.*/##;
 	copy_if_diff($_, "${installprivlib}/$pod/${base}");
+	chmod(0644, "${installprivlib}/$pod/${base}");
     }
 
 }
@@ -661,7 +628,7 @@
 	for ($i = 1; $i < 50; $i++) {
 	    last if rename($to, "$to.$i");
 	}
-	warn("Cannot rename to `$to.$i': $!"), return 0
+	warn("Cannot rename to '$to.$i': $!"), return 0
 	   if $i >= 50;	# Give up!
     }
     link($from,$to) || return 0;
@@ -688,11 +655,26 @@
 
 sub installlib {
     my $dir = $File::Find::dir;
-    $dir =~ s#^\.(?![^/])/?##;
-    local($depth) = $dir ? "lib/$dir" : "lib";
+    $dir =~ s!\Alib/?!!;
 
-    my $name = $_;
+    m!([^/]+)\z!;
+    my $name = $1;
 
+    # This remains ugly, and in need of refactoring.
+
+    # $name always starts as the leafname
+    # $dir is the directory *within* lib
+    # $name later has $dir pre-pended, to give the relative path in lib/
+    # which is used to create the path in the target directory.
+
+    # $_ was always the filename to use on disk. Adding no_chdir doesn't change
+    # this, as $_ becomes a pathname, and so still works. However, it's not
+    # obvious that $_ is needed later, and hence $_ must not be modified.
+
+    # Also, many of the regex exlusion tests below are now superfluous, as the
+    # files in question are either no longer in blead, or now in ext/, dist/ or
+    # cpan/ and not copied into lib/
+
     # Ignore version control directories.
     if ($name =~ /^(?:CVS|RCS|SCCS|\.svn)\z/ and -d $name) {
 	$File::Find::prune = 1;
@@ -707,8 +689,9 @@
     # scripts in lib/ExtUtils, the prove script in lib/Test/Harness,
     # the corelist script from lib/Module/CoreList/bin and ptar* in
     # lib/Archive/Tar/bin, the config_data script in lib/Module/Build/scripts
+    # and zipdetails in cpan/IO-Compress/bin
     # (they're installed later with other utils)
-    return if $name =~ /^(?:cpan|instmodsh|prove|corelist|ptar|cpan2dist|cpanp|cpanp-run-perl|ptardiff|ptargrep|config_data)\z/;
+    return if $name =~ /^(?:cpan|instmodsh|prove|corelist|ptar|cpan2dist|cpanp|cpanp-run-perl|ptardiff|ptargrep|config_data|zipdetails)\z/;
     # ignore the Makefiles
     return if $name =~ /^makefile$/i;
     # ignore the test extensions
@@ -722,13 +705,13 @@
     if ( $dir =~ /^unicore/ ) {
       if ( $name =~ /\.txt\z/ ) {
         # We can ignore most, but not all .txt files
-        return unless $name =~ /\A(?:Blocks|CaseFolding|SpecialCasing|NamedSequences)\.txt\z/;
+        return unless $name =~ /\A(?:Blocks|SpecialCasing|NamedSequences)\.txt\z/;
       }
       else {
         # TestProp only needed during testing
         return if $name =~ /\ATestProp.pl\z/;
         # we need version and *.pl files and can skip the rest
-        return unless $name =~ /\A(?:version|\w+\.pl)\z/;
+        return unless $name =~ /\A(?:version|\w+\.p[lm])\z/;
       }
     }
 
@@ -750,6 +733,9 @@
 
     $name = "$dir/$name" if $dir ne '';
 
+    # ignore pods that are stand alone documentation from dual life modules.
+    return if /\.pod\z/ && is_duplicate_pod($_);
+
     return if $name eq 'ExtUtils/XSSymSet.pm' and !$Is_VMS;
 
     my $installlib = $installprivlib;
@@ -764,6 +750,14 @@
 	return unless $do_installprivlib;
     }
 
+    if ($Is_NetWare && !$nwinstall && /\.(?:nlp|nlm|bs)$/) {
+        # Don't copy .nlp,.nlm files, doesn't make sense on Windows and also
+        # if copied will give problems when building new extensions.
+        # Has to be copied if we are installing on a NetWare server and
+        # hence the check !$nwinstall
+        return;
+    }
+
     if (-f $_) {
 	if (/\.(?:al|ix)$/ && !($dir =~ m[^auto/(.*)$])) {
 	    $installlib = $installprivlib;
@@ -781,28 +775,11 @@
 	    mkpath("$installlib/$dir", $opts{verbose}, 0777);
 	    # HP-UX (at least) needs to maintain execute permissions
 	    # on dynamically-loaded libraries.
-	    if ($Is_NetWare && !$nwinstall) {
-		# Don't copy .nlp,.nlm files, doesn't make sense on Windows and also
-		# if copied will give problems when building new extensions.
-		# Has to be copied if we are installing on a NetWare server and hence
-		# the check !$nwinstall
-		if (!(/\.(?:nlp|nlm|bs)$/)) {
-		    copy_if_diff($_, "$installlib/$name")
-			and chmod($name =~ /\.(so|$dlext)$/o ? 0555 : 0444,
-				  "$installlib/$name");
-		}
-	   } else {
-		if (copy_if_diff($_, "$installlib/$name")) {
-		    if ($name =~ /\.(so|$dlext)$/o) {
-			strip("-S", "$installlib/$name") if $^O =~ /^(rhapsody|darwin)$/;
-			chmod(0555, "$installlib/$name");
-		    } else {
-			strip("-S", "$installlib/$name")
-			    if ($name =~ /\.a$/o and $^O =~ /^(rhapsody|darwin)$/);
-			chmod(0444, "$installlib/$name");
-		    }
-		}
-	    } #if ($Is_NetWare)
+            if (copy_if_diff($_, "$installlib/$name")) {
+                strip("-S", "$installlib/$name")
+                    if $^O eq 'darwin' and /\.(?:so|$dlext|a)$/;
+                chmod(/\.(so|$dlext)$/ ? 0555 : 0444, "$installlib/$name");
+            }
 	}
     }
 }
@@ -837,9 +814,6 @@
     $packlist->{$xto} = { type => 'file' };
     if ($force || compare($from, $to) || $opts{notify}) {
 	safe_unlink($to);   # In case we don't have write permissions.
-	if ($opts{notify}) {
-	    $from = $depth . "/" . $from if $depth;
-	}
 	if ($perlpodbadsymlink && $from =~ m!^pod/perl(.+)\.pod$!) {
 	    $from = "README.$1";
 	}
@@ -877,3 +851,10 @@
 	}
     }
 }
+
+# Local variables:
+# cperl-indent-level: 4
+# indent-tabs-mode: nil
+# End:
+#
+# ex: set ts=8 sts=4 sw=4 et:


Property changes on: trunk/contrib/perl/installperl
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.3
\ No newline at end of property
Index: trunk/contrib/perl/perlsh
===================================================================
--- trunk/contrib/perl/perlsh	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/perlsh	2013-12-02 21:28:58 UTC (rev 6443)

Property changes on: trunk/contrib/perl/perlsh
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.1
\ No newline at end of property
Modified: trunk/contrib/perl/perly.act
===================================================================
--- trunk/contrib/perl/perly.act	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/perly.act	2013-12-02 21:28:58 UTC (rev 6443)
@@ -5,44 +5,44 @@
  */
 
 case 2:
-#line 142 "perly.y"
+#line 141 "perly.y"
     {
 			  PL_parser->expect = XSTATE;
-			;}
+			}
     break;
 
   case 3:
-#line 146 "perly.y"
+#line 145 "perly.y"
     {
 			  newPROG(block_end((ps[(3) - (4)].val.ival),(ps[(4) - (4)].val.opval)));
 			  (yyval.ival) = 0;
-			;}
+			}
     break;
 
   case 4:
-#line 151 "perly.y"
+#line 150 "perly.y"
     {
 			  parser->expect = XTERM;
-			;}
+			}
     break;
 
   case 5:
-#line 155 "perly.y"
+#line 154 "perly.y"
     {
 			  PL_eval_root = (ps[(3) - (3)].val.opval);
 			  (yyval.ival) = 0;
-			;}
+			}
     break;
 
   case 6:
-#line 160 "perly.y"
+#line 159 "perly.y"
     {
 			  parser->expect = XBLOCK;
-			;}
+			}
     break;
 
   case 7:
-#line 164 "perly.y"
+#line 163 "perly.y"
     {
 			  PL_pad_reset_pending = TRUE;
 			  PL_eval_root = (ps[(3) - (3)].val.opval);
@@ -49,18 +49,18 @@
 			  (yyval.ival) = 0;
 			  yyunlex();
 			  parser->yychar = YYEOF;
-			;}
+			}
     break;
 
   case 8:
-#line 172 "perly.y"
+#line 171 "perly.y"
     {
 			  parser->expect = XSTATE;
-			;}
+			}
     break;
 
   case 9:
-#line 176 "perly.y"
+#line 175 "perly.y"
     {
 			  PL_pad_reset_pending = TRUE;
 			  PL_eval_root = (ps[(3) - (3)].val.opval);
@@ -67,18 +67,18 @@
 			  (yyval.ival) = 0;
 			  yyunlex();
 			  parser->yychar = YYEOF;
-			;}
+			}
     break;
 
   case 10:
-#line 184 "perly.y"
+#line 183 "perly.y"
     {
 			  parser->expect = XSTATE;
-			;}
+			}
     break;
 
   case 11:
-#line 188 "perly.y"
+#line 187 "perly.y"
     {
 			  PL_pad_reset_pending = TRUE;
 			  PL_eval_root = (ps[(3) - (3)].val.opval);
@@ -85,75 +85,94 @@
 			  (yyval.ival) = 0;
 			  yyunlex();
 			  parser->yychar = YYEOF;
-			;}
+			}
     break;
 
   case 12:
-#line 196 "perly.y"
+#line 195 "perly.y"
     {
 			  parser->expect = XSTATE;
-			;}
+			}
     break;
 
   case 13:
-#line 200 "perly.y"
+#line 199 "perly.y"
     {
 			  PL_eval_root = (ps[(3) - (3)].val.opval);
 			  (yyval.ival) = 0;
-			;}
+			}
     break;
 
   case 14:
-#line 208 "perly.y"
+#line 207 "perly.y"
     { if (PL_parser->copline > (line_t)IVAL((ps[(1) - (4)].val.i_tkval)))
 			      PL_parser->copline = (line_t)IVAL((ps[(1) - (4)].val.i_tkval));
 			  (yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'{');
 			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),'}');
-			;}
+			}
     break;
 
   case 15:
 #line 217 "perly.y"
-    { (yyval.ival) = block_start(TRUE); ;}
+    { if (PL_parser->copline > (line_t)IVAL((ps[(1) - (7)].val.i_tkval)))
+			      PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval));
+			  (yyval.opval) = block_end((ps[(2) - (7)].val.ival), (ps[(5) - (7)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (7)].val.i_tkval),(yyval.opval),'{');
+			  TOKEN_GETMAD((ps[(7) - (7)].val.i_tkval),(yyval.opval),'}');
+			}
     break;
 
   case 16:
-#line 221 "perly.y"
-    { (yyval.ival) = (I32) Perl_allocmy(aTHX_ STR_WITH_LEN("$_"), 0); ;}
+#line 226 "perly.y"
+    { (yyval.ival) = block_start(TRUE); }
     break;
 
   case 17:
-#line 225 "perly.y"
+#line 230 "perly.y"
     { if (PL_parser->copline > (line_t)IVAL((ps[(1) - (4)].val.i_tkval)))
 			      PL_parser->copline = (line_t)IVAL((ps[(1) - (4)].val.i_tkval));
 			  (yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'{');
 			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),'}');
-			;}
+			}
     break;
 
   case 18:
-#line 234 "perly.y"
-    { (yyval.ival) = block_start(FALSE); ;}
+#line 239 "perly.y"
+    { (yyval.ival) = block_start(FALSE); }
     break;
 
   case 19:
-#line 239 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 244 "perly.y"
+    { (yyval.opval) = (OP*)NULL; }
     break;
 
   case 20:
-#line 241 "perly.y"
+#line 246 "perly.y"
     {   (yyval.opval) = op_append_list(OP_LINESEQ, (ps[(1) - (2)].val.opval), (ps[(2) - (2)].val.opval));
 			    PL_pad_reset_pending = TRUE;
 			    if ((ps[(1) - (2)].val.opval) && (ps[(2) - (2)].val.opval))
 				PL_hints |= HINT_BLOCK_SCOPE;
-			;}
+			}
     break;
 
   case 21:
-#line 250 "perly.y"
+#line 255 "perly.y"
+    { (yyval.opval) = (OP*)NULL; }
+    break;
+
+  case 22:
+#line 257 "perly.y"
+    {   (yyval.opval) = op_append_list(OP_LINESEQ, (ps[(1) - (2)].val.opval), (ps[(2) - (2)].val.opval));
+			    PL_pad_reset_pending = TRUE;
+			    if ((ps[(1) - (2)].val.opval) && (ps[(2) - (2)].val.opval))
+				PL_hints |= HINT_BLOCK_SCOPE;
+			}
+    break;
+
+  case 23:
+#line 266 "perly.y"
     {
 			  if((ps[(1) - (1)].val.opval)) {
 			      (yyval.opval) = newSTATEOP(0, NULL, (ps[(1) - (1)].val.opval));
@@ -160,49 +179,52 @@
 			  } else {
 			      (yyval.opval) = IF_MAD(newOP(OP_NULL, 0), NULL);
 			  }
-			;}
+			}
     break;
 
-  case 22:
-#line 258 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 24:
+#line 274 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
     break;
 
-  case 23:
-#line 262 "perly.y"
+  case 25:
+#line 278 "perly.y"
     {
-			  (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval));
+			  (yyval.opval) = newSTATEOP(SVf_UTF8
+					   * PVAL((ps[(1) - (2)].val.p_tkval))[strlen(PVAL((ps[(1) - (2)].val.p_tkval)))+1],
+					  PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.p_tkval),
 			      (ps[(2) - (2)].val.opval) ? cLISTOPx((yyval.opval))->op_first : (yyval.opval), 'L');
-			;}
+			}
     break;
 
-  case 24:
-#line 268 "perly.y"
+  case 26:
+#line 286 "perly.y"
     {
-			  (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval));
+			  (yyval.opval) = newSTATEOP(SVf_UTF8
+					   * PVAL((ps[(1) - (2)].val.p_tkval))[strlen(PVAL((ps[(1) - (2)].val.p_tkval)))+1],
+					  PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.p_tkval), cLISTOPx((yyval.opval))->op_first, 'L');
-			;}
+			}
     break;
 
-  case 25:
-#line 276 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 27:
+#line 296 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
     break;
 
-  case 26:
-#line 278 "perly.y"
+  case 28:
+#line 298 "perly.y"
     {
 			  (yyval.opval) = newOP(OP_NULL,0);
 			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'p');
-			;}
+			}
     break;
 
-  case 27:
-#line 283 "perly.y"
+  case 29:
+#line 303 "perly.y"
     {
 			  CV *fmtcv = PL_compcv;
-			  SvREFCNT_inc_simple_void(PL_compcv);
 #ifdef MAD
 			  (yyval.opval) = newFORM((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval), (ps[(4) - (4)].val.opval));
 			  prepend_madprops((ps[(1) - (4)].val.i_tkval)->tk_mad, (yyval.opval), 'F');
@@ -212,56 +234,73 @@
 			  newFORM((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval), (ps[(4) - (4)].val.opval));
 			  (yyval.opval) = (OP*)NULL;
 #endif
-			  if (CvOUTSIDE(fmtcv) && !CvUNIQUE(CvOUTSIDE(fmtcv))) {
+			  if (CvOUTSIDE(fmtcv) && !CvEVAL(CvOUTSIDE(fmtcv))) {
 			      SvREFCNT_inc_simple_void(fmtcv);
-			      pad_add_anon((SV*)fmtcv, OP_NULL);
+			      pad_add_anon(fmtcv, OP_NULL);
 			  }
-			;}
+			}
     break;
 
-  case 28:
-#line 301 "perly.y"
+  case 30:
+#line 320 "perly.y"
     {
+			  if ((ps[(2) - (3)].val.opval)->op_type == OP_CONST) {
+			    const char *const name =
+				SvPV_nolen_const(((SVOP*)(ps[(2) - (3)].val.opval))->op_sv);
+			    if (strEQ(name, "BEGIN") || strEQ(name, "END")
+			      || strEQ(name, "INIT") || strEQ(name, "CHECK")
+			      || strEQ(name, "UNITCHECK"))
+			      CvSPECIAL_on(PL_compcv);
+			  }
+			  else
+			  /* State subs inside anonymous subs need to be
+			     clonable themselves. */
+			  if (CvANON(CvOUTSIDE(PL_compcv))
+			   || CvCLONE(CvOUTSIDE(PL_compcv))
+			   || !PadnameIsSTATE(PadlistNAMESARRAY(CvPADLIST(
+						CvOUTSIDE(PL_compcv)
+					     ))[(ps[(2) - (3)].val.opval)->op_targ]))
+			      CvCLONE_on(PL_compcv);
+			  PL_parser->in_my = 0;
+			  PL_parser->in_my_stash = NULL;
+			}
+    break;
+
+  case 31:
+#line 342 "perly.y"
+    {
 			  SvREFCNT_inc_simple_void(PL_compcv);
 #ifdef MAD
 			  {
 			      OP* o = newSVOP(OP_ANONCODE, 0,
-				(SV*)newATTRSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval)));
+				(SV*)(
+#endif
+			  (ps[(2) - (7)].val.opval)->op_type == OP_CONST
+			      ? newATTRSUB((ps[(3) - (7)].val.ival), (ps[(2) - (7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval), (ps[(7) - (7)].val.opval))
+			      : newMYSUB((ps[(3) - (7)].val.ival), (ps[(2) - (7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval), (ps[(7) - (7)].val.opval))
+#ifdef MAD
+				));
 			      (yyval.opval) = newOP(OP_NULL,0);
 			      op_getmad(o,(yyval.opval),'&');
-			      op_getmad((ps[(3) - (6)].val.opval),(yyval.opval),'n');
-			      op_getmad((ps[(4) - (6)].val.opval),(yyval.opval),'s');
-			      op_getmad((ps[(5) - (6)].val.opval),(yyval.opval),'a');
-			      token_getmad((ps[(1) - (6)].val.i_tkval),(yyval.opval),'d');
-			      append_madprops((ps[(6) - (6)].val.opval)->op_madprop, (yyval.opval), 0);
-			      (ps[(6) - (6)].val.opval)->op_madprop = 0;
+			      op_getmad((ps[(2) - (7)].val.opval),(yyval.opval),'n');
+			      op_getmad((ps[(5) - (7)].val.opval),(yyval.opval),'s');
+			      op_getmad((ps[(6) - (7)].val.opval),(yyval.opval),'a');
+			      token_getmad((ps[(1) - (7)].val.i_tkval),(yyval.opval),'d');
+			      append_madprops((ps[(7) - (7)].val.opval)->op_madprop, (yyval.opval), 0);
+			      (ps[(7) - (7)].val.opval)->op_madprop = 0;
 			  }
 #else
-			  newATTRSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval));
+			  ;
 			  (yyval.opval) = (OP*)NULL;
 #endif
-			;}
+			  intro_my();
+			}
     break;
 
-  case 29:
-#line 322 "perly.y"
+  case 32:
+#line 370 "perly.y"
     {
-			  /* Unimplemented "my sub foo { }" */
-			  SvREFCNT_inc_simple_void(PL_compcv);
 #ifdef MAD
-			  (yyval.opval) = newMYSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval));
-			  token_getmad((ps[(1) - (6)].val.i_tkval),(yyval.opval),'d');
-#else
-			  newMYSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval));
-			  (yyval.opval) = (OP*)NULL;
-#endif
-			;}
-    break;
-
-  case 30:
-#line 334 "perly.y"
-    {
-#ifdef MAD
 			  (yyval.opval) = package((ps[(3) - (4)].val.opval));
 			  token_getmad((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o');
 			  if ((ps[(2) - (4)].val.opval))
@@ -273,16 +312,16 @@
 			      package_version((ps[(2) - (4)].val.opval));
 			  (yyval.opval) = (OP*)NULL;
 #endif
-			;}
+			}
     break;
 
-  case 31:
-#line 349 "perly.y"
-    { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;}
+  case 33:
+#line 385 "perly.y"
+    { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ }
     break;
 
-  case 32:
-#line 351 "perly.y"
+  case 34:
+#line 387 "perly.y"
     {
 			  SvREFCNT_inc_simple_void(PL_compcv);
 #ifdef MAD
@@ -296,11 +335,11 @@
 			  utilize(IVAL((ps[(1) - (7)].val.i_tkval)), (ps[(2) - (7)].val.ival), (ps[(4) - (7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval));
 			  (yyval.opval) = (OP*)NULL;
 #endif
-			;}
+			}
     break;
 
-  case 33:
-#line 366 "perly.y"
+  case 35:
+#line 402 "perly.y"
     {
 			  (yyval.opval) = block_end((ps[(3) - (7)].val.ival),
 			      newCONDOP(0, (ps[(4) - (7)].val.opval), op_scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval)));
@@ -308,11 +347,11 @@
 			  TOKEN_GETMAD((ps[(2) - (7)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(5) - (7)].val.i_tkval),(yyval.opval),')');
 			  PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval));
-			;}
+			}
     break;
 
-  case 34:
-#line 375 "perly.y"
+  case 36:
+#line 411 "perly.y"
     {
 			  (yyval.opval) = block_end((ps[(3) - (7)].val.ival),
 			      newCONDOP(0, (ps[(4) - (7)].val.opval), op_scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval)));
@@ -320,30 +359,35 @@
 			  TOKEN_GETMAD((ps[(2) - (7)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(5) - (7)].val.i_tkval),(yyval.opval),')');
 			  PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval));
-			;}
+			}
     break;
 
-  case 35:
-#line 384 "perly.y"
+  case 37:
+#line 420 "perly.y"
     {
-			  (yyval.opval) = block_end((ps[(3) - (7)].val.ival),
-				  newGIVENOP((ps[(5) - (7)].val.opval), op_scope((ps[(7) - (7)].val.opval)), (PADOFFSET)(ps[(4) - (7)].val.ival)));
-			  PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval));
-			;}
+			  const PADOFFSET offset = pad_findmy_pvs("$_", 0);
+			  (yyval.opval) = block_end((ps[(3) - (6)].val.ival),
+				  newGIVENOP((ps[(4) - (6)].val.opval), op_scope((ps[(6) - (6)].val.opval)),
+				    offset == NOT_IN_PAD
+				    || PAD_COMPNAME_FLAGS_isOUR(offset)
+				      ? 0
+				      : offset));
+			  PL_parser->copline = (line_t)IVAL((ps[(1) - (6)].val.i_tkval));
+			}
     break;
 
-  case 36:
-#line 390 "perly.y"
-    { (yyval.opval) = block_end((ps[(3) - (6)].val.ival), newWHENOP((ps[(4) - (6)].val.opval), op_scope((ps[(6) - (6)].val.opval)))); ;}
+  case 38:
+#line 431 "perly.y"
+    { (yyval.opval) = block_end((ps[(3) - (6)].val.ival), newWHENOP((ps[(4) - (6)].val.opval), op_scope((ps[(6) - (6)].val.opval)))); }
     break;
 
-  case 37:
-#line 392 "perly.y"
-    { (yyval.opval) = newWHENOP(0, op_scope((ps[(2) - (2)].val.opval))); ;}
+  case 39:
+#line 433 "perly.y"
+    { (yyval.opval) = newWHENOP(0, op_scope((ps[(2) - (2)].val.opval))); }
     break;
 
-  case 38:
-#line 394 "perly.y"
+  case 40:
+#line 435 "perly.y"
     {
 			  (yyval.opval) = block_end((ps[(3) - (8)].val.ival),
 				  newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
@@ -352,11 +396,11 @@
 			  TOKEN_GETMAD((ps[(2) - (8)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(5) - (8)].val.i_tkval),(yyval.opval),')');
 			  PL_parser->copline = (line_t)IVAL((ps[(1) - (8)].val.i_tkval));
-			;}
+			}
     break;
 
-  case 39:
-#line 404 "perly.y"
+  case 41:
+#line 445 "perly.y"
     {
 			  (yyval.opval) = block_end((ps[(3) - (8)].val.ival),
 				  newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
@@ -365,11 +409,11 @@
 			  TOKEN_GETMAD((ps[(2) - (8)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(5) - (8)].val.i_tkval),(yyval.opval),')');
 			  PL_parser->copline = (line_t)IVAL((ps[(1) - (8)].val.i_tkval));
-			;}
+			}
     break;
 
-  case 40:
-#line 415 "perly.y"
+  case 42:
+#line 456 "perly.y"
     {
 			  OP *initop = IF_MAD((ps[(4) - (11)].val.opval) ? (ps[(4) - (11)].val.opval) : newOP(OP_NULL, 0), (ps[(4) - (11)].val.opval));
 			  OP *forop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
@@ -388,11 +432,11 @@
 			  TOKEN_GETMAD((ps[(7) - (11)].val.i_tkval),(yyval.opval),'2');
 			  TOKEN_GETMAD((ps[(10) - (11)].val.i_tkval),(yyval.opval),')');
 			  PL_parser->copline = (line_t)IVAL((ps[(1) - (11)].val.i_tkval));
-			;}
+			}
     break;
 
-  case 41:
-#line 435 "perly.y"
+  case 43:
+#line 476 "perly.y"
     {
 			  (yyval.opval) = block_end((ps[(3) - (9)].val.ival), newFOROP(0, (ps[(4) - (9)].val.opval), (ps[(6) - (9)].val.opval), (ps[(8) - (9)].val.opval), (ps[(9) - (9)].val.opval)));
 			  TOKEN_GETMAD((ps[(1) - (9)].val.i_tkval),(yyval.opval),'W');
@@ -400,11 +444,11 @@
 			  TOKEN_GETMAD((ps[(5) - (9)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(7) - (9)].val.i_tkval),(yyval.opval),')');
 			  PL_parser->copline = (line_t)IVAL((ps[(1) - (9)].val.i_tkval));
-			;}
+			}
     break;
 
-  case 42:
-#line 444 "perly.y"
+  case 44:
+#line 485 "perly.y"
     {
 			  (yyval.opval) = block_end((ps[(4) - (8)].val.ival), newFOROP(0,
 				      op_lvalue((ps[(2) - (8)].val.opval), OP_ENTERLOOP), (ps[(5) - (8)].val.opval), (ps[(7) - (8)].val.opval), (ps[(8) - (8)].val.opval)));
@@ -412,11 +456,11 @@
 			  TOKEN_GETMAD((ps[(3) - (8)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(6) - (8)].val.i_tkval),(yyval.opval),')');
 			  PL_parser->copline = (line_t)IVAL((ps[(1) - (8)].val.i_tkval));
-			;}
+			}
     break;
 
-  case 43:
-#line 453 "perly.y"
+  case 45:
+#line 494 "perly.y"
     {
 			  (yyval.opval) = block_end((ps[(3) - (7)].val.ival),
 				  newFOROP(0, (OP*)NULL, (ps[(4) - (7)].val.opval), (ps[(6) - (7)].val.opval), (ps[(7) - (7)].val.opval)));
@@ -424,136 +468,161 @@
 			  TOKEN_GETMAD((ps[(2) - (7)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(5) - (7)].val.i_tkval),(yyval.opval),')');
 			  PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval));
-			;}
+			}
     break;
 
-  case 44:
-#line 462 "perly.y"
+  case 46:
+#line 503 "perly.y"
     {
 			  /* a block is a loop that happens once */
 			  (yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
 				  (OP*)NULL, (ps[(1) - (2)].val.opval), (ps[(2) - (2)].val.opval), 0);
-			;}
+			}
     break;
 
-  case 45:
-#line 468 "perly.y"
+  case 47:
+#line 509 "perly.y"
     {
-			  int save_3_latefree = (ps[(3) - (5)].val.opval)->op_latefree;
-			  (ps[(3) - (5)].val.opval)->op_latefree = 1;
 			  package((ps[(3) - (5)].val.opval));
-			  (ps[(3) - (5)].val.opval)->op_latefree = save_3_latefree;
 			  if ((ps[(2) - (5)].val.opval)) {
-			      int save_2_latefree = (ps[(2) - (5)].val.opval)->op_latefree;
-			      (ps[(2) - (5)].val.opval)->op_latefree = 1;
 			      package_version((ps[(2) - (5)].val.opval));
-			      (ps[(2) - (5)].val.opval)->op_latefree = save_2_latefree;
 			  }
-			;}
+			}
     break;
 
-  case 46:
-#line 481 "perly.y"
+  case 48:
+#line 516 "perly.y"
     {
 			  /* a block is a loop that happens once */
 			  (yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
 				  (OP*)NULL, block_end((ps[(5) - (8)].val.ival), (ps[(7) - (8)].val.opval)), (OP*)NULL, 0);
-			  op_free((ps[(3) - (8)].val.opval));
-			  if ((ps[(2) - (8)].val.opval))
-			      op_free((ps[(2) - (8)].val.opval));
 			  TOKEN_GETMAD((ps[(4) - (8)].val.i_tkval),(yyval.opval),'{');
 			  TOKEN_GETMAD((ps[(8) - (8)].val.i_tkval),(yyval.opval),'}');
 			  if (PL_parser->copline > (line_t)IVAL((ps[(4) - (8)].val.i_tkval)))
 			      PL_parser->copline = (line_t)IVAL((ps[(4) - (8)].val.i_tkval));
-			;}
+			}
     break;
 
-  case 47:
-#line 494 "perly.y"
+  case 49:
+#line 526 "perly.y"
     {
 			  PL_parser->expect = XSTATE;
 			  (yyval.opval) = (ps[(1) - (2)].val.opval);
 			  TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),';');
-			;}
+			}
     break;
 
-  case 48:
-#line 500 "perly.y"
+  case 50:
+#line 532 "perly.y"
     {
 			  PL_parser->expect = XSTATE;
 			  (yyval.opval) = IF_MAD(newOP(OP_NULL, 0), (OP*)NULL);
 			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),';');
 			  PL_parser->copline = NOLINE;
-			;}
+			}
     break;
 
-  case 49:
-#line 510 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+  case 51:
+#line 542 "perly.y"
+    { OP *list;
+			  if ((ps[(2) - (2)].val.opval)) {
+			      OP *term = (ps[(2) - (2)].val.opval);
+			      DO_MAD(term = newUNOP(OP_NULL, 0, term));
+			      list = op_append_elem(OP_LIST, (ps[(1) - (2)].val.opval), term);
+			  }
+			  else {
+#ifdef MAD
+			      OP *op = newNULLLIST();
+			      list = op_append_elem(OP_LIST, (ps[(1) - (2)].val.opval), op);
+#else
+			      list = (ps[(1) - (2)].val.opval);
+#endif
+			  }
+			  if (PL_parser->copline == NOLINE)
+			       PL_parser->copline = CopLINE(PL_curcop)-1;
+			  else PL_parser->copline--;
+			  (yyval.opval) = newSTATEOP(0, NULL,
+					  convert(OP_FORMLINE, 0, list));
+			}
     break;
 
-  case 50:
-#line 512 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 52:
+#line 565 "perly.y"
+    { (yyval.opval) = NULL; }
     break;
 
-  case 51:
-#line 514 "perly.y"
+  case 53:
+#line 567 "perly.y"
+    { (yyval.opval) = op_unscope((ps[(2) - (3)].val.opval)); }
+    break;
+
+  case 54:
+#line 572 "perly.y"
+    { (yyval.opval) = (OP*)NULL; }
+    break;
+
+  case 55:
+#line 574 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
+    break;
+
+  case 56:
+#line 576 "perly.y"
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'i');
-			;}
+			}
     break;
 
-  case 52:
-#line 518 "perly.y"
+  case 57:
+#line 580 "perly.y"
     { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'i');
-			;}
+			}
     break;
 
-  case 53:
-#line 522 "perly.y"
+  case 58:
+#line 584 "perly.y"
     { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[(3) - (3)].val.opval)), (ps[(1) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w');
-			;}
+			}
     break;
 
-  case 54:
-#line 526 "perly.y"
+  case 59:
+#line 588 "perly.y"
     { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w');
-			;}
+			}
     break;
 
-  case 55:
-#line 530 "perly.y"
+  case 60:
+#line 592 "perly.y"
     { (yyval.opval) = newFOROP(0, (OP*)NULL, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval), (OP*)NULL);
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w');
 			  PL_parser->copline = (line_t)IVAL((ps[(2) - (3)].val.i_tkval));
-			;}
+			}
     break;
 
-  case 56:
-#line 535 "perly.y"
-    { (yyval.opval) = newWHENOP((ps[(3) - (3)].val.opval), op_scope((ps[(1) - (3)].val.opval))); ;}
+  case 61:
+#line 597 "perly.y"
+    { (yyval.opval) = newWHENOP((ps[(3) - (3)].val.opval), op_scope((ps[(1) - (3)].val.opval))); }
     break;
 
-  case 57:
-#line 540 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+  case 62:
+#line 602 "perly.y"
+    { (yyval.opval) = (OP*)NULL; }
     break;
 
-  case 58:
-#line 542 "perly.y"
+  case 63:
+#line 604 "perly.y"
     {
 			  ((ps[(2) - (2)].val.opval))->op_flags |= OPf_PARENS;
 			  (yyval.opval) = op_scope((ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 59:
-#line 548 "perly.y"
+  case 64:
+#line 610 "perly.y"
     { PL_parser->copline = (line_t)IVAL((ps[(1) - (6)].val.i_tkval));
 			    (yyval.opval) = newCONDOP(0,
 				newSTATEOP(OPf_SPECIAL,NULL,(ps[(3) - (6)].val.opval)),
@@ -562,150 +631,140 @@
 			  TOKEN_GETMAD((ps[(1) - (6)].val.i_tkval),(yyval.opval),'I');
 			  TOKEN_GETMAD((ps[(2) - (6)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(4) - (6)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 60:
-#line 561 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+  case 65:
+#line 623 "perly.y"
+    { (yyval.opval) = (OP*)NULL; }
     break;
 
-  case 61:
-#line 563 "perly.y"
+  case 66:
+#line 625 "perly.y"
     {
 			  (yyval.opval) = op_scope((ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 62:
-#line 571 "perly.y"
+  case 67:
+#line 633 "perly.y"
     { (yyval.ival) = (PL_min_intro_pending &&
 			    PL_max_intro_pending >=  PL_min_intro_pending);
-			  intro_my(); ;}
+			  intro_my(); }
     break;
 
-  case 63:
-#line 577 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+  case 68:
+#line 639 "perly.y"
+    { (yyval.opval) = (OP*)NULL; }
     break;
 
-  case 65:
-#line 583 "perly.y"
+  case 70:
+#line 645 "perly.y"
     { YYSTYPE tmplval;
 			  (void)scan_num("1", &tmplval);
-			  (yyval.opval) = tmplval.opval; ;}
+			  (yyval.opval) = tmplval.opval; }
     break;
 
-  case 67:
-#line 591 "perly.y"
-    { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;}
+  case 72:
+#line 653 "perly.y"
+    { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); }
     break;
 
-  case 68:
-#line 596 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
+  case 73:
+#line 658 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); }
     break;
 
-  case 69:
-#line 600 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
+  case 74:
+#line 662 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); }
     break;
 
-  case 70:
-#line 604 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
+  case 75:
+#line 666 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); }
     break;
 
-  case 71:
-#line 607 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 76:
+#line 669 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
     break;
 
-  case 72:
-#line 608 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+  case 77:
+#line 670 "perly.y"
+    { (yyval.opval) = (OP*)NULL; }
     break;
 
-  case 73:
-#line 612 "perly.y"
+  case 78:
+#line 674 "perly.y"
     { (yyval.ival) = start_subparse(FALSE, 0);
-			    SAVEFREESV(PL_compcv); ;}
+			    SAVEFREESV(PL_compcv); }
     break;
 
-  case 74:
-#line 618 "perly.y"
+  case 79:
+#line 680 "perly.y"
     { (yyval.ival) = start_subparse(FALSE, CVf_ANON);
-			    SAVEFREESV(PL_compcv); ;}
+			    SAVEFREESV(PL_compcv); }
     break;
 
-  case 75:
-#line 623 "perly.y"
+  case 80:
+#line 685 "perly.y"
     { (yyval.ival) = start_subparse(TRUE, 0);
-			    SAVEFREESV(PL_compcv); ;}
+			    SAVEFREESV(PL_compcv); }
     break;
 
-  case 76:
-#line 628 "perly.y"
-    { const char *const name = SvPV_nolen_const(((SVOP*)(ps[(1) - (1)].val.opval))->op_sv);
-			  if (strEQ(name, "BEGIN") || strEQ(name, "END")
-			      || strEQ(name, "INIT") || strEQ(name, "CHECK")
-			      || strEQ(name, "UNITCHECK"))
-			      CvSPECIAL_on(PL_compcv);
-			  (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 83:
+#line 696 "perly.y"
+    { (yyval.opval) = (OP*)NULL; }
     break;
 
-  case 77:
-#line 638 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+  case 85:
+#line 702 "perly.y"
+    { (yyval.opval) = (OP*)NULL; }
     break;
 
-  case 79:
-#line 644 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
-    break;
-
-  case 80:
-#line 646 "perly.y"
+  case 86:
+#line 704 "perly.y"
     { (yyval.opval) = (ps[(2) - (2)].val.opval);
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':');
-			;}
+			}
     break;
 
-  case 81:
-#line 650 "perly.y"
+  case 87:
+#line 708 "perly.y"
     { (yyval.opval) = IF_MAD(
 				    newOP(OP_NULL, 0),
 				    (OP*)NULL
 				);
 			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),':');
-			;}
+			}
     break;
 
-  case 82:
-#line 660 "perly.y"
+  case 88:
+#line 718 "perly.y"
     { (yyval.opval) = (ps[(2) - (2)].val.opval);
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':');
-			;}
+			}
     break;
 
-  case 83:
-#line 664 "perly.y"
+  case 89:
+#line 722 "perly.y"
     { (yyval.opval) = IF_MAD(
 				    newOP(OP_NULL, 0),
 				    (OP*)NULL
 				);
 			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),':');
-			;}
+			}
     break;
 
-  case 84:
-#line 673 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 90:
+#line 731 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
     break;
 
-  case 85:
-#line 674 "perly.y"
+  case 91:
+#line 732 "perly.y"
     { (yyval.opval) = IF_MAD(
 				    newOP(OP_NULL,0),
 				    (OP*)NULL
@@ -712,32 +771,32 @@
 				);
 			  PL_parser->expect = XSTATE;
 			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),';');
-			;}
+			}
     break;
 
-  case 86:
-#line 685 "perly.y"
+  case 92:
+#line 743 "perly.y"
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 87:
-#line 689 "perly.y"
+  case 93:
+#line 747 "perly.y"
     { (yyval.opval) = newLOGOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 88:
-#line 693 "perly.y"
+  case 94:
+#line 751 "perly.y"
     { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 90:
-#line 701 "perly.y"
+  case 96:
+#line 759 "perly.y"
     {
 #ifdef MAD
 			  OP* op = newNULLLIST();
@@ -746,11 +805,11 @@
 #else
 			  (yyval.opval) = (ps[(1) - (2)].val.opval);
 #endif
-			;}
+			}
     break;
 
-  case 91:
-#line 711 "perly.y"
+  case 97:
+#line 769 "perly.y"
     { 
 			  OP* term = (ps[(3) - (3)].val.opval);
 			  DO_MAD(
@@ -758,29 +817,29 @@
 			      token_getmad((ps[(2) - (3)].val.i_tkval),term,',');
 			  )
 			  (yyval.opval) = op_append_elem(OP_LIST, (ps[(1) - (3)].val.opval), term);
-			;}
+			}
     break;
 
-  case 93:
-#line 724 "perly.y"
+  case 99:
+#line 782 "perly.y"
     { (yyval.opval) = convert(IVAL((ps[(1) - (3)].val.i_tkval)), OPf_STACKED,
 				op_prepend_elem(OP_LIST, newGVREF(IVAL((ps[(1) - (3)].val.i_tkval)),(ps[(2) - (3)].val.opval)), (ps[(3) - (3)].val.opval)) );
 			  TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 94:
-#line 729 "perly.y"
+  case 100:
+#line 787 "perly.y"
     { (yyval.opval) = convert(IVAL((ps[(1) - (5)].val.i_tkval)), OPf_STACKED,
 				op_prepend_elem(OP_LIST, newGVREF(IVAL((ps[(1) - (5)].val.i_tkval)),(ps[(3) - (5)].val.opval)), (ps[(4) - (5)].val.opval)) );
 			  TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o');
 			  TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 95:
-#line 736 "perly.y"
+  case 101:
+#line 794 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST,
 				    op_prepend_elem(OP_LIST, scalar((ps[(1) - (6)].val.opval)), (ps[(5) - (6)].val.opval)),
@@ -788,29 +847,29 @@
 			  TOKEN_GETMAD((ps[(2) - (6)].val.i_tkval),(yyval.opval),'A');
 			  TOKEN_GETMAD((ps[(4) - (6)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(6) - (6)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 96:
-#line 745 "perly.y"
+  case 102:
+#line 803 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST, scalar((ps[(1) - (3)].val.opval)),
 				    newUNOP(OP_METHOD, 0, (ps[(3) - (3)].val.opval))));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'A');
-			;}
+			}
     break;
 
-  case 97:
-#line 751 "perly.y"
+  case 103:
+#line 809 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST,
 				    op_prepend_elem(OP_LIST, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval)),
 				    newUNOP(OP_METHOD, 0, (ps[(1) - (3)].val.opval))));
-			;}
+			}
     break;
 
-  case 98:
-#line 757 "perly.y"
+  case 104:
+#line 815 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST,
 				    op_prepend_elem(OP_LIST, (ps[(2) - (5)].val.opval), (ps[(4) - (5)].val.opval)),
@@ -817,59 +876,59 @@
 				    newUNOP(OP_METHOD, 0, (ps[(1) - (5)].val.opval))));
 			  TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 99:
-#line 765 "perly.y"
+  case 105:
+#line 823 "perly.y"
     { (yyval.opval) = convert(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 100:
-#line 769 "perly.y"
+  case 106:
+#line 827 "perly.y"
     { (yyval.opval) = convert(IVAL((ps[(1) - (4)].val.i_tkval)), 0, (ps[(3) - (4)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o');
 			  TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 101:
-#line 775 "perly.y"
+  case 107:
+#line 833 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
-			  (yyval.opval) = newANONATTRSUB((ps[(2) - (3)].val.ival), 0, (OP*)NULL, (ps[(3) - (3)].val.opval)); ;}
+			  (yyval.opval) = newANONATTRSUB((ps[(2) - (3)].val.ival), 0, (OP*)NULL, (ps[(3) - (3)].val.opval)); }
     break;
 
-  case 102:
-#line 778 "perly.y"
+  case 108:
+#line 836 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				 op_append_elem(OP_LIST,
 				   op_prepend_elem(OP_LIST, (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval)), (ps[(1) - (5)].val.opval)));
-			;}
+			}
     break;
 
-  case 105:
-#line 793 "perly.y"
+  case 111:
+#line 851 "perly.y"
     { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[(1) - (5)].val.opval), scalar((ps[(3) - (5)].val.opval)));
 			    PL_parser->expect = XOPERATOR;
 			  TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{');
 			  TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),';');
 			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),'}');
-			;}
+			}
     break;
 
-  case 106:
-#line 800 "perly.y"
+  case 112:
+#line 858 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[(1) - (4)].val.opval)), scalar((ps[(3) - (4)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'[');
 			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']');
-			;}
+			}
     break;
 
-  case 107:
-#line 805 "perly.y"
+  case 113:
+#line 863 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
 					ref(newAVREF((ps[(1) - (5)].val.opval)),OP_RV2AV),
 					scalar((ps[(4) - (5)].val.opval)));
@@ -876,31 +935,31 @@
 			  TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'a');
 			  TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'[');
 			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),']');
-			;}
+			}
     break;
 
-  case 108:
-#line 813 "perly.y"
+  case 114:
+#line 871 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
 					ref(newAVREF((ps[(1) - (4)].val.opval)),OP_RV2AV),
 					scalar((ps[(3) - (4)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'[');
 			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']');
-			;}
+			}
     break;
 
-  case 109:
-#line 820 "perly.y"
+  case 115:
+#line 878 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[(1) - (5)].val.opval)), jmaybe((ps[(3) - (5)].val.opval)));
 			    PL_parser->expect = XOPERATOR;
 			  TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{');
 			  TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),';');
 			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),'}');
-			;}
+			}
     break;
 
-  case 110:
-#line 827 "perly.y"
+  case 116:
+#line 885 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
 					ref(newHVREF((ps[(1) - (6)].val.opval)),OP_RV2HV),
 					jmaybe((ps[(4) - (6)].val.opval)));
@@ -909,11 +968,11 @@
 			  TOKEN_GETMAD((ps[(3) - (6)].val.i_tkval),(yyval.opval),'{');
 			  TOKEN_GETMAD((ps[(5) - (6)].val.i_tkval),(yyval.opval),';');
 			  TOKEN_GETMAD((ps[(6) - (6)].val.i_tkval),(yyval.opval),'}');
-			;}
+			}
     break;
 
-  case 111:
-#line 837 "perly.y"
+  case 117:
+#line 895 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
 					ref(newHVREF((ps[(1) - (5)].val.opval)),OP_RV2HV),
 					jmaybe((ps[(3) - (5)].val.opval)));
@@ -921,21 +980,21 @@
 			  TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{');
 			  TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),';');
 			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),'}');
-			;}
+			}
     break;
 
-  case 112:
-#line 846 "perly.y"
+  case 118:
+#line 904 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   newCVREF(0, scalar((ps[(1) - (4)].val.opval))));
 			  TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'a');
 			  TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 113:
-#line 853 "perly.y"
+  case 119:
+#line 911 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   op_append_elem(OP_LIST, (ps[(4) - (5)].val.opval),
 				       newCVREF(0, scalar((ps[(1) - (5)].val.opval)))));
@@ -942,123 +1001,123 @@
 			  TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'a');
 			  TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 114:
-#line 862 "perly.y"
+  case 120:
+#line 920 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   op_append_elem(OP_LIST, (ps[(3) - (4)].val.opval),
 					       newCVREF(0, scalar((ps[(1) - (4)].val.opval)))));
 			  TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 115:
-#line 869 "perly.y"
+  case 121:
+#line 927 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   newCVREF(0, scalar((ps[(1) - (3)].val.opval))));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 116:
-#line 875 "perly.y"
+  case 122:
+#line 933 "perly.y"
     { (yyval.opval) = newSLICEOP(0, (ps[(5) - (6)].val.opval), (ps[(2) - (6)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (6)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(3) - (6)].val.i_tkval),(yyval.opval),')');
 			  TOKEN_GETMAD((ps[(4) - (6)].val.i_tkval),(yyval.opval),'[');
 			  TOKEN_GETMAD((ps[(6) - (6)].val.i_tkval),(yyval.opval),']');
-			;}
+			}
     break;
 
-  case 117:
-#line 882 "perly.y"
+  case 123:
+#line 940 "perly.y"
     { (yyval.opval) = newSLICEOP(0, (ps[(3) - (4)].val.opval), (ps[(1) - (4)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'[');
 			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']');
-			;}
+			}
     break;
 
-  case 118:
-#line 887 "perly.y"
+  case 124:
+#line 945 "perly.y"
     { (yyval.opval) = newSLICEOP(0, (ps[(4) - (5)].val.opval), (OP*)NULL);
 			  TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),')');
 			  TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'[');
 			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),']');
-			;}
+			}
     break;
 
-  case 119:
-#line 897 "perly.y"
+  case 125:
+#line 955 "perly.y"
     { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[(1) - (3)].val.opval), IVAL((ps[(2) - (3)].val.i_tkval)), (ps[(3) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 120:
-#line 901 "perly.y"
+  case 126:
+#line 959 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 121:
-#line 905 "perly.y"
+  case 127:
+#line 963 "perly.y"
     {   if (IVAL((ps[(2) - (3)].val.i_tkval)) != OP_REPEAT)
 				scalar((ps[(1) - (3)].val.opval));
 			    (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, (ps[(1) - (3)].val.opval), scalar((ps[(3) - (3)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 122:
-#line 911 "perly.y"
+  case 128:
+#line 969 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 123:
-#line 915 "perly.y"
+  case 129:
+#line 973 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 124:
-#line 919 "perly.y"
+  case 130:
+#line 977 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 125:
-#line 923 "perly.y"
+  case 131:
+#line 981 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 126:
-#line 927 "perly.y"
+  case 132:
+#line 985 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 127:
-#line 931 "perly.y"
+  case 133:
+#line 989 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 128:
-#line 935 "perly.y"
+  case 134:
+#line 993 "perly.y"
     {
 			  (yyval.opval) = newRANGE(IVAL((ps[(2) - (3)].val.i_tkval)), scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
 			  DO_MAD({
@@ -1068,164 +1127,164 @@
 			      op = (UNOP*)op->op_first;	/* get to flip */
 			      op = (UNOP*)op->op_first;	/* get to range */
 			      token_getmad((ps[(2) - (3)].val.i_tkval),(OP*)op,'o');
-			    })
-			;}
+			    });
+			}
     break;
 
-  case 129:
-#line 947 "perly.y"
+  case 135:
+#line 1005 "perly.y"
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 130:
-#line 951 "perly.y"
+  case 136:
+#line 1009 "perly.y"
     { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 131:
-#line 955 "perly.y"
+  case 137:
+#line 1013 "perly.y"
     { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 132:
-#line 959 "perly.y"
+  case 138:
+#line 1017 "perly.y"
     { (yyval.opval) = bind_match(IVAL((ps[(2) - (3)].val.i_tkval)), (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),
 				((yyval.opval)->op_type == OP_NOT
 				    ? ((UNOP*)(yyval.opval))->op_first : (yyval.opval)),
 				'~');
-			;}
+			}
     break;
 
-  case 133:
-#line 969 "perly.y"
+  case 139:
+#line 1027 "perly.y"
     { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[(2) - (2)].val.opval)));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 134:
-#line 973 "perly.y"
+  case 140:
+#line 1031 "perly.y"
     { (yyval.opval) = IF_MAD(
 				    newUNOP(OP_NULL, 0, (ps[(2) - (2)].val.opval)),
 				    (ps[(2) - (2)].val.opval)
 				);
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'+');
-			;}
+			}
     break;
 
-  case 135:
-#line 980 "perly.y"
+  case 141:
+#line 1038 "perly.y"
     { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval)));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 136:
-#line 984 "perly.y"
+  case 142:
+#line 1042 "perly.y"
     { (yyval.opval) = newUNOP(OP_COMPLEMENT, 0, scalar((ps[(2) - (2)].val.opval)));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 137:
-#line 988 "perly.y"
+  case 143:
+#line 1046 "perly.y"
     { (yyval.opval) = newUNOP(OP_POSTINC, 0,
 					op_lvalue(scalar((ps[(1) - (2)].val.opval)), OP_POSTINC));
 			  TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 138:
-#line 993 "perly.y"
+  case 144:
+#line 1051 "perly.y"
     { (yyval.opval) = newUNOP(OP_POSTDEC, 0,
 					op_lvalue(scalar((ps[(1) - (2)].val.opval)), OP_POSTDEC));
 			  TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 139:
-#line 998 "perly.y"
+  case 145:
+#line 1056 "perly.y"
     { (yyval.opval) = newUNOP(OP_PREINC, 0,
 					op_lvalue(scalar((ps[(2) - (2)].val.opval)), OP_PREINC));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 140:
-#line 1003 "perly.y"
+  case 146:
+#line 1061 "perly.y"
     { (yyval.opval) = newUNOP(OP_PREDEC, 0,
 					op_lvalue(scalar((ps[(2) - (2)].val.opval)), OP_PREDEC));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 141:
-#line 1012 "perly.y"
+  case 147:
+#line 1070 "perly.y"
     { (yyval.opval) = newANONLIST((ps[(2) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'[');
 			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),']');
-			;}
+			}
     break;
 
-  case 142:
-#line 1017 "perly.y"
+  case 148:
+#line 1075 "perly.y"
     { (yyval.opval) = newANONLIST((OP*)NULL);
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'[');
 			  TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),']');
-			;}
+			}
     break;
 
-  case 143:
-#line 1022 "perly.y"
+  case 149:
+#line 1080 "perly.y"
     { (yyval.opval) = newANONHASH((ps[(2) - (4)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'{');
 			  TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),';');
 			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),'}');
-			;}
+			}
     break;
 
-  case 144:
-#line 1028 "perly.y"
+  case 150:
+#line 1086 "perly.y"
     { (yyval.opval) = newANONHASH((OP*)NULL);
 			  TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'{');
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),';');
 			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),'}');
-			;}
+			}
     break;
 
-  case 145:
-#line 1034 "perly.y"
+  case 151:
+#line 1092 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
 			  (yyval.opval) = newANONATTRSUB((ps[(2) - (5)].val.ival), (ps[(3) - (5)].val.opval), (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o');
 			  OP_GETMAD((ps[(3) - (5)].val.opval),(yyval.opval),'s');
 			  OP_GETMAD((ps[(4) - (5)].val.opval),(yyval.opval),'a');
-			;}
+			}
     break;
 
-  case 146:
-#line 1045 "perly.y"
+  case 152:
+#line 1103 "perly.y"
     { (yyval.opval) = dofile((ps[(2) - (2)].val.opval), IVAL((ps[(1) - (2)].val.i_tkval)));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 147:
-#line 1049 "perly.y"
+  case 153:
+#line 1107 "perly.y"
     { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[(2) - (2)].val.opval)));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'D');
-			;}
+			}
     break;
 
-  case 148:
-#line 1053 "perly.y"
+  case 154:
+#line 1111 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB,
 			    OPf_SPECIAL|OPf_STACKED,
 			    op_prepend_elem(OP_LIST,
@@ -1236,11 +1295,11 @@
 			  TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o');
 			  TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 149:
-#line 1065 "perly.y"
+  case 155:
+#line 1123 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB,
 			    OPf_SPECIAL|OPf_STACKED,
 			    op_append_elem(OP_LIST,
@@ -1252,11 +1311,11 @@
 			  TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o');
 			  TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 150:
-#line 1078 "perly.y"
+  case 156:
+#line 1136 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
 			    op_prepend_elem(OP_LIST,
 				scalar(newCVREF(0,scalar((ps[(2) - (4)].val.opval)))), (OP*)NULL)); dep();
@@ -1263,11 +1322,11 @@
 			  TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o');
 			  TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 151:
-#line 1086 "perly.y"
+  case 157:
+#line 1144 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
 			    op_prepend_elem(OP_LIST,
 				(ps[(4) - (5)].val.opval),
@@ -1275,89 +1334,89 @@
 			  TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o');
 			  TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 156:
-#line 1102 "perly.y"
+  case 162:
+#line 1160 "perly.y"
     { (yyval.opval) = newCONDOP(0, (ps[(1) - (5)].val.opval), (ps[(3) - (5)].val.opval), (ps[(5) - (5)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'?');
 			  TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),':');
-			;}
+			}
     break;
 
-  case 157:
-#line 1107 "perly.y"
+  case 163:
+#line 1165 "perly.y"
     { (yyval.opval) = newUNOP(OP_REFGEN, 0, op_lvalue((ps[(2) - (2)].val.opval),OP_REFGEN));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 158:
-#line 1111 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 164:
+#line 1169 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
     break;
 
-  case 159:
-#line 1113 "perly.y"
+  case 165:
+#line 1171 "perly.y"
     { (yyval.opval) = localize((ps[(2) - (2)].val.opval),IVAL((ps[(1) - (2)].val.i_tkval)));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'k');
-			;}
+			}
     break;
 
-  case 160:
-#line 1117 "perly.y"
+  case 166:
+#line 1175 "perly.y"
     { (yyval.opval) = sawparens(IF_MAD(newUNOP(OP_NULL,0,(ps[(2) - (3)].val.opval)), (ps[(2) - (3)].val.opval)));
 			  TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 161:
-#line 1122 "perly.y"
-    { (yyval.opval) = IF_MAD(newUNOP(OP_NULL,0,(ps[(1) - (1)].val.opval)), (ps[(1) - (1)].val.opval)); ;}
+  case 167:
+#line 1180 "perly.y"
+    { (yyval.opval) = IF_MAD(newUNOP(OP_NULL,0,(ps[(1) - (1)].val.opval)), (ps[(1) - (1)].val.opval)); }
     break;
 
-  case 162:
-#line 1124 "perly.y"
+  case 168:
+#line 1182 "perly.y"
     { (yyval.opval) = sawparens(newNULLLIST());
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 163:
-#line 1129 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 169:
+#line 1187 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
     break;
 
-  case 164:
-#line 1131 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 170:
+#line 1189 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
     break;
 
-  case 165:
-#line 1133 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 171:
+#line 1191 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
     break;
 
-  case 166:
-#line 1135 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 172:
+#line 1193 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
     break;
 
-  case 167:
-#line 1137 "perly.y"
-    { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;}
+  case 173:
+#line 1195 "perly.y"
+    { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));}
     break;
 
-  case 168:
-#line 1139 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 174:
+#line 1197 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
     break;
 
-  case 169:
-#line 1141 "perly.y"
+  case 175:
+#line 1199 "perly.y"
     { (yyval.opval) = op_prepend_elem(OP_ASLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_ASLICE, 0,
@@ -1365,11 +1424,11 @@
 					ref((ps[(1) - (4)].val.opval), OP_ASLICE)));
 			  TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'[');
 			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']');
-			;}
+			}
     break;
 
-  case 170:
-#line 1150 "perly.y"
+  case 176:
+#line 1208 "perly.y"
     { (yyval.opval) = op_prepend_elem(OP_HSLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_HSLICE, 0,
@@ -1379,29 +1438,29 @@
 			  TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{');
 			  TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),';');
 			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),'}');
-			;}
+			}
     break;
 
-  case 171:
-#line 1161 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 177:
+#line 1219 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
     break;
 
-  case 172:
-#line 1163 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); ;}
+  case 178:
+#line 1221 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); }
     break;
 
-  case 173:
-#line 1165 "perly.y"
+  case 179:
+#line 1223 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (3)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 174:
-#line 1170 "perly.y"
+  case 180:
+#line 1228 "perly.y"
     {
 			  (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST, (ps[(3) - (4)].val.opval), scalar((ps[(1) - (4)].val.opval))));
@@ -1412,110 +1471,123 @@
 			      }
 			      token_getmad((ps[(2) - (4)].val.i_tkval),op,'(');
 			      token_getmad((ps[(4) - (4)].val.i_tkval),op,')');
-			  })
-			;}
+			  });
+			}
     break;
 
-  case 175:
-#line 1183 "perly.y"
+  case 181:
+#line 1241 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 			    op_append_elem(OP_LIST, (ps[(3) - (3)].val.opval), scalar((ps[(2) - (3)].val.opval))));
 			  TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 176:
-#line 1188 "perly.y"
+  case 182:
+#line 1246 "perly.y"
     { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), OPf_SPECIAL);
 			    PL_hints |= HINT_BLOCK_SCOPE;
 			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 177:
-#line 1193 "perly.y"
+  case 183:
+#line 1251 "perly.y"
     { (yyval.opval) = newLOOPEX(IVAL((ps[(1) - (2)].val.i_tkval)),(ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 178:
-#line 1197 "perly.y"
+  case 184:
+#line 1255 "perly.y"
     { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval)));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 179:
-#line 1201 "perly.y"
+  case 185:
+#line 1259 "perly.y"
     { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), 0);
 			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 180:
-#line 1205 "perly.y"
+  case 186:
+#line 1263 "perly.y"
     { (yyval.opval) = newUNOP(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 181:
-#line 1209 "perly.y"
+  case 187:
+#line 1267 "perly.y"
     { (yyval.opval) = newUNOP(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 182:
-#line 1213 "perly.y"
+  case 188:
+#line 1271 "perly.y"
     { (yyval.opval) = newOP(OP_REQUIRE, (ps[(1) - (1)].val.i_tkval) ? OPf_SPECIAL : 0);
 			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 183:
-#line 1217 "perly.y"
+  case 189:
+#line 1275 "perly.y"
     { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[(1) - (2)].val.i_tkval) ? OPf_SPECIAL : 0, (ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 184:
-#line 1221 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;}
+  case 190:
+#line 1279 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); }
     break;
 
-  case 185:
-#line 1223 "perly.y"
+  case 191:
+#line 1281 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-			    op_append_elem(OP_LIST, (ps[(2) - (2)].val.opval), scalar((ps[(1) - (2)].val.opval)))); ;}
+			    op_append_elem(OP_LIST, (ps[(2) - (2)].val.opval), scalar((ps[(1) - (2)].val.opval)))); }
     break;
 
-  case 186:
-#line 1226 "perly.y"
+  case 192:
+#line 1284 "perly.y"
     { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), 0);
 			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
-			;}
+			}
     break;
 
-  case 187:
-#line 1230 "perly.y"
+  case 193:
+#line 1288 "perly.y"
     { (yyval.opval) = newOP(IVAL((ps[(1) - (3)].val.i_tkval)), 0);
 			  TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o');
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 188:
-#line 1236 "perly.y"
+  case 194:
+#line 1294 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
+    break;
+
+  case 195:
+#line 1296 "perly.y"
+    { (yyval.opval) = (ps[(1) - (3)].val.opval);
+			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
+			}
+    break;
+
+  case 196:
+#line 1301 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				scalar((ps[(1) - (1)].val.opval))); ;}
+				scalar((ps[(1) - (1)].val.opval))); }
     break;
 
-  case 189:
-#line 1239 "perly.y"
+  case 197:
+#line 1304 "perly.y"
     { (yyval.opval) = (IVAL((ps[(1) - (3)].val.i_tkval)) == OP_NOT)
 			    ? newUNOP(IVAL((ps[(1) - (3)].val.i_tkval)), 0, newSVOP(OP_CONST, 0, newSViv(0)))
 			    : newOP(IVAL((ps[(1) - (3)].val.i_tkval)), OPf_SPECIAL);
@@ -1523,193 +1595,189 @@
 			  TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o');
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 190:
-#line 1248 "perly.y"
+  case 198:
+#line 1313 "perly.y"
     { (yyval.opval) = newUNOP(IVAL((ps[(1) - (4)].val.i_tkval)), 0, (ps[(3) - (4)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o');
 			  TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 191:
-#line 1254 "perly.y"
-    { (yyval.opval) = pmruntime((ps[(1) - (4)].val.opval), (ps[(3) - (4)].val.opval), 1);
-			  TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')');
-			;}
+  case 199:
+#line 1319 "perly.y"
+    {
+			    if (   (ps[(1) - (1)].val.opval)->op_type != OP_TRANS
+			        && (ps[(1) - (1)].val.opval)->op_type != OP_TRANSR
+				&& (((PMOP*)(ps[(1) - (1)].val.opval))->op_pmflags & PMf_HAS_CV))
+			    {
+				(yyval.ival) = start_subparse(FALSE, CVf_ANON);
+				SAVEFREESV(PL_compcv);
+			    } else
+				(yyval.ival) = 0;
+			}
     break;
 
-  case 194:
-#line 1261 "perly.y"
+  case 200:
+#line 1330 "perly.y"
+    { (yyval.opval) = pmruntime((ps[(1) - (5)].val.opval), (ps[(4) - (5)].val.opval), 1, (ps[(2) - (5)].val.ival));
+			  TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')');
+			}
+    break;
+
+  case 203:
+#line 1337 "perly.y"
     {
 			  (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0),
 				newSVOP(OP_CONST, 0, newSVpvs("Unimplemented")));
 			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'X');
-			;}
+			}
     break;
 
-  case 196:
-#line 1271 "perly.y"
+  case 205:
+#line 1347 "perly.y"
     { (yyval.opval) = my_attrs((ps[(2) - (3)].val.opval),(ps[(3) - (3)].val.opval));
 			  DO_MAD(
 			      token_getmad((ps[(1) - (3)].val.i_tkval),(yyval.opval),'d');
 			      append_madprops((ps[(3) - (3)].val.opval)->op_madprop, (yyval.opval), 'a');
 			      (ps[(3) - (3)].val.opval)->op_madprop = 0;
-			  )
-			;}
+			  );
+			}
     break;
 
-  case 197:
-#line 1279 "perly.y"
+  case 206:
+#line 1355 "perly.y"
     { (yyval.opval) = localize((ps[(2) - (2)].val.opval),IVAL((ps[(1) - (2)].val.i_tkval)));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'d');
-			;}
+			}
     break;
 
-  case 198:
-#line 1286 "perly.y"
+  case 207:
+#line 1362 "perly.y"
     { (yyval.opval) = sawparens((ps[(2) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 199:
-#line 1291 "perly.y"
+  case 208:
+#line 1367 "perly.y"
     { (yyval.opval) = sawparens(newNULLLIST());
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),')');
-			;}
+			}
     break;
 
-  case 200:
-#line 1296 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 209:
+#line 1372 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
     break;
 
-  case 201:
-#line 1298 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 210:
+#line 1374 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
     break;
 
-  case 202:
-#line 1300 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 211:
+#line 1376 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
     break;
 
-  case 203:
-#line 1305 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+  case 212:
+#line 1381 "perly.y"
+    { (yyval.opval) = (OP*)NULL; }
     break;
 
-  case 204:
-#line 1307 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 213:
+#line 1383 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
     break;
 
-  case 205:
-#line 1311 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+  case 214:
+#line 1387 "perly.y"
+    { (yyval.opval) = (OP*)NULL; }
     break;
 
-  case 206:
-#line 1313 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 215:
+#line 1389 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
     break;
 
-  case 207:
-#line 1317 "perly.y"
-    { (yyval.i_tkval) = (ps[(1) - (1)].val.i_tkval); ;}
+  case 216:
+#line 1395 "perly.y"
+    { PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); }
     break;
 
-  case 208:
-#line 1319 "perly.y"
-    { munge_qwlist_to_paren_list((ps[(1) - (1)].val.opval)); ;}
-    break;
-
-  case 209:
-#line 1321 "perly.y"
-    { (yyval.i_tkval) = (ps[(3) - (3)].val.i_tkval); ;}
-    break;
-
-  case 210:
-#line 1327 "perly.y"
-    { PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;}
-    break;
-
-  case 211:
-#line 1331 "perly.y"
+  case 217:
+#line 1399 "perly.y"
     { (yyval.opval) = newCVREF(IVAL((ps[(1) - (2)].val.i_tkval)),(ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'&');
-			;}
+			}
     break;
 
-  case 212:
-#line 1337 "perly.y"
+  case 218:
+#line 1405 "perly.y"
     { (yyval.opval) = newSVREF((ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'$');
-			;}
+			}
     break;
 
-  case 213:
-#line 1343 "perly.y"
+  case 219:
+#line 1411 "perly.y"
     { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'@');
-			;}
+			}
     break;
 
-  case 214:
-#line 1349 "perly.y"
+  case 220:
+#line 1417 "perly.y"
     { (yyval.opval) = newHVREF((ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'%');
-			;}
+			}
     break;
 
-  case 215:
-#line 1355 "perly.y"
+  case 221:
+#line 1423 "perly.y"
     { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'l');
-			;}
+			}
     break;
 
-  case 216:
-#line 1361 "perly.y"
+  case 222:
+#line 1429 "perly.y"
     { (yyval.opval) = newGVREF(0,(ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'*');
-			;}
+			}
     break;
 
-  case 217:
-#line 1368 "perly.y"
-    { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
+  case 223:
+#line 1436 "perly.y"
+    { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); }
     break;
 
-  case 218:
-#line 1370 "perly.y"
-    { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
+  case 224:
+#line 1438 "perly.y"
+    { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); }
     break;
 
-  case 219:
-#line 1372 "perly.y"
-    { (yyval.opval) = op_scope((ps[(1) - (1)].val.opval)); ;}
+  case 225:
+#line 1440 "perly.y"
+    { (yyval.opval) = op_scope((ps[(1) - (1)].val.opval)); }
     break;
 
-  case 220:
-#line 1375 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+  case 226:
+#line 1443 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); }
     break;
 
-
-/* Line 1267 of yacc.c.  */
-
       default: break;
     
 
 /* Generated from:
- * bd41fc813e5d2d23ff7edef2ab1ef88bbb054176476b7d989db7522dce1c9328 perly.y
- * dc72db91baa0a3c17a6c95718e5ad70e9ac7b75919df1317df7fe6c3f1649239 regen_perly.pl
+ * 28c2c7738eefc00762e227af0363c729186c992e9127e0c935684cccbf3a3b4f perly.y
+ * 5c9d2a0262457fe9b70073fc8ad6c188f812f38ad57712b7e2f53daa01b297cc regen_perly.pl
  * ex: set ro: */


Property changes on: trunk/contrib/perl/perly.act
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.3
\ No newline at end of property
Modified: trunk/contrib/perl/perly.tab
===================================================================
--- trunk/contrib/perl/perly.tab	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/perly.tab	2013-12-02 21:28:58 UTC (rev 6443)
@@ -6,20 +6,20 @@
 
 #define YYFINAL  14
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   2683
+#define YYLAST   2910
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  100
+#define YYNTOKENS  104
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  63
+#define YYNNTS  66
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  220
+#define YYNRULES  226
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  446
+#define YYNSTATES  455
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   335
+#define YYMAXUTOK   337
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -30,16 +30,16 @@
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    87,     2,     2,    15,    17,    19,     2,
-      98,    97,    18,    14,    76,    13,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,    79,    20,
-       2,     2,     2,    78,    16,     2,     2,     2,     2,     2,
+       2,     2,     2,    91,     2,     2,    15,    17,    19,     2,
+     102,   101,    18,    14,    80,    13,    22,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    83,    20,
+       2,    21,     2,    82,    16,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,    11,     2,    12,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     9,     2,    10,    88,     2,     2,     2,
+       2,     2,     2,     9,     2,    10,    92,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -53,14 +53,14 @@
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    77,
-      80,    81,    82,    83,    84,    85,    86,    89,    90,    91,
-      92,    93,    94,    95,    96,    99
+       5,     6,     7,     8,    23,    24,    25,    26,    27,    28,
+      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
+      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
+      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
+      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
+      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
+      79,    81,    84,    85,    86,    87,    88,    89,    90,    93,
+      94,    95,    96,    97,    98,    99,   100,   103
 };
 
 #if YYDEBUG
@@ -69,142 +69,143 @@
 static const yytype_uint16 yyprhs[] =
 {
        0,     0,     3,     4,     9,    10,    14,    15,    19,    20,
-      24,    25,    29,    30,    34,    39,    40,    41,    46,    47,
-      48,    51,    53,    55,    58,    61,    63,    65,    70,    77,
-      84,    89,    90,    98,   106,   114,   122,   129,   132,   141,
-     150,   162,   172,   181,   189,   192,   193,   202,   205,   207,
-     209,   211,   215,   219,   223,   227,   231,   235,   236,   239,
-     246,   247,   250,   251,   252,   254,   255,   257,   259,   261,
-     263,   265,   267,   268,   269,   270,   271,   273,   274,   276,
-     277,   280,   282,   285,   287,   289,   291,   295,   299,   303,
-     305,   308,   312,   314,   318,   324,   331,   335,   339,   345,
-     348,   353,   354,   360,   362,   364,   370,   375,   381,   386,
-     392,   399,   405,   410,   416,   421,   425,   432,   437,   443,
-     447,   451,   455,   459,   463,   467,   471,   475,   479,   483,
-     487,   491,   495,   499,   502,   505,   508,   511,   514,   517,
-     520,   523,   527,   530,   535,   539,   545,   548,   551,   556,
-     562,   567,   573,   575,   577,   579,   581,   587,   590,   592,
-     595,   599,   601,   604,   606,   608,   610,   612,   614,   616,
-     621,   627,   629,   631,   635,   640,   644,   646,   649,   652,
-     654,   657,   660,   662,   665,   667,   670,   672,   676,   678,
-     682,   687,   692,   694,   696,   698,   700,   704,   707,   711,
-     714,   716,   718,   720,   721,   723,   724,   726,   728,   729,
-     733,   735,   738,   741,   744,   747,   750,   753,   755,   757,
-     759
+      24,    25,    29,    30,    34,    39,    47,    48,    53,    54,
+      55,    58,    59,    62,    64,    66,    69,    72,    74,    76,
+      81,    82,    90,    95,    96,   104,   112,   120,   127,   134,
+     137,   146,   155,   167,   177,   186,   194,   197,   198,   207,
+     210,   212,   215,   216,   220,   222,   224,   228,   232,   236,
+     240,   244,   248,   249,   252,   259,   260,   263,   264,   265,
+     267,   268,   270,   272,   274,   276,   278,   280,   281,   282,
+     283,   284,   286,   288,   289,   291,   292,   295,   297,   300,
+     302,   304,   306,   310,   314,   318,   320,   323,   327,   329,
+     333,   339,   346,   350,   354,   360,   363,   368,   369,   375,
+     377,   379,   385,   390,   396,   401,   407,   414,   420,   425,
+     431,   436,   440,   447,   452,   458,   462,   466,   470,   474,
+     478,   482,   486,   490,   494,   498,   502,   506,   510,   514,
+     517,   520,   523,   526,   529,   532,   535,   538,   542,   545,
+     550,   554,   560,   563,   566,   571,   577,   582,   588,   590,
+     592,   594,   596,   602,   605,   607,   610,   614,   616,   619,
+     621,   623,   625,   627,   629,   631,   636,   642,   644,   646,
+     650,   655,   659,   661,   664,   667,   669,   672,   675,   677,
+     680,   682,   685,   687,   691,   693,   697,   699,   703,   708,
+     709,   715,   717,   719,   721,   723,   727,   730,   734,   737,
+     739,   741,   743,   744,   746,   747,   749,   751,   754,   757,
+     760,   763,   766,   769,   771,   773,   775
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-     101,     0,    -1,    -1,     3,   102,   109,   113,    -1,    -1,
-       4,   103,   152,    -1,    -1,     5,   104,   108,    -1,    -1,
-       6,   105,   116,    -1,    -1,     7,   106,   114,    -1,    -1,
-       8,   107,   113,    -1,     9,   109,   113,    10,    -1,    -1,
-      -1,     9,   112,   113,    10,    -1,    -1,    -1,   113,   114,
-      -1,   116,    -1,   115,    -1,    33,   116,    -1,    33,   115,
-      -1,    32,    -1,    99,    -1,    34,   132,   129,   108,    -1,
-      35,   130,   133,   134,   135,   137,    -1,    68,   130,   133,
-     134,   135,   137,    -1,    37,    21,    21,    20,    -1,    -1,
-      38,   130,   117,    21,    21,   151,    20,    -1,    41,   153,
-     109,   126,    97,   111,   120,    -1,    42,   153,   109,   128,
-      97,   111,   120,    -1,    47,   153,   109,   110,   126,    97,
-     111,    -1,    48,   153,   109,   126,    97,   111,    -1,    49,
-     108,    -1,    39,   153,   109,   124,    97,   122,   111,   121,
-      -1,    40,   153,   109,   125,    97,   122,   111,   121,    -1,
-      46,   153,   109,   127,    20,   124,    20,   122,   127,    97,
-     111,    -1,    46,    67,   109,   155,   153,   126,    97,   111,
-     121,    -1,    46,   157,   153,   109,   126,    97,   111,   121,
-      -1,    46,   153,   109,   126,    97,   111,   121,    -1,   108,
-     121,    -1,    -1,    37,    21,    21,     9,   109,   118,   113,
-      10,    -1,   119,    20,    -1,    20,    -1,     1,    -1,   138,
-      -1,   138,    41,   138,    -1,   138,    42,   138,    -1,   138,
-      39,   138,    -1,   138,    40,   125,    -1,   138,    46,   138,
-      -1,   138,    48,   138,    -1,    -1,    43,   111,    -1,    44,
-     153,   126,    97,   111,   120,    -1,    -1,    45,   108,    -1,
-      -1,    -1,   119,    -1,    -1,   138,    -1,   138,    -1,   138,
-      -1,   123,    -1,   125,    -1,    21,    -1,    -1,    -1,    -1,
-      -1,    21,    -1,    -1,    24,    -1,    -1,    70,    24,    -1,
-      70,    -1,    70,    24,    -1,    70,    -1,   108,    -1,    20,
-      -1,   138,    74,   138,    -1,   138,    73,   138,    -1,   138,
-      72,   138,    -1,   139,    -1,   139,    76,    -1,   139,    76,
-     148,    -1,   148,    -1,    57,   162,   139,    -1,    55,    98,
-     162,   138,    97,    -1,   148,    96,   142,   153,   152,    97,
-      -1,   148,    96,   142,    -1,    22,   162,   151,    -1,    23,
-     162,    98,   152,    97,    -1,    57,   151,    -1,    55,    98,
-     152,    97,    -1,    -1,    30,   131,   108,   141,   151,    -1,
-      22,    -1,   157,    -1,   161,     9,   138,    20,    10,    -1,
-     157,    11,   138,    12,    -1,   148,    96,    11,   138,    12,
-      -1,   143,    11,   138,    12,    -1,   157,     9,   138,    20,
-      10,    -1,   148,    96,     9,   138,    20,    10,    -1,   143,
-       9,   138,    20,    10,    -1,   148,    96,    98,    97,    -1,
-     148,    96,    98,   138,    97,    -1,   143,   153,   138,    97,
-      -1,   143,   153,    97,    -1,    98,   138,    97,    11,   138,
-      12,    -1,    27,    11,   138,    12,    -1,    98,    97,    11,
-     138,    12,    -1,   148,    77,   148,    -1,   148,    91,   148,
-      -1,   148,    60,   148,    -1,   148,    61,   148,    -1,   148,
-      85,   148,    -1,   148,    58,   148,    -1,   148,    59,   148,
-      -1,   148,    84,   148,    -1,   148,    83,   148,    -1,   148,
-      51,   148,    -1,   148,    82,   148,    -1,   148,    81,   148,
-      -1,   148,    80,   148,    -1,   148,    86,   148,    -1,    13,
-     148,    -1,    14,   148,    -1,    87,   148,    -1,    88,   148,
-      -1,   148,    93,    -1,   148,    92,    -1,    95,   148,    -1,
-      94,   148,    -1,    11,   138,    12,    -1,    11,    12,    -1,
-      64,   138,    20,    10,    -1,    64,    20,    10,    -1,    36,
-     131,   134,   135,   108,    -1,    63,   148,    -1,    63,   108,
-      -1,    63,    21,   153,    97,    -1,    63,    21,   153,   138,
-      97,    -1,    63,   157,   153,    97,    -1,    63,   157,   153,
-     138,    97,    -1,   144,    -1,   145,    -1,   146,    -1,   147,
-      -1,   148,    78,   148,    79,   148,    -1,    89,   148,    -1,
-     149,    -1,    66,   148,    -1,    98,   138,    97,    -1,    27,
-      -1,    98,    97,    -1,   157,    -1,   161,    -1,   159,    -1,
-     158,    -1,   160,    -1,   143,    -1,   158,    11,   138,    12,
-      -1,   158,     9,   138,    20,    10,    -1,    24,    -1,   156,
-      -1,   156,   153,    97,    -1,   156,   153,   138,    97,    -1,
-      65,    21,   151,    -1,    50,    -1,    50,   148,    -1,    75,
-     139,    -1,    56,    -1,    56,   108,    -1,    56,   148,    -1,
-      69,    -1,    69,   148,    -1,    29,    -1,    29,   148,    -1,
-      53,    -1,    53,    98,    97,    -1,    28,    -1,    54,    98,
-      97,    -1,    54,    98,   138,    97,    -1,    25,    98,   139,
-      97,    -1,    21,    -1,   140,    -1,    52,    -1,    31,    -1,
-      67,   150,   136,    -1,    67,   150,    -1,    98,   138,    97,
-      -1,    98,    97,    -1,   157,    -1,   159,    -1,   158,    -1,
-      -1,   139,    -1,    -1,   138,    -1,    98,    -1,    -1,    27,
-     154,    98,    -1,   157,    -1,    19,   162,    -1,    15,   162,
-      -1,    16,   162,    -1,    17,   162,    -1,    62,   162,    -1,
-      18,   162,    -1,    21,    -1,   157,    -1,   108,    -1,    26,
-      -1
+     105,     0,    -1,    -1,     3,   106,   114,   117,    -1,    -1,
+       4,   107,   161,    -1,    -1,     5,   108,   112,    -1,    -1,
+       6,   109,   121,    -1,    -1,     7,   110,   119,    -1,    -1,
+       8,   111,   117,    -1,     9,   114,   117,    10,    -1,    21,
+     114,    20,    74,   118,    20,    22,    -1,    -1,     9,   116,
+     117,    10,    -1,    -1,    -1,   117,   119,    -1,    -1,   118,
+     125,    -1,   121,    -1,   120,    -1,    36,   121,    -1,    36,
+     120,    -1,    35,    -1,   103,    -1,    37,   140,   137,   113,
+      -1,    -1,    38,   141,   138,   122,   142,   143,   145,    -1,
+      40,    23,    23,    20,    -1,    -1,    41,   138,   123,    23,
+      23,   160,    20,    -1,    44,   102,   114,   134,   101,   115,
+     128,    -1,    45,   102,   114,   136,   101,   115,   128,    -1,
+      50,   102,   114,   134,   101,   115,    -1,    51,   102,   114,
+     134,   101,   115,    -1,    52,   112,    -1,    42,   102,   114,
+     132,   101,   130,   115,   129,    -1,    43,   102,   114,   133,
+     101,   130,   115,   129,    -1,    49,   102,   114,   135,    20,
+     132,    20,   130,   135,   101,   115,    -1,    49,    70,   114,
+     162,   102,   134,   101,   115,   129,    -1,    49,   164,   102,
+     114,   134,   101,   115,   129,    -1,    49,   102,   114,   134,
+     101,   115,   129,    -1,   112,   129,    -1,    -1,    40,    23,
+      23,     9,   114,   124,   117,    10,    -1,   127,    20,    -1,
+      20,    -1,    26,   126,    -1,    -1,    73,   117,    74,    -1,
+       1,    -1,   146,    -1,   146,    44,   146,    -1,   146,    45,
+     146,    -1,   146,    42,   146,    -1,   146,    43,   133,    -1,
+     146,    49,   146,    -1,   146,    51,   146,    -1,    -1,    46,
+     115,    -1,    47,   102,   134,   101,   115,   128,    -1,    -1,
+      48,   112,    -1,    -1,    -1,   127,    -1,    -1,   146,    -1,
+     146,    -1,   146,    -1,   131,    -1,   133,    -1,    23,    -1,
+      -1,    -1,    -1,    -1,    23,    -1,    28,    -1,    -1,    26,
+      -1,    -1,    72,    26,    -1,    72,    -1,    72,    26,    -1,
+      72,    -1,   112,    -1,    20,    -1,   146,    78,   146,    -1,
+     146,    77,   146,    -1,   146,    76,   146,    -1,   147,    -1,
+     147,    80,    -1,   147,    80,   156,    -1,   156,    -1,    60,
+     169,   147,    -1,    58,   102,   169,   146,   101,    -1,   156,
+     100,   150,   102,   161,   101,    -1,   156,   100,   150,    -1,
+      24,   169,   160,    -1,    25,   169,   102,   161,   101,    -1,
+      60,   160,    -1,    58,   102,   161,   101,    -1,    -1,    33,
+     139,   112,   149,   160,    -1,    24,    -1,   164,    -1,   168,
+       9,   146,    20,    10,    -1,   164,    11,   146,    12,    -1,
+     156,   100,    11,   146,    12,    -1,   151,    11,   146,    12,
+      -1,   164,     9,   146,    20,    10,    -1,   156,   100,     9,
+     146,    20,    10,    -1,   151,     9,   146,    20,    10,    -1,
+     156,   100,   102,   101,    -1,   156,   100,   102,   146,   101,
+      -1,   151,   102,   146,   101,    -1,   151,   102,   101,    -1,
+     102,   146,   101,    11,   146,    12,    -1,    29,    11,   146,
+      12,    -1,   102,   101,    11,   146,    12,    -1,   156,    81,
+     156,    -1,   156,    95,   156,    -1,   156,    63,   156,    -1,
+     156,    64,   156,    -1,   156,    89,   156,    -1,   156,    61,
+     156,    -1,   156,    62,   156,    -1,   156,    88,   156,    -1,
+     156,    87,   156,    -1,   156,    54,   156,    -1,   156,    86,
+     156,    -1,   156,    85,   156,    -1,   156,    84,   156,    -1,
+     156,    90,   156,    -1,    13,   156,    -1,    14,   156,    -1,
+      91,   156,    -1,    92,   156,    -1,   156,    97,    -1,   156,
+      96,    -1,    99,   156,    -1,    98,   156,    -1,    11,   146,
+      12,    -1,    11,    12,    -1,    67,   146,    20,    10,    -1,
+      67,    20,    10,    -1,    39,   139,   142,   143,   112,    -1,
+      66,   156,    -1,    66,   112,    -1,    66,   141,   102,   101,
+      -1,    66,   141,   102,   146,   101,    -1,    66,   164,   102,
+     101,    -1,    66,   164,   102,   146,   101,    -1,   152,    -1,
+     153,    -1,   154,    -1,   155,    -1,   156,    82,   156,    83,
+     156,    -1,    93,   156,    -1,   158,    -1,    69,   156,    -1,
+     102,   146,   101,    -1,    29,    -1,   102,   101,    -1,   164,
+      -1,   168,    -1,   166,    -1,   165,    -1,   167,    -1,   151,
+      -1,   165,    11,   146,    12,    -1,   165,     9,   146,    20,
+      10,    -1,    26,    -1,   163,    -1,   163,   102,   101,    -1,
+     163,   102,   146,   101,    -1,    68,   141,   160,    -1,    53,
+      -1,    53,   156,    -1,    79,   147,    -1,    59,    -1,    59,
+     112,    -1,    59,   156,    -1,    71,    -1,    71,   156,    -1,
+      32,    -1,    32,   156,    -1,    56,    -1,    56,   102,   101,
+      -1,    30,    -1,    30,   102,   101,    -1,    31,    -1,    57,
+     102,   101,    -1,    57,   102,   146,   101,    -1,    -1,    27,
+     157,   102,   147,   101,    -1,    23,    -1,   148,    -1,    55,
+      -1,    34,    -1,    70,   159,   144,    -1,    70,   159,    -1,
+     102,   146,   101,    -1,   102,   101,    -1,   164,    -1,   166,
+      -1,   165,    -1,    -1,   147,    -1,    -1,   146,    -1,   164,
+      -1,    19,   169,    -1,    15,   169,    -1,    16,   169,    -1,
+      17,   169,    -1,    65,   169,    -1,    18,   169,    -1,    23,
+      -1,   164,    -1,   112,    -1,    28,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   142,   142,   141,   151,   150,   160,   159,   172,   171,
-     184,   183,   196,   195,   207,   217,   221,   224,   234,   239,
-     240,   249,   257,   261,   267,   275,   277,   282,   300,   321,
-     333,   349,   348,   365,   374,   383,   389,   391,   393,   403,
-     413,   434,   443,   452,   461,   468,   467,   493,   499,   509,
-     511,   513,   517,   521,   525,   529,   534,   540,   541,   547,
-     561,   562,   571,   577,   578,   583,   586,   590,   595,   599,
-     603,   607,   608,   612,   618,   623,   628,   638,   639,   644,
-     645,   649,   659,   663,   673,   674,   684,   688,   692,   696,
-     700,   710,   719,   723,   728,   735,   744,   750,   756,   764,
-     768,   775,   774,   785,   786,   790,   799,   804,   812,   819,
-     826,   836,   845,   852,   861,   868,   874,   881,   886,   896,
-     900,   904,   910,   914,   918,   922,   926,   930,   934,   946,
-     950,   954,   958,   968,   972,   979,   983,   987,   992,   997,
-    1002,  1011,  1016,  1021,  1027,  1033,  1044,  1048,  1052,  1064,
-    1077,  1085,  1097,  1098,  1099,  1100,  1101,  1106,  1110,  1112,
-    1116,  1121,  1123,  1128,  1130,  1132,  1134,  1136,  1138,  1140,
-    1149,  1160,  1162,  1164,  1169,  1182,  1187,  1192,  1196,  1200,
-    1204,  1208,  1212,  1216,  1220,  1222,  1225,  1229,  1235,  1238,
-    1247,  1253,  1258,  1259,  1260,  1266,  1270,  1278,  1285,  1290,
-    1295,  1297,  1299,  1304,  1306,  1311,  1312,  1316,  1319,  1318,
-    1326,  1330,  1336,  1342,  1348,  1354,  1360,  1367,  1369,  1371,
-    1374
+       0,   141,   141,   140,   150,   149,   159,   158,   171,   170,
+     183,   182,   195,   194,   206,   216,   226,   229,   239,   244,
+     245,   255,   256,   265,   273,   277,   285,   295,   297,   302,
+     320,   319,   369,   385,   384,   401,   410,   419,   430,   432,
+     434,   444,   454,   475,   484,   493,   502,   509,   508,   525,
+     531,   541,   565,   566,   571,   573,   575,   579,   583,   587,
+     591,   596,   602,   603,   609,   623,   624,   633,   639,   640,
+     645,   648,   652,   657,   661,   665,   669,   670,   674,   680,
+     685,   690,   691,   696,   697,   702,   703,   707,   717,   721,
+     731,   732,   742,   746,   750,   754,   758,   768,   777,   781,
+     786,   793,   802,   808,   814,   822,   826,   833,   832,   843,
+     844,   848,   857,   862,   870,   877,   884,   894,   903,   910,
+     919,   926,   932,   939,   944,   954,   958,   962,   968,   972,
+     976,   980,   984,   988,   992,  1004,  1008,  1012,  1016,  1026,
+    1030,  1037,  1041,  1045,  1050,  1055,  1060,  1069,  1074,  1079,
+    1085,  1091,  1102,  1106,  1110,  1122,  1135,  1143,  1155,  1156,
+    1157,  1158,  1159,  1164,  1168,  1170,  1174,  1179,  1181,  1186,
+    1188,  1190,  1192,  1194,  1196,  1198,  1207,  1218,  1220,  1222,
+    1227,  1240,  1245,  1250,  1254,  1258,  1262,  1266,  1270,  1274,
+    1278,  1280,  1283,  1287,  1293,  1295,  1300,  1303,  1312,  1319,
+    1318,  1334,  1335,  1336,  1342,  1346,  1354,  1361,  1366,  1371,
+    1373,  1375,  1380,  1382,  1387,  1388,  1394,  1398,  1404,  1410,
+    1416,  1422,  1428,  1435,  1437,  1439,  1442
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
@@ -211,28 +212,29 @@
 {
   "$end", "error", "$undefined", "GRAMPROG", "GRAMEXPR", "GRAMBLOCK",
   "GRAMBARESTMT", "GRAMFULLSTMT", "GRAMSTMTSEQ", "'{'", "'}'", "'['",
-  "']'", "'-'", "'+'", "'$'", "'@'", "'%'", "'*'", "'&'", "';'", "WORD",
-  "METHOD", "FUNCMETH", "THING", "PMFUNC", "PRIVATEREF", "QWLIST",
-  "FUNC0SUB", "UNIOPSUB", "LSTOPSUB", "PLUGEXPR", "PLUGSTMT", "LABEL",
-  "FORMAT", "SUB", "ANONSUB", "PACKAGE", "USE", "WHILE", "UNTIL", "IF",
-  "UNLESS", "ELSE", "ELSIF", "CONTINUE", "FOR", "GIVEN", "WHEN", "DEFAULT",
-  "LOOPEX", "DOTDOT", "YADAYADA", "FUNC0", "FUNC1", "FUNC", "UNIOP",
-  "LSTOP", "RELOP", "EQOP", "MULOP", "ADDOP", "DOLSHARP", "DO",
-  "HASHBRACK", "NOAMP", "LOCAL", "MY", "MYSUB", "REQUIRE", "COLONATTR",
-  "PREC_LOW", "DOROP", "OROP", "ANDOP", "NOTOP", "','", "ASSIGNOP", "'?'",
-  "':'", "DORDOR", "OROR", "ANDAND", "BITOROP", "BITANDOP", "SHIFTOP",
-  "MATCHOP", "'!'", "'~'", "REFGEN", "UMINUS", "POWOP", "POSTDEC",
-  "POSTINC", "PREDEC", "PREINC", "ARROW", "')'", "'('", "PEG", "$accept",
-  "grammar", "@1", "@2", "@3", "@4", "@5", "@6", "block", "remember",
-  "mydefsv", "mblock", "mremember", "stmtseq", "fullstmt", "labfullstmt",
-  "barestmt", "@7", "@8", "sideff", "else", "cont", "mintro", "nexpr",
-  "texpr", "iexpr", "mexpr", "mnexpr", "miexpr", "formname", "startsub",
-  "startanonsub", "startformsub", "subname", "proto", "subattrlist",
-  "myattrlist", "subbody", "expr", "listexpr", "listop", "@9", "method",
-  "subscripted", "termbinop", "termunop", "anonymous", "termdo", "term",
-  "myattrterm", "myterm", "optlistexpr", "optexpr", "lpar_or_qw", "@10",
-  "my_scalar", "amper", "scalar", "ary", "hsh", "arylen", "star",
-  "indirob", 0
+  "']'", "'-'", "'+'", "'$'", "'@'", "'%'", "'*'", "'&'", "';'", "'='",
+  "'.'", "WORD", "METHOD", "FUNCMETH", "THING", "PMFUNC", "PRIVATEREF",
+  "QWLIST", "FUNC0OP", "FUNC0SUB", "UNIOPSUB", "LSTOPSUB", "PLUGEXPR",
+  "PLUGSTMT", "LABEL", "FORMAT", "SUB", "ANONSUB", "PACKAGE", "USE",
+  "WHILE", "UNTIL", "IF", "UNLESS", "ELSE", "ELSIF", "CONTINUE", "FOR",
+  "GIVEN", "WHEN", "DEFAULT", "LOOPEX", "DOTDOT", "YADAYADA", "FUNC0",
+  "FUNC1", "FUNC", "UNIOP", "LSTOP", "RELOP", "EQOP", "MULOP", "ADDOP",
+  "DOLSHARP", "DO", "HASHBRACK", "NOAMP", "LOCAL", "MY", "REQUIRE",
+  "COLONATTR", "FORMLBRACK", "FORMRBRACK", "PREC_LOW", "DOROP", "OROP",
+  "ANDOP", "NOTOP", "','", "ASSIGNOP", "'?'", "':'", "DORDOR", "OROR",
+  "ANDAND", "BITOROP", "BITANDOP", "SHIFTOP", "MATCHOP", "'!'", "'~'",
+  "REFGEN", "UMINUS", "POWOP", "POSTDEC", "POSTINC", "PREDEC", "PREINC",
+  "ARROW", "')'", "'('", "PEG", "$accept", "grammar", "$@1", "$@2", "$@3",
+  "$@4", "$@5", "$@6", "block", "formblock", "remember", "mblock",
+  "mremember", "stmtseq", "formstmtseq", "fullstmt", "labfullstmt",
+  "barestmt", "$@7", "$@8", "$@9", "formline", "formarg", "sideff", "else",
+  "cont", "mintro", "nexpr", "texpr", "iexpr", "mexpr", "mnexpr", "miexpr",
+  "formname", "startsub", "startanonsub", "startformsub", "subname",
+  "proto", "subattrlist", "myattrlist", "subbody", "expr", "listexpr",
+  "listop", "@10", "method", "subscripted", "termbinop", "termunop",
+  "anonymous", "termdo", "term", "@11", "myattrterm", "myterm",
+  "optlistexpr", "optexpr", "my_scalar", "amper", "scalar", "ary", "hsh",
+  "arylen", "star", "indirob", YY_NULL
 };
 #endif
 
@@ -243,14 +245,15 @@
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   123,
      125,    91,    93,    45,    43,    36,    64,    37,    42,    38,
-      59,   264,   265,   266,   267,   268,   269,   270,   271,   272,
-     273,   274,   275,   276,   277,   278,   279,   280,   281,   282,
-     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
-     293,   294,   295,   296,   297,   298,   299,   300,   301,   302,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,   315,   316,   317,   318,    44,   319,    63,    58,
-     320,   321,   322,   323,   324,   325,   326,    33,   126,   327,
-     328,   329,   330,   331,   332,   333,   334,    41,    40,   335
+      59,    61,    46,   264,   265,   266,   267,   268,   269,   270,
+     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
+     281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
+     291,   292,   293,   294,   295,   296,   297,   298,   299,   300,
+     301,   302,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,   314,   315,   316,   317,   318,   319,   320,
+      44,   321,    63,    58,   322,   323,   324,   325,   326,   327,
+     328,    33,   126,   329,   330,   331,   332,   333,   334,   335,
+     336,    41,    40,   337
 };
 # endif
 
@@ -257,29 +260,29 @@
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,   100,   102,   101,   103,   101,   104,   101,   105,   101,
-     106,   101,   107,   101,   108,   109,   110,   111,   112,   113,
-     113,   114,   114,   115,   115,   116,   116,   116,   116,   116,
-     116,   117,   116,   116,   116,   116,   116,   116,   116,   116,
-     116,   116,   116,   116,   116,   118,   116,   116,   116,   119,
-     119,   119,   119,   119,   119,   119,   119,   120,   120,   120,
-     121,   121,   122,   123,   123,   124,   124,   125,   126,   127,
-     128,   129,   129,   130,   131,   132,   133,   134,   134,   135,
-     135,   135,   136,   136,   137,   137,   138,   138,   138,   138,
-     139,   139,   139,   140,   140,   140,   140,   140,   140,   140,
-     140,   141,   140,   142,   142,   143,   143,   143,   143,   143,
-     143,   143,   143,   143,   143,   143,   143,   143,   143,   144,
-     144,   144,   144,   144,   144,   144,   144,   144,   144,   144,
-     144,   144,   144,   145,   145,   145,   145,   145,   145,   145,
-     145,   146,   146,   146,   146,   146,   147,   147,   147,   147,
-     147,   147,   148,   148,   148,   148,   148,   148,   148,   148,
-     148,   148,   148,   148,   148,   148,   148,   148,   148,   148,
-     148,   148,   148,   148,   148,   148,   148,   148,   148,   148,
-     148,   148,   148,   148,   148,   148,   148,   148,   148,   148,
-     148,   148,   148,   148,   148,   148,   149,   149,   150,   150,
-     150,   150,   150,   151,   151,   152,   152,   153,   154,   153,
-     155,   156,   157,   158,   159,   160,   161,   162,   162,   162,
-     162
+       0,   104,   106,   105,   107,   105,   108,   105,   109,   105,
+     110,   105,   111,   105,   112,   113,   114,   115,   116,   117,
+     117,   118,   118,   119,   119,   120,   120,   121,   121,   121,
+     122,   121,   121,   123,   121,   121,   121,   121,   121,   121,
+     121,   121,   121,   121,   121,   121,   121,   124,   121,   121,
+     121,   125,   126,   126,   127,   127,   127,   127,   127,   127,
+     127,   127,   128,   128,   128,   129,   129,   130,   131,   131,
+     132,   132,   133,   134,   135,   136,   137,   137,   138,   139,
+     140,   141,   141,   142,   142,   143,   143,   143,   144,   144,
+     145,   145,   146,   146,   146,   146,   147,   147,   147,   148,
+     148,   148,   148,   148,   148,   148,   148,   149,   148,   150,
+     150,   151,   151,   151,   151,   151,   151,   151,   151,   151,
+     151,   151,   151,   151,   151,   152,   152,   152,   152,   152,
+     152,   152,   152,   152,   152,   152,   152,   152,   152,   153,
+     153,   153,   153,   153,   153,   153,   153,   154,   154,   154,
+     154,   154,   155,   155,   155,   155,   155,   155,   156,   156,
+     156,   156,   156,   156,   156,   156,   156,   156,   156,   156,
+     156,   156,   156,   156,   156,   156,   156,   156,   156,   156,
+     156,   156,   156,   156,   156,   156,   156,   156,   156,   156,
+     156,   156,   156,   156,   156,   156,   156,   156,   156,   157,
+     156,   156,   156,   156,   156,   158,   158,   159,   159,   159,
+     159,   159,   160,   160,   161,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   169,   169,   169
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -286,707 +289,760 @@
 static const yytype_uint8 yyr2[] =
 {
        0,     2,     0,     4,     0,     3,     0,     3,     0,     3,
-       0,     3,     0,     3,     4,     0,     0,     4,     0,     0,
-       2,     1,     1,     2,     2,     1,     1,     4,     6,     6,
-       4,     0,     7,     7,     7,     7,     6,     2,     8,     8,
-      11,     9,     8,     7,     2,     0,     8,     2,     1,     1,
-       1,     3,     3,     3,     3,     3,     3,     0,     2,     6,
-       0,     2,     0,     0,     1,     0,     1,     1,     1,     1,
-       1,     1,     0,     0,     0,     0,     1,     0,     1,     0,
-       2,     1,     2,     1,     1,     1,     3,     3,     3,     1,
-       2,     3,     1,     3,     5,     6,     3,     3,     5,     2,
-       4,     0,     5,     1,     1,     5,     4,     5,     4,     5,
-       6,     5,     4,     5,     4,     3,     6,     4,     5,     3,
-       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     2,     2,     2,     2,     2,     2,     2,
-       2,     3,     2,     4,     3,     5,     2,     2,     4,     5,
-       4,     5,     1,     1,     1,     1,     5,     2,     1,     2,
-       3,     1,     2,     1,     1,     1,     1,     1,     1,     4,
-       5,     1,     1,     3,     4,     3,     1,     2,     2,     1,
-       2,     2,     1,     2,     1,     2,     1,     3,     1,     3,
-       4,     4,     1,     1,     1,     1,     3,     2,     3,     2,
-       1,     1,     1,     0,     1,     0,     1,     1,     0,     3,
-       1,     2,     2,     2,     2,     2,     2,     1,     1,     1,
-       1
+       0,     3,     0,     3,     4,     7,     0,     4,     0,     0,
+       2,     0,     2,     1,     1,     2,     2,     1,     1,     4,
+       0,     7,     4,     0,     7,     7,     7,     6,     6,     2,
+       8,     8,    11,     9,     8,     7,     2,     0,     8,     2,
+       1,     2,     0,     3,     1,     1,     3,     3,     3,     3,
+       3,     3,     0,     2,     6,     0,     2,     0,     0,     1,
+       0,     1,     1,     1,     1,     1,     1,     0,     0,     0,
+       0,     1,     1,     0,     1,     0,     2,     1,     2,     1,
+       1,     1,     3,     3,     3,     1,     2,     3,     1,     3,
+       5,     6,     3,     3,     5,     2,     4,     0,     5,     1,
+       1,     5,     4,     5,     4,     5,     6,     5,     4,     5,
+       4,     3,     6,     4,     5,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     2,
+       2,     2,     2,     2,     2,     2,     2,     3,     2,     4,
+       3,     5,     2,     2,     4,     5,     4,     5,     1,     1,
+       1,     1,     5,     2,     1,     2,     3,     1,     2,     1,
+       1,     1,     1,     1,     1,     4,     5,     1,     1,     3,
+       4,     3,     1,     2,     2,     1,     2,     2,     1,     2,
+       1,     2,     1,     3,     1,     3,     1,     3,     4,     0,
+       5,     1,     1,     1,     1,     3,     2,     3,     2,     1,
+       1,     1,     0,     1,     0,     1,     1,     2,     2,     2,
+       2,     2,     2,     1,     1,     1,     1
 };
 
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
+   Performed when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       0,     2,     4,     6,     8,    10,    12,     0,    15,   205,
+       0,     2,     4,     6,     8,    10,    12,     0,    16,   214,
        0,     0,     0,    19,     1,    19,     0,     0,     0,     0,
-       0,     0,     0,     0,   192,     0,     0,   171,     0,   161,
-     188,   184,    74,   195,    74,   176,   194,   186,     0,     0,
-     179,   203,     0,     0,     0,     0,     0,     0,   182,     0,
-       0,     0,     0,     0,     0,     0,   206,    89,   193,   168,
-     152,   153,   154,   155,    92,   158,     5,   172,   163,   166,
-     165,   167,   164,    15,     7,    49,    48,    25,    75,    73,
-       0,    73,     0,     0,     0,     0,     0,     0,     0,     0,
-      73,    26,    60,     9,     0,    50,     0,    11,    22,    21,
-       0,     0,   142,     0,   133,   134,   217,   220,   219,   218,
-     212,   213,   214,   216,   211,   203,     0,     0,     0,   185,
-       0,    77,   177,     0,     0,   205,   180,   181,   217,   204,
-      99,   218,     0,   215,   192,   147,   146,   163,     0,     0,
-     203,   159,     0,   197,   200,   202,   201,   183,   178,   135,
-     136,   157,   140,   139,   162,     0,     0,     0,     0,    90,
-       0,     0,   208,   207,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   201,     0,     0,   177,   199,   167,
+     194,   196,   190,    79,   204,    79,   182,   203,   192,     0,
+       0,   185,   212,     0,     0,     0,     0,     0,     0,   188,
+       0,     0,     0,     0,     0,     0,     0,   215,    95,   202,
+     174,   158,   159,   160,   161,    98,   164,     5,   178,   169,
+     172,   171,   173,   170,    16,     7,    54,    50,    27,    80,
+       0,     0,    78,     0,     0,     0,     0,     0,     0,     0,
+       0,    28,    65,     9,     0,    55,     0,    11,    24,    23,
+       0,     0,   148,     0,   139,   140,   223,   226,   225,   224,
+     218,   219,   220,   222,   217,   212,     0,     0,     0,     0,
+     191,     0,    83,   183,     0,     0,   214,   186,   187,   223,
+     213,   105,   224,     0,   221,   201,    82,   153,     0,   152,
+     169,     0,     0,    81,   212,   165,     0,   206,   209,   211,
+     210,   189,   184,   141,   142,   163,   146,   145,   168,     0,
+       0,     0,     0,    96,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     138,   137,     0,     0,     0,     0,     0,     0,     0,    19,
-      72,     0,     0,    31,    15,    15,    15,    15,    15,    15,
-       0,    15,    15,    37,     0,     0,    44,    47,     0,     0,
-       0,     0,     0,     0,    24,    23,    20,   141,    97,   205,
-       0,     0,   101,    78,    79,   187,   189,     0,     0,     0,
-      93,     0,     0,   144,     0,   175,   199,     0,    83,   196,
-       0,   160,    88,    87,    86,    91,     0,     0,     0,   115,
-       0,   128,   124,   125,   121,   122,   119,     0,   131,   130,
-     129,   127,   126,   123,   132,   120,     0,     0,   103,     0,
-      96,   104,   173,     0,     0,     0,     0,     0,     0,     0,
-      71,     0,    76,    77,     0,     0,    65,     0,     0,     0,
-       0,     0,    15,    16,     0,    77,    61,    53,    54,    67,
-      51,    52,    55,    56,     0,   191,   117,   203,    81,     0,
-     190,   100,     0,   148,     0,   150,     0,   143,   198,    82,
-       0,     0,     0,   108,   209,   114,     0,     0,     0,   112,
-       0,   205,   174,     0,   106,     0,   169,     0,    14,    27,
-      79,    15,    30,     0,     0,    66,     0,     0,    68,    70,
-       0,     0,   210,    64,    69,     0,     0,    50,     0,     0,
-       0,    79,    98,   102,    80,   145,    94,   149,   151,   118,
-       0,   111,   156,     0,   107,   113,     0,   109,   170,   105,
-       0,    45,   203,    62,    62,     0,     0,     0,     0,    65,
-       0,     0,     0,     0,   116,   110,    95,    85,    84,    28,
-      19,     0,     0,     0,    18,    57,    57,     0,    60,     0,
-       0,     0,    36,    29,     0,    32,    60,    60,    19,     0,
-       0,    33,    34,     0,    43,    62,    60,    35,    46,    38,
-      39,     0,    58,     0,    60,     0,    42,    17,     0,    41,
-       0,     0,     0,    57,    40,    59
+       0,     0,   144,   143,     0,     0,     0,     0,     0,     0,
+       0,    19,    77,    78,     0,    33,    16,    16,    16,    16,
+      16,    16,     0,    16,    16,    39,     0,    46,    49,     0,
+       0,     0,     0,     0,     0,    26,    25,    20,   147,   103,
+     214,     0,     0,   195,   107,    84,    85,   193,   197,     0,
+       0,     0,    99,     0,     0,   150,     0,   181,   208,     0,
+      89,   205,     0,   166,    94,    93,    92,    97,     0,     0,
+     121,     0,   134,   130,   131,   127,   128,   125,     0,   137,
+     136,   135,   133,   132,   129,   138,   126,     0,     0,   109,
+       0,   102,   110,   179,     0,     0,     0,     0,     0,     0,
+       0,    76,     0,    30,     0,     0,    70,     0,     0,     0,
+       0,     0,    16,     0,     0,    66,    58,    59,    72,    56,
+      57,    60,    61,     0,     0,   123,   212,    87,     0,   198,
+     106,     0,   154,     0,   156,     0,   149,   207,    88,     0,
+       0,     0,   114,   120,     0,     0,     0,   118,     0,   214,
+     180,     0,   112,     0,   175,     0,    14,    16,    29,    83,
+      16,    32,     0,     0,    71,     0,     0,    73,    75,     0,
+       0,   216,    69,    74,     0,     0,    55,     0,     0,     0,
+     104,   200,   108,    86,   151,   100,   155,   157,   124,     0,
+     117,   162,     0,   113,   119,     0,   115,   176,   111,     0,
+      85,    47,   212,    67,    67,     0,     0,     0,     0,    70,
+       0,     0,     0,   122,   116,   101,     0,     0,    19,     0,
+       0,     0,    18,    62,    62,     0,    65,     0,     0,    37,
+      38,    21,    91,    90,    31,     0,    34,    65,    65,    19,
+       0,     0,    35,    36,     0,    45,    67,    65,     0,    48,
+      40,    41,     0,    63,     0,    65,     0,    44,     0,    52,
+      22,    17,     0,    43,     0,    15,    19,    51,     0,     0,
+       0,    62,    42,    53,    64
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     7,     8,     9,    10,    11,    12,    13,   108,    15,
-     359,   405,   418,   100,   216,    98,    99,   285,   400,    94,
-     421,   206,   402,   354,   344,   298,   347,   356,   350,   281,
-     191,   120,   190,   283,   224,   309,   239,   399,    95,    57,
-      58,   307,   270,    59,    60,    61,    62,    63,    64,    65,
-     143,   130,    66,   164,   248,   351,    67,    68,    69,    70,
-      71,    72,   110
+      -1,     7,     8,     9,    10,    11,    12,    13,   108,   338,
+      15,   403,   419,   100,   428,   217,    98,    99,   339,   285,
+     398,   440,   447,    94,   422,   207,   400,   353,   343,   297,
+     346,   355,   349,   282,   195,   121,   192,   138,   226,   308,
+     241,   414,    95,    58,    59,   306,   271,    60,    61,    62,
+      63,    64,    65,   117,    66,   147,   131,    67,   350,    68,
+      69,    70,    71,    72,    73,   110
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -374
+#define YYPACT_NINF -391
 static const yytype_int16 yypact[] =
 {
-     767,  -374,  -374,  -374,  -374,  -374,  -374,    43,  -374,  2422,
-      38,   967,   876,  -374,  -374,  -374,  1546,  2422,  2422,   667,
-     667,   667,   667,   667,  -374,   667,   667,  -374,   -25,    85,
-    -374,  2422,  -374,  -374,  -374,  2422,  -374,     3,     6,    16,
-    1370,   310,   667,  1458,  1632,    97,  2422,    68,  2422,  2422,
-    2422,  2422,  2422,  2422,  2422,  1718,   160,    45,  -374,    28,
-    -374,  -374,  -374,  -374,  2509,  -374,  -374,   -12,    42,    56,
-    -374,  -374,   110,  -374,  -374,  -374,  -374,  -374,  -374,  -374,
-     115,  -374,   -12,   -12,   -12,   -12,     9,   -12,   -12,    38,
-    -374,  -374,   101,  -374,   130,  1630,   876,  -374,  -374,  -374,
-     421,   512,  -374,    87,   335,   335,  -374,  -374,  -374,  -374,
-    -374,  -374,  -374,  -374,  -374,  2422,    65,  2422,  2422,   327,
-      38,   141,  2509,    71,  1806,   310,  -374,   327,  1281,    45,
-    -374,  1206,  2422,  -374,   -12,  -374,   327,    55,   163,   123,
-    2422,   327,  1894,   111,  -374,  -374,  -374,   327,    45,   335,
-     335,   335,   224,   224,   177,   118,  2422,  2422,  2422,  2422,
-    2422,  2422,  -374,  -374,  1982,  2422,  2422,  2422,  2422,  2422,
-    2422,  2422,  2422,  2422,  2422,  2422,  2422,  2422,  2422,  2422,
-    -374,  -374,    59,  2070,  2422,  2422,  2422,  2422,  2422,  -374,
-     172,   185,   192,  -374,  -374,  -374,  -374,  -374,  -374,  -374,
-     -12,  -374,  -374,  -374,   185,    38,  -374,  -374,  2422,  2422,
-    2422,  2422,  2422,  2422,  -374,  -374,  -374,  -374,  -374,  2422,
-     -72,    98,  -374,  -374,   142,  -374,  -374,   271,   122,  2422,
-      45,  2158,  2246,  -374,   211,  -374,  -374,   328,   206,  -374,
-    2422,   227,   188,   188,  -374,  2509,   167,   112,   161,  -374,
-     407,  2587,  1531,   298,   409,   212,  2509,  2470,  1177,  1177,
-    1252,  1356,  1443,  1044,   335,   335,  2422,  2422,  -374,  2334,
-     -12,  -374,  -374,   420,   191,   144,   217,   152,   241,   603,
-    -374,    38,  -374,   141,   149,   245,  2422,  2422,  2422,  2422,
-     256,  1056,  -374,  -374,  2422,   141,  -374,   160,  -374,   160,
-     160,   160,   160,   160,   190,  -374,  -374,  2422,   264,    38,
-    -374,  -374,   425,  -374,   498,  -374,   511,  -374,  -374,  -374,
-     155,  2422,   283,  -374,  -374,  -374,  2422,   279,   196,  -374,
-     518,  2422,  -374,   284,  -374,   285,  -374,   286,  -374,  -374,
-     142,  -374,  -374,   281,   209,   160,   210,   233,   160,  -374,
-     250,   -12,  -374,  -374,  -374,   251,   289,  1055,  2422,  2422,
-     257,   142,  -374,  -374,  -374,  -374,  -374,  -374,  -374,  -374,
-     202,  -374,  2548,   351,  -374,  -374,   272,  -374,  -374,  -374,
-     174,  -374,  2422,  -374,  -374,   361,   361,  2422,   361,  2422,
-     274,   295,   361,   174,  -374,  -374,  -374,  -374,  -374,  -374,
-    -374,   366,   361,   361,  -374,    44,    44,   299,   101,   386,
-     361,   361,  -374,  -374,   694,  -374,   101,   101,  -374,   361,
-     -12,  -374,  -374,   361,  -374,  -374,   101,  -374,  -374,  -374,
-    -374,   785,  -374,  2422,   101,  1145,  -374,  -374,   312,  -374,
-     313,   361,   361,    44,  -374,  -374
+     594,  -391,  -391,  -391,  -391,  -391,  -391,    43,  -391,  2708,
+      17,  1095,  1000,  -391,  -391,  -391,  1792,  2708,  2708,   215,
+     215,   215,   215,   215,  -391,   215,   215,  -391,  -391,    28,
+     -17,  -391,  2708,  -391,  -391,  -391,  2708,  -391,    20,    25,
+      44,  1700,  1516,   215,  1608,  1882,    72,  2708,     3,  2708,
+    2708,  2708,  2708,  2708,  2708,  2708,  1972,    62,    38,  -391,
+       6,  -391,  -391,  -391,  -391,  2770,  -391,  -391,    49,    98,
+     143,  -391,  -391,   110,  -391,  -391,  -391,  -391,  -391,  -391,
+      72,   146,  -391,    86,   109,   114,   119,    -6,   120,   121,
+      17,  -391,   177,  -391,   220,  1698,  1000,  -391,  -391,  -391,
+     430,   525,  -391,    26,   408,   408,  -391,  -391,  -391,  -391,
+    -391,  -391,  -391,  -391,  -391,  2708,   139,   155,  2708,   144,
+     314,    17,   147,  2770,   157,  2064,  1516,  -391,   314,  1423,
+      38,  -391,  1344,  2708,  -391,   162,  -391,  -391,   167,   314,
+      21,   270,    16,  -391,  2708,   314,  2156,   218,  -391,  -391,
+    -391,   314,    38,   408,   408,   408,   -27,   -27,   276,   -29,
+    2708,  2708,  2708,  2708,  2708,  2708,  2248,  2708,  2708,  2708,
+    2708,  2708,  2708,  2708,  2708,  2708,  2708,  2708,  2708,  2708,
+    2708,  2708,  -391,  -391,    73,  2340,  2708,  2708,  2708,  2708,
+    2708,  -391,   271,  -391,   272,  -391,  -391,  -391,  -391,  -391,
+    -391,  -391,   212,  -391,  -391,  -391,    17,  -391,  -391,  2708,
+    2708,  2708,  2708,  2708,  2708,  -391,  -391,  -391,  -391,  -391,
+    2708,  2708,    48,  -391,  -391,  -391,   228,  -391,  -391,   113,
+     202,  2708,    38,  2432,  2524,  -391,   306,  -391,  -391,   116,
+     294,  -391,  2708,   310,   245,   245,  -391,  2770,    39,    53,
+    -391,   198,   247,  1593,   171,   417,   222,  2770,  2730,  1174,
+    1174,  1314,  1393,  1501,  1352,   408,   408,  2708,  2708,  -391,
+    2616,   224,  -391,  -391,   201,   125,    56,   142,    59,   175,
+     620,  -391,   309,  -391,    57,   304,  2708,  2708,  2708,  2708,
+     323,  1188,  -391,  2708,  2708,  -391,    62,  -391,    62,    62,
+      62,    62,    62,   240,   -38,  -391,  2708,   319,    17,  -391,
+    -391,   312,  -391,   320,  -391,   341,  -391,  -391,  -391,    66,
+    2708,   336,  -391,  -391,  2708,   178,    71,  -391,   415,  2708,
+    -391,   340,  -391,   345,  -391,   346,  -391,  -391,  -391,   147,
+    -391,  -391,   328,   258,    62,   259,   260,    62,  -391,   278,
+     279,  -391,  -391,  -391,   282,   360,   350,  2708,   284,   290,
+    -391,  -391,  -391,  -391,  -391,  -391,  -391,  -391,  -391,   100,
+    -391,  2810,   390,  -391,  -391,   301,  -391,  -391,  -391,   386,
+     228,  -391,  2708,  -391,  -391,   399,   399,  2708,   399,  2708,
+     311,   399,   399,  -391,  -391,  -391,   342,    78,  -391,   395,
+     399,   399,  -391,   153,   153,   322,   177,   400,   399,  -391,
+    -391,  -391,  -391,  -391,  -391,   715,  -391,   177,   177,  -391,
+     399,   330,  -391,  -391,   399,  -391,  -391,   177,    36,  -391,
+    -391,  -391,   810,  -391,  2708,   177,  1281,  -391,   402,   352,
+    -391,  -391,   332,  -391,   334,  -391,  -391,  -391,   399,   399,
+     905,   153,  -391,  -391,  -391
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -374,  -374,  -374,  -374,  -374,  -374,  -374,  -374,     2,   -57,
-    -374,  2104,  -374,    -7,   369,   311,    -6,  -374,  -374,  -281,
-    -372,  -116,  -373,  -374,    25,  -176,  -253,   -20,  -374,  -374,
-      -1,   383,  -374,   225,  -239,  -300,  -374,    54,    -9,   -40,
-    -374,  -374,  -374,  -374,  -374,  -374,  -374,  -374,    77,  -374,
-    -374,  -109,  -122,   -65,  -374,  -374,  -374,     7,   417,   418,
-    -374,  -374,    37
+    -391,  -391,  -391,  -391,  -391,  -391,  -391,  -391,   -10,  -391,
+     -33,   -95,  -391,   -12,  -391,   424,   356,    18,  -391,  -391,
+    -391,  -391,  -391,  -286,  -390,   -78,  -347,  -391,    69,  -115,
+    -281,     1,  -391,  -391,   283,   403,  -391,   -13,   138,   104,
+    -391,  -391,    -5,   -34,  -391,  -391,  -391,  -391,  -391,  -391,
+    -391,  -391,   195,  -391,  -391,  -391,  -109,  -119,  -391,  -391,
+       2,   446,   454,  -391,  -391,    32
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -193
+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -202
 static const yytype_int16 yytable[] =
 {
-      56,   129,   183,   228,   159,    93,   218,   103,   101,   148,
-     353,   403,    74,    92,    92,   162,   189,   194,   195,   196,
-     197,   199,   201,   202,    19,   305,   109,   109,   109,   109,
-     109,   235,   109,   109,   422,   139,   162,   160,   355,   161,
-     380,   360,   126,    14,   340,   135,   155,    73,   131,   109,
-     137,   184,   435,   185,   144,   162,   361,   111,   112,   113,
-     114,   393,   115,   116,   184,   186,   185,   187,   266,   231,
-     267,   445,   232,   117,    19,   129,   198,   220,   132,   133,
-     193,   268,   162,    19,    20,    21,   163,   419,   420,   204,
-     215,   203,   230,   200,   104,   105,   118,   304,    92,   217,
-     129,   123,    92,    92,   124,   390,   391,   163,   119,   221,
-     306,   346,   122,   349,   125,   227,    56,   127,   140,   188,
-     136,   159,   222,   141,   323,   147,   163,   149,   150,   151,
-     152,   153,   131,   237,   407,   292,   192,   286,   287,   288,
-     289,   290,   291,   234,   293,   294,   205,   242,   243,   244,
-     207,   246,   247,   163,   353,   250,   334,   269,   341,   156,
-     157,   158,   229,   219,   336,   223,   142,   369,   225,   342,
-     156,   157,   158,   233,   273,   274,   275,   276,   277,   278,
-     438,   238,   279,    73,   156,   157,   158,   322,   240,   271,
-     156,   157,   158,   280,   397,   156,   157,   158,   363,   297,
-     299,   300,   301,   302,   303,   331,   282,   296,   374,   376,
-      56,   333,   308,   284,   394,   241,   156,   157,   158,   311,
-     312,   317,   314,   316,   156,   157,   158,   156,   157,   158,
-     319,   320,   156,   157,   158,   358,   245,   335,   321,   156,
-     157,   158,   251,   252,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   327,   328,   324,
-     330,   337,   158,   156,   157,   158,   343,   129,   156,   157,
-     158,    19,   168,   401,   156,   157,   158,   345,   299,   348,
-     299,    92,   357,   339,   381,   348,   387,   362,   364,   156,
-     157,   158,   424,   371,   377,   378,   379,   352,   178,   373,
-     429,   430,   382,   179,   180,   181,   383,   384,   182,   389,
-     436,   365,   370,   156,   157,   158,  -193,  -193,   439,    73,
-     182,    16,    56,    17,    18,    19,    20,    21,    22,    23,
-     385,   128,    25,    26,    27,    28,   107,    29,    30,    31,
-      32,    33,   129,   156,   157,   158,    34,   386,   388,   348,
-     348,   156,   157,   158,   392,   433,   166,  -193,   168,   169,
-      35,   395,    36,    37,    38,    39,    40,    41,   310,   396,
-     404,   410,    42,    43,    44,    45,    46,    47,   348,    48,
-     345,    97,   398,   177,   178,    49,   415,   168,   169,   179,
-     180,   181,   411,   414,   182,   398,   423,    50,    51,    52,
-     156,   157,   158,   372,    53,    54,   425,   214,    55,   441,
-     442,   431,   177,   178,   409,   440,    92,   121,   179,   180,
-     181,   -13,    75,   182,   348,   318,   179,   180,   181,   295,
-      73,   182,    16,    92,    17,    18,    19,    20,    21,    22,
-      23,    76,    24,    25,    26,    27,    28,   413,    29,    30,
-      31,    32,    33,    77,    96,    78,    79,    34,    80,    81,
-      82,    83,    84,    85,   145,   146,     0,    86,    87,    88,
-      89,    35,     0,    36,    37,    38,    39,    40,    41,   156,
-     157,   158,     0,    42,    43,    44,    45,    46,    47,    90,
-      48,     0,   156,   157,   158,   178,    49,   156,   157,   158,
-     179,   180,   181,     0,   325,   182,     0,     0,    50,    51,
-      52,     0,    -3,    75,     0,    53,    54,   332,     0,    55,
-      91,    73,   366,    16,     0,    17,    18,    19,    20,    21,
-      22,    23,    76,    24,    25,    26,    27,    28,     0,    29,
-      30,    31,    32,    33,    77,    96,    78,    79,    34,    80,
-      81,    82,    83,    84,    85,     0,     0,     0,    86,    87,
-      88,    89,    35,     0,    36,    37,    38,    39,    40,    41,
-     156,   157,   158,     0,    42,    43,    44,    45,    46,    47,
-      90,    48,     0,   156,   157,   158,     0,    49,     0,     0,
-     156,   157,   158,     0,     0,   367,     0,     0,     0,    50,
-      51,    52,     0,     0,    75,     0,    53,    54,   368,     0,
-      55,    91,    73,   338,    16,   375,    17,    18,    19,    20,
-      21,    22,    23,    76,    24,    25,    26,    27,    28,     0,
-      29,    30,    31,    32,    33,    77,    96,    78,    79,    34,
-      80,    81,    82,    83,    84,    85,     0,     0,     0,    86,
-      87,    88,    89,    35,     0,    36,    37,    38,    39,    40,
-      41,     0,     0,     0,     0,    42,    43,    44,    45,    46,
-      47,    90,    48,     0,     0,     0,    73,     0,    49,     0,
-       0,     0,    19,     0,     0,     0,     0,     0,   106,     0,
-      50,    51,    52,   107,     0,    75,     0,    53,    54,     0,
-       0,    55,    91,    73,   428,    16,     0,    17,    18,    19,
-      20,    21,    22,    23,    76,    24,    25,    26,    27,    28,
-       0,    29,    30,    31,    32,    33,    77,    96,    78,    79,
-      34,    80,    81,    82,    83,    84,    85,     0,     0,     0,
-      86,    87,    88,    89,    35,     0,    36,    37,    38,    39,
-      40,    41,     0,     0,     0,     0,    42,    43,    44,    45,
-      46,    47,    90,    48,     0,     0,     0,     0,     0,    49,
-       1,     2,     3,     4,     5,     6,     0,     0,     0,     0,
-       0,    50,    51,    52,     0,     0,    75,     0,    53,    54,
-       0,     0,    55,    91,    73,   437,    16,     0,    17,    18,
-      19,    20,    21,    22,    23,    76,    24,    25,    26,    27,
-      28,     0,    29,    30,    31,    32,    33,    77,    96,    78,
-      79,    34,    80,    81,    82,    83,    84,    85,     0,     0,
-       0,    86,    87,    88,    89,    35,     0,    36,    37,    38,
-      39,    40,    41,     0,     0,     0,     0,    42,    43,    44,
-      45,    46,    47,    90,    48,     0,     0,     0,     0,     0,
-      49,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    50,    51,    52,     0,     0,    75,     0,    53,
-      54,     0,     0,    55,    91,    73,     0,    16,     0,    17,
-      18,    19,    20,    21,    22,    23,    76,    24,    25,    26,
-      27,    28,     0,    29,    30,    31,    32,    33,    77,    96,
-      78,    79,    34,    80,    81,    82,    83,    84,    85,     0,
-       0,     0,    86,    87,    88,    89,    35,     0,    36,    37,
-      38,    39,    40,    41,     0,     0,     0,     0,    42,    43,
-      44,    45,    46,    47,    90,    48,     0,     0,     0,     0,
-       0,    49,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    50,    51,    52,     0,     0,    75,     0,
-      53,    54,     0,     0,    55,    91,    73,     0,    16,     0,
-      17,    18,    19,    20,    21,    22,    23,    76,    24,    25,
-      26,    27,    28,     0,    29,    30,    31,    32,    33,    77,
-       0,    78,    79,    34,    80,    81,    82,    83,    84,    85,
-       0,     0,     0,    86,    87,    88,    89,    35,     0,    36,
-      37,    38,    39,    40,    41,     0,     0,     0,     0,    42,
-      43,    44,    45,    46,    47,    90,    48,     0,     0,     0,
-       0,     0,    49,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    50,    51,    52,    75,     0,     0,
-       0,    53,    54,     0,     0,    55,    91,    16,     0,    17,
-      18,    19,    20,    21,    22,    23,   -63,    24,    25,    26,
-      27,    28,     0,    29,    30,    31,    32,    33,     0,     0,
-       0,     0,    34,     0,   208,   209,   210,   211,     0,     0,
-       0,   212,     0,   213,   168,   169,    35,     0,    36,    37,
-      38,    39,    40,    41,     0,     0,     0,     0,    42,    43,
-      44,    45,    46,    47,     0,    48,     0,   156,   157,   158,
-     178,    49,     0,     0,     0,   179,   180,   181,     0,     0,
-     182,     0,     0,    50,    51,    52,    75,     0,     0,     0,
-      53,    54,   -68,     0,    55,     0,    16,     0,    17,    18,
-      19,    20,    21,    22,    23,     0,    24,    25,    26,    27,
-      28,     0,    29,    30,    31,    32,    33,     0,     0,     0,
-       0,    34,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    35,     0,    36,    37,    38,
-      39,    40,    41,     0,     0,     0,  -163,    42,    43,    44,
-      45,    46,    47,     0,    48,   184,     0,   185,  -163,     0,
-      49,     0,     0,     0,     0,     0,  -163,     0,     0,     0,
-       0,     0,    50,    51,    52,   166,   167,   168,   169,    53,
-      54,     0,   -63,    55,     0,  -163,  -163,  -163,  -163,     0,
-       0,     0,  -163,     0,  -163,     0,     0,  -163,     0,   174,
-     175,   176,   177,   178,  -163,  -163,  -163,  -163,   179,   180,
-     181,     0,     0,   182,     0,     0,     0,     0,  -163,  -163,
-    -163,  -192,  -163,  -163,  -163,  -163,  -163,  -163,  -163,  -163,
-    -163,  -163,  -163,  -192,     0,     0,     0,  -163,  -163,  -163,
-       0,  -192,  -163,  -163,     0,     0,     0,     0,     0,     0,
-     166,   167,   168,   169,     0,     0,     0,     0,     0,     0,
-    -192,  -192,  -192,  -192,     0,     0,     0,  -192,     0,  -192,
-       0,     0,  -192,     0,     0,   175,   176,   177,   178,  -192,
-    -192,  -192,  -192,   179,   180,   181,     0,     0,   182,     0,
-       0,     0,     0,  -192,  -192,  -192,     0,  -192,  -192,  -192,
-    -192,  -192,  -192,  -192,  -192,  -192,  -192,  -192,     0,     0,
-       0,     0,  -192,  -192,  -192,     0,     0,  -192,  -192,    73,
+      75,    92,    92,   101,    57,   352,   219,   230,   130,    19,
+     354,   103,   358,   359,   423,   164,   152,   165,    19,    20,
+      21,   109,   109,   109,   109,   109,    74,   109,   109,    93,
+     186,   127,   187,   144,   137,   237,   236,   401,   218,   118,
+     142,   191,   163,    14,   132,   109,   140,   160,   161,   162,
+     148,   159,   111,   112,   113,   114,   438,   115,   116,   321,
+     305,   454,   439,   361,   200,   322,   340,   193,   332,  -202,
+    -202,   334,   243,   184,   133,   134,   390,   341,   368,   436,
+     205,   130,   267,   373,   268,   119,    92,    74,    19,   202,
+      92,    92,   160,   161,   162,   143,   201,   269,   412,   232,
+     136,   303,   160,   161,   162,   146,   405,   186,   166,   187,
+     130,   224,   393,   222,   216,   160,   161,   162,   163,   190,
+     229,    57,   124,   234,   160,   161,   162,   125,   132,   160,
+     161,   162,   160,   161,   162,   160,   161,   162,   160,   161,
+     162,   239,   160,   161,   162,   331,   126,   160,   161,   162,
+     352,   185,   188,   442,   189,   244,   245,   246,   231,   248,
+     249,   251,   333,   286,   287,   288,   289,   290,   291,   194,
+     293,   294,   345,   225,   348,   270,   160,   161,   162,   280,
+     274,   275,   276,   277,   278,   279,   272,   304,   196,   160,
+     161,   162,   160,   161,   162,   335,   295,   362,   372,   420,
+     421,   160,   161,   162,   296,   298,   299,   300,   301,   302,
+     375,   197,   104,   105,   309,    57,   198,   317,   160,   161,
+     162,   199,   203,   204,    74,   206,   311,   120,   313,   315,
+      19,   123,   168,  -202,   170,   171,   128,   319,   106,   139,
+     208,   220,   145,   107,   151,   223,   153,   154,   155,   156,
+     157,   160,   161,   162,   160,   161,   162,   221,   227,   357,
+     179,   180,   325,   326,   -81,   328,   181,   182,   183,   233,
+      92,   184,   130,   399,   160,   161,   162,   160,   161,   162,
+     235,   344,   298,   347,   298,   170,   356,   242,   347,   347,
+     240,   404,   351,   406,   281,   284,   409,   410,   364,   323,
+     307,  -202,   330,   310,   379,   417,   418,   381,   168,   169,
+     170,   171,   180,   427,   292,   369,   316,   181,   182,   183,
+     318,   320,   184,   162,    57,   433,   329,   342,   425,   435,
+     337,   174,   175,   176,   177,   178,   179,   180,    19,   430,
+     431,   360,   181,   182,   183,   363,   370,   184,   130,   437,
+     376,   382,   347,   451,   452,   377,   378,   443,   247,   383,
+     384,   385,   252,   253,   254,   255,   256,   257,   258,   259,
+     260,   261,   262,   263,   264,   265,   266,   170,   171,   386,
+     389,   387,   347,   388,   344,   391,   415,   413,   160,   161,
+     162,   392,   209,   210,   211,   212,   160,   161,   162,   213,
+     394,   214,   395,   179,   180,    92,   396,   432,   402,   181,
+     182,   183,   408,   365,   184,   416,   411,   160,   161,   162,
+     426,   366,    92,   424,   445,   446,   160,   161,   162,   347,
+     -13,    76,   434,   448,   450,   449,    97,   444,   122,    74,
+      92,    16,   367,    17,    18,    19,    20,    21,    22,    23,
+      77,   -73,   215,    24,    25,    26,    27,    28,   407,    29,
+      30,    31,    32,    33,    34,    78,    96,    79,    80,    35,
+      81,    82,    83,    84,    85,    86,   283,   380,     0,    87,
+      88,    89,    90,    36,   397,    37,    38,    39,    40,    41,
+      42,   160,   161,   162,   149,    43,    44,    45,    46,    47,
+      48,    49,   150,   181,   182,   183,     0,   180,   184,    50,
+       0,     0,   181,   182,   183,     0,   374,   184,     0,   371,
+       0,    51,    52,    53,     0,    -3,    76,     0,    54,    55,
+       0,     0,    56,    91,    74,     0,    16,     0,    17,    18,
+      19,    20,    21,    22,    23,    77,     0,     0,    24,    25,
+      26,    27,    28,     0,    29,    30,    31,    32,    33,    34,
+      78,    96,    79,    80,    35,    81,    82,    83,    84,    85,
+      86,     0,     0,     0,    87,    88,    89,    90,    36,     0,
+      37,    38,    39,    40,    41,    42,     0,     0,     0,     0,
+      43,    44,    45,    46,    47,    48,    49,     1,     2,     3,
+       4,     5,     6,     0,    50,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    51,    52,    53,     0,
+       0,    76,     0,    54,    55,     0,     0,    56,    91,    74,
+     336,    16,     0,    17,    18,    19,    20,    21,    22,    23,
+      77,     0,     0,    24,    25,    26,    27,    28,     0,    29,
+      30,    31,    32,    33,    34,    78,    96,    79,    80,    35,
+      81,    82,    83,    84,    85,    86,     0,     0,     0,    87,
+      88,    89,    90,    36,     0,    37,    38,    39,    40,    41,
+      42,     0,     0,     0,     0,    43,    44,    45,    46,    47,
+      48,    49,     0,     0,     0,     0,     0,     0,     0,    50,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    51,    52,    53,     0,     0,    76,     0,    54,    55,
+       0,     0,    56,    91,    74,   429,    16,     0,    17,    18,
+      19,    20,    21,    22,    23,    77,     0,     0,    24,    25,
+      26,    27,    28,     0,    29,    30,    31,    32,    33,    34,
+      78,    96,    79,    80,    35,    81,    82,    83,    84,    85,
+      86,     0,     0,     0,    87,    88,    89,    90,    36,     0,
+      37,    38,    39,    40,    41,    42,     0,     0,     0,     0,
+      43,    44,    45,    46,    47,    48,    49,     0,     0,     0,
+       0,     0,     0,     0,    50,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    51,    52,    53,     0,
+       0,    76,     0,    54,    55,     0,     0,    56,    91,    74,
+     441,    16,     0,    17,    18,    19,    20,    21,    22,    23,
+      77,     0,     0,    24,    25,    26,    27,    28,     0,    29,
+      30,    31,    32,    33,    34,    78,    96,    79,    80,    35,
+      81,    82,    83,    84,    85,    86,     0,     0,     0,    87,
+      88,    89,    90,    36,     0,    37,    38,    39,    40,    41,
+      42,     0,     0,     0,     0,    43,    44,    45,    46,    47,
+      48,    49,     0,     0,     0,     0,     0,     0,     0,    50,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    51,    52,    53,     0,     0,    76,     0,    54,    55,
+       0,     0,    56,    91,    74,     0,    16,     0,    17,    18,
+      19,    20,    21,    22,    23,    77,     0,     0,    24,    25,
+      26,    27,    28,     0,    29,    30,    31,    32,    33,    34,
+      78,    96,    79,    80,    35,    81,    82,    83,    84,    85,
+      86,     0,     0,     0,    87,    88,    89,    90,    36,     0,
+      37,    38,    39,    40,    41,    42,     0,     0,     0,     0,
+      43,    44,    45,    46,    47,    48,    49,     0,     0,   453,
+       0,     0,     0,     0,    50,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    51,    52,    53,     0,
+       0,    76,     0,    54,    55,     0,     0,    56,    91,    74,
        0,    16,     0,    17,    18,    19,    20,    21,    22,    23,
+      77,     0,     0,    24,    25,    26,    27,    28,     0,    29,
+      30,    31,    32,    33,    34,    78,    96,    79,    80,    35,
+      81,    82,    83,    84,    85,    86,     0,     0,     0,    87,
+      88,    89,    90,    36,     0,    37,    38,    39,    40,    41,
+      42,     0,     0,     0,     0,    43,    44,    45,    46,    47,
+      48,    49,     0,     0,     0,     0,     0,     0,     0,    50,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    51,    52,    53,     0,     0,    76,     0,    54,    55,
+       0,     0,    56,    91,    74,     0,    16,     0,    17,    18,
+      19,    20,    21,    22,    23,    77,     0,     0,    24,    25,
+      26,    27,    28,     0,    29,    30,    31,    32,    33,    34,
+      78,     0,    79,    80,    35,    81,    82,    83,    84,    85,
+      86,     0,     0,     0,    87,    88,    89,    90,    36,     0,
+      37,    38,    39,    40,    41,    42,     0,     0,     0,     0,
+      43,    44,    45,    46,    47,    48,    49,     0,     0,     0,
+       0,     0,     0,     0,    50,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    51,    52,    53,    76,
+       0,     0,     0,    54,    55,     0,     0,    56,    91,    16,
+       0,    17,    18,    19,    20,    21,    22,    23,   -68,     0,
        0,    24,    25,    26,    27,    28,     0,    29,    30,    31,
-      32,    33,     0,     0,     0,     0,    34,     0,     0,     0,
-       0,     0,     0,     0,   166,   167,   168,   169,     0,     0,
-      35,     0,    36,    37,    38,    39,    40,    41,     0,     0,
-       0,     0,    42,    43,    44,    45,    46,    47,     0,    48,
-     176,   177,   178,     0,     0,    49,     0,   179,   180,   181,
-       0,     0,   182,     0,     0,     0,     0,    50,    51,    52,
-       0,     0,     0,     0,    53,    54,     0,    73,    55,    16,
-       0,    17,    18,    19,    20,    21,    22,    23,     0,   134,
+      32,    33,    34,     0,     0,     0,     0,    35,     0,     0,
+       0,     0,     0,     0,     0,   168,   169,   170,   171,     0,
+       0,    36,     0,    37,    38,    39,    40,    41,    42,     0,
+       0,     0,     0,    43,    44,    45,    46,    47,    48,    49,
+     176,   177,   178,   179,   180,     0,     0,    50,     0,   181,
+     182,   183,     0,     0,   184,     0,     0,     0,     0,    51,
+      52,    53,    76,     0,     0,     0,    54,    55,     0,     0,
+      56,     0,    16,     0,    17,    18,    19,    20,    21,    22,
+      23,     0,     0,     0,    24,    25,    26,    27,    28,     0,
+      29,    30,    31,    32,    33,    34,     0,     0,     0,     0,
+      35,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    36,     0,    37,    38,    39,    40,
+      41,    42,     0,     0,  -169,     0,    43,    44,    45,    46,
+      47,    48,    49,   186,     0,   187,  -169,     0,     0,     0,
+      50,     0,     0,     0,  -169,     0,     0,     0,     0,     0,
+       0,     0,    51,    52,    53,   168,   169,   170,   171,    54,
+      55,     0,   -68,    56,     0,     0,  -169,  -169,  -169,  -169,
+       0,     0,     0,  -169,     0,  -169,     0,     0,  -169,     0,
+       0,   177,   178,   179,   180,  -169,  -169,  -169,  -169,   181,
+     182,   183,     0,     0,   184,   170,   171,     0,     0,     0,
+    -169,  -169,  -169,  -201,  -169,  -169,  -169,  -169,  -169,  -169,
+    -169,  -169,  -169,  -169,  -169,  -201,     0,     0,     0,  -169,
+    -169,  -169,   180,  -201,  -169,  -169,     0,   181,   182,   183,
+       0,     0,   184,     0,   168,   169,   170,   171,     0,     0,
+       0,     0,     0,     0,     0,  -201,  -201,  -201,  -201,     0,
+       0,     0,  -201,     0,  -201,     0,     0,  -201,     0,     0,
+       0,   178,   179,   180,  -201,  -201,  -201,  -201,   181,   182,
+     183,     0,     0,   184,     0,     0,     0,     0,     0,  -201,
+    -201,  -201,     0,  -201,  -201,  -201,  -201,  -201,  -201,  -201,
+    -201,  -201,  -201,  -201,     0,     0,     0,     0,  -201,  -201,
+    -201,     0,     0,  -201,  -201,    74,     0,    16,     0,    17,
+      18,    19,    20,    21,    22,    23,     0,     0,     0,   129,
+      25,    26,    27,    28,   107,    29,    30,    31,    32,    33,
+      34,     0,     0,     0,     0,    35,     0,     0,     0,     0,
+       0,     0,   168,   169,   170,   171,     0,     0,     0,    36,
+       0,    37,    38,    39,    40,    41,    42,     0,     0,     0,
+       0,    43,    44,    45,    46,    47,    48,    49,     0,     0,
+     179,   180,     0,     0,     0,    50,   181,   182,   183,     0,
+       0,   184,     0,     0,     0,     0,     0,    51,    52,    53,
+       0,     0,     0,     0,    54,    55,     0,    74,    56,    16,
+       0,    17,    18,    19,    20,    21,    22,    23,     0,     0,
+       0,   135,    25,    26,    27,    28,   136,    29,    30,    31,
+      32,    33,    34,     0,     0,     0,     0,    35,     0,     0,
+       0,     0,     0,     0,  -202,     0,   170,   171,     0,     0,
+       0,    36,     0,    37,    38,    39,    40,    41,    42,     0,
+       0,     0,     0,    43,    44,    45,    46,    47,    48,    49,
+       0,     0,   179,   180,     0,     0,     0,    50,   181,   182,
+     183,     0,     0,   184,     0,     0,     0,     0,     0,    51,
+      52,    53,     0,     0,     0,     0,    54,    55,     0,    74,
+      56,    16,     0,    17,    18,    19,    20,    21,    22,    23,
+       0,     0,     0,    24,    25,    26,    27,    28,     0,    29,
+      30,    31,    32,    33,    34,     0,     0,     0,     0,    35,
+     209,   210,   211,   212,     0,     0,     0,   213,     0,   214,
+       0,     0,     0,    36,     0,    37,    38,    39,    40,    41,
+      42,     0,     0,     0,     0,    43,    44,    45,    46,    47,
+      48,    49,     0,     0,   160,   161,   162,     0,     0,    50,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    51,    52,    53,     0,     0,     0,     0,    54,    55,
+       0,     0,    56,    16,   102,    17,    18,    19,    20,    21,
+      22,    23,     0,     0,     0,    24,    25,    26,    27,    28,
+       0,    29,    30,    31,    32,    33,    34,     0,     0,     0,
+       0,    35,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    36,     0,    37,    38,    39,
+      40,    41,    42,     0,     0,     0,     0,    43,    44,    45,
+      46,    47,    48,    49,     0,     0,     0,     0,     0,     0,
+       0,    50,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    51,    52,    53,     0,     0,     0,     0,
+      54,    55,     0,    16,    56,    17,    18,    19,    20,    21,
+      22,    23,   141,     0,     0,    24,    25,    26,    27,    28,
+       0,    29,    30,    31,    32,    33,    34,     0,     0,     0,
+       0,    35,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    36,     0,    37,    38,    39,
+      40,    41,    42,     0,     0,     0,     0,    43,    44,    45,
+      46,    47,    48,    49,     0,     0,     0,     0,     0,     0,
+       0,    50,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    51,    52,    53,     0,     0,     0,     0,
+      54,    55,     0,    16,    56,    17,    18,    19,    20,    21,
+      22,    23,     0,     0,     0,    24,    25,    26,    27,    28,
+       0,    29,    30,    31,    32,    33,    34,     0,     0,     0,
+       0,    35,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    36,     0,    37,    38,    39,
+      40,    41,    42,     0,     0,     0,     0,    43,    44,    45,
+      46,    47,    48,    49,     0,     0,     0,     0,     0,     0,
+       0,    50,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    51,    52,    53,     0,     0,     0,     0,
+      54,    55,     0,   158,    56,    16,     0,    17,    18,    19,
+      20,    21,    22,    23,     0,     0,     0,    24,    25,    26,
+      27,    28,     0,    29,    30,    31,    32,    33,    34,     0,
+       0,     0,     0,    35,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    36,     0,    37,
+      38,    39,    40,    41,    42,     0,     0,     0,     0,    43,
+      44,    45,    46,    47,    48,    49,     0,     0,     0,     0,
+       0,     0,     0,    50,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    51,    52,    53,     0,     0,
+       0,     0,    54,    55,     0,   228,    56,    16,     0,    17,
+      18,    19,    20,    21,    22,    23,     0,     0,     0,    24,
       25,    26,    27,    28,     0,    29,    30,    31,    32,    33,
-       0,     0,     0,     0,    34,     0,     0,     0,     0,     0,
-       0,   166,   167,   168,   169,     0,     0,     0,    35,     0,
-      36,    37,    38,    39,    40,    41,     0,     0,     0,     0,
-      42,    43,    44,    45,    46,    47,     0,    48,   177,   178,
-       0,     0,     0,    49,   179,   180,   181,     0,     0,   182,
-       0,     0,     0,     0,     0,    50,    51,    52,     0,     0,
-       0,     0,    53,    54,     0,     0,    55,    16,   102,    17,
-      18,    19,    20,    21,    22,    23,     0,    24,    25,    26,
-      27,    28,     0,    29,    30,    31,    32,    33,     0,     0,
-       0,     0,    34,     0,     0,     0,     0,     0,     0,  -193,
-       0,   168,   169,     0,     0,     0,    35,     0,    36,    37,
-      38,    39,    40,    41,     0,     0,     0,     0,    42,    43,
-      44,    45,    46,    47,     0,    48,   177,   178,     0,     0,
-       0,    49,   179,   180,   181,     0,     0,   182,     0,     0,
-       0,     0,     0,    50,    51,    52,     0,     0,     0,     0,
-      53,    54,     0,    16,    55,    17,    18,    19,    20,    21,
-      22,    23,   138,    24,    25,    26,    27,    28,     0,    29,
-      30,    31,    32,    33,     0,     0,     0,     0,    34,   208,
-     209,   210,   211,     0,     0,     0,   212,     0,   213,     0,
-       0,     0,    35,     0,    36,    37,    38,    39,    40,    41,
-       0,     0,     0,     0,    42,    43,    44,    45,    46,    47,
-       0,    48,   156,   157,   158,     0,     0,    49,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    50,
-      51,    52,     0,     0,     0,     0,    53,    54,     0,    16,
-      55,    17,    18,    19,    20,    21,    22,    23,     0,    24,
-      25,    26,    27,    28,     0,    29,    30,    31,    32,    33,
-       0,     0,     0,     0,    34,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    35,     0,
-      36,    37,    38,    39,    40,    41,     0,     0,     0,     0,
-      42,    43,    44,    45,    46,    47,     0,    48,     0,     0,
-       0,     0,     0,    49,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    50,    51,    52,     0,     0,
-       0,     0,    53,    54,     0,   154,    55,    16,     0,    17,
-      18,    19,    20,    21,    22,    23,     0,    24,    25,    26,
-      27,    28,     0,    29,    30,    31,    32,    33,     0,     0,
-       0,     0,    34,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    35,     0,    36,    37,
-      38,    39,    40,    41,     0,     0,     0,     0,    42,    43,
-      44,    45,    46,    47,     0,    48,     0,     0,     0,     0,
-       0,    49,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    50,    51,    52,     0,     0,     0,     0,
-      53,    54,     0,   226,    55,    16,     0,    17,    18,    19,
-      20,    21,    22,    23,     0,    24,    25,    26,    27,    28,
-       0,    29,    30,    31,    32,    33,     0,     0,     0,     0,
-      34,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    35,     0,    36,    37,    38,    39,
-      40,    41,     0,     0,     0,     0,    42,    43,    44,    45,
-      46,    47,     0,    48,     0,     0,     0,     0,     0,    49,
+      34,     0,     0,     0,     0,    35,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    36,
+       0,    37,    38,    39,    40,    41,    42,     0,     0,     0,
+       0,    43,    44,    45,    46,    47,    48,    49,     0,     0,
+       0,     0,     0,     0,     0,    50,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    51,    52,    53,
+       0,     0,     0,     0,    54,    55,     0,   238,    56,    16,
+       0,    17,    18,    19,    20,    21,    22,    23,     0,     0,
+       0,    24,    25,    26,    27,    28,     0,    29,    30,    31,
+      32,    33,    34,     0,     0,     0,     0,    35,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    50,    51,    52,     0,     0,     0,     0,    53,    54,
-       0,   236,    55,    16,     0,    17,    18,    19,    20,    21,
-      22,    23,     0,    24,    25,    26,    27,    28,     0,    29,
-      30,    31,    32,    33,     0,     0,     0,     0,    34,     0,
+       0,    36,     0,    37,    38,    39,    40,    41,    42,     0,
+       0,     0,     0,    43,    44,    45,    46,    47,    48,    49,
+       0,     0,     0,     0,     0,     0,     0,    50,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    51,
+      52,    53,     0,     0,     0,     0,    54,    55,     0,   250,
+      56,    16,     0,    17,    18,    19,    20,    21,    22,    23,
+       0,     0,     0,    24,    25,    26,    27,    28,     0,    29,
+      30,    31,    32,    33,    34,     0,     0,     0,     0,    35,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    35,     0,    36,    37,    38,    39,    40,    41,
-       0,     0,     0,     0,    42,    43,    44,    45,    46,    47,
-       0,    48,     0,     0,     0,     0,     0,    49,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    50,
-      51,    52,     0,     0,     0,     0,    53,    54,     0,   249,
-      55,    16,     0,    17,    18,    19,    20,    21,    22,    23,
-       0,    24,    25,    26,    27,    28,     0,    29,    30,    31,
-      32,    33,     0,     0,     0,     0,    34,     0,     0,     0,
+       0,     0,     0,    36,     0,    37,    38,    39,    40,    41,
+      42,     0,     0,     0,     0,    43,    44,    45,    46,    47,
+      48,    49,     0,     0,     0,     0,     0,     0,     0,    50,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      35,     0,    36,    37,    38,    39,    40,    41,     0,     0,
-       0,     0,    42,    43,    44,    45,    46,    47,     0,    48,
-       0,     0,     0,     0,     0,    49,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    50,    51,    52,
-       0,     0,     0,     0,    53,    54,     0,   272,    55,    16,
-       0,    17,    18,    19,    20,    21,    22,    23,     0,    24,
+       0,    51,    52,    53,     0,     0,     0,     0,    54,    55,
+       0,   273,    56,    16,     0,    17,    18,    19,    20,    21,
+      22,    23,     0,     0,     0,    24,    25,    26,    27,    28,
+       0,    29,    30,    31,    32,    33,    34,     0,     0,     0,
+       0,    35,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    36,     0,    37,    38,    39,
+      40,    41,    42,     0,     0,     0,     0,    43,    44,    45,
+      46,    47,    48,    49,     0,     0,     0,     0,     0,     0,
+       0,    50,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    51,    52,    53,     0,     0,     0,     0,
+      54,    55,     0,   312,    56,    16,     0,    17,    18,    19,
+      20,    21,    22,    23,     0,     0,     0,    24,    25,    26,
+      27,    28,     0,    29,    30,    31,    32,    33,    34,     0,
+       0,     0,     0,    35,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    36,     0,    37,
+      38,    39,    40,    41,    42,     0,     0,     0,     0,    43,
+      44,    45,    46,    47,    48,    49,     0,     0,     0,     0,
+       0,     0,     0,    50,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    51,    52,    53,     0,     0,
+       0,     0,    54,    55,     0,   314,    56,    16,     0,    17,
+      18,    19,    20,    21,    22,    23,     0,     0,     0,    24,
       25,    26,    27,    28,     0,    29,    30,    31,    32,    33,
-       0,     0,     0,     0,    34,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    35,     0,
-      36,    37,    38,    39,    40,    41,     0,     0,     0,     0,
-      42,    43,    44,    45,    46,    47,     0,    48,     0,     0,
-       0,     0,     0,    49,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    50,    51,    52,     0,     0,
-       0,     0,    53,    54,     0,   313,    55,    16,     0,    17,
-      18,    19,    20,    21,    22,    23,     0,    24,    25,    26,
-      27,    28,     0,    29,    30,    31,    32,    33,     0,     0,
-       0,     0,    34,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    35,     0,    36,    37,
-      38,    39,    40,    41,     0,     0,     0,     0,    42,    43,
-      44,    45,    46,    47,     0,    48,     0,     0,     0,     0,
-       0,    49,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    50,    51,    52,     0,     0,     0,     0,
-      53,    54,     0,   315,    55,    16,     0,    17,    18,    19,
-      20,    21,    22,    23,     0,    24,    25,    26,    27,    28,
-       0,    29,    30,    31,    32,    33,     0,     0,     0,     0,
-      34,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    35,     0,    36,    37,    38,    39,
-      40,    41,     0,     0,     0,     0,    42,    43,    44,    45,
-      46,    47,     0,    48,     0,     0,     0,     0,     0,    49,
+      34,     0,     0,     0,     0,    35,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    36,
+       0,    37,    38,    39,    40,    41,    42,     0,     0,     0,
+       0,    43,    44,    45,    46,    47,    48,    49,     0,     0,
+       0,     0,     0,     0,     0,    50,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    51,    52,    53,
+       0,     0,     0,     0,    54,    55,     0,   327,    56,    16,
+       0,    17,    18,    19,    20,    21,    22,    23,     0,     0,
+       0,    24,    25,    26,    27,    28,     0,    29,    30,    31,
+      32,    33,    34,     0,     0,     0,     0,    35,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    50,    51,    52,     0,     0,     0,     0,    53,    54,
-       0,   329,    55,    16,     0,    17,    18,    19,    20,    21,
-      22,    23,     0,    24,    25,    26,    27,    28,     0,    29,
-      30,    31,    32,    33,     0,     0,     0,     0,    34,     0,
+       0,    36,     0,    37,    38,    39,    40,    41,    42,     0,
+       0,     0,     0,    43,    44,    45,    46,    47,    48,    49,
+       0,     0,     0,     0,   167,     0,     0,    50,     0,     0,
+       0,   168,   169,   170,   171,     0,     0,     0,     0,    51,
+      52,    53,     0,     0,     0,     0,    54,    55,     0,     0,
+      56,   172,   173,   324,   174,   175,   176,   177,   178,   179,
+     180,     0,     0,     0,   167,   181,   182,   183,     0,     0,
+     184,   168,   169,   170,   171,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    35,     0,    36,    37,    38,    39,    40,    41,
-       0,     0,     0,     0,    42,    43,    44,    45,    46,    47,
-     406,    48,   408,     0,     0,     0,   412,    49,     0,     0,
-       0,     0,     0,     0,     0,     0,   416,   417,     0,    50,
-      51,    52,     0,     0,   426,   427,    53,    54,     0,     0,
-      55,   165,     0,   432,     0,     0,     0,   434,   166,   167,
-     168,   169,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   443,   444,   170,   171,   326,
-     172,   173,   174,   175,   176,   177,   178,     0,     0,     0,
-     165,   179,   180,   181,     0,     0,   182,   166,   167,   168,
-     169,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   170,   171,     0,   172,
-     173,   174,   175,   176,   177,   178,     0,     0,     0,   165,
-     179,   180,   181,     0,     0,   182,   166,   167,   168,   169,
+       0,   172,   173,     0,   174,   175,   176,   177,   178,   179,
+     180,     0,     0,     0,   167,   181,   182,   183,     0,     0,
+     184,   168,   169,   170,   171,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   171,     0,   172,   173,
-     174,   175,   176,   177,   178,     0,     0,     0,  -193,   179,
-     180,   181,     0,     0,   182,   166,   167,   168,   169,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   172,   173,   174,
-     175,   176,   177,   178,     0,     0,     0,     0,   179,   180,
-     181,     0,     0,   182
+       0,     0,   173,     0,   174,   175,   176,   177,   178,   179,
+     180,     0,     0,     0,     0,   181,   182,   183,     0,     0,
+     184
 };
 
+#define yypact_value_is_default(yystate) \
+  ((yystate) == (-391))
+
+#define yytable_value_is_error(yytable_value) \
+  ((yytable_value) == (-202))
+
 static const yytype_int16 yycheck[] =
 {
-       9,    41,    67,   125,    76,    11,   115,    16,    15,    49,
-     291,   384,    10,    11,    12,    27,    73,    82,    83,    84,
-      85,    86,    87,    88,    15,    97,    19,    20,    21,    22,
-      23,   140,    25,    26,   406,    44,    27,     9,   291,    11,
-     340,   294,    40,     0,   283,    43,    55,     9,    41,    42,
-      43,     9,   425,    11,    47,    27,   295,    20,    21,    22,
-      23,   361,    25,    26,     9,     9,    11,    11,     9,   134,
-      11,   443,   137,    98,    15,   115,    67,   117,    41,    42,
-      81,    22,    27,    15,    16,    17,    98,    43,    44,    90,
-      96,    89,   132,    86,    17,    18,    11,   219,    96,    12,
-     140,    98,   100,   101,    98,   358,   359,    98,    31,   118,
-      12,   287,    35,   289,    98,   124,   125,    40,    21,     9,
-      43,    76,   120,    46,    12,    48,    98,    50,    51,    52,
-      53,    54,   125,   142,   387,   200,    21,   194,   195,   196,
-     197,   198,   199,    20,   201,   202,    45,   156,   157,   158,
-      20,   160,   161,    98,   435,   164,    12,    98,     9,    72,
-      73,    74,   125,    98,    12,    24,    98,    12,    97,    20,
-      72,    73,    74,    10,   183,   184,   185,   186,   187,   188,
-     433,    70,   189,     9,    72,    73,    74,    20,    11,   182,
-      72,    73,    74,    21,    20,    72,    73,    74,   307,   208,
-     209,   210,   211,   212,   213,   270,    21,   205,    12,   331,
-     219,    20,    70,    21,    12,    97,    72,    73,    74,    97,
-     229,    10,   231,   232,    72,    73,    74,    72,    73,    74,
-      24,   240,    72,    73,    74,   292,   159,    20,    11,    72,
-      73,    74,   165,   166,   167,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,   266,   267,    98,
-     269,    20,    74,    72,    73,    74,    21,   307,    72,    73,
-      74,    15,    60,   382,    72,    73,    74,   286,   287,   288,
-     289,   279,   291,   281,   341,   294,   351,    97,    24,    72,
-      73,    74,   408,    10,    10,    10,    10,   290,    86,    20,
-     416,   417,    21,    91,    92,    93,    97,    97,    96,    20,
-     426,   309,   321,    72,    73,    74,    92,    93,   434,     9,
-      96,    11,   331,    13,    14,    15,    16,    17,    18,    19,
-      97,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,   382,    72,    73,    74,    36,    97,    97,   358,
-     359,    72,    73,    74,    97,   420,    58,    59,    60,    61,
-      50,    10,    52,    53,    54,    55,    56,    57,    97,    97,
-       9,    97,    62,    63,    64,    65,    66,    67,   387,    69,
-     389,    12,   380,    85,    86,    75,    20,    60,    61,    91,
-      92,    93,    97,   400,    96,   393,    97,    87,    88,    89,
-      72,    73,    74,   326,    94,    95,    20,    96,    98,    97,
-      97,   418,    85,    86,   389,   435,   414,    34,    91,    92,
-      93,     0,     1,    96,   433,    97,    91,    92,    93,   204,
-       9,    96,    11,   431,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,   393,    27,    28,
-      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    47,    47,    -1,    46,    47,    48,
-      49,    50,    -1,    52,    53,    54,    55,    56,    57,    72,
-      73,    74,    -1,    62,    63,    64,    65,    66,    67,    68,
-      69,    -1,    72,    73,    74,    86,    75,    72,    73,    74,
-      91,    92,    93,    -1,    97,    96,    -1,    -1,    87,    88,
-      89,    -1,     0,     1,    -1,    94,    95,    97,    -1,    98,
-      99,     9,    97,    11,    -1,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    -1,    27,
-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    40,    41,    42,    -1,    -1,    -1,    46,    47,
-      48,    49,    50,    -1,    52,    53,    54,    55,    56,    57,
-      72,    73,    74,    -1,    62,    63,    64,    65,    66,    67,
-      68,    69,    -1,    72,    73,    74,    -1,    75,    -1,    -1,
-      72,    73,    74,    -1,    -1,    97,    -1,    -1,    -1,    87,
-      88,    89,    -1,    -1,     1,    -1,    94,    95,    97,    -1,
-      98,    99,     9,    10,    11,    97,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    -1,    -1,    -1,    46,
-      47,    48,    49,    50,    -1,    52,    53,    54,    55,    56,
-      57,    -1,    -1,    -1,    -1,    62,    63,    64,    65,    66,
-      67,    68,    69,    -1,    -1,    -1,     9,    -1,    75,    -1,
-      -1,    -1,    15,    -1,    -1,    -1,    -1,    -1,    21,    -1,
-      87,    88,    89,    26,    -1,     1,    -1,    94,    95,    -1,
-      -1,    98,    99,     9,    10,    11,    -1,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      -1,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    -1,    -1,    -1,
-      46,    47,    48,    49,    50,    -1,    52,    53,    54,    55,
-      56,    57,    -1,    -1,    -1,    -1,    62,    63,    64,    65,
-      66,    67,    68,    69,    -1,    -1,    -1,    -1,    -1,    75,
-       3,     4,     5,     6,     7,     8,    -1,    -1,    -1,    -1,
-      -1,    87,    88,    89,    -1,    -1,     1,    -1,    94,    95,
-      -1,    -1,    98,    99,     9,    10,    11,    -1,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    -1,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    -1,    -1,
-      -1,    46,    47,    48,    49,    50,    -1,    52,    53,    54,
-      55,    56,    57,    -1,    -1,    -1,    -1,    62,    63,    64,
-      65,    66,    67,    68,    69,    -1,    -1,    -1,    -1,    -1,
-      75,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    87,    88,    89,    -1,    -1,     1,    -1,    94,
-      95,    -1,    -1,    98,    99,     9,    -1,    11,    -1,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    -1,    27,    28,    29,    30,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    41,    42,    -1,
-      -1,    -1,    46,    47,    48,    49,    50,    -1,    52,    53,
-      54,    55,    56,    57,    -1,    -1,    -1,    -1,    62,    63,
-      64,    65,    66,    67,    68,    69,    -1,    -1,    -1,    -1,
-      -1,    75,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    87,    88,    89,    -1,    -1,     1,    -1,
-      94,    95,    -1,    -1,    98,    99,     9,    -1,    11,    -1,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    -1,    27,    28,    29,    30,    31,    32,
-      -1,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      -1,    -1,    -1,    46,    47,    48,    49,    50,    -1,    52,
-      53,    54,    55,    56,    57,    -1,    -1,    -1,    -1,    62,
-      63,    64,    65,    66,    67,    68,    69,    -1,    -1,    -1,
-      -1,    -1,    75,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    87,    88,    89,     1,    -1,    -1,
-      -1,    94,    95,    -1,    -1,    98,    99,    11,    -1,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    -1,    27,    28,    29,    30,    31,    -1,    -1,
-      -1,    -1,    36,    -1,    39,    40,    41,    42,    -1,    -1,
-      -1,    46,    -1,    48,    60,    61,    50,    -1,    52,    53,
-      54,    55,    56,    57,    -1,    -1,    -1,    -1,    62,    63,
-      64,    65,    66,    67,    -1,    69,    -1,    72,    73,    74,
-      86,    75,    -1,    -1,    -1,    91,    92,    93,    -1,    -1,
-      96,    -1,    -1,    87,    88,    89,     1,    -1,    -1,    -1,
-      94,    95,    97,    -1,    98,    -1,    11,    -1,    13,    14,
-      15,    16,    17,    18,    19,    -1,    21,    22,    23,    24,
-      25,    -1,    27,    28,    29,    30,    31,    -1,    -1,    -1,
-      -1,    36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    50,    -1,    52,    53,    54,
-      55,    56,    57,    -1,    -1,    -1,     0,    62,    63,    64,
-      65,    66,    67,    -1,    69,     9,    -1,    11,    12,    -1,
-      75,    -1,    -1,    -1,    -1,    -1,    20,    -1,    -1,    -1,
-      -1,    -1,    87,    88,    89,    58,    59,    60,    61,    94,
-      95,    -1,    97,    98,    -1,    39,    40,    41,    42,    -1,
-      -1,    -1,    46,    -1,    48,    -1,    -1,    51,    -1,    82,
-      83,    84,    85,    86,    58,    59,    60,    61,    91,    92,
-      93,    -1,    -1,    96,    -1,    -1,    -1,    -1,    72,    73,
-      74,     0,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    12,    -1,    -1,    -1,    91,    92,    93,
-      -1,    20,    96,    97,    -1,    -1,    -1,    -1,    -1,    -1,
-      58,    59,    60,    61,    -1,    -1,    -1,    -1,    -1,    -1,
-      39,    40,    41,    42,    -1,    -1,    -1,    46,    -1,    48,
-      -1,    -1,    51,    -1,    -1,    83,    84,    85,    86,    58,
-      59,    60,    61,    91,    92,    93,    -1,    -1,    96,    -1,
-      -1,    -1,    -1,    72,    73,    74,    -1,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    -1,    -1,
-      -1,    -1,    91,    92,    93,    -1,    -1,    96,    97,     9,
+      10,    11,    12,    15,     9,   291,   115,   126,    42,    15,
+     291,    16,   293,   294,   404,     9,    50,    11,    15,    16,
+      17,    19,    20,    21,    22,    23,     9,    25,    26,    11,
+       9,    41,    11,    46,    44,   144,    20,   384,    12,    11,
+      45,    74,    80,     0,    42,    43,    44,    76,    77,    78,
+      48,    56,    20,    21,    22,    23,    20,    25,    26,    20,
+      12,   451,    26,   101,    70,    12,     9,    80,    12,    96,
+      97,    12,   101,   100,    42,    43,   357,    20,    12,   426,
+      90,   115,     9,    12,    11,   102,    96,     9,    15,    87,
+     100,   101,    76,    77,    78,    23,   102,    24,    20,   133,
+      28,   220,    76,    77,    78,   102,   387,     9,   102,    11,
+     144,   121,    12,   118,    96,    76,    77,    78,    80,     9,
+     125,   126,   102,   102,    76,    77,    78,   102,   126,    76,
+      77,    78,    76,    77,    78,    76,    77,    78,    76,    77,
+      78,   146,    76,    77,    78,    20,   102,    76,    77,    78,
+     436,   102,     9,   434,    11,   160,   161,   162,   126,   164,
+     165,   166,    20,   196,   197,   198,   199,   200,   201,    23,
+     203,   204,   287,    26,   289,   102,    76,    77,    78,   191,
+     185,   186,   187,   188,   189,   190,   184,   221,   102,    76,
+      77,    78,    76,    77,    78,    20,   206,   306,    20,    46,
+      47,    76,    77,    78,   209,   210,   211,   212,   213,   214,
+     329,   102,    17,    18,   101,   220,   102,   101,    76,    77,
+      78,   102,   102,   102,     9,    48,   231,    32,   233,   234,
+      15,    36,    61,    62,    63,    64,    41,   242,    23,    44,
+      20,   102,    47,    28,    49,   101,    51,    52,    53,    54,
+      55,    76,    77,    78,    76,    77,    78,   102,   101,   292,
+      89,    90,   267,   268,   102,   270,    95,    96,    97,   102,
+     280,   100,   306,   382,    76,    77,    78,    76,    77,    78,
+      10,   286,   287,   288,   289,    63,   291,    11,   293,   294,
+      72,   386,   290,   388,    23,    23,   391,   392,   308,   101,
+      72,    54,   101,   101,   337,   400,   401,   340,    61,    62,
+      63,    64,    90,   408,   102,   320,    10,    95,    96,    97,
+      26,    11,   100,    78,   329,   420,   102,    23,   406,   424,
+      21,    84,    85,    86,    87,    88,    89,    90,    15,   417,
+     418,   101,    95,    96,    97,    26,    10,   100,   382,   427,
+      10,    23,   357,   448,   449,    10,    10,   435,   163,   101,
+     101,   101,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,    63,    64,   101,
+      20,   102,   387,   101,   389,   101,   398,   397,    76,    77,
+      78,   101,    42,    43,    44,    45,    76,    77,    78,    49,
+      10,    51,   101,    89,    90,   415,    20,   419,     9,    95,
+      96,    97,   101,   101,   100,    20,    74,    76,    77,    78,
+      20,   101,   432,   101,    22,    73,    76,    77,    78,   434,
+       0,     1,   102,   101,   446,   101,    12,   436,    35,     9,
+     450,    11,   101,    13,    14,    15,    16,    17,    18,    19,
+      20,   101,    96,    23,    24,    25,    26,    27,   389,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    43,    44,    45,   193,   339,    -1,    49,
+      50,    51,    52,    53,   380,    55,    56,    57,    58,    59,
+      60,    76,    77,    78,    48,    65,    66,    67,    68,    69,
+      70,    71,    48,    95,    96,    97,    -1,    90,   100,    79,
+      -1,    -1,    95,    96,    97,    -1,   101,   100,    -1,   324,
+      -1,    91,    92,    93,    -1,     0,     1,    -1,    98,    99,
+      -1,    -1,   102,   103,     9,    -1,    11,    -1,    13,    14,
+      15,    16,    17,    18,    19,    20,    -1,    -1,    23,    24,
+      25,    26,    27,    -1,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    -1,    -1,    -1,    49,    50,    51,    52,    53,    -1,
+      55,    56,    57,    58,    59,    60,    -1,    -1,    -1,    -1,
+      65,    66,    67,    68,    69,    70,    71,     3,     4,     5,
+       6,     7,     8,    -1,    79,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    91,    92,    93,    -1,
+      -1,     1,    -1,    98,    99,    -1,    -1,   102,   103,     9,
+      10,    11,    -1,    13,    14,    15,    16,    17,    18,    19,
+      20,    -1,    -1,    23,    24,    25,    26,    27,    -1,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
+      50,    51,    52,    53,    -1,    55,    56,    57,    58,    59,
+      60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,    69,
+      70,    71,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    79,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    91,    92,    93,    -1,    -1,     1,    -1,    98,    99,
+      -1,    -1,   102,   103,     9,    10,    11,    -1,    13,    14,
+      15,    16,    17,    18,    19,    20,    -1,    -1,    23,    24,
+      25,    26,    27,    -1,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    -1,    -1,    -1,    49,    50,    51,    52,    53,    -1,
+      55,    56,    57,    58,    59,    60,    -1,    -1,    -1,    -1,
+      65,    66,    67,    68,    69,    70,    71,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    79,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    91,    92,    93,    -1,
+      -1,     1,    -1,    98,    99,    -1,    -1,   102,   103,     9,
+      10,    11,    -1,    13,    14,    15,    16,    17,    18,    19,
+      20,    -1,    -1,    23,    24,    25,    26,    27,    -1,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
+      50,    51,    52,    53,    -1,    55,    56,    57,    58,    59,
+      60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,    69,
+      70,    71,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    79,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    91,    92,    93,    -1,    -1,     1,    -1,    98,    99,
+      -1,    -1,   102,   103,     9,    -1,    11,    -1,    13,    14,
+      15,    16,    17,    18,    19,    20,    -1,    -1,    23,    24,
+      25,    26,    27,    -1,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    -1,    -1,    -1,    49,    50,    51,    52,    53,    -1,
+      55,    56,    57,    58,    59,    60,    -1,    -1,    -1,    -1,
+      65,    66,    67,    68,    69,    70,    71,    -1,    -1,    74,
+      -1,    -1,    -1,    -1,    79,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    91,    92,    93,    -1,
+      -1,     1,    -1,    98,    99,    -1,    -1,   102,   103,     9,
       -1,    11,    -1,    13,    14,    15,    16,    17,    18,    19,
-      -1,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
-      30,    31,    -1,    -1,    -1,    -1,    36,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    58,    59,    60,    61,    -1,    -1,
-      50,    -1,    52,    53,    54,    55,    56,    57,    -1,    -1,
-      -1,    -1,    62,    63,    64,    65,    66,    67,    -1,    69,
-      84,    85,    86,    -1,    -1,    75,    -1,    91,    92,    93,
-      -1,    -1,    96,    -1,    -1,    -1,    -1,    87,    88,    89,
-      -1,    -1,    -1,    -1,    94,    95,    -1,     9,    98,    11,
-      -1,    13,    14,    15,    16,    17,    18,    19,    -1,    21,
-      22,    23,    24,    25,    -1,    27,    28,    29,    30,    31,
-      -1,    -1,    -1,    -1,    36,    -1,    -1,    -1,    -1,    -1,
-      -1,    58,    59,    60,    61,    -1,    -1,    -1,    50,    -1,
-      52,    53,    54,    55,    56,    57,    -1,    -1,    -1,    -1,
-      62,    63,    64,    65,    66,    67,    -1,    69,    85,    86,
-      -1,    -1,    -1,    75,    91,    92,    93,    -1,    -1,    96,
-      -1,    -1,    -1,    -1,    -1,    87,    88,    89,    -1,    -1,
-      -1,    -1,    94,    95,    -1,    -1,    98,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    -1,    21,    22,    23,
-      24,    25,    -1,    27,    28,    29,    30,    31,    -1,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    -1,    -1,    -1,    58,
-      -1,    60,    61,    -1,    -1,    -1,    50,    -1,    52,    53,
-      54,    55,    56,    57,    -1,    -1,    -1,    -1,    62,    63,
-      64,    65,    66,    67,    -1,    69,    85,    86,    -1,    -1,
-      -1,    75,    91,    92,    93,    -1,    -1,    96,    -1,    -1,
-      -1,    -1,    -1,    87,    88,    89,    -1,    -1,    -1,    -1,
-      94,    95,    -1,    11,    98,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    -1,    27,
-      28,    29,    30,    31,    -1,    -1,    -1,    -1,    36,    39,
-      40,    41,    42,    -1,    -1,    -1,    46,    -1,    48,    -1,
-      -1,    -1,    50,    -1,    52,    53,    54,    55,    56,    57,
-      -1,    -1,    -1,    -1,    62,    63,    64,    65,    66,    67,
-      -1,    69,    72,    73,    74,    -1,    -1,    75,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    87,
-      88,    89,    -1,    -1,    -1,    -1,    94,    95,    -1,    11,
-      98,    13,    14,    15,    16,    17,    18,    19,    -1,    21,
-      22,    23,    24,    25,    -1,    27,    28,    29,    30,    31,
-      -1,    -1,    -1,    -1,    36,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    50,    -1,
-      52,    53,    54,    55,    56,    57,    -1,    -1,    -1,    -1,
-      62,    63,    64,    65,    66,    67,    -1,    69,    -1,    -1,
-      -1,    -1,    -1,    75,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    87,    88,    89,    -1,    -1,
-      -1,    -1,    94,    95,    -1,    97,    98,    11,    -1,    13,
-      14,    15,    16,    17,    18,    19,    -1,    21,    22,    23,
-      24,    25,    -1,    27,    28,    29,    30,    31,    -1,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    50,    -1,    52,    53,
-      54,    55,    56,    57,    -1,    -1,    -1,    -1,    62,    63,
-      64,    65,    66,    67,    -1,    69,    -1,    -1,    -1,    -1,
-      -1,    75,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    87,    88,    89,    -1,    -1,    -1,    -1,
-      94,    95,    -1,    97,    98,    11,    -1,    13,    14,    15,
-      16,    17,    18,    19,    -1,    21,    22,    23,    24,    25,
-      -1,    27,    28,    29,    30,    31,    -1,    -1,    -1,    -1,
-      36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    50,    -1,    52,    53,    54,    55,
-      56,    57,    -1,    -1,    -1,    -1,    62,    63,    64,    65,
-      66,    67,    -1,    69,    -1,    -1,    -1,    -1,    -1,    75,
+      20,    -1,    -1,    23,    24,    25,    26,    27,    -1,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
+      50,    51,    52,    53,    -1,    55,    56,    57,    58,    59,
+      60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,    69,
+      70,    71,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    87,    88,    89,    -1,    -1,    -1,    -1,    94,    95,
-      -1,    97,    98,    11,    -1,    13,    14,    15,    16,    17,
-      18,    19,    -1,    21,    22,    23,    24,    25,    -1,    27,
-      28,    29,    30,    31,    -1,    -1,    -1,    -1,    36,    -1,
+      -1,    91,    92,    93,    -1,    -1,     1,    -1,    98,    99,
+      -1,    -1,   102,   103,     9,    -1,    11,    -1,    13,    14,
+      15,    16,    17,    18,    19,    20,    -1,    -1,    23,    24,
+      25,    26,    27,    -1,    29,    30,    31,    32,    33,    34,
+      35,    -1,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    -1,    -1,    -1,    49,    50,    51,    52,    53,    -1,
+      55,    56,    57,    58,    59,    60,    -1,    -1,    -1,    -1,
+      65,    66,    67,    68,    69,    70,    71,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    79,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    91,    92,    93,     1,
+      -1,    -1,    -1,    98,    99,    -1,    -1,   102,   103,    11,
+      -1,    13,    14,    15,    16,    17,    18,    19,    20,    -1,
+      -1,    23,    24,    25,    26,    27,    -1,    29,    30,    31,
+      32,    33,    34,    -1,    -1,    -1,    -1,    39,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    61,    62,    63,    64,    -1,
+      -1,    53,    -1,    55,    56,    57,    58,    59,    60,    -1,
+      -1,    -1,    -1,    65,    66,    67,    68,    69,    70,    71,
+      86,    87,    88,    89,    90,    -1,    -1,    79,    -1,    95,
+      96,    97,    -1,    -1,   100,    -1,    -1,    -1,    -1,    91,
+      92,    93,     1,    -1,    -1,    -1,    98,    99,    -1,    -1,
+     102,    -1,    11,    -1,    13,    14,    15,    16,    17,    18,
+      19,    -1,    -1,    -1,    23,    24,    25,    26,    27,    -1,
+      29,    30,    31,    32,    33,    34,    -1,    -1,    -1,    -1,
+      39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    53,    -1,    55,    56,    57,    58,
+      59,    60,    -1,    -1,     0,    -1,    65,    66,    67,    68,
+      69,    70,    71,     9,    -1,    11,    12,    -1,    -1,    -1,
+      79,    -1,    -1,    -1,    20,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    91,    92,    93,    61,    62,    63,    64,    98,
+      99,    -1,   101,   102,    -1,    -1,    42,    43,    44,    45,
+      -1,    -1,    -1,    49,    -1,    51,    -1,    -1,    54,    -1,
+      -1,    87,    88,    89,    90,    61,    62,    63,    64,    95,
+      96,    97,    -1,    -1,   100,    63,    64,    -1,    -1,    -1,
+      76,    77,    78,     0,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    12,    -1,    -1,    -1,    95,
+      96,    97,    90,    20,   100,   101,    -1,    95,    96,    97,
+      -1,    -1,   100,    -1,    61,    62,    63,    64,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    42,    43,    44,    45,    -1,
+      -1,    -1,    49,    -1,    51,    -1,    -1,    54,    -1,    -1,
+      -1,    88,    89,    90,    61,    62,    63,    64,    95,    96,
+      97,    -1,    -1,   100,    -1,    -1,    -1,    -1,    -1,    76,
+      77,    78,    -1,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    -1,    -1,    -1,    -1,    95,    96,
+      97,    -1,    -1,   100,   101,     9,    -1,    11,    -1,    13,
+      14,    15,    16,    17,    18,    19,    -1,    -1,    -1,    23,
+      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+      34,    -1,    -1,    -1,    -1,    39,    -1,    -1,    -1,    -1,
+      -1,    -1,    61,    62,    63,    64,    -1,    -1,    -1,    53,
+      -1,    55,    56,    57,    58,    59,    60,    -1,    -1,    -1,
+      -1,    65,    66,    67,    68,    69,    70,    71,    -1,    -1,
+      89,    90,    -1,    -1,    -1,    79,    95,    96,    97,    -1,
+      -1,   100,    -1,    -1,    -1,    -1,    -1,    91,    92,    93,
+      -1,    -1,    -1,    -1,    98,    99,    -1,     9,   102,    11,
+      -1,    13,    14,    15,    16,    17,    18,    19,    -1,    -1,
+      -1,    23,    24,    25,    26,    27,    28,    29,    30,    31,
+      32,    33,    34,    -1,    -1,    -1,    -1,    39,    -1,    -1,
+      -1,    -1,    -1,    -1,    61,    -1,    63,    64,    -1,    -1,
+      -1,    53,    -1,    55,    56,    57,    58,    59,    60,    -1,
+      -1,    -1,    -1,    65,    66,    67,    68,    69,    70,    71,
+      -1,    -1,    89,    90,    -1,    -1,    -1,    79,    95,    96,
+      97,    -1,    -1,   100,    -1,    -1,    -1,    -1,    -1,    91,
+      92,    93,    -1,    -1,    -1,    -1,    98,    99,    -1,     9,
+     102,    11,    -1,    13,    14,    15,    16,    17,    18,    19,
+      -1,    -1,    -1,    23,    24,    25,    26,    27,    -1,    29,
+      30,    31,    32,    33,    34,    -1,    -1,    -1,    -1,    39,
+      42,    43,    44,    45,    -1,    -1,    -1,    49,    -1,    51,
+      -1,    -1,    -1,    53,    -1,    55,    56,    57,    58,    59,
+      60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,    69,
+      70,    71,    -1,    -1,    76,    77,    78,    -1,    -1,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    50,    -1,    52,    53,    54,    55,    56,    57,
-      -1,    -1,    -1,    -1,    62,    63,    64,    65,    66,    67,
-      -1,    69,    -1,    -1,    -1,    -1,    -1,    75,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    87,
-      88,    89,    -1,    -1,    -1,    -1,    94,    95,    -1,    97,
-      98,    11,    -1,    13,    14,    15,    16,    17,    18,    19,
-      -1,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
-      30,    31,    -1,    -1,    -1,    -1,    36,    -1,    -1,    -1,
+      -1,    91,    92,    93,    -1,    -1,    -1,    -1,    98,    99,
+      -1,    -1,   102,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    -1,    -1,    -1,    23,    24,    25,    26,    27,
+      -1,    29,    30,    31,    32,    33,    34,    -1,    -1,    -1,
+      -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    53,    -1,    55,    56,    57,
+      58,    59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,
+      68,    69,    70,    71,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    91,    92,    93,    -1,    -1,    -1,    -1,
+      98,    99,    -1,    11,   102,    13,    14,    15,    16,    17,
+      18,    19,    20,    -1,    -1,    23,    24,    25,    26,    27,
+      -1,    29,    30,    31,    32,    33,    34,    -1,    -1,    -1,
+      -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    53,    -1,    55,    56,    57,
+      58,    59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,
+      68,    69,    70,    71,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    91,    92,    93,    -1,    -1,    -1,    -1,
+      98,    99,    -1,    11,   102,    13,    14,    15,    16,    17,
+      18,    19,    -1,    -1,    -1,    23,    24,    25,    26,    27,
+      -1,    29,    30,    31,    32,    33,    34,    -1,    -1,    -1,
+      -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    53,    -1,    55,    56,    57,
+      58,    59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,
+      68,    69,    70,    71,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    91,    92,    93,    -1,    -1,    -1,    -1,
+      98,    99,    -1,   101,   102,    11,    -1,    13,    14,    15,
+      16,    17,    18,    19,    -1,    -1,    -1,    23,    24,    25,
+      26,    27,    -1,    29,    30,    31,    32,    33,    34,    -1,
+      -1,    -1,    -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,    -1,    55,
+      56,    57,    58,    59,    60,    -1,    -1,    -1,    -1,    65,
+      66,    67,    68,    69,    70,    71,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    91,    92,    93,    -1,    -1,
+      -1,    -1,    98,    99,    -1,   101,   102,    11,    -1,    13,
+      14,    15,    16,    17,    18,    19,    -1,    -1,    -1,    23,
+      24,    25,    26,    27,    -1,    29,    30,    31,    32,    33,
+      34,    -1,    -1,    -1,    -1,    39,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,
+      -1,    55,    56,    57,    58,    59,    60,    -1,    -1,    -1,
+      -1,    65,    66,    67,    68,    69,    70,    71,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    79,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    91,    92,    93,
+      -1,    -1,    -1,    -1,    98,    99,    -1,   101,   102,    11,
+      -1,    13,    14,    15,    16,    17,    18,    19,    -1,    -1,
+      -1,    23,    24,    25,    26,    27,    -1,    29,    30,    31,
+      32,    33,    34,    -1,    -1,    -1,    -1,    39,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      50,    -1,    52,    53,    54,    55,    56,    57,    -1,    -1,
-      -1,    -1,    62,    63,    64,    65,    66,    67,    -1,    69,
-      -1,    -1,    -1,    -1,    -1,    75,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    87,    88,    89,
-      -1,    -1,    -1,    -1,    94,    95,    -1,    97,    98,    11,
-      -1,    13,    14,    15,    16,    17,    18,    19,    -1,    21,
-      22,    23,    24,    25,    -1,    27,    28,    29,    30,    31,
-      -1,    -1,    -1,    -1,    36,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    50,    -1,
-      52,    53,    54,    55,    56,    57,    -1,    -1,    -1,    -1,
-      62,    63,    64,    65,    66,    67,    -1,    69,    -1,    -1,
-      -1,    -1,    -1,    75,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    87,    88,    89,    -1,    -1,
-      -1,    -1,    94,    95,    -1,    97,    98,    11,    -1,    13,
-      14,    15,    16,    17,    18,    19,    -1,    21,    22,    23,
-      24,    25,    -1,    27,    28,    29,    30,    31,    -1,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    50,    -1,    52,    53,
-      54,    55,    56,    57,    -1,    -1,    -1,    -1,    62,    63,
-      64,    65,    66,    67,    -1,    69,    -1,    -1,    -1,    -1,
-      -1,    75,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    87,    88,    89,    -1,    -1,    -1,    -1,
-      94,    95,    -1,    97,    98,    11,    -1,    13,    14,    15,
-      16,    17,    18,    19,    -1,    21,    22,    23,    24,    25,
-      -1,    27,    28,    29,    30,    31,    -1,    -1,    -1,    -1,
-      36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    50,    -1,    52,    53,    54,    55,
-      56,    57,    -1,    -1,    -1,    -1,    62,    63,    64,    65,
-      66,    67,    -1,    69,    -1,    -1,    -1,    -1,    -1,    75,
+      -1,    53,    -1,    55,    56,    57,    58,    59,    60,    -1,
+      -1,    -1,    -1,    65,    66,    67,    68,    69,    70,    71,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    79,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    91,
+      92,    93,    -1,    -1,    -1,    -1,    98,    99,    -1,   101,
+     102,    11,    -1,    13,    14,    15,    16,    17,    18,    19,
+      -1,    -1,    -1,    23,    24,    25,    26,    27,    -1,    29,
+      30,    31,    32,    33,    34,    -1,    -1,    -1,    -1,    39,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    87,    88,    89,    -1,    -1,    -1,    -1,    94,    95,
-      -1,    97,    98,    11,    -1,    13,    14,    15,    16,    17,
-      18,    19,    -1,    21,    22,    23,    24,    25,    -1,    27,
-      28,    29,    30,    31,    -1,    -1,    -1,    -1,    36,    -1,
+      -1,    -1,    -1,    53,    -1,    55,    56,    57,    58,    59,
+      60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,    69,
+      70,    71,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    50,    -1,    52,    53,    54,    55,    56,    57,
-      -1,    -1,    -1,    -1,    62,    63,    64,    65,    66,    67,
-     386,    69,   388,    -1,    -1,    -1,   392,    75,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   402,   403,    -1,    87,
-      88,    89,    -1,    -1,   410,   411,    94,    95,    -1,    -1,
-      98,    51,    -1,   419,    -1,    -1,    -1,   423,    58,    59,
-      60,    61,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   441,   442,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    86,    -1,    -1,    -1,
-      51,    91,    92,    93,    -1,    -1,    96,    58,    59,    60,
-      61,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    77,    78,    -1,    80,
-      81,    82,    83,    84,    85,    86,    -1,    -1,    -1,    51,
-      91,    92,    93,    -1,    -1,    96,    58,    59,    60,    61,
+      -1,    91,    92,    93,    -1,    -1,    -1,    -1,    98,    99,
+      -1,   101,   102,    11,    -1,    13,    14,    15,    16,    17,
+      18,    19,    -1,    -1,    -1,    23,    24,    25,    26,    27,
+      -1,    29,    30,    31,    32,    33,    34,    -1,    -1,    -1,
+      -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    53,    -1,    55,    56,    57,
+      58,    59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,
+      68,    69,    70,    71,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    91,    92,    93,    -1,    -1,    -1,    -1,
+      98,    99,    -1,   101,   102,    11,    -1,    13,    14,    15,
+      16,    17,    18,    19,    -1,    -1,    -1,    23,    24,    25,
+      26,    27,    -1,    29,    30,    31,    32,    33,    34,    -1,
+      -1,    -1,    -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,    -1,    55,
+      56,    57,    58,    59,    60,    -1,    -1,    -1,    -1,    65,
+      66,    67,    68,    69,    70,    71,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    79,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    91,    92,    93,    -1,    -1,
+      -1,    -1,    98,    99,    -1,   101,   102,    11,    -1,    13,
+      14,    15,    16,    17,    18,    19,    -1,    -1,    -1,    23,
+      24,    25,    26,    27,    -1,    29,    30,    31,    32,    33,
+      34,    -1,    -1,    -1,    -1,    39,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,
+      -1,    55,    56,    57,    58,    59,    60,    -1,    -1,    -1,
+      -1,    65,    66,    67,    68,    69,    70,    71,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    79,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    91,    92,    93,
+      -1,    -1,    -1,    -1,    98,    99,    -1,   101,   102,    11,
+      -1,    13,    14,    15,    16,    17,    18,    19,    -1,    -1,
+      -1,    23,    24,    25,    26,    27,    -1,    29,    30,    31,
+      32,    33,    34,    -1,    -1,    -1,    -1,    39,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    78,    -1,    80,    81,
-      82,    83,    84,    85,    86,    -1,    -1,    -1,    51,    91,
-      92,    93,    -1,    -1,    96,    58,    59,    60,    61,    -1,
+      -1,    53,    -1,    55,    56,    57,    58,    59,    60,    -1,
+      -1,    -1,    -1,    65,    66,    67,    68,    69,    70,    71,
+      -1,    -1,    -1,    -1,    54,    -1,    -1,    79,    -1,    -1,
+      -1,    61,    62,    63,    64,    -1,    -1,    -1,    -1,    91,
+      92,    93,    -1,    -1,    -1,    -1,    98,    99,    -1,    -1,
+     102,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    -1,    -1,    -1,    54,    95,    96,    97,    -1,    -1,
+     100,    61,    62,    63,    64,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    80,    81,    82,
-      83,    84,    85,    86,    -1,    -1,    -1,    -1,    91,    92,
-      93,    -1,    -1,    96
+      -1,    81,    82,    -1,    84,    85,    86,    87,    88,    89,
+      90,    -1,    -1,    -1,    54,    95,    96,    97,    -1,    -1,
+     100,    61,    62,    63,    64,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    82,    -1,    84,    85,    86,    87,    88,    89,
+      90,    -1,    -1,    -1,    -1,    95,    96,    97,    -1,    -1,
+     100
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -993,51 +1049,52 @@
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,     3,     4,     5,     6,     7,     8,   101,   102,   103,
-     104,   105,   106,   107,     0,   109,    11,    13,    14,    15,
-      16,    17,    18,    19,    21,    22,    23,    24,    25,    27,
-      28,    29,    30,    31,    36,    50,    52,    53,    54,    55,
-      56,    57,    62,    63,    64,    65,    66,    67,    69,    75,
-      87,    88,    89,    94,    95,    98,   138,   139,   140,   143,
-     144,   145,   146,   147,   148,   149,   152,   156,   157,   158,
-     159,   160,   161,     9,   108,     1,    20,    32,    34,    35,
-      37,    38,    39,    40,    41,    42,    46,    47,    48,    49,
-      68,    99,   108,   116,   119,   138,    33,   114,   115,   116,
-     113,   113,    12,   138,   148,   148,    21,    26,   108,   157,
-     162,   162,   162,   162,   162,   162,   162,    98,    11,   148,
-     131,   131,   148,    98,    98,    98,   108,   148,    21,   139,
-     151,   157,   162,   162,    21,   108,   148,   157,    20,   138,
-      21,   148,    98,   150,   157,   158,   159,   148,   139,   148,
-     148,   148,   148,   148,    97,   138,    72,    73,    74,    76,
-       9,    11,    27,    98,   153,    51,    58,    59,    60,    61,
-      77,    78,    80,    81,    82,    83,    84,    85,    86,    91,
-      92,    93,    96,   153,     9,    11,     9,    11,     9,   109,
-     132,   130,    21,   130,   153,   153,   153,   153,    67,   153,
-     157,   153,   153,   108,   130,    45,   121,    20,    39,    40,
-      41,    42,    46,    48,   115,   116,   114,    12,   151,    98,
-     139,   138,   108,    24,   134,    97,    97,   138,   152,   162,
-     139,   153,   153,    10,    20,   151,    97,   138,    70,   136,
-      11,    97,   138,   138,   138,   148,   138,   138,   154,    97,
-     138,   148,   148,   148,   148,   148,   148,   148,   148,   148,
-     148,   148,   148,   148,   148,   148,     9,    11,    22,    98,
-     142,   157,    97,   138,   138,   138,   138,   138,   138,   113,
-      21,   129,    21,   133,    21,   117,   109,   109,   109,   109,
-     109,   109,   153,   109,   109,   133,   108,   138,   125,   138,
-     138,   138,   138,   138,   152,    97,    12,   141,    70,   135,
-      97,    97,   138,    97,   138,    97,   138,    10,    97,    24,
-     138,    11,    20,    12,    98,    97,    79,   138,   138,    97,
-     138,   153,    97,    20,    12,    20,    12,    20,    10,   108,
-     134,     9,    20,    21,   124,   138,   125,   126,   138,   125,
-     128,   155,   157,   119,   123,   126,   127,   138,   109,   110,
-     126,   134,    97,   151,    24,   108,    97,    97,    97,    12,
-     138,    10,   148,    20,    12,    97,   152,    10,    10,    10,
-     135,   109,    21,    97,    97,    97,    97,   153,    97,    20,
-     126,   126,    97,   135,    12,    10,    97,    20,   108,   137,
-     118,   151,   122,   122,     9,   111,   111,   126,   111,   124,
-      97,    97,   111,   137,   113,    20,   111,   111,   112,    43,
-      44,   120,   120,    97,   121,    20,   111,   111,    10,   121,
-     121,   113,   111,   153,   111,   122,   121,    10,   126,   121,
-     127,    97,    97,   111,   111,   120
+       0,     3,     4,     5,     6,     7,     8,   105,   106,   107,
+     108,   109,   110,   111,     0,   114,    11,    13,    14,    15,
+      16,    17,    18,    19,    23,    24,    25,    26,    27,    29,
+      30,    31,    32,    33,    34,    39,    53,    55,    56,    57,
+      58,    59,    60,    65,    66,    67,    68,    69,    70,    71,
+      79,    91,    92,    93,    98,    99,   102,   146,   147,   148,
+     151,   152,   153,   154,   155,   156,   158,   161,   163,   164,
+     165,   166,   167,   168,     9,   112,     1,    20,    35,    37,
+      38,    40,    41,    42,    43,    44,    45,    49,    50,    51,
+      52,   103,   112,   121,   127,   146,    36,   119,   120,   121,
+     117,   117,    12,   146,   156,   156,    23,    28,   112,   164,
+     169,   169,   169,   169,   169,   169,   169,   157,    11,   102,
+     156,   139,   139,   156,   102,   102,   102,   112,   156,    23,
+     147,   160,   164,   169,   169,    23,    28,   112,   141,   156,
+     164,    20,   146,    23,   141,   156,   102,   159,   164,   165,
+     166,   156,   147,   156,   156,   156,   156,   156,   101,   146,
+      76,    77,    78,    80,     9,    11,   102,    54,    61,    62,
+      63,    64,    81,    82,    84,    85,    86,    87,    88,    89,
+      90,    95,    96,    97,   100,   102,     9,    11,     9,    11,
+       9,   114,   140,   141,    23,   138,   102,   102,   102,   102,
+      70,   102,   164,   102,   102,   112,    48,   129,    20,    42,
+      43,    44,    45,    49,    51,   120,   121,   119,    12,   160,
+     102,   102,   146,   101,   112,    26,   142,   101,   101,   146,
+     161,   169,   147,   102,   102,    10,    20,   160,   101,   146,
+      72,   144,    11,   101,   146,   146,   146,   156,   146,   146,
+     101,   146,   156,   156,   156,   156,   156,   156,   156,   156,
+     156,   156,   156,   156,   156,   156,   156,     9,    11,    24,
+     102,   150,   164,   101,   146,   146,   146,   146,   146,   146,
+     117,    23,   137,   138,    23,   123,   114,   114,   114,   114,
+     114,   114,   102,   114,   114,   112,   146,   133,   146,   146,
+     146,   146,   146,   161,   147,    12,   149,    72,   143,   101,
+     101,   146,   101,   146,   101,   146,    10,   101,    26,   146,
+      11,    20,    12,   101,    83,   146,   146,   101,   146,   102,
+     101,    20,    12,    20,    12,    20,    10,    21,   113,   122,
+       9,    20,    23,   132,   146,   133,   134,   146,   133,   136,
+     162,   164,   127,   131,   134,   135,   146,   114,   134,   134,
+     101,   101,   160,    26,   112,   101,   101,   101,    12,   146,
+      10,   156,    20,    12,   101,   161,    10,    10,    10,   114,
+     142,   114,    23,   101,   101,   101,   101,   102,   101,    20,
+     134,   101,   101,    12,    10,   101,    20,   143,   124,   160,
+     130,   130,     9,   115,   115,   134,   115,   132,   101,   115,
+     115,    74,    20,   112,   145,   117,    20,   115,   115,   116,
+      46,    47,   128,   128,   101,   129,    20,   115,   118,    10,
+     129,   129,   117,   115,   102,   115,   130,   129,    20,    26,
+     125,    10,   134,   129,   135,    22,    73,   126,   101,   101,
+     117,   115,   115,    74,   128
 };
 
 typedef enum {
@@ -1049,31 +1106,32 @@
 {
   toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival,
   toketype_ival, toketype_ival, toketype_ival, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval,
-  toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_opval,
+  toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval,
+  toketype_i_tkval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
   toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
-  toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_p_tkval,
+  toketype_opval, toketype_p_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval,
   toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval,
+  toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval,
   toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval,
   toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval,
-  toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval,
-  toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval,
+  toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_ival, toketype_ival, toketype_ival,
   toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival,
   toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival,
   toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival,
-  toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_i_tkval, toketype_ival,
-  toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_opval, toketype_ival,
-  toketype_ival, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval,
-  toketype_opval, toketype_ival, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval,
-  toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival,
-  toketype_ival, toketype_ival, toketype_opval, toketype_opval, toketype_opval,
-  toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval,
+  toketype_ival, toketype_ival, toketype_ival, toketype_i_tkval, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival,
+  toketype_ival, toketype_ival, toketype_ival, toketype_opval, toketype_opval, toketype_ival, toketype_opval,
+  toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
+  toketype_opval, toketype_ival, toketype_ival, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
+  toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
+  toketype_opval, toketype_ival, toketype_ival, toketype_ival, toketype_opval,
   toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
-  toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_i_tkval, toketype_ival,
+  toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
+  toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_opval,
   toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
-  toketype_opval
+  toketype_opval, toketype_opval, toketype_opval
 };
 
 /* Generated from:
- * bd41fc813e5d2d23ff7edef2ab1ef88bbb054176476b7d989db7522dce1c9328 perly.y
- * dc72db91baa0a3c17a6c95718e5ad70e9ac7b75919df1317df7fe6c3f1649239 regen_perly.pl
+ * 28c2c7738eefc00762e227af0363c729186c992e9127e0c935684cccbf3a3b4f perly.y
+ * 5c9d2a0262457fe9b70073fc8ad6c188f812f38ad57712b7e2f53daa01b297cc regen_perly.pl
  * ex: set ro: */


Property changes on: trunk/contrib/perl/perly.tab
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.3
\ No newline at end of property
Modified: trunk/contrib/perl/perly.y
===================================================================
--- trunk/contrib/perl/perly.y	2013-12-02 21:28:27 UTC (rev 6442)
+++ trunk/contrib/perl/perly.y	2013-12-02 21:28:58 UTC (rev 6443)
@@ -1,7 +1,7 @@
 /*    perly.y
  *
  *    Copyright (c) 1991-2002, 2003, 2004, 2005, 2006 Larry Wall
- *    Copyright (c) 2007, 2008 by Larry Wall and others
+ *    Copyright (c) 2007, 2008, 2009, 2010, 2011 by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -71,10 +71,10 @@
 
 %token <ival> GRAMPROG GRAMEXPR GRAMBLOCK GRAMBARESTMT GRAMFULLSTMT GRAMSTMTSEQ
 
-%token <i_tkval> '{' '}' '[' ']' '-' '+' '$' '@' '%' '*' '&' ';'
+%token <i_tkval> '{' '}' '[' ']' '-' '+' '$' '@' '%' '*' '&' ';' '=' '.'
 
 %token <opval> WORD METHOD FUNCMETH THING PMFUNC PRIVATEREF QWLIST
-%token <opval> FUNC0SUB UNIOPSUB LSTOPSUB
+%token <opval> FUNC0OP FUNC0SUB UNIOPSUB LSTOPSUB
 %token <opval> PLUGEXPR PLUGSTMT
 %token <p_tkval> LABEL
 %token <i_tkval> FORMAT SUB ANONSUB PACKAGE USE
@@ -84,23 +84,22 @@
 %token <i_tkval> FUNC0 FUNC1 FUNC UNIOP LSTOP
 %token <i_tkval> RELOP EQOP MULOP ADDOP
 %token <i_tkval> DOLSHARP DO HASHBRACK NOAMP
-%token <i_tkval> LOCAL MY MYSUB REQUIRE
-%token <i_tkval> COLONATTR
+%token <i_tkval> LOCAL MY REQUIRE
+%token <i_tkval> COLONATTR FORMLBRACK FORMRBRACK
 
-%type <i_tkval> lpar_or_qw
-
 %type <ival> grammar remember mremember
 %type <ival>  startsub startanonsub startformsub
 /* FIXME for MAD - are these two ival? */
-%type <ival> mydefsv mintro
+%type <ival> mintro
 
 %type <opval> stmtseq fullstmt labfullstmt barestmt block mblock else
 %type <opval> expr term subscripted scalar ary hsh arylen star amper sideff
 %type <opval> listexpr nexpr texpr iexpr mexpr mnexpr miexpr
 %type <opval> optlistexpr optexpr indirob listop method
-%type <opval> formname subname proto subbody cont my_scalar
+%type <opval> formname subname proto subbody cont my_scalar formblock
 %type <opval> subattrlist myattrlist myattrterm myterm
 %type <opval> termbinop termunop anonymous termdo
+%type <opval> formstmtseq formline formarg
 
 %nonassoc <i_tkval> PREC_LOW
 %nonassoc LOOPEX
@@ -213,14 +212,20 @@
 			}
 	;
 
+/* format body */
+formblock:	'=' remember ';' FORMRBRACK formstmtseq ';' '.'
+			{ if (PL_parser->copline > (line_t)IVAL($1))
+			      PL_parser->copline = (line_t)IVAL($1);
+			  $$ = block_end($2, $5);
+			  TOKEN_GETMAD($1,$$,'{');
+			  TOKEN_GETMAD($7,$$,'}');
+			}
+	;
+
 remember:	/* NULL */	/* start a full lexical scope */
 			{ $$ = block_start(TRUE); }
 	;
 
-mydefsv:	/* NULL */	/* lexicalize $_ */
-			{ $$ = (I32) Perl_allocmy(aTHX_ STR_WITH_LEN("$_"), 0); }
-	;
-
 mblock	:	'{' mremember stmtseq '}'
 			{ if (PL_parser->copline > (line_t)IVAL($1))
 			      PL_parser->copline = (line_t)IVAL($1);
@@ -245,6 +250,17 @@
 			}
 	;
 
+/* A sequence of format lines */
+formstmtseq:	/* NULL */
+			{ $$ = (OP*)NULL; }
+	|	formstmtseq formline
+			{   $$ = op_append_list(OP_LINESEQ, $1, $2);
+			    PL_pad_reset_pending = TRUE;
+			    if ($1 && $2)
+				PL_hints |= HINT_BLOCK_SCOPE;
+			}
+	;
+
 /* A statement in the program, including optional labels */
 fullstmt:	barestmt
 			{
@@ -260,13 +276,17 @@
 
 labfullstmt:	LABEL barestmt
 			{
-			  $$ = newSTATEOP(0, PVAL($1), $2);
+			  $$ = newSTATEOP(SVf_UTF8
+					   * PVAL($1)[strlen(PVAL($1))+1],
+					  PVAL($1), $2);
 			  TOKEN_GETMAD($1,
 			      $2 ? cLISTOPx($$)->op_first : $$, 'L');
 			}
 	|	LABEL labfullstmt
 			{
-			  $$ = newSTATEOP(0, PVAL($1), $2);
+			  $$ = newSTATEOP(SVf_UTF8
+					   * PVAL($1)[strlen(PVAL($1))+1],
+					  PVAL($1), $2);
 			  TOKEN_GETMAD($1, cLISTOPx($$)->op_first, 'L');
 			}
 	;
@@ -279,10 +299,9 @@
 			  $$ = newOP(OP_NULL,0);
 			  TOKEN_GETMAD($1,$$,'p');
 			}
-	|	FORMAT startformsub formname block
+	|	FORMAT startformsub formname formblock
 			{
 			  CV *fmtcv = PL_compcv;
-			  SvREFCNT_inc_simple_void(PL_compcv);
 #ifdef MAD
 			  $$ = newFORM($2, $3, $4);
 			  prepend_madprops($1->tk_mad, $$, 'F');
@@ -292,44 +311,61 @@
 			  newFORM($2, $3, $4);
 			  $$ = (OP*)NULL;
 #endif
-			  if (CvOUTSIDE(fmtcv) && !CvUNIQUE(CvOUTSIDE(fmtcv))) {
+			  if (CvOUTSIDE(fmtcv) && !CvEVAL(CvOUTSIDE(fmtcv))) {
 			      SvREFCNT_inc_simple_void(fmtcv);
-			      pad_add_anon((SV*)fmtcv, OP_NULL);
+			      pad_add_anon(fmtcv, OP_NULL);
 			  }
 			}
-	|	SUB startsub subname proto subattrlist subbody
+	|	SUB subname startsub
 			{
+			  if ($2->op_type == OP_CONST) {
+			    const char *const name =
+				SvPV_nolen_const(((SVOP*)$2)->op_sv);
+			    if (strEQ(name, "BEGIN") || strEQ(name, "END")
+			      || strEQ(name, "INIT") || strEQ(name, "CHECK")
+			      || strEQ(name, "UNITCHECK"))
+			      CvSPECIAL_on(PL_compcv);
+			  }
+			  else
+			  /* State subs inside anonymous subs need to be
+			     clonable themselves. */
+			  if (CvANON(CvOUTSIDE(PL_compcv))
+			   || CvCLONE(CvOUTSIDE(PL_compcv))
+			   || !PadnameIsSTATE(PadlistNAMESARRAY(CvPADLIST(
+						CvOUTSIDE(PL_compcv)
+					     ))[$2->op_targ]))
+			      CvCLONE_on(PL_compcv);
+			  PL_parser->in_my = 0;
+			  PL_parser->in_my_stash = NULL;
+			}
+		proto subattrlist subbody
+			{
 			  SvREFCNT_inc_simple_void(PL_compcv);
 #ifdef MAD
 			  {
 			      OP* o = newSVOP(OP_ANONCODE, 0,
-				(SV*)newATTRSUB($2, $3, $4, $5, $6));
+				(SV*)(
+#endif
+			  $2->op_type == OP_CONST
+			      ? newATTRSUB($3, $2, $5, $6, $7)
+			      : newMYSUB($3, $2, $5, $6, $7)
+#ifdef MAD
+				));
 			      $$ = newOP(OP_NULL,0);
 			      op_getmad(o,$$,'&');
-			      op_getmad($3,$$,'n');
-			      op_getmad($4,$$,'s');
-			      op_getmad($5,$$,'a');
+			      op_getmad($2,$$,'n');
+			      op_getmad($5,$$,'s');
+			      op_getmad($6,$$,'a');
 			      token_getmad($1,$$,'d');
-			      append_madprops($6->op_madprop, $$, 0);
-			      $6->op_madprop = 0;
+			      append_madprops($7->op_madprop, $$, 0);
+			      $7->op_madprop = 0;
 			  }
 #else
-			  newATTRSUB($2, $3, $4, $5, $6);
+			  ;
 			  $$ = (OP*)NULL;
 #endif
+			  intro_my();
 			}
-	|	MYSUB startsub subname proto subattrlist subbody
-			{
-			  /* Unimplemented "my sub foo { }" */
-			  SvREFCNT_inc_simple_void(PL_compcv);
-#ifdef MAD
-			  $$ = newMYSUB($2, $3, $4, $5, $6);
-			  token_getmad($1,$$,'d');
-#else
-			  newMYSUB($2, $3, $4, $5, $6);
-			  $$ = (OP*)NULL;
-#endif
-			}
 	|	PACKAGE WORD WORD ';'
 			{
 #ifdef MAD
@@ -362,7 +398,7 @@
 			  $$ = (OP*)NULL;
 #endif
 			}
-	|	IF lpar_or_qw remember mexpr ')' mblock else
+	|	IF '(' remember mexpr ')' mblock else
 			{
 			  $$ = block_end($3,
 			      newCONDOP(0, $4, op_scope($6), $7));
@@ -371,7 +407,7 @@
 			  TOKEN_GETMAD($5,$$,')');
 			  PL_parser->copline = (line_t)IVAL($1);
 			}
-	|	UNLESS lpar_or_qw remember miexpr ')' mblock else
+	|	UNLESS '(' remember miexpr ')' mblock else
 			{
 			  $$ = block_end($3,
 			      newCONDOP(0, $4, op_scope($6), $7));
@@ -380,17 +416,22 @@
 			  TOKEN_GETMAD($5,$$,')');
 			  PL_parser->copline = (line_t)IVAL($1);
 			}
-	|	GIVEN lpar_or_qw remember mydefsv mexpr ')' mblock
+	|	GIVEN '(' remember mexpr ')' mblock
 			{
+			  const PADOFFSET offset = pad_findmy_pvs("$_", 0);
 			  $$ = block_end($3,
-				  newGIVENOP($5, op_scope($7), (PADOFFSET)$4));
+				  newGIVENOP($4, op_scope($6),
+				    offset == NOT_IN_PAD
+				    || PAD_COMPNAME_FLAGS_isOUR(offset)
+				      ? 0
+				      : offset));
 			  PL_parser->copline = (line_t)IVAL($1);
 			}
-	|	WHEN lpar_or_qw remember mexpr ')' mblock
+	|	WHEN '(' remember mexpr ')' mblock
 			{ $$ = block_end($3, newWHENOP($4, op_scope($6))); }
 	|	DEFAULT block
 			{ $$ = newWHENOP(0, op_scope($2)); }
-	|	WHILE lpar_or_qw remember texpr ')' mintro mblock cont
+	|	WHILE '(' remember texpr ')' mintro mblock cont
 			{
 			  $$ = block_end($3,
 				  newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
@@ -400,7 +441,7 @@
 			  TOKEN_GETMAD($5,$$,')');
 			  PL_parser->copline = (line_t)IVAL($1);
 			}
-	|	UNTIL lpar_or_qw remember iexpr ')' mintro mblock cont
+	|	UNTIL '(' remember iexpr ')' mintro mblock cont
 			{
 			  $$ = block_end($3,
 				  newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
@@ -410,7 +451,7 @@
 			  TOKEN_GETMAD($5,$$,')');
 			  PL_parser->copline = (line_t)IVAL($1);
 			}
-	|	FOR lpar_or_qw remember mnexpr ';' texpr ';' mintro mnexpr ')'
+	|	FOR '(' remember mnexpr ';' texpr ';' mintro mnexpr ')'
 		mblock
 			{
 			  OP *initop = IF_MAD($4 ? $4 : newOP(OP_NULL, 0), $4);
@@ -431,7 +472,7 @@
 			  TOKEN_GETMAD($10,$$,')');
 			  PL_parser->copline = (line_t)IVAL($1);
 			}
-	|	FOR MY remember my_scalar lpar_or_qw mexpr ')' mblock cont
+	|	FOR MY remember my_scalar '(' mexpr ')' mblock cont
 			{
 			  $$ = block_end($3, newFOROP(0, $4, $6, $8, $9));
 			  TOKEN_GETMAD($1,$$,'W');
@@ -440,7 +481,7 @@
 			  TOKEN_GETMAD($7,$$,')');
 			  PL_parser->copline = (line_t)IVAL($1);
 			}
-	|	FOR scalar lpar_or_qw remember mexpr ')' mblock cont
+	|	FOR scalar '(' remember mexpr ')' mblock cont
 			{
 			  $$ = block_end($4, newFOROP(0,
 				      op_lvalue($2, OP_ENTERLOOP), $5, $7, $8));
@@ -449,7 +490,7 @@
 			  TOKEN_GETMAD($6,$$,')');
 			  PL_parser->copline = (line_t)IVAL($1);
 			}
-	|	FOR lpar_or_qw remember mexpr ')' mblock cont
+	|	FOR '(' remember mexpr ')' mblock cont
 			{
 			  $$ = block_end($3,
 				  newFOROP(0, (OP*)NULL, $4, $6, $7));
@@ -466,15 +507,9 @@
 			}
 	|	PACKAGE WORD WORD '{' remember
 			{
-			  int save_3_latefree = $3->op_latefree;
-			  $3->op_latefree = 1;
 			  package($3);
-			  $3->op_latefree = save_3_latefree;
 			  if ($2) {
-			      int save_2_latefree = $2->op_latefree;
-			      $2->op_latefree = 1;
 			      package_version($2);
-			      $2->op_latefree = save_2_latefree;
 			  }
 			}
 		stmtseq '}'
@@ -482,9 +517,6 @@
 			  /* a block is a loop that happens once */
 			  $$ = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
 				  (OP*)NULL, block_end($5, $7), (OP*)NULL, 0);
-			  op_free($3);
-			  if ($2)
-			      op_free($2);
 			  TOKEN_GETMAD($4,$$,'{');
 			  TOKEN_GETMAD($8,$$,'}');
 			  if (PL_parser->copline > (line_t)IVAL($4))
@@ -505,6 +537,36 @@
 			}
 	;
 
+/* Format line */
+formline:	THING formarg
+			{ OP *list;
+			  if ($2) {
+			      OP *term = $2;
+			      DO_MAD(term = newUNOP(OP_NULL, 0, term));
+			      list = op_append_elem(OP_LIST, $1, term);
+			  }
+			  else {
+#ifdef MAD
+			      OP *op = newNULLLIST();
+			      list = op_append_elem(OP_LIST, $1, op);
+#else
+			      list = $1;
+#endif
+			  }
+			  if (PL_parser->copline == NOLINE)
+			       PL_parser->copline = CopLINE(PL_curcop)-1;
+			  else PL_parser->copline--;
+			  $$ = newSTATEOP(0, NULL,
+					  convert(OP_FORMLINE, 0, list));
+			}
+	;
+
+formarg	:	/* NULL */
+			{ $$ = NULL; }
+	|	FORMLBRACK stmtseq FORMRBRACK
+			{ $$ = op_unscope($2); }
+	;
+
 /* An expression which may have a side-effect */
 sideff	:	error
 			{ $$ = (OP*)NULL; }
@@ -544,7 +606,7 @@
 			  $$ = op_scope($2);
 			  TOKEN_GETMAD($1,$$,'o');
 			}
-	|	ELSIF lpar_or_qw mexpr ')' mblock else
+	|	ELSIF '(' mexpr ')' mblock else
 			{ PL_parser->copline = (line_t)IVAL($1);
 			    $$ = newCONDOP(0,
 				newSTATEOP(OPf_SPECIAL,NULL,$3),
@@ -625,12 +687,8 @@
 	;
 
 /* Name of a subroutine - must be a bareword, could be special */
-subname	:	WORD	{ const char *const name = SvPV_nolen_const(((SVOP*)$1)->op_sv);
-			  if (strEQ(name, "BEGIN") || strEQ(name, "END")
-			      || strEQ(name, "INIT") || strEQ(name, "CHECK")
-			      || strEQ(name, "UNITCHECK"))
-			      CvSPECIAL_on(PL_compcv);
-			  $$ = $1; }
+subname	:	WORD
+	|	PRIVATEREF
 	;
 
 /* Subroutine prototype */
@@ -732,7 +790,7 @@
 			  TOKEN_GETMAD($2,$$,'(');
 			  TOKEN_GETMAD($5,$$,')');
 			}
-	|	term ARROW method lpar_or_qw optexpr ')' /* $foo->bar(list) */
+	|	term ARROW method '(' optexpr ')' /* $foo->bar(list) */
 			{ $$ = convert(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST,
 				    op_prepend_elem(OP_LIST, scalar($1), $5),
@@ -816,7 +874,7 @@
 			  TOKEN_GETMAD($2,$$,'[');
 			  TOKEN_GETMAD($4,$$,']');
 			}
-	|	scalar '{' expr ';' '}'    /* $foo->{bar();} */
+	|	scalar '{' expr ';' '}'    /* $foo{bar();} */
 			{ $$ = newBINOP(OP_HELEM, 0, oopsHV($1), jmaybe($3));
 			    PL_parser->expect = XOPERATOR;
 			  TOKEN_GETMAD($2,$$,'{');
@@ -858,7 +916,7 @@
 			  TOKEN_GETMAD($5,$$,')');
 			}
 
-	|	subscripted lpar_or_qw expr ')'   /* $foo->{bar}->(@args) */
+	|	subscripted '(' expr ')'   /* $foo->{bar}->(@args) */
 			{ $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   op_append_elem(OP_LIST, $3,
 					       newCVREF(0, scalar($1))));
@@ -865,7 +923,7 @@
 			  TOKEN_GETMAD($2,$$,'(');
 			  TOKEN_GETMAD($4,$$,')');
 			}
-	|	subscripted lpar_or_qw ')'        /* $foo->{bar}->() */
+	|	subscripted '(' ')'        /* $foo->{bar}->() */
 			{ $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   newCVREF(0, scalar($1)));
 			  TOKEN_GETMAD($2,$$,'(');
@@ -941,7 +999,7 @@
 			      op = (UNOP*)op->op_first;	/* get to flip */
 			      op = (UNOP*)op->op_first;	/* get to range */
 			      token_getmad($2,(OP*)op,'o');
-			    })
+			    });
 			}
 	|	term ANDAND term                       /* $x && $y */
 			{ $$ = newLOGOP(OP_AND, 0, $1, $3);
@@ -1049,7 +1107,7 @@
 			{ $$ = newUNOP(OP_NULL, OPf_SPECIAL, op_scope($2));
 			  TOKEN_GETMAD($1,$$,'D');
 			}
-	|	DO WORD lpar_or_qw ')'                  /* do somesub() */
+	|	DO subname '(' ')'                  /* do somesub() */
 			{ $$ = newUNOP(OP_ENTERSUB,
 			    OPf_SPECIAL|OPf_STACKED,
 			    op_prepend_elem(OP_LIST,
@@ -1061,7 +1119,7 @@
 			  TOKEN_GETMAD($3,$$,'(');
 			  TOKEN_GETMAD($4,$$,')');
 			}
-	|	DO WORD lpar_or_qw expr ')'             /* do somesub(@args) */
+	|	DO subname '(' expr ')'             /* do somesub(@args) */
 			{ $$ = newUNOP(OP_ENTERSUB,
 			    OPf_SPECIAL|OPf_STACKED,
 			    op_append_elem(OP_LIST,
@@ -1074,7 +1132,7 @@
 			  TOKEN_GETMAD($3,$$,'(');
 			  TOKEN_GETMAD($5,$$,')');
 			}
-	|	DO scalar lpar_or_qw ')'                /* do $subref () */
+	|	DO scalar '(' ')'                /* do $subref () */
 			{ $$ = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
 			    op_prepend_elem(OP_LIST,
 				scalar(newCVREF(0,scalar($2))), (OP*)NULL)); dep();
@@ -1082,7 +1140,7 @@
 			  TOKEN_GETMAD($3,$$,'(');
 			  TOKEN_GETMAD($4,$$,')');
 			}
-	|	DO scalar lpar_or_qw expr ')'           /* do $subref (@args) */
+	|	DO scalar '(' expr ')'           /* do $subref (@args) */
 			{ $$ = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
 			    op_prepend_elem(OP_LIST,
 				$4,
@@ -1161,12 +1219,12 @@
 			{ $$ = $1; }
 	|	amper                                /* &foo; */
 			{ $$ = newUNOP(OP_ENTERSUB, 0, scalar($1)); }
-	|	amper lpar_or_qw ')'                 /* &foo() */
+	|	amper '(' ')'                 /* &foo() */
 			{ $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar($1));
 			  TOKEN_GETMAD($2,$$,'(');
 			  TOKEN_GETMAD($3,$$,')');
 			}
-	|	amper lpar_or_qw expr ')'            /* &foo(@args) */
+	|	amper '(' expr ')'            /* &foo(@args) */
 			{
 			  $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST, $3, scalar($1)));
@@ -1177,9 +1235,9 @@
 			      }
 			      token_getmad($2,op,'(');
 			      token_getmad($4,op,')');
-			  })
+			  });
 			}
-	|	NOAMP WORD optlistexpr               /* foo(@args) */
+	|	NOAMP subname optlistexpr               /* foo(@args) */
 			{ $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
 			    op_append_elem(OP_LIST, $3, scalar($2)));
 			  TOKEN_GETMAD($1,$$,'o');
@@ -1232,6 +1290,13 @@
 			  TOKEN_GETMAD($2,$$,'(');
 			  TOKEN_GETMAD($3,$$,')');
 			}
+	|	FUNC0OP       /* Same as above, but op created in toke.c */
+			{ $$ = $1; }
+	|	FUNC0OP '(' ')'
+			{ $$ = $1;
+			  TOKEN_GETMAD($2,$$,'(');
+			  TOKEN_GETMAD($3,$$,')');
+			}
 	|	FUNC0SUB                             /* Sub treated as nullop */
 			{ $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				scalar($1)); }
@@ -1250,11 +1315,22 @@
 			  TOKEN_GETMAD($2,$$,'(');
 			  TOKEN_GETMAD($4,$$,')');
 			}
-	|	PMFUNC '(' listexpr ')'		/* m//, s///, tr/// */
-			{ $$ = pmruntime($1, $3, 1);
-			  TOKEN_GETMAD($2,$$,'(');
-			  TOKEN_GETMAD($4,$$,')');
+	|	PMFUNC /* m//, s///, qr//, tr/// */
+			{
+			    if (   $1->op_type != OP_TRANS
+			        && $1->op_type != OP_TRANSR
+				&& (((PMOP*)$1)->op_pmflags & PMf_HAS_CV))
+			    {
+				$<ival>$ = start_subparse(FALSE, CVf_ANON);
+				SAVEFREESV(PL_compcv);
+			    } else
+				$<ival>$ = 0;
 			}
+		    '(' listexpr ')'
+			{ $$ = pmruntime($1, $4, 1, $<ival>2);
+			  TOKEN_GETMAD($3,$$,'(');
+			  TOKEN_GETMAD($5,$$,')');
+			}
 	|	WORD
 	|	listop
 	|	YADAYADA
@@ -1273,7 +1349,7 @@
 			      token_getmad($1,$$,'d');
 			      append_madprops($3->op_madprop, $$, 'a');
 			      $3->op_madprop = 0;
-			  )
+			  );
 			}
 	|	MY myterm
 			{ $$ = localize($2,IVAL($1));
@@ -1313,14 +1389,6 @@
 			{ $$ = $1; }
 	;
 
-lpar_or_qw:	'('
-			{ $$ = $1; }
-	|	QWLIST
-			{ munge_qwlist_to_paren_list($1); }
-		'('
-			{ $$ = $3; }
-	;
-
 /* A little bit of trickery to make "for my $foo (@bar)" actually be
    lexical */
 my_scalar:	scalar


Property changes on: trunk/contrib/perl/perly.y
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.3
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list