Fix remaining crashes in NAM emitter

sorear · Dec 14, 2010 · 4baa098 · 4baa098
1 parent ee2c1df
commit 4baa098
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/src/CompilerDriver.pm b/src/CompilerDriver.pm
@@ -10,7 +10,6 @@ use Sub::Exporter -setup => {
 use Time::HiRes 'time';
 use File::Basename;
 use autodie ':all';
-use JSON;
 
 use Body ();
 use Unit ();
@@ -226,7 +225,7 @@ sub compile {
         } ],
         [ 'beta', sub { Optimizer::Beta::run($ast) } ],
         [ 'simpl', sub { Optimizer::Simplifier::run($ast) } ],
-        [ 'nam', sub { $ast = [$ast, encode_json(NAMBackend::run($ast))] } ],
+        [ 'nam', sub { $ast = [$ast, NAMBackend::run($ast)] } ],
         [ 'writenam', sub {
             open my $fh, ">", $namfile;
             print $fh $ast->[1];

diff --git a/src/NAMBackend.pm b/src/NAMBackend.pm
@@ -6,13 +6,22 @@ use warnings;
 package NAMBackend;
 
 our $unit;
+use JSON;
 
 sub run {
     local $unit = shift;
 
     $unit->visit_local_subs_postorder(\&nam_sub);
-
-    $unit->to_nam;
+    my $nam = $unit->to_nam;
+
+    eval {
+        $nam = encode_json $nam;
+    };
+    if ($@) {
+        say ($@);
+        say (YAML::XS::Dump $nam);
+    }
+    return $nam;
 }
 
 sub nam_sub {
@@ -21,7 +30,7 @@ sub nam_sub {
     if ($s->parametric_role_hack) {
         for (@{ $unit->deref($s->parametric_role_hack)->methods }) {
             if (ref $_->[0]) {
-                $_->[0] = $_->[0]->cgop($s);
+                $_->[0] = $_->[0]->cgop($s)->to_nam;
             }
         }
     }

diff --git a/src/Op.pm b/src/Op.pm
@@ -923,7 +923,7 @@ use CgOp;
     sub code_bvalue {
         my ($self, $body, $ro, $rhscg) = @_;
         CgOp::prog(
-            CgOp::scopedlex($self->name, CgOp::newboundvar($ro, $self->list || $self->hash, $rhscg)),
+            CgOp::scopedlex($self->name, CgOp::newboundvar($ro, (($self->list || $self->hash) ? 1 : 0), $rhscg)),
             CgOp::scopedlex($self->name));
     }
 
@@ -1143,7 +1143,7 @@ use CgOp;
             @pre,
             CgOp::rxinit(CgOp::str($self->name),
                     CgOp::cast('cursor', CgOp::fetch(CgOp::scopedlex('self'))),
-                    $self->passcap, $self->passcut),
+                    ($self->passcap?1:0), ($self->passcut?1:0)),
             ($self->passcap ? () :
                 CgOp::rxpushcapture(CgOp::null('cursor'), @mcaps)),
             $self->rxop->code($body),