Move "invoke" to a helper class, refer to it as a WVal

partcl · Sep 25, 2012 · d3368fc · d3368fc
1 parent cb0c0f8
commit d3368fc
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 29 deletions.
diff --git a/build/Makefile.in b/build/Makefile.in
@@ -101,6 +101,7 @@ GEN_SOURCES = \
   src/Partcl/commands/variable.pir \
   src/Partcl/commands/vwait.pir \
   src/Partcl/commands/while.pir \
+  src/Internals.pir \
   src/TclArray.pir \
   src/TclLexPad.pir \
   src/TclList.pir \
@@ -112,7 +113,7 @@ all: $(PARTCL_EXE) .revision
 
 src/Partcl.pir: $(GEN_SOURCES)
 
-src/FileGlob/Actions.pm: src/StringGlob/Actions.pir
+src/FileGlob/Actions.pm: src/StringGlob/Actions.pir src/Internals.pir
 src/FileGlob/Grammar.pm: src/StringGlob/Grammar.pir
 src/init.pm: src/TclLexPad.pir
 src/init.pm: src/TclArray.pir

diff --git a/src/Internals.pm b/src/Internals.pm
@@ -0,0 +1,29 @@
+    class Internals {
+
+    ## wrapper method for invoking tcl builtins - deals with unknown
+    ## handling and namespace desugaring
+
+    method invoke($command, *@args) {
+
+        ## Get our caller's namespace, do the lookup from there.
+        my $ns := Q:PIR {
+            $P1 = getinterp
+            %r = $P1['sub'; 1]
+        }.get_namespace();
+    
+        my &command := $ns{$command};
+
+        ## if that didn't work, check in the root ns.
+        if pir::typeof__SP(&command) eq "Undef" {
+            $ns := pir::get_hll_namespace__P();
+            &command := $ns{$command};
+        }
+
+        if pir::typeof__SP(&command) eq "Undef" {
+            error("invalid command name \"$command\"");
+        }
+
+        &command(|@args);
+    }
+} 
+# vim: expandtab shiftwidth=4 ft=perl6:
diff --git a/src/Partcl/Actions.pm b/src/Partcl/Actions.pm
@@ -1,3 +1,5 @@
+use src::Internals;
+
 class Partcl::Actions is HLL::Actions {
 
     method TOP($/) { make $<TOP_eval>.ast; }

diff --git a/src/init.pm b/src/init.pm
@@ -68,32 +68,4 @@ sub dumper($what, $label = 'VAR1') {
     &dumper($what, $label);
 }
 
-## wrapper sub for invoking tcl builtins - deals with unknown handling and
-### namespace desugaring; use a pointy block to avoid tampering with CONTROLs.
-
-INIT {
-#    GLOBAL::invoke := -> $command, *@args {
-#
-#        ## Get our caller's namespace, do the lookup from there.
-#        my $ns := Q:PIR {
-#           $P1 = getinterp
-#           %r = $P1['sub'; 1]
-#        }.get_namespace();
-#
-#        my &command := $ns{$command};
-#
-#        ## if that didn't work, check in the root ns.
-#        if pir::typeof(&command) eq "Undef" {
-#            $ns := pir::get_hll_namespace__p();
-#            &command := $ns{$command};
-#        }
-#
-#        if pir::typeof(&command) eq "Undef" {
-#            error("invalid command name \"$command\"");
-#        }
-#
-#        &command(|@args);
-#    }
-}
-
 # vim: expandtab shiftwidth=4 ft=perl6: