[puts] works again

Author: coke

src/Partcl.pm

@@ -24,6 +24,12 @@ sub MAIN($partcl, $filename) {
     my @ARGS := [];
     nqp::push(@ARGS, $filename);
     my %LEXPAD;
+    my %*CHANNELS := nqp::hash();
+
+    %*CHANNELS<stdout> := nqp::getstdout;
+    %*CHANNELS<stderr> := nqp::getstderr;
+    %*CHANNELS<stdin>  := nqp::getstdin;
+
     my $compiler := Partcl::Compiler.new();
     $compiler.language('Partcl');
     $compiler.parsegrammar(Partcl::Grammar);

src/Partcl/commands/fileevent.pm

@@ -9,8 +9,7 @@ method fileevent(*@args) {
         self.error("bad event name \"$event\": must be readable or writable");
     }
 
-    our %CHANNELS;
-    my $chanObj   := %CHANNELS{$channelId};
+    my $chanObj   := %*CHANNELS{$channelId};
     if (! nqp::defined($chanObj) ) {
         self.error("can not find channel named \"$channelId\"");
     }

src/Partcl/commands/gets.pm

@@ -1,6 +1,4 @@
 method gets(*@args) {
-    our %CHANNELS;
-
     if +@args < 1 || +@args > 2 {
         self.error('wrong # args: should be "gets channelId ?varName?"');
     }

src/Partcl/commands/puts.pm

@@ -4,15 +4,17 @@ method puts(*@args) {
         @args.shift; $nl := 0;
     }
     my $channelId;
-    if +@args == 1 {
+    if nqp::elems(@args) == 1 {
         $channelId := 'stdout';
     } else {
         $channelId := @args.shift;
     } 
-    my $chanObj := _getChannel($channelId);
-    $chanObj.print(@args[0]);
+    my $chanObj := %*CHANNELS{$channelId};
+    $chanObj // nqp::die("can not find channel named \"$channelId\"");
+    $chanObj := nqp::getstdout;
+    nqp::printfh($chanObj, @args[0]);
     if $nl { 
-        $chanObj.print("\n");
+        nqp::printfh($chanObj, "\n");
         1; # the void print causes trouble elsewise.
     }
     '';

src/init.pm

@@ -1,8 +1,6 @@
 use src::TclLexPad;
 use src::TclArray;
 
-our %CHANNELS_HASH;
-
 INIT {
     # only necessary on parrot?
     #pir::loadlib__Ps("os");
@@ -21,13 +19,6 @@ INIT {
     %GLOBALS<errorCode>      := 'NONE';
     %GLOBALS<errorInfo>      := '';
 
-    ## cannot merge
-    ##%CHANNELS_HASH := TclLexPad.newpad();
-
-    ##%CHANNELS_HASH<stdout> := nqp::getstdout;
-    ##%CHANNELS_HASH<stderr> := nqp::getstderr;
-    ##%CHANNELS_HASH<stdin>  := nqp::getstdin;
-
 =begin XXX    
 
     my %PConfig := pir::getinterp__P()[8]; ## .IGLOBALS_CONFIG_HASH
@@ -49,14 +40,6 @@ INIT {
 =end XXX
 }
 
-# Get a channel (XXX put into _tcl NS and move to another file)
-# This should use the [error] builtin.
-sub _getChannel($name) is export {
-    my $ioObj := %CHANNELS_HASH{$name};
-    $ioObj // nqp::die("can not find channel named \"$name\"");
-    return $ioObj;
-}
-
 ##  EXPAND is a helper sub for {*} argument expansion; it probably
 ##  doesn't belong in the global namespace but this is a convenient
 ##  place to test it for now.  It takes a string and splits it up

tools/build/Makefile-JVM.in

@@ -31,7 +31,7 @@ EXT = jar
 COMMANDS = \
   src/Partcl/commands/puts.pm \
 
-COMMANDS = \
+NYICOMMANDS = \
   src/Partcl/commands/after.pm \
   src/Partcl/commands/apply.pm \
   src/Partcl/commands/array.pm \
@@ -134,13 +134,13 @@ src/Partcl.$(EXT): $(GEN_SOURCES)
 src/Partcl/commands.pm: $(COMMANDS) $(HELPERS) src/init.$(EXT) src/TclList.$(EXT) \
     src/Partcl/Actions.pm src/Partcl/Compiler.pm src/Partcl/Grammar.pm\
     src/Internals.pm
-	$(ECHO) "use src::init;"              > src/Partcl/commands.pm
+	$(ECHO) ""                            > src/Partcl/commands.pm
 	$(ECHO) "use src::TclList;"          >> src/Partcl/commands.pm
 	$(CAT)  src/Partcl/Grammar.pm        >> src/Partcl/commands.pm
 	$(CAT)  src/Partcl/Actions.pm        >> src/Partcl/commands.pm
 	$(CAT)  src/Partcl/Compiler.pm       >> src/Partcl/commands.pm
 	$(ECHO) "class Builtins {"           >> src/Partcl/commands.pm
-	#$(CAT)  $(COMMANDS)                  >> src/Partcl/commands.pm
+	$(CAT)  $(COMMANDS)                  >> src/Partcl/commands.pm
 	$(ECHO) "}"                          >> src/Partcl/commands.pm
 	$(CAT)  src/Internals.pm             >> src/Partcl/commands.pm
 	$(CAT)  $(HELPERS)                   >> src/Partcl/commands.pm