Don't hand null strings back from QAST::Op.

jnthn · Feb 28, 2013 · 431f8fb · 431f8fb
1 parent 60f479a
commit 431f8fb
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/nqp-src/QASTNodes.nqp b/nqp-src/QASTNodes.nqp
@@ -342,9 +342,18 @@ class QAST::Op is QAST::Node {
     has str $!op;
     has str $!childorder;
 
-    method name(*@value)       { $!name := @value[0] if @value; $!name || "" }
-    method op(*@value)         { $!op := @value[0] if @value; $!op }
-    method childorder(*@value) { $!childorder := @value[0] if @value; $!childorder || "" }
+    method name(*@value) {
+        $!name := @value[0] if @value;
+        nqp::isnull_s($!name) ?? "" !! $!name
+    }
+    method op(*@value) {
+        $!op := @value[0] if @value;
+        nqp::isnull_s($!op) ?? "" !! $!op
+    }
+    method childorder(*@value) {
+        $!childorder := @value[0] if @value;
+        nqp::isnull_s($!childorder) ?? "" !! $!childorder
+    }
 
     method substitute_inline_placeholders(@fillers) {
         my $result := self.shallow_clone();