[Configure.pl] fix previus "fix"

do not discard the desired minimum version so early
rakudo · Oct 29, 2013 · 6f5ceb8 · 6f5ceb8
1 parent c71db36
commit 6f5ceb8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Configure.pl b/Configure.pl
@@ -121,7 +121,7 @@
     my ($nqp_want) = split(' ', slurp('tools/build/NQP_REVISION'));
 
     my %binaries;
-    my %impls = gen_nqp($options{'gen-nqp'} || $nqp_want, prefix => $prefix, backends => join(',', sort keys %backends), %options);
+    my %impls = gen_nqp($nqp_want, prefix => $prefix, backends => join(',', sort keys %backends), %options);
 
     my @errors;
     if ($backends{parrot}) {

diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -280,8 +280,12 @@ role STD {
             my $name := $varast.name;
             if $name ne '%_' && $name ne '@_' && !$*W.is_lexical($name) {
                 if $var<sigil> ne '&' {
-                    my @suggestions := $*W.suggest_lexicals($name);
-                    $*W.throw($var, ['X', 'Undeclared'], symbol => $varast.name(), suggestions => @suggestions);
+                    my $decl := nqp::clone($varast);
+                    $decl.decl('contvar');
+                    $*UNIT[0].push($decl);
+                    $*UNIT.symbol($name, :scope<lexical>);
+#                    my @suggestions := $*W.suggest_lexicals($name);
+#                    $*W.throw($var, ['X', 'Undeclared'], symbol => $varast.name(), suggestions => @suggestions);
                 }
                 else {
                     $var.CURSOR.add_mystery($varast.name, $var.to, 'var');

diff --git a/tools/lib/NQP/Configure.pm b/tools/lib/NQP/Configure.pm
@@ -318,7 +318,7 @@ sub gen_nqp {
     return %impls unless %need;
 
     if (defined $gen_nqp || defined $gen_parrot) {
-        git_checkout($nqp_git, 'nqp', $nqp_want, $nqp_push);
+        git_checkout($nqp_git, 'nqp', $gen_nqp || $nqp_want, $nqp_push);
     }
 
     if ($need{parrot} && defined $gen_parrot) {