more patchies

Philip Guo · Philip Guo · commit 9ff092107d13 · 2012-08-10T11:27:47.000-07:00
diff --git a/PyTutorGAE/embedding-examples.js b/PyTutorGAE/embedding-examples.js
diff --git a/PyTutorGAE/generate_json_trace.py b/PyTutorGAE/generate_json_trace.py
@@ -6,8 +6,9 @@
 def json_finalizer(input_code, output_trace):
   ret = dict(code=input_code, trace=output_trace)
   json_output = json.dumps(ret, indent=None) # use indent=None for most compact repr
-  print json_output
+  print(json_output)
 
 
-pg_logger.exec_script_str(open(sys.argv[1]).read(), json_finalizer)
+for f in sys.argv[1:]:
+  pg_logger.exec_script_str(open(f).read(), json_finalizer)
 
diff --git a/PyTutorGAE/js/opt-frontend.js b/PyTutorGAE/js/opt-frontend.js
@@ -377,12 +377,10 @@ $(document).ready(function() {
   });
 
 
-  // redraw everything on window resize so that connectors are in the
-  // right place
-  // TODO: can be SLOW on older browsers!!!
+  // redraw connector arrows on window resize
   $(window).resize(function() {
     if (appMode == 'visualize') {
-      myVisualizer.updateOutput();
+      myVisualizer.redrawConnectors();
     }
   });
 
diff --git a/PyTutorGAE/js/pytutor.js b/PyTutorGAE/js/pytutor.js
@@ -1767,6 +1767,12 @@ ExecutionVisualizer.prototype.renderDataStructures = function() {
 }
 
 
+
+ExecutionVisualizer.prototype.redrawConnectors = function() {
+  this.jsPlumbInstance.repaintEverything();
+}
+
+
 // Utilities
 
 
@@ -1790,9 +1796,9 @@ var hoverBreakpointColor = medLightBlue;
 
 
 function assert(cond) {
-  // TODO: add more precision in the error message
   if (!cond) {
-    alert("Error: ASSERTION FAILED!!!");
+    alert("Assertion Failure (see console log for backtrace)");
+    throw 'Assertion Failure';
   }
 }
 
diff --git a/example-code/aliasing.txt b/example-code/aliasing.txt
@@ -4,11 +4,11 @@ z = y
 y = x
 x = z
 
-x = [1, 2, 3]
+x = [1, 2, 3] # a different [1, 2, 3] list!
 y = x
 x.append(4)
 y.append(5)
-z = [1, 2, 3, 4, 5]
+z = [1, 2, 3, 4, 5] # a different list!
 x.append(6)
 y.append(7)
 y = "hello"

Original file line number	Diff line number	Diff line change
`@@ -1767,6 +1767,12 @@ ExecutionVisualizer.prototype.renderDataStructures = function() {`
`1767`	`1767`	`}`
`1768`	`1768`
`1769`	`1769`
	`1770`	`+`
	`1771`	`+ExecutionVisualizer.prototype.redrawConnectors = function() {`
	`1772`	`+ this.jsPlumbInstance.repaintEverything();`
	`1773`	`+}`
	`1774`	`+`
	`1775`	`+`
`1770`	`1776`	`// Utilities`
`1771`	`1777`
`1772`	`1778`
`@@ -1790,9 +1796,9 @@ var hoverBreakpointColor = medLightBlue;`
`1790`	`1796`
`1791`	`1797`
`1792`	`1798`	`function assert(cond) {`
`1793`		`- // TODO: add more precision in the error message`
`1794`	`1799`	`if (!cond) {`
`1795`		`- alert("Error: ASSERTION FAILED!!!");`
	`1800`	`+ alert("Assertion Failure (see console log for backtrace)");`
	`1801`	`+ throw 'Assertion Failure';`
`1796`	`1802`	`}`
`1797`	`1803`	`}`
`1798`	`1804`