- Better deparsing of certain expressions.

Example: expr1 ~~ expr2 is now deparsed as: do {expr} ~~ do {expr} This is true for unary `!`, `<=>`, '==`, `!=` and `!~`
trizen · Dec 17, 2015 · 1e2133f · 1e2133f
1 parent 5fa3c64
commit 1e2133f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/lib/Sidef/Deparse/Perl.pm b/lib/Sidef/Deparse/Perl.pm
@@ -1311,34 +1311,39 @@ HEADER
                     if ($method eq '==' or $method eq '!=') {
                         $code =
                             'Sidef::Types::Bool::Bool->new('
-                          . ($method eq '!=' ? 'CORE::not' : '') . '('
-                          . $code . 'eq'
-                          . $self->deparse_args(@{$call->{arg}}) . '))';
+                          . ($method eq '!=' ? 'CORE::not ' : '') . 'do{'
+                          . $code
+                          . '} eq do{'
+                          . $self->deparse_args(@{$call->{arg}}) . '})';
                         next;
                     }
 
                     # <=> method
                     if ($method eq '<=>') {
                         $code =
                             'Sidef::Types::Number::Number->new(do{'
-                          . $code . '}cmp'
-                          . $self->deparse_args(@{$call->{arg}}) . ')';
+                          . $code
+                          . '} cmp do {'
+                          . $self->deparse_args(@{$call->{arg}}) . '})';
                         next;
                     }
 
                     # !~ and ~~ methods
                     if ($method eq '~~' or $method eq '!~') {
                         $self->top_add(qq{use experimental 'smartmatch';\n});
                         $code =
-                          'Sidef::Types::Bool::Bool->new(do{' . $code . '}~~' . $self->deparse_args(@{$call->{arg}}) . ')';
-                        $code .= '->not' if ($method eq '!~');
+                            'Sidef::Types::Bool::Bool->new('
+                          . ($method eq '!~' ? 'CORE::not ' : '') . 'do{'
+                          . $code
+                          . '} ~~ do{'
+                          . $self->deparse_args(@{$call->{arg}}) . '})';
                         next;
                     }
 
                     # ! prefix-unary
                     if ($ref eq 'Sidef::Object::Unary') {
                         if ($method eq '!') {
-                            $code = 'Sidef::Types::Bool::Bool->new(!' . $self->deparse_args(@{$call->{arg}}) . ')';
+                            $code = 'Sidef::Types::Bool::Bool->new(!do{' . $self->deparse_args(@{$call->{arg}}) . '})';
                             next;
                         }
 

diff --git a/scripts/Games/forest_fire.sf b/scripts/Games/forest_fire.sf
@@ -59,7 +59,7 @@ class Forest(p=0.01, f=0.001, height, width) {
 
     method show {
         range(0, height-1).each { |i|
-            say pix.@[spot[i]];
+            say pix[@spot[i]];
         }
     }
 }

diff --git a/scripts/elementary_cellular_automaton.sf b/scripts/elementary_cellular_automaton.sf
@@ -9,13 +9,13 @@ class Automaton(rule, cells) {
     method next {
         var previous = cells.map{_};
         var len = previous.len;
-        cells = [rule.@[
+        cells = rule.items(
                     previous.range.map { |i|
                         4*previous[i-1 % len] +
                         2*previous[i]         +
                         previous[i+1 % len]
-                    }
-                ]];
+                    }...
+                )
     }
 
     method to_s {

diff --git a/scripts/fast_fourier_transform.sf b/scripts/fast_fourier_transform.sf
@@ -3,8 +3,8 @@
 func fft(arr) {
     arr.len == 1 && return arr;
 
-    var evn = fft([arr.@[arr.range.grep { .is_even }]]);
-    var odd = fft([arr.@[arr.range.grep { .is_odd  }]]);
+    var evn = fft([arr[arr.range.grep { .is_even }...]]);
+    var odd = fft([arr[arr.range.grep { .is_odd  }...]]);
     var twd = (Complex(0, 2) * Math::PI / arr.len);
 
     odd.range.map {|n| odd[n] *= exp(twd * n)};