- nil values are now displayed correctly in interactive mode (-i)

- Minor changes and improvements in Sidef and Perl deparsers.# Please enter the commit message for your changes. Lines starting
trizen · Nov 22, 2015 · adebde5 · adebde5
1 parent 70b4957
commit adebde5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/bin/sidef b/bin/sidef
@@ -501,7 +501,8 @@ EOT
                       ? "$result"
                       : eval { $result->can('dump') } ? $result->dump
                     : $result
-                : $result
+                : defined($result) ? $result
+                :                    'nil'
               );
         }
         redo;

diff --git a/lib/Sidef/Deparse/Perl.pm b/lib/Sidef/Deparse/Perl.pm
@@ -1033,8 +1033,8 @@ HEADER
 
                 # Check arity
                 @args == 1
-                  or die "[ERROR] Incorrect number of arguments for $obj->{act}\() in"
-                  . " `$obj->{file}' at line $obj->{line} (expected 1 argument)\n";
+                  or die "[ERROR] Incorrect number of arguments for $obj->{act}\() at"
+                  . " $obj->{file} line $obj->{line} (expected 1 argument)\n";
 
                 # Generate code
                 $code = qq~do{do{$args[0]} or CORE::die "$obj->{act}\Q$obj->{code}\E failed ~
@@ -1045,7 +1045,7 @@ HEADER
                 # Check arity
                 @args == 2
                   or die "[ERROR] Incorrect number of arguments for $obj->{act}\() at"
-                  . " `$obj->{file}' line $obj->{line} (expected 2 arguments)\n";
+                  . " $obj->{file} line $obj->{line} (expected 2 arguments)\n";
 
                 # Generate code
                 $code = "do{"
@@ -1061,12 +1061,6 @@ HEADER
             my @args = $self->deparse_args($obj->{arg});
             $code = qq~Sidef::Types::Bool::Bool->new(CORE::warn(@args, " at \Q$obj->{file}\E line $obj->{line}\\n"))~;
         }
-        elsif ($ref eq 'Sidef::Parser') {
-            $code = $ref . '->new';
-        }
-        elsif ($ref eq 'Sidef') {
-            $code = $self->make_constant($ref, 'new', "Sidef$refaddr");
-        }
         elsif ($ref eq 'Sidef::Object::Object') {
             $code = $self->make_constant($ref, 'new', "Object$refaddr");
         }
@@ -1104,6 +1098,12 @@ HEADER
         elsif ($ref eq 'Sidef::Types::Glob::Pipe') {
             $code = $self->make_constant($ref, 'new', "Pipe$refaddr", map { $self->_dump_string($_) } @{$obj});
         }
+        elsif ($ref eq 'Sidef::Parser') {
+            $code = $ref . '->new';
+        }
+        elsif ($ref eq 'Sidef') {
+            $code = $self->make_constant($ref, 'new', "Sidef$refaddr");
+        }
 
         # Array indices
         if (exists $expr->{ind}) {

diff --git a/lib/Sidef/Deparse/Sidef.pm b/lib/Sidef/Deparse/Sidef.pm
@@ -331,11 +331,14 @@ package Sidef::Deparse::Sidef {
         elsif ($ref eq 'Sidef::Meta::Assert') {
             $code = $obj->{act} . $self->deparse_args($obj->{arg});
         }
-        elsif ($ref eq 'Sidef::Meta::Error' or $ref eq 'Sidef::Meta::Warning') {
-            $code = $obj->{act} . $self->deparse_args($obj->{arg});
+        elsif ($ref eq 'Sidef::Meta::Error') {
+            $code = 'die' . $self->deparse_args($obj->{arg});
+        }
+        elsif ($ref eq 'Sidef::Meta::Warning') {
+            $code = 'warn' . $self->deparse_args($obj->{arg});
         }
         elsif ($ref eq 'Sidef::Eval::Eval') {
-            $code = 'eval(' . $self->deparse_script($obj->{expr}) . ')';
+            $code = 'eval' . $self->deparse_args($obj->{expr});
         }
         elsif ($ref eq 'Sidef::Parser') {
             $code = 'Parser';

diff --git a/lib/Sidef/Parser.pm b/lib/Sidef/Parser.pm
@@ -1652,7 +1652,6 @@ package Sidef::Parser {
                          : "Sidef::Meta::Warning"
                         )->new(
                                arg  => $arg,
-                               act  => $action,
                                line => $self->{line},
                                file => $self->{file_name},
                               )