chugging along

Philip Guo · Philip Guo · commit 7a7e2c9b94e4 · 2011-09-27T10:34:50.000-04:00
diff --git a/edu-python-questions.js b/edu-python-questions.js
@@ -75,7 +75,7 @@ reverse(input)\n";
            {user_script : submittedCode},
            function(traceData) {
              renderPyCodeOutput(submittedCode);
-             processTrace(traceData);
+             processTrace(traceData, true);
 
              $("#pyInputPane").hide();
              $("#pyOutputPane").show();
diff --git a/edu-python-tutor.js b/edu-python-tutor.js
@@ -43,7 +43,7 @@ $(document).ready(function() {
            {user_script : $("#pyInput").val()},
            function(traceData) {
              renderPyCodeOutput($("#pyInput").val());
-             processTrace(traceData);
+             processTrace(traceData, false);
 
              $("#pyInputPane").hide();
              $("#pyOutputPane").show();
diff --git a/edu-python.js b/edu-python.js
@@ -77,7 +77,7 @@ function htmlspecialchars(str) {
   return str;
 }
 
-function processTrace(traceData) {
+function processTrace(traceData, jumpToEnd) {
   curTrace = traceData;
   curInstr = 0;
 
@@ -91,22 +91,6 @@ function processTrace(traceData) {
     // GLOBAL!
     instrLimitReached = (lastEntry.event == 'instruction_limit_reached');
 
-    // if there is some sort of error, then JUMP to it so that we can
-    // immediately alert the user:
-    // (cgi-bin/pg_logger.py ensures that if there is an uncaught
-    //  exception, then that exception event will be the FINAL
-    //  entry in curTrace.  a caught exception will appear somewhere in
-    //  the MIDDLE of curTrace)
-    //
-    // on second thought, let's hold off on that for now
-
-    /*
-    if (lastEntry.event == 'exception' ||
-        lastEntry.event == 'uncaught_exception') {
-      // updateOutput should take care of the rest ...
-      curInstr = curTrace.length - 1;
-    }
-    */
     if (instrLimitReached) {
       curTrace.pop() // kill last entry
       var warningMsg = lastEntry.exception_msg;
@@ -118,6 +102,23 @@ function processTrace(traceData) {
     else if (curTrace.length == 2) {
       curTrace.shift();
     }
+
+
+    if (jumpToEnd) {
+      // if there's an exception, then jump to the FIRST occurrence of
+      // that exception.  otherwise, jump to the very end of execution.
+      curInstr = curTrace.length - 1;
+
+      for (var i = 0; i < curTrace.length; i++) {
+        var curEntry = curTrace[i];
+        if (curEntry.event == 'exception' ||
+            curEntry.event == 'uncaught_exception') {
+          curInstr = i;
+          break;
+        }
+      }
+    }
+
   }
 
   updateOutput();
diff --git a/question.html b/question.html
@@ -138,6 +138,8 @@
 
 <div id="footer">
 
+<input type="checkbox" id="classicModeCheckbox"/> Use low-bandwidth mode (for older browsers)
+
 <p/>
 This application supports the core <a
 href="http://www.python.org/doc/2.5/">Python 2.5</a> language, with no
