Factor out repetitive rx literal code.

Raku · Sep 24, 2015 · 6b3c7b0 · 6b3c7b0
1 parent 7190914
commit 6b3c7b0
Showing 1 changed file with 16 additions and 30 deletions.
diff --git a/src/QRegex/P6Regex/Actions.nqp b/src/QRegex/P6Regex/Actions.nqp
@@ -119,16 +119,7 @@ class QRegex::P6Regex::Actions is HLL::Actions {
         }
         else {
             my $qast := QAST::Regex.new( ~$/, :rxtype<literal>, :node($/));
-            if %*RX<i> && %*RX<m> { # >
-                $qast.subtype('ignorecase+ignoremark')
-            }
-            elsif %*RX<i> {
-                $qast.subtype('ignorecase')
-            }
-            elsif %*RX<m> { # >
-                $qast.subtype('ignoremark')
-            }
-            make $qast;
+            make self.apply_literal_modifiers($qast);
         }
     }
 
@@ -213,32 +204,14 @@ class QRegex::P6Regex::Actions is HLL::Actions {
         my $quote := $<quote_EXPR>.ast;
         if QAST::SVal.ACCEPTS($quote) { $quote := $quote.value; }
         my $qast := QAST::Regex.new( $quote, :rxtype<literal>, :node($/) );
-        if %*RX<i> && %*RX<m> { # >
-            $qast.subtype('ignorecase+ignoremark')
-        }
-        elsif %*RX<i> {
-            $qast.subtype('ignorecase')
-        }
-        elsif %*RX<m> { # >
-            $qast.subtype('ignoremark')
-        }
-        make $qast;
+        make self.apply_literal_modifiers($qast);
     }
 
     method metachar:sym<">($/) {
         my $quote := $<quote_EXPR>.ast;
         if QAST::SVal.ACCEPTS($quote) { $quote := $quote.value; }
         my $qast := QAST::Regex.new( $quote, :rxtype<literal>, :node($/) );
-        if %*RX<i> && %*RX<m> { # >
-            $qast.subtype('ignorecase+ignoremark')
-        }
-        elsif %*RX<i> {
-            $qast.subtype('ignorecase')
-        }
-        elsif %*RX<m> { # >
-            $qast.subtype('ignoremark')
-        }
-        make $qast;
+        make self.apply_literal_modifiers($qast);
     }
 
     method metachar:sym<.>($/) {
@@ -772,6 +745,19 @@ class QRegex::P6Regex::Actions is HLL::Actions {
         $ast;
     }
 
+    method apply_literal_modifiers($qast) {
+        if %*RX<i> && %*RX<m> { # >
+            $qast.subtype('ignorecase+ignoremark')
+        }
+        elsif %*RX<i> {
+            $qast.subtype('ignorecase')
+        }
+        elsif %*RX<m> { # >
+            $qast.subtype('ignoremark')
+        }
+        return $qast
+    }
+
     method qbuildsub($qast, $block = QAST::Block.new(), :$anon, :$addself, *%rest) {
         my $code_obj := nqp::existskey(%rest, 'code_obj')
             ?? %rest<code_obj>