Merge pull request #1192 from MasterDuke17/convert_INTERPOLATE_into_a…

…_multi Convert INTERPOLATE into multis
rakudo · Oct 14, 2017 · d561517 · d561517
2 parents 012c80f + 4d3ccd8
commit d561517
Show file tree

Hide file tree

Showing 2 changed files with 412 additions and 179 deletions.
diff --git a/src/Perl6/Actions.nqp b/src/Perl6/Actions.nqp
@@ -9887,8 +9887,7 @@ class Perl6::RegexActions is QRegex::P6Regex::Actions does STDActions {
         make QAST::Regex.new(QAST::NodeList.new(
                 QAST::SVal.new( :value('INTERPOLATE') ),
                 $varast,
-                QAST::IVal.new( :value(%*RX<i> ?? 1 !! 0) ),
-                QAST::IVal.new( :value(%*RX<m> ?? 1 !! 0) ),
+                QAST::IVal.new( :value(%*RX<i> && %*RX<m> ?? 3 !! %*RX<m> ?? 2 !! %*RX<i> ?? 1 !! 0) ),
                 QAST::IVal.new( :value(monkey_see_no_eval($/)) ),
                 QAST::IVal.new( :value($*SEQ ?? 1 !! 0) ),
                 QAST::IVal.new( :value(0) ),
@@ -9904,8 +9903,7 @@ class Perl6::RegexActions is QRegex::P6Regex::Actions does STDActions {
                  QAST::NodeList.new(
                     QAST::SVal.new( :value('INTERPOLATE') ),
                     $<codeblock>.ast,
-                    QAST::IVal.new( :value(%*RX<i> ?? 1 !! 0) ),
-                    QAST::IVal.new( :value(%*RX<m> ?? 1 !! 0) ),
+                    QAST::IVal.new( :value(%*RX<i> && %*RX<m> ?? 3 !! %*RX<m> ?? 2 !! %*RX<i> ?? 1 !! 0) ),
                     QAST::IVal.new( :value(monkey_see_no_eval($/)) ),
                     QAST::IVal.new( :value($*SEQ ?? 1 !! 0) ),
                     QAST::IVal.new( :value(1) ),
@@ -9943,8 +9941,7 @@ class Perl6::RegexActions is QRegex::P6Regex::Actions does STDActions {
                 QAST::NodeList.new(
                     QAST::SVal.new( :value('INTERPOLATE') ),
                     wanted($<var>.ast, 'assertvar2'),
-                    QAST::IVal.new( :value(%*RX<i> ?? 1 !! 0) ),
-                    QAST::IVal.new( :value(%*RX<m> ?? 1 !! 0) ),
+                    QAST::IVal.new( :value(%*RX<i> && %*RX<m> ?? 3 !! %*RX<m> ?? 2 !! %*RX<i> ?? 1 !! 0) ),
                     QAST::IVal.new( :value(monkey_see_no_eval($/)) ),
                     QAST::IVal.new( :value($*SEQ ?? 1 !! 0) ),
                     QAST::IVal.new( :value(1) ),
@@ -10107,7 +10104,6 @@ class Perl6::P5RegexActions is QRegex::P5Regex::Actions does STDActions {
                     QAST::SVal.new( :value('INTERPOLATE') ),
                     $<codeblock>.ast,
                     QAST::IVal.new( :value(%*RX<i> ?? 1 !! 0) ),
-                    QAST::IVal.new( :value(0) ),
                     QAST::IVal.new( :value(monkey_see_no_eval($/)) ),
                     QAST::IVal.new( :value($*SEQ ?? 1 !! 0) ),
                     QAST::IVal.new( :value($*INTERPOLATION) ),
@@ -10124,7 +10120,6 @@ class Perl6::P5RegexActions is QRegex::P5Regex::Actions does STDActions {
                     QAST::SVal.new( :value('INTERPOLATE') ),
                     wanted($<var>.ast, 'p5var'),
                     QAST::IVal.new( :value(%*RX<i> ?? 1 !! 0) ),
-                    QAST::IVal.new( :value(0) ),
                     QAST::IVal.new( :value(monkey_see_no_eval($/)) ),
                     QAST::IVal.new( :value($*SEQ ?? 1 !! 0) ),
                     QAST::IVal.new( :value($*INTERPOLATION) ),