Perlito5 - parser - tweak qr() AST

fglock · Oct 29, 2014 · e8398b1 · e8398b1
1 parent 2df3521
commit e8398b1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/perlito5.pl b/perlito5.pl
@@ -4408,7 +4408,7 @@ sub Perlito5::Grammar::String::qr_quote_parse {
         $modifiers = Perlito5::Match::flat($m);
         $part1->{'to'} = $m->{'to'}
     }
-    $part1->{'capture'} = Perlito5::AST::Apply->new('code' => 'p5:qr', 'arguments' => [$str_regex, $modifiers], 'namespace' => '');
+    $part1->{'capture'} = Perlito5::AST::Apply->new('code' => 'p5:qr', 'arguments' => [$str_regex, Perlito5::AST::Val::Buf->new('buf' => $modifiers)], 'namespace' => '');
     return $part1
 }
 sub Perlito5::Grammar::String::qx_quote_parse {
@@ -9667,7 +9667,7 @@ package Perlito5::AST::Apply;
         my $self = shift;
         my $level = shift;
         my $wantarray = shift;
-        'p5qr(' . Perlito5::Javascript2::to_str($self->{'arguments'}->[0]) . ', "' . $self->{'arguments'}->[1] . '")'
+        'p5qr(' . Perlito5::Javascript2::to_str($self->{'arguments'}->[0]) . ', ' . Perlito5::Javascript2::to_str($self->{'arguments'}->[1]) . ')'
     }, '__PACKAGE__' => sub {
         my $self = $_[0];
         '"' . $Perlito5::PKG_NAME . '"'

diff --git a/src5/lib/Perlito5/Grammar/String.pm b/src5/lib/Perlito5/Grammar/String.pm
@@ -233,7 +233,9 @@ sub qr_quote_parse {
 
     $part1->{capture} = Perlito5::AST::Apply->new( 
         code => 'p5:qr',
-        arguments => [ $str_regex, $modifiers ],
+        arguments => [ $str_regex,
+                       Perlito5::AST::Val::Buf->new( buf => $modifiers ),
+                     ],
         namespace => ''
     );
     return $part1;

diff --git a/src5/lib/Perlito5/Javascript2/Emitter.pm b/src5/lib/Perlito5/Javascript2/Emitter.pm
@@ -1677,7 +1677,8 @@ package Perlito5::AST::Apply;
             my $level = shift;
             my $wantarray = shift;
             # p5qr( $str, $modifier );
-            'p5qr(' . Perlito5::Javascript2::to_str( $self->{arguments}[0] ) . ', "' . $self->{arguments}[1] . '")';
+            'p5qr(' . Perlito5::Javascript2::to_str( $self->{arguments}[0] ) . ', '
+                    . Perlito5::Javascript2::to_str( $self->{arguments}[1] ) . ')';
         },
         '__PACKAGE__' => sub {
             my $self = $_[0];