second attempt at MAIN sub

rakudo · Jun 9, 2010 · b0d427b · b0d427b
1 parent f7ddcf5
commit b0d427b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -61,6 +61,14 @@ method comp_unit($/, $key?) {
         return 1;
     }
 
+    # run MAIN subs
+    $mainline.push(
+        PAST::Op.new(
+            :pasttype('call'),
+            :name('&MAIN_HELPER')
+        )
+    );
+
     # Create a block for the entire compilation unit.
     our $?RAKUDO_HLL;
     my $unit := PAST::Block.new( :node($/), :hll($?RAKUDO_HLL) );
@@ -107,13 +115,6 @@ method comp_unit($/, $key?) {
         $unit.unshift(PAST::Op.new(:inline(".annotate 'file', '" ~ $file ~ "'")));
     }
 
-    $unit.push(
-        PAST::Op.new(
-            :pasttype('call'),
-            :name('&MAIN_HELPER'),
-        )
-    );
-
     # Remove the outer module package.
     @PACKAGE.shift;
 

diff --git a/src/core/MAIN.pm b/src/core/MAIN.pm
@@ -1,4 +1,4 @@
-my sub process-cmd-args(@args, %named) {
+our sub process-cmd-args(@args, %named) {
     my (@positional-arguments, %named-arguments , $negate);
     while ( @args )  {
         my $passed_value = @args.shift;
@@ -65,7 +65,7 @@ our sub MAIN_HELPER() {
     done:
     };
     unless $m {
-        say "no MAIN, no cookie";
+        return;
     }
     my @named-params = $m.signature.params.grep: {.named && .type ~~ Bool};
     my %named-params = @named-params».name».substr(1) Z=> @named-params».type;