Merge remote branch 'origin/nom' into constant-folding

rakudo · Feb 1, 2013 · 03cce4d · 03cce4d
2 parents cd64560 + 9ec0a59
commit 03cce4d
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 13 deletions.
diff --git a/docs/ChangeLog b/docs/ChangeLog
@@ -1,3 +1,12 @@
+New in 2013.02
++ "Did you mean ..." suggestions for symbol-not-found errors
++ Compile-time optimization of some cases of junctions in boolean context
++ Date and DateTime now support a .delta method
++ IO::Socket.get now works again with non-Unicode characters
++ $() now takes $/.ast into account
++ proper return value for smartmatching against a substitution
++ better error reporting when a parent class does not exist
+
 New in 2013.01
 + sink context; for-loops are now lazy by default
 + first mentioning a variable from outer scope and then redeclaring it

diff --git a/src/Perl6/Compiler.nqp b/src/Perl6/Compiler.nqp
@@ -18,7 +18,6 @@ class Perl6::Compiler is HLL::Compiler {
         $super(self, |@args, |%options);
     }
 
-    # XXX Disable optimizer for now while doing QAST transition.
     method optimize($past, *%adverbs) {
         %adverbs<optimize> eq 'off' ??
             $past !!
@@ -32,16 +31,25 @@ class Perl6::Compiler is HLL::Compiler {
         }
         $past;
     }
-
-    method autoprint($value) {
-        unless pir::getinterp__P().stdout_handle().tell() > $*AUTOPRINTPOS {
-            CATCH { nqp::say($_) }
-            if nqp::can($value, 'gist') {
-                nqp::say(nqp::unbox_s($value.gist));
-            } else {
-                nqp::say(~$value);
-            }
+
+    method interactive_result($value) {
+        CATCH { nqp::say($_) }
+        if nqp::can($value, 'gist') {
+            nqp::say(nqp::unbox_s($value.gist));
+        } else {
+            nqp::say(~$value);
+        }
+    }
+
+    method interactive_exception($ex) {
+        my $payload := nqp::getpayload($ex);
+        if nqp::can($payload, 'gist') {
+            nqp::say(nqp::unbox_s($payload.gist));
+        }
+        else {
+            nqp::say(~$ex)
         }
+        CATCH { nqp::say(~$ex) }
     }
 
     method usage($name?) {

diff --git a/src/core/terms.pm b/src/core/terms.pm
@@ -73,9 +73,9 @@ sub term:<time>() { nqp::p6box_i(nqp::time_i()) }
     %CUSTOM_LIB<perl>   = $prefix;
     %CUSTOM_LIB<vendor> = $prefix ~ '/vendor';
     %CUSTOM_LIB<site>   = $prefix ~ '/site';
-    @INC.push(%CUSTOM_LIB<perl>   ~ '/lib');
-    @INC.push(%CUSTOM_LIB<vendor> ~ '/lib');
     @INC.push(%CUSTOM_LIB<site>   ~ '/lib');
+    @INC.push(%CUSTOM_LIB<vendor> ~ '/lib');
+    @INC.push(%CUSTOM_LIB<perl>   ~ '/lib');
     try {
         my $home := %ENV<HOME> // %ENV<HOMEDRIVE> ~ %ENV<HOMEPATH>;
         my $ver  := nqp::p6box_s(nqp::atkey($compiler, 'version'));

diff --git a/src/pmc/perl6lexpad.pmc b/src/pmc/perl6lexpad.pmc
@@ -473,6 +473,24 @@ Return the LexInfo PMC, if any or a Null PMC.
         GET_ATTR_lexinfo(INTERP, SELF, lexinfo);
         RETURN(PMC *lexinfo);
     }
+
+    METHOD get_lex_type(STRING *name) {
+        Hash *hash;
+        HashBucket *b;
+        INTVAL spec;
+        GET_ATTR_lexinfo_hash(INTERP, SELF, hash);
+        b = Parrot_hash_get_bucket(interp, hash, name);
+        if (!b)
+            Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_LEX_NOT_FOUND,
+                "Lexical '%Ss' not found", name);
+        switch ((INTVAL)b->value & 3) {
+            case REGNO_INT: spec = STORAGE_SPEC_BP_INT; break;
+            case REGNO_NUM: spec = STORAGE_SPEC_BP_NUM; break;
+            case REGNO_STR: spec = STORAGE_SPEC_BP_STR; break;
+            default: spec = STORAGE_SPEC_BP_NONE; break;
+        }
+        RETURN(INTVAL spec);
+    }
 
 /*
 

diff --git a/tools/build/NQP_REVISION b/tools/build/NQP_REVISION
@@ -1 +1 @@
-2013.01-23-gb8a381e
+2013.01-35-g63d9ae4