Perlito5 - java - require VERSION

fglock · Jul 14, 2017 · a73c77e · a73c77e
1 parent 15df80d
commit a73c77e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -30,6 +30,7 @@
 -- /xx regex modifier
 -- strict refs
 -- srand() returns true, warns on overflow
+-- require VERSION
 
 9.022 cpan:Perlito5  2017-05-xx
 - Parser:

diff --git a/perlito5.pl b/perlito5.pl
@@ -17736,12 +17736,9 @@
             (my($self), my($level), my($wantarray)) = @_;
             my $arg = $self->{"arguments"}->[0];
             if ($arg->{"is_version_string"}) {;
-                return "p5pkg[\"Perlito5\"][\"test_perl_version\"]([" . Perlito5::Java::to_str($self->{"arguments"}->[0]) . "], " . Perlito5::Java::to_context($wantarray) . ")"
+                return "PlV.apply(\"Perlito5::test_perl_version\", PlCx.VOID, new PlArray(" . $arg->emit_java($level, "scalar") . "))"
             }
             "PlCORE.require(" . Perlito5::Java::to_context($wantarray) . ", " . Perlito5::Java::to_str($self->{"arguments"}->[0]) . ", " . ($self->{"arguments"}->[0]->{"bareword"} ? "true" : "false") . ")"
-        }, "select", sub {
-            (my($self), my($level), my($wantarray)) = @_;
-            "p5pkg[\"CORE\"][\"select\"]([" . ($self->{"arguments"}->[0]->{"bareword"} ? Perlito5::Java::to_str($self->{"arguments"}->[0]) : $self->{"arguments"}->[0]->emit_java($level, "scalar")) . "])"
         }, "prefix:<\$>", sub {
             (my($self), my($level), my($wantarray), my($autovivification_type)) = @_;
             my $arg = $self->{"arguments"}->[0];
@@ -18399,7 +18396,7 @@
                 "PlCORE." . $op . "(" . Perlito5::Java::to_context($wantarray) . ", " . Perlito5::Java::to_filehandle($fun, $level + 1) . ", " . Perlito5::Java::to_param_list(\@in, $level + 1) . ")"
             }
         }
-        for my $op ("sleep", "ref", "exit", "warn", "die", "system", "qx", "pack", "unpack", "sprintf", "crypt", "join", "reverse") {;
+        for my $op ("sleep", "ref", "exit", "warn", "die", "system", "qx", "pack", "unpack", "sprintf", "crypt", "join", "reverse", "select") {;
             $emit_js{$op} = sub {
                 (my($self), my($level), my($wantarray)) = @_;
                 "PlCORE." . $op . "(" . Perlito5::Java::to_context($wantarray) . ", " . Perlito5::Java::to_list($self->{"arguments"}, $level) . ")"
@@ -20566,6 +20563,9 @@
         }
         return PlCx.UNDEF;
     }
+    public static final PlObject select(int want, PlArray List__) {
+        return PlCORE.die(\"select() not implemented\");
+    }
     public static final PlObject exit(int want, PlArray List__) {
         int arg = List__.aget(0).to_int();
         System.exit(arg);

diff --git a/src5/lib/Perlito5/Java/Apply.pm b/src5/lib/Perlito5/Java/Apply.pm
@@ -567,9 +567,9 @@ package Perlito5::AST::Apply;
             my $arg  = $self->{arguments}->[0];
             if ($arg->{is_version_string}) {
                 # require VERSION
-                return 'p5pkg["Perlito5"]["test_perl_version"]([' 
-                        . Perlito5::Java::to_str( $self->{arguments}[0] )
-                    . '], ' . Perlito5::Java::to_context($wantarray) . ')';
+                return 'PlV.apply("Perlito5::test_perl_version", PlCx.VOID, new PlArray('
+                    .       $arg->emit_java( $level, 'scalar' )
+                    . '))';
             }
             # require FILE
             'PlCORE.require('
@@ -578,14 +578,6 @@ package Perlito5::AST::Apply;
                 . ($self->{arguments}[0]{bareword} ? 'true' : 'false') 
             . ')';
         },
-        'select' => sub {
-            my ($self, $level, $wantarray) = @_;
-            'p5pkg["CORE"]["select"]([' 
-                . ( $self->{arguments}[0]{bareword}
-                  ? Perlito5::Java::to_str( $self->{arguments}[0] )
-                  : $self->{arguments}[0]->emit_java( $level, 'scalar' ) )
-            . '])';
-        },
         'prefix:<$>' => sub {
             my ($self, $level, $wantarray, $autovivification_type) = @_;
             my $arg  = $self->{arguments}->[0];
@@ -1607,7 +1599,7 @@ package Perlito5::AST::Apply;
         };
     }
 
-    for my $op (qw/ sleep ref exit warn die system qx pack unpack sprintf crypt join reverse /) {
+    for my $op (qw/ sleep ref exit warn die system qx pack unpack sprintf crypt join reverse select /) {
         $emit_js{$op} = sub {
             my ($self, $level, $wantarray) = @_;
             'PlCORE.' . $op . '('

diff --git a/src5/lib/Perlito5/Java/CORE.pm b/src5/lib/Perlito5/Java/CORE.pm
@@ -458,6 +458,9 @@ EOT
         }
         return PlCx.UNDEF;
     }
+    public static final PlObject select(int want, PlArray List__) {
+        return PlCORE.die("select() not implemented");
+    }
     public static final PlObject exit(int want, PlArray List__) {
         int arg = List__.aget(0).to_int();
         System.exit(arg);