perl: Turn $core_ns into %core_ns.

I found myself assuming it was the latter, which is a pretty good sign
it's unidiomatic.

diff --git a/perl/core.pm b/perl/core.pm
index eecff33..1c1908e 100644 (file)
--- a/perl/core.pm
+++ b/perl/core.pm
@@ -2,7 +2,7 @@ package core;
 use strict;
 use warnings FATAL => qw(all);
 use Exporter 'import';
-our @EXPORT_OK = qw($core_ns);
+our @EXPORT_OK = qw(%core_ns);
 use Time::HiRes qw(time);
 
 use readline;
@@ -186,7 +186,7 @@ sub swap_BANG {
 
 
 
-our $core_ns = {
+our %core_ns = (
     '=' =>  sub { _equal_Q($_[0], $_[1]) ? $true : $false },
     'throw' => sub { die $_[0] },
     'nil?' => sub { _nil_Q($_[0]) ? $true : $false },
@@ -251,9 +251,9 @@ our $core_ns = {
     'deref' => sub { ${$_[0]} },
     'reset!' => sub { ${$_[0]} = $_[1] },
     'swap!' => \&swap_BANG,
-};
+);
 
-foreach my $f (values %$core_ns) {
+foreach my $f (values %core_ns) {
     bless $f, 'CoreFunction';
 }
 

diff --git a/perl/step4_if_fn_do.pl b/perl/step4_if_fn_do.pl
index e3d8481..57bd17d 100644 (file)
--- a/perl/step4_if_fn_do.pl
+++ b/perl/step4_if_fn_do.pl
@@ -11,7 +11,7 @@ use types qw($nil $true $false _list_Q);
 use reader;
 use printer;
 use env;
-use core qw($core_ns);
+use core qw(%core_ns);
 
 # read
 sub READ {
@@ -104,8 +104,8 @@ sub REP {
 }
 
 # core.pl: defined using perl
-foreach my $n (keys %$core_ns) {
-    $repl_env->set(Symbol->new($n), $core_ns->{$n});
+foreach my $n (keys %core_ns) {
+    $repl_env->set(Symbol->new($n), $core_ns{$n});
 }
 
 # core.mal: defined using the language itself

diff --git a/perl/step5_tco.pl b/perl/step5_tco.pl
index 7a94fce..d665405 100644 (file)
--- a/perl/step5_tco.pl
+++ b/perl/step5_tco.pl
@@ -11,7 +11,7 @@ use types qw($nil $true $false _list_Q);
 use reader;
 use printer;
 use env;
-use core qw($core_ns);
+use core qw(%core_ns);
 
 # read
 sub READ {
@@ -115,8 +115,8 @@ sub REP {
 }
 
 # core.pl: defined using perl
-foreach my $n (keys %$core_ns) {
-    $repl_env->set(Symbol->new($n), $core_ns->{$n});
+foreach my $n (keys %core_ns) {
+    $repl_env->set(Symbol->new($n), $core_ns{$n});
 }
 
 # core.mal: defined using the language itself

diff --git a/perl/step6_file.pl b/perl/step6_file.pl
index 3b499a5..88d22fd 100644 (file)
--- a/perl/step6_file.pl
+++ b/perl/step6_file.pl
@@ -11,7 +11,7 @@ use types qw($nil $true $false _list_Q);
 use reader;
 use printer;
 use env;
-use core qw($core_ns);
+use core qw(%core_ns);
 
 # read
 sub READ {
@@ -115,8 +115,8 @@ sub REP {
 }
 
 # core.pl: defined using perl
-foreach my $n (keys %$core_ns) {
-    $repl_env->set(Symbol->new($n), $core_ns->{$n});
+foreach my $n (keys %core_ns) {
+    $repl_env->set(Symbol->new($n), $core_ns{$n});
 }
 $repl_env->set(Symbol->new('eval'),
               bless sub { EVAL($_[0], $repl_env); }, 'CoreFunction');

diff --git a/perl/step7_quote.pl b/perl/step7_quote.pl
index 54f7b9b..dfb70e5 100644 (file)
--- a/perl/step7_quote.pl
+++ b/perl/step7_quote.pl
@@ -11,7 +11,7 @@ use types qw($nil $true $false _sequential_Q _symbol_Q _list_Q);
 use reader;
 use printer;
 use env;
-use core qw($core_ns);
+use core qw(%core_ns);
 
 # read
 sub READ {
@@ -145,8 +145,8 @@ sub REP {
 }
 
 # core.pl: defined using perl
-foreach my $n (keys %$core_ns) {
-    $repl_env->set(Symbol->new($n), $core_ns->{$n});
+foreach my $n (keys %core_ns) {
+    $repl_env->set(Symbol->new($n), $core_ns{$n});
 }
 $repl_env->set(Symbol->new('eval'),
               bless sub { EVAL($_[0], $repl_env); }, 'CoreFunction');

diff --git a/perl/step8_macros.pl b/perl/step8_macros.pl
index 4ddd680..59e3be1 100644 (file)
--- a/perl/step8_macros.pl
+++ b/perl/step8_macros.pl
@@ -11,7 +11,7 @@ use types qw($nil $true $false _sequential_Q _symbol_Q _list_Q);
 use reader;
 use printer;
 use env;
-use core qw($core_ns);
+use core qw(%core_ns);
 
 # read
 sub READ {
@@ -183,8 +183,8 @@ sub REP {
 }
 
 # core.pl: defined using perl
-foreach my $n (keys %$core_ns) {
-    $repl_env->set(Symbol->new($n), $core_ns->{$n});
+foreach my $n (keys %core_ns) {
+    $repl_env->set(Symbol->new($n), $core_ns{$n});
 }
 $repl_env->set(Symbol->new('eval'),
               bless sub { EVAL($_[0], $repl_env); }, 'CoreFunction');

diff --git a/perl/step9_try.pl b/perl/step9_try.pl
index e4acb1d..3a2560a 100644 (file)
--- a/perl/step9_try.pl
+++ b/perl/step9_try.pl
@@ -11,7 +11,7 @@ use types qw($nil $true $false _sequential_Q _symbol_Q _list_Q);
 use reader;
 use printer;
 use env;
-use core qw($core_ns);
+use core qw(%core_ns);
 use interop qw(pl_to_mal);
 
 # read
@@ -211,8 +211,8 @@ sub REP {
 }
 
 # core.pl: defined using perl
-foreach my $n (keys %$core_ns) {
-    $repl_env->set(Symbol->new($n), $core_ns->{$n});
+foreach my $n (keys %core_ns) {
+    $repl_env->set(Symbol->new($n), $core_ns{$n});
 }
 $repl_env->set(Symbol->new('eval'),
               bless sub { EVAL($_[0], $repl_env); }, 'CoreFunction');

diff --git a/perl/stepA_mal.pl b/perl/stepA_mal.pl
index c09b035..5b7a017 100644 (file)
--- a/perl/stepA_mal.pl
+++ b/perl/stepA_mal.pl
@@ -11,7 +11,7 @@ use types qw($nil $true $false _sequential_Q _symbol_Q _list_Q);
 use reader;
 use printer;
 use env;
-use core qw($core_ns);
+use core qw(%core_ns);
 use interop qw(pl_to_mal);
 
 # read
@@ -214,8 +214,8 @@ sub REP {
 }
 
 # core.pl: defined using perl
-foreach my $n (keys %$core_ns) {
-    $repl_env->set(Symbol->new($n), $core_ns->{$n});
+foreach my $n (keys %core_ns) {
+    $repl_env->set(Symbol->new($n), $core_ns{$n});
 }
 $repl_env->set(Symbol->new('eval'),
               bless sub { EVAL($_[0], $repl_env); }, 'CoreFunction');