Improve double fault reporting

sorear · Oct 24, 2010 · 6742210 · 6742210
1 parent d1fae71
commit 6742210
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/lib/Kernel.cs b/lib/Kernel.cs
@@ -1195,7 +1195,7 @@ class ExitRunloopException : Exception { }
             return sb.ToString();
         }
 
-        private static bool in_unhandled;
+        private static object in_unhandled;
 
         // exception processing goes in two stages
         // 1. find the correct place to unwind to, calling CATCH filters
@@ -1230,16 +1230,16 @@ class ExitRunloopException : Exception { }
                 Variable mp = (type == SubInfo.ON_DIE) ? ((Variable)payload) :
                     BoxAny("Unhandled control operator: " +
                             SubInfo.DescribeControl(type, tgt, lid, name), StrP);
-                if (in_unhandled) {
-                    Console.Error.WriteLine("Double fault {0}", type);
-                    DynObject dob = mp.Fetch() as DynObject;
-                    if (dob != null && dob.slots.Length != 0 &&
-                            dob.slots[0] is string) {
-                        Console.Error.WriteLine(dob.slots[0]);
-                    }
+                if (in_unhandled != null) {
+                    Console.Error.WriteLine("Double fault {0}", in_unhandled);
                     Environment.Exit(1);
                 }
                 in_unhandled = true;
+                DynObject dob = mp.Fetch() as DynObject;
+                if (dob != null && dob.slots.Length != 0 &&
+                        dob.slots[0] is string) {
+                    in_unhandled = dob.slots[0];
+                }
                 Frame r = th.MakeChild(null, UnhandledSI);
                 r.lex0 = mp;
                 return r;

diff --git a/v6/TODO b/v6/TODO
@@ -1,5 +1,3 @@
-Cursor.cursor_fresh
-Cursor.mixin
 Parcel.LISTSTORE
 Highwater stuff
 
@@ -19,6 +17,8 @@ token { $param-role-var }
 
 DONE:
 ~
+Cursor.cursor_fresh
+Cursor.mixin
 <?{ }>
 $/ and $¢ in subrule argument lists
 <after>

diff --git a/v6/tryfile b/v6/tryfile
@@ -1,7 +1,7 @@
 # vim: ft=perl6
 use MONKEY_TYPING;
 
-#use STD;
+use STD;
 
 sub infix:<min>($a,$b) { $a > $b ?? $b !! $a }
 
@@ -66,3 +66,6 @@ augment class Cursor {
 
     method mixin($role) { self.cursor_fresh(self.WHAT but $role) }
 }
+
+STD.parse("2 + 2");
+say "OK";