Change 31208: Give the 'local' declarator a new key, such that 'local our'

[Dave Mitchell]

Change 31208 by [EMAIL PROTECTED] on 2007/05/12 22:44:02

        Give the 'local' declarator a new key, such that 'local our'
        declaration don't have multiple 'd' keys.
        
        Subject:  [PATCH] mad: different key for the locale declarator
        From:  Gerard Goossen <[EMAIL PROTECTED]>
        Date:    Tue May 8 17:42:45 2007 +0200
        Message-Id:  <[EMAIL PROTECTED]>

Affected files ...

... //depot/perl/mad/Nomad.pm#6 edit
... //depot/perl/op.h#181 edit
... //depot/perl/perly.act#33 edit
... //depot/perl/perly.y#87 edit

Differences ...

==== //depot/perl/mad/Nomad.pm#6 (xtext) ====
Index: perl/mad/Nomad.pm
--- perl/mad/Nomad.pm#5~31207~  2007-05-12 15:43:01.000000000 -0700
+++ perl/mad/Nomad.pm   2007-05-12 15:44:02.000000000 -0700
@@ -440,6 +440,7 @@
 sub madness {
     my $self = shift;
     my @keys = split(' ', shift);
+    @keys = map { $_ eq 'd' ? ('k', 'd') : $_ } @keys;
     my @vals = ();
     for my $key (@keys) {
        my $madprop = $self->{mp}{$key};

==== //depot/perl/op.h#181 (text) ====
Index: perl/op.h
--- perl/op.h#180~31206~        2007-05-12 15:42:09.000000000 -0700
+++ perl/op.h   2007-05-12 15:44:02.000000000 -0700
@@ -696,6 +696,7 @@
  * g       op was forced to be a word
  * i       if/unless modifier
  * I       if/elsif/unless statement
+ * k       local declarator
  * K       retired kid op
  * l       last index of array ($#foo)
  * L       label

==== //depot/perl/perly.act#33 (text) ====
Index: perl/perly.act
--- perl/perly.act#32~31203~    2007-05-12 15:17:40.000000000 -0700
+++ perl/perly.act      2007-05-12 15:44:02.000000000 -0700
@@ -1213,7 +1213,7 @@
   case 154:
 #line 1085 "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');
+                         TOKEN_GETMAD((ps[(1) - 
(2)].val.i_tkval),(yyval.opval),'k');
                        ;}
     break;
 

==== //depot/perl/perly.y#87 (text) ====
Index: perl/perly.y
--- perl/perly.y#86~31203~      2007-05-12 15:17:40.000000000 -0700
+++ perl/perly.y        2007-05-12 15:44:02.000000000 -0700
@@ -1083,7 +1083,7 @@
                        { $$ = $1; }
        |       LOCAL term      %prec UNIOP
                        { $$ = localize($2,IVAL($1));
-                         TOKEN_GETMAD($1,$$,'d');
+                         TOKEN_GETMAD($1,$$,'k');
                        }
        |       '(' expr ')'
                        { $$ = sawparens(IF_MAD(newUNOP(OP_NULL,0,$2), $2));
End of Patch.