- Added support for %s(...) and %S(...) to specifiy literal Perl …

…module "symbols". Example: require "File::Spec"; say %s(File::Spec).catfile("a","b"); # prints: "a/b" require "File::Spec::Functions"; say %S(File::Spec::Functions).catfile("a", "b"); # =//= Notes: %s(...) is used to specify object-oriented Perl modules. %S(...) is used to specify functional Perl modules. More notes: %s(...) is equivalent with "...".to_caller %S(...) is equivalent with "...".to_fcaller
trizen · Jul 23, 2015 · f527e18 · f527e18
1 parent 3b61c89
commit f527e18
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 19 deletions.
diff --git a/lib/Sidef/Convert/Convert.pm b/lib/Sidef/Convert/Convert.pm
@@ -48,7 +48,7 @@ package Sidef::Convert::Convert {
         Sidef::Types::Number::Number->new($_[0]->get_value);
     }
 
-    *to_num = \&to_n;
+    *to_num    = \&to_n;
     *to_number = \&to_n;
 
     sub to_float {
@@ -96,11 +96,11 @@ package Sidef::Convert::Convert {
     }
 
     sub to_caller {
-        Sidef::Module::OO->__NEW__(module => $_[0]->get_value);
+        Sidef::Module::OO->__NEW__($_[0]->get_value);
     }
 
     sub to_fcaller {
-        Sidef::Module::Func->__NEW__(module => $_[0]->get_value);
+        Sidef::Module::Func->__NEW__($_[0]->get_value);
     }
 };
 

diff --git a/lib/Sidef/Module/Func.pm b/lib/Sidef/Module/Func.pm
@@ -4,8 +4,8 @@ package Sidef::Module::Func {
     our $AUTOLOAD;
 
     sub __NEW__ {
-        my (undef, %opt) = @_;
-        bless \%opt, __PACKAGE__;
+        my (undef, $module) = @_;
+        bless {module => $module}, __PACKAGE__;
     }
 
     sub DESTROY {

diff --git a/lib/Sidef/Module/OO.pm b/lib/Sidef/Module/OO.pm
@@ -4,8 +4,8 @@ package Sidef::Module::OO {
     our $AUTOLOAD;
 
     sub __NEW__ {
-        my (undef, %opt) = @_;
-        bless \%opt, __PACKAGE__;
+        my (undef, $module) = @_;
+        bless {module => $module}, __PACKAGE__;
     }
 
     sub DESTROY {
@@ -17,7 +17,7 @@ package Sidef::Module::OO {
         my ($method) = ($AUTOLOAD =~ /^.*[^:]::(.*)$/);
 
         if ($method eq '') {
-            return Sidef::Module::Func->__NEW__(module => $self->{module});
+            return Sidef::Module::Func->__NEW__($self->{module});
         }
 
         my @args = (
@@ -45,7 +45,7 @@ package Sidef::Module::OO {
 
         my $result = $results[0];
         if (ref($result) && eval { $result->can('can') }) {
-            return $self->__NEW__(module => ($result));
+            return $self->__NEW__($result);
         }
 
         Sidef::Perl::Perl->to_sidef($result);

diff --git a/lib/Sidef/Parser.pm b/lib/Sidef/Parser.pm
@@ -136,6 +136,10 @@ package Sidef::Parser {
                 # Chars
                 | %c\b.                                                    (?{ [qw(0 to_chars Sidef::Types::Char::Chars)] })
                 | %C\b.                                                    (?{ [qw(1 to_chars Sidef::Types::Char::Chars)] })
+
+                # Symbols
+                | %s\b.                                                    (?{ [qw(0 __NEW__ Sidef::Module::OO)] })
+                | %S\b.                                                    (?{ [qw(0 __NEW__ Sidef::Module::Func)] })
              )
             }xs,
             built_in_classes => {
@@ -775,20 +779,22 @@ package Sidef::Parser {
 
                 # Special case for array-like objects (bytes and chars)
                 my @array_like;
-                if ($method ne 'new') {
+                if ($method ne 'new' and $method ne '__NEW__') {
                     @array_like = ($package, $method);
                     $package    = 'Sidef::Types::String::String';
                     $method     = 'new';
                 }
 
-                my $obj = $double_quoted
-                  ? do {
-                    state $str = Sidef::Types::String::String->new;    # load the string module
-                    Sidef::Types::String::String::apply_escapes($package->$method($string), $self);
-                  }
-                  : $package->$method($string =~ s{\\\\}{\\}gr);
+                my $obj = (
+                    $double_quoted
+                    ? do {
+                        state $str = Sidef::Types::String::String->new;    # load the string module
+                        Sidef::Types::String::String::apply_escapes($package->$method($string), $self);
+                      }
+                    : $package->$method($string =~ s{\\\\}{\\}gr)
+                );
 
-                # Special case for backticks (add method '`')
+                # Special case for backticks (add method 'exec')
                 if ($package eq 'Sidef::Types::Glob::Backtick') {
                     my $struct =
                         $double_quoted && ref($obj) eq 'HASH'

diff --git a/lib/Sidef/Types/String/String.pm b/lib/Sidef/Types/String/String.pm
@@ -888,12 +888,12 @@ package Sidef::Types::String::String {
 
     sub require {
         my ($self) = @_;
-        Sidef::Module::OO->__NEW__(module => $self->_require);
+        Sidef::Module::OO->__NEW__($self->_require);
     }
 
     sub frequire {
         my ($self) = @_;
-        Sidef::Module::Func->__NEW__(module => $self->_require);
+        Sidef::Module::Func->__NEW__($self->_require);
     }
 
     sub unescape {