Merge branch 'master' into target-pbc

Raku · Feb 17, 2013 · b19dbc1 · b19dbc1
2 parents 2d6a387 + c6832d5
commit b19dbc1
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 17 deletions.
diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -225,12 +225,11 @@ class NQP::Actions is HLL::Actions {
             # this in the setting as Regex depends on the setting).
             unless %*COMPILING<%?OPTIONS><setting> eq 'NULL' {
                 import_HOW_exports($SETTING);
-                if %*COMPILING<%?OPTIONS><old-regex-lib> {
-                    $*W.load_module('NQPRegex', $*GLOBALish);
-                }
                 unless %*COMPILING<%?OPTIONS><no-regex-lib> {
-                    $*W.load_module('QRegex', $*GLOBALish);
-                    unless %*COMPILING<%?OPTIONS><old-regex-lib> {
+                    if %*COMPILING<%?OPTIONS><custom-regex-lib> -> $lib {
+                        $*W.load_module($lib, $*GLOBALish);
+                    }
+                    else {
                         $*W.load_module('NQPP6QRegex', $*GLOBALish);
                     }
                 }

diff --git a/src/NQP/Compiler.pm b/src/NQP/Compiler.pm
@@ -16,7 +16,6 @@ my @clo := $nqpcomp.commandline_options();
 @clo.push('module-path=s');
 @clo.push('vmlibs=s');
 @clo.push('no-regex-lib');
-@clo.push('old-regex-lib');
 @clo.push('dynext=s');
 @clo.push('stable-sc');
 

diff --git a/src/QAST/Stmt.nqp b/src/QAST/Stmt.nqp
@@ -24,4 +24,7 @@ class QAST::Stmt is QAST::Node {
         }
         $result
     }
+    method dump_extra_node_info() {
+        nqp::defined($!resultchild) ?? ":resultchild($!resultchild))" !! ''
+    }
 }
diff --git a/src/QAST/Stmts.nqp b/src/QAST/Stmts.nqp
@@ -24,4 +24,8 @@ class QAST::Stmts is QAST::Node {
         }
         $result
     }
+
+    method dump_extra_node_info() {
+        nqp::defined($!resultchild) ?? ":resultchild($!resultchild))" !! ''
+    }
 }
diff --git a/src/QAST/Var.nqp b/src/QAST/Var.nqp
@@ -20,6 +20,8 @@ class QAST::Var is QAST::Node {
     }
 
     method dump_extra_node_info() {
-        "$!scope $!name";
+        $!decl
+            ?? "$!scope $!name :decl"
+            !! "$!scope $!name";
     }
 }
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
@@ -4,12 +4,12 @@
 PARROT_ARGS      = -L. -X.
 
 # values from parrot_config
-PARROT_BIN_DIR     = "@bindir@"
-PARROT_LIB_SHARED  = "@libparrot_shared@"
-PARROT_VERSION     = "@versiondir@"
-PARROT_INCLUDE_DIR = "@includedir@$(PARROT_VERSION)"
-PARROT_LIB_DIR     = "@libdir@$(PARROT_VERSION)"
-PARROT_SRC_DIR     = "@srcdir@$(PARROT_VERSION)"
+PARROT_BIN_DIR     = @bindir@
+PARROT_LIB_SHARED  = @libparrot_shared@
+PARROT_VERSION     = @versiondir@
+PARROT_INCLUDE_DIR = @includedir@$(PARROT_VERSION)
+PARROT_LIB_DIR     = @libdir@$(PARROT_VERSION)
+PARROT_SRC_DIR     = @srcdir@$(PARROT_VERSION)
 PARROT_LIBRARY_DIR = $(PARROT_LIB_DIR)/library
 NQP_LANG_DIR       = $(PARROT_LIB_DIR)/languages/nqp
 HAS_ICU            = @has_icu@
@@ -24,7 +24,7 @@ LIBPARROT     = @inst_libparrot_ldflags@
 O             = @o@
 A             = @a@
 LOAD_EXT      = @load_ext@
-PERL          = "@perl@"
+PERL          = @perl@
 CP            = @cp@
 MV            = @mv@
 RM_F          = @rm_f@

diff --git a/tools/lib/NQP/Configure.pm b/tools/lib/NQP/Configure.pm
@@ -83,7 +83,7 @@ sub read_config {
     my %config = ();
     for my $file (@config_src) {
         no warnings;
-        if (open my $CONFIG, '-|', qq["$file" --show-config]) {
+        if (open my $CONFIG, '-|', "$file --show-config") {
             while (<$CONFIG>) {
                 if (/^([\w:]+)=(.*)/) { $config{$1} = $2 }
             }
@@ -132,7 +132,7 @@ END
             }
             close($PARROT_CONFIG) or die $!;
         }
-        elsif (open my $PARROT, '-|', qq["$file" parrot-config.pir]) {
+        elsif (open my $PARROT, '-|', "$file parrot-config.pir") {
             while (<$PARROT>) {
                 if (/^([\w:]+)=(.*)/) { $config{$1} = $2 }
             }
@@ -290,7 +290,7 @@ sub gen_nqp {
         return $nqp_exe;
     }
 
-    my @cmd = ($^X, 'Configure.pl', qq[--with-parrot="$with_parrot"],
+    my @cmd = ($^X, 'Configure.pl', "--with-parrot=$with_parrot",
                "--make-install");
     print "Building NQP ...\n";
     chdir("$startdir/nqp");