Get hll and namespace bits added.

Author: jnthn

src/QAST/Compiler.nqp

@@ -215,11 +215,6 @@ class QAST::Compiler is HLL::Compiler {
 
         # Compile the block.
         my $block_post := self.as_post($cu[0]);
-
-        # Apply HLL if any.
-        if $*HLL {
-            $block_post.hll($*HLL);
-        }
 
         # If we are in compilation mode, or have pre-deserialization or
         # post-deserialization tasks, handle those. Overall, the process
@@ -402,6 +397,13 @@ class QAST::Compiler is HLL::Compiler {
             $sub.push($stmts);
             $sub.push_pirop(".return (" ~ $stmts.result ~ ")");
 
+            # Apply HLL if any.
+            my $hll := '';
+            try $hll := $*HLL;
+            if $hll {
+                $sub.hll($hll);
+            }
+            
             # Set compilation unit ID, name and, if applicable, outer.
             $sub.subid($node.cuid);
             if nqp::istype($block.outer, BlockInfo) {

src/QAST/PIRT.nqp

@@ -112,6 +112,8 @@ class PIRT::Sub is PIRT::Node {
     has str $!subid;
     has str $!pirflags;
     has str $!name;
+    has str $!hll;
+    has @!namespace;
     has @!loadlibs;
     
     has @!nested_blocks;
@@ -159,6 +161,14 @@ class PIRT::Sub is PIRT::Node {
         @libs ?? (@!loadlibs := @libs) !! @!loadlibs
     }
     
+    method hll(*@value) {
+        @value ?? ($!hll := @value[0]) !! $!hll
+    }
+    
+    method namespace(@namespace?) {
+        @namespace ?? (@!namespace := @namespace) !! @!namespace
+    }
+    
     method result() {
         nqp::die("Cannot use a PIRT::Sub in a context expecting a result");
     }
@@ -170,6 +180,19 @@ class PIRT::Sub is PIRT::Node {
         for @!loadlibs {
             nqp::push(@parts, ".loadlib " ~ self.escape($_));
         }
+        if $!hll {
+            nqp::push(@parts, ".HLL " ~ self.escape($!hll));
+        }
+        if @!namespace {
+            my @ns;
+            for @!namespace {
+                nqp::push(@ns, self.escape($_));
+            }
+            nqp::push(@parts, '.namespace [' ~ nqp::join(';', @ns) ~ ']');
+        }
+        else {
+            nqp::push(@parts, ".namespace []");
+        }
         my $sub_decl := ".sub " ~ self.escape($!name || '');
         if $!subid {
             $sub_decl := $sub_decl ~ " :subid(" ~ self.escape($!subid) ~ ")";