- Better dumping of regular expressions.

trizen · Dec 16, 2015 · 32262a1 · 32262a1
1 parent 932cebb
commit 32262a1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/lib/Sidef/Deparse/Perl.pm b/lib/Sidef/Deparse/Perl.pm
@@ -887,8 +887,8 @@ HEADER
         elsif ($ref eq 'Sidef::Types::Regex::Regex') {
             $code =
               $self->make_constant($ref, 'new', "Regex$refaddr",
-                                   $self->_dump_string("$obj->{regex}"),
-                                   $obj->{global} ? '"g"' : ());
+                                   $self->_dump_string("$obj->{raw}"),
+                                   $self->_dump_string($obj->{flags} . ($obj->{global} ? 'g' : '')));
         }
         elsif ($ref eq 'Sidef::Types::Block::If' or $ref eq 'Sidef::Types::Block::While') {
             ## ok

diff --git a/lib/Sidef/Types/Regex/Regex.pm b/lib/Sidef/Types/Regex/Regex.pm
@@ -14,13 +14,16 @@ package Sidef::Types::Regex::Regex {
     sub new {
         my (undef, $regex, $mode) = @_;
 
-        $mode = defined($mode) ? ref($mode) ? $mode->get_value : $mode : '';
+        $regex = defined($regex) ? ref($regex) ? $regex->get_value : $regex : '';
+        $mode  = defined($mode)  ? ref($mode)  ? $mode->get_value  : $mode  : '';
 
         my $global_mode = $mode =~ tr/g//d;
-        my $compiled_re = $mode eq '' ? qr{$regex} : qr{(?$mode:$regex)};
+        my $compiled_re = qr{(?$mode:$regex)};
 
         bless {
                regex  => $compiled_re,
+               raw    => $regex,
+               flags  => $mode,
                global => $global_mode,
                pos    => 0,
               },
@@ -64,14 +67,8 @@ package Sidef::Types::Regex::Regex {
     sub dump {
         my ($self) = @_;
 
-        my $str = "$self->{regex}";
-
-        my $flags = '';
-        if ($str =~ s/\(\?\^u:\(\?(?:\^|(.*?))://) {
-            $flags = $1 // '';
-            chop $str;
-            chop $str;
-        }
+        my $str   = $self->{raw};
+        my $flags = $self->{flags};
 
         Sidef::Types::String::String->new('/' . $str =~ s{/}{\\/}gr . '/' . $flags . ($self->{global} ? 'g' : ''));
     }