use more idiomatic nqp

partcl · Jun 28, 2010 · dd7abe2 · dd7abe2
1 parent 297e2ca
commit dd7abe2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/Partcl/commands/control.pm b/src/Partcl/commands/control.pm
@@ -34,9 +34,9 @@ INIT {
 
         if +@args >= 2 {
             our %GLOBALS;
-            %GLOBALS{'errorInfo'} := @args[1];
+            %GLOBALS<errorInfo> := @args[1];
             my $errorCode := @args[2] // 'NONE';
-            %GLOBALS{'errorCode'} := $errorCode;
+            %GLOBALS<errorCode> := $errorCode;
         }
 
         my $exception := pir::new__ps('Exception');

diff --git a/src/Partcl/commands/info.pm b/src/Partcl/commands/info.pm
@@ -40,7 +40,7 @@ our sub info(*@args) {
         return '';
     } elsif $cmd eq 'library' {
         our %GLOBALS;
-        return %GLOBALS{'tcl_library'};
+        return %GLOBALS<tcl_library>;
     } elsif $cmd eq 'loaded' {
         return '';
     } elsif $cmd eq 'locals' {
@@ -49,7 +49,7 @@ our sub info(*@args) {
         return '';
     } elsif $cmd eq 'patchlevel' {
         our %GLOBALS;
-        return %GLOBALS{'tcl_patchLevel'};
+        return %GLOBALS<tcl_patchLevel>;
     } elsif $cmd eq 'procs' {
         return '';
     } elsif $cmd eq 'script' {
@@ -58,7 +58,7 @@ our sub info(*@args) {
         return '';
     } elsif $cmd eq 'tclversion' {
         our %GLOBALS;
-        return %GLOBALS{'tcl_version'};
+        return %GLOBALS<tcl_version>;
     } elsif $cmd eq 'vars' {
         return '';
     }

diff --git a/src/Partcl/commands/main.pm b/src/Partcl/commands/main.pm
@@ -94,7 +94,7 @@ our sub cd(*@args) {
     if @args == 1 {
         $dir := @args[0];
     } else {
-        $dir := pir::new__ps('Env'){'HOME'};
+        $dir := pir::new__ps('Env')<HOME>;
     }
     my $OS := pir::new__ps('OS');
     $OS.chdir($dir);

diff --git a/src/Partcl/commands/package.pm b/src/Partcl/commands/package.pm
@@ -18,7 +18,7 @@ our sub package(*@args) {
         return '';
     } elsif $cmd eq 'require' {
         our %GLOBALS;
-        my $library := %GLOBALS{'tcl_library'};
+        my $library := %GLOBALS<tcl_library>;
         my $package := @args.shift();
         if $package eq 'tcltest' {
             return Partcl::Compiler.evalfiles("$library/tcltest/tcltest.tcl");

diff --git a/src/init.pm b/src/init.pm
@@ -2,14 +2,14 @@
 
 INIT {
     our %GLOBALS := TclLexPad.newpad();
-    %GLOBALS{'tcl_version'}    := '8.5';
-    %GLOBALS{'tcl_patchLevel'} := '8.5.6';
-    %GLOBALS{'tcl_library'}    := 'library';
+    %GLOBALS<tcl_version>    := '8.5';
+    %GLOBALS<tcl_patchLevel> := '8.5.6';
+    %GLOBALS<tcl_library>    := 'library';
 
     our %CHANNELS := TclLexPad.newpad();
-    %CHANNELS{'stdout'} := pir::getstdout__p();
-    %CHANNELS{'stderr'} := pir::getstderr__p();
-    %CHANNELS{'stdin'}  := pir::getstdin__p();
+    %CHANNELS<stdout> := pir::getstdout__p();
+    %CHANNELS<stderr> := pir::getstderr__p();
+    %CHANNELS<stdin>  := pir::getstdin__p();
 
     my @interp  := pir::getinterp__p();
     my %PConfig := @interp[6]; ## .IGLOBALS_CONFIG_HASH