support for dumping annotations

Author: TimToady

src/QAST/Children.nqp

@@ -29,6 +29,7 @@ role QAST::Children {
                 nqp::push(@onto, "\n");
             }
         }
+	CATCH { nqp::push(@onto, "Oops!!!") }
     }
 
     method extra_children() {

src/QAST/Node.nqp

@@ -109,36 +109,43 @@ class QAST::Node {
         if nqp::chars($extra) {
             nqp::push(@chunks, "($extra)");
         }
+	nqp::push(@chunks, ' ');
+	nqp::push(@chunks, self.dump_annotations);
+        if (self.node) {
+            nqp::push(@chunks, ' ');
+            my $escaped_node := nqp::escape(self.node);
+            nqp::push(@chunks, nqp::substr($escaped_node, 0, 50));
+            if (nqp::chars($escaped_node) > 50) {
+                nqp::push(@chunks, "...");
+            }
+        }
+        nqp::push(@chunks, "\n");
+        self.dump_children($indent + 2, @chunks);
+        return join('', @chunks);
+    }
+
+    method dump_annotations() {
+	my @anns;
         if nqp::ishash(%!annotations) {
 	    for %!annotations {
 		my $k := $_.key;
-		nqp::push(@chunks, ' :' ~ $k);
 		my $v := $_.value;
 		try {
 		    if nqp::isconcrete($v) {
-			if $k eq 'context' {
-			    nqp::push(@chunks, '<' ~ $v ~ '>');
+			if $k eq 'context' || $k eq 'IN_DECL' || $k eq 'BY' {
+			    nqp::push(@anns, ':' ~ $k ~ '<' ~ $v ~ '>');
 			}
 			elsif $k eq 'sink_ok' || $k eq 'WANTED' || $k eq 'final' {
+			    nqp::push(@anns, ':' ~ $k);
 			}
 			else {   # dunno how to introspect
-			    nqp::push(@chunks, '<?>');
+			    nqp::push(@anns, ':' ~ $k ~ '<?>');
 			}
 		    }
 		}
 	    }
 	}
-        if (self.node) {
-            nqp::push(@chunks, ' ');
-            my $escaped_node := nqp::escape(self.node);
-            nqp::push(@chunks, nqp::substr($escaped_node, 0, 50));
-            if (nqp::chars($escaped_node) > 50) {
-                nqp::push(@chunks, "...");
-            }
-        }
-        nqp::push(@chunks, "\n");
-        self.dump_children($indent + 2, @chunks);
-        return join('', @chunks);
+	nqp::join(' ',@anns);
     }
 
     method dump_children(int $indent, @onto) { }

src/QAST/WVal.nqp

@@ -23,6 +23,7 @@ class QAST::WVal is QAST::Node does QAST::CompileTimeValue {
     }
 
     method dump_extra_node_info() {
+	CATCH { return "?" } 
         my $v := self.compile_time_value();
         $v.HOW.name($v);
     }