got memory labels rendered

pgbovine · pgbovine · commit 7d1c1510cffa · 2013-01-07T21:43:49.000-08:00
diff --git a/v3/css/pytutor.css b/v3/css/pytutor.css
@@ -218,7 +218,7 @@ div.ExecutionVisualizer .vizFrame {
 /* Rendering of primitive types */
 
 div.ExecutionVisualizer .nullObj {
-  font-size: 8pt;
+//  font-size: 8pt;
 }
 
 div.ExecutionVisualizer .stringObj,
@@ -383,8 +383,8 @@ div.ExecutionVisualizer .objectIdLabel {
 
 div.ExecutionVisualizer .typeLabel {
   font-size: 8pt;
-  color: #222222;
-  margin-bottom: 1px;
+  color: #555;
+  margin-bottom: 2px;
 }
 
 div.ExecutionVisualizer div#stack,
diff --git a/v3/js/pytutor.js b/v3/js/pytutor.js
@@ -1947,10 +1947,6 @@ ExecutionVisualizer.prototype.renderDataStructures = function() {
     d3DomElement.append('<div class="heapObject" id="' + heapObjID + '"></div>');
     d3DomElement = myViz.domRoot.find('#' + heapObjID);
 
-    if (myViz.textualMemoryLabels) {
-      d3DomElement.append('<div class="objectIdLabel">id' + objID + '</div>');
-    }
-
     renderedObjectIDs.set(objID, 1);
 
     var obj = curEntry.heap[objID];
@@ -2088,19 +2084,24 @@ ExecutionVisualizer.prototype.renderDataStructures = function() {
       var funcName = htmlspecialchars(obj[1]).replace('&lt;lambda&gt;', '\u03bb');
       var parentFrameID = obj[2]; // optional
 
+      d3DomElement.append('<div class="typeLabel">function</div>');
+
       if (parentFrameID) {
-        d3DomElement.append('<div class="funcObj">function ' + funcName + ' [parent=f'+ parentFrameID + ']</div>');
+        d3DomElement.append('<div class="funcObj">' + funcName + ' [parent=f'+ parentFrameID + ']</div>');
       }
       else {
-        d3DomElement.append('<div class="funcObj">function ' + funcName + '</div>');
+        d3DomElement.append('<div class="funcObj">' + funcName + '</div>');
       }
     }
     else if (obj[0] == 'HEAP_PRIMITIVE') {
-      assert(obj.length == 2);
+      assert(obj.length == 3);
+
+      var typeName = obj[1];
+      var primitiveVal = obj[2];
 
-      var primitiveVal = obj[1];
       // add a bit of padding to heap primitives, for aesthetics
       d3DomElement.append('<div class="heapPrimitive"></div>');
+      d3DomElement.find('div.heapPrimitive').append('<div class="typeLabel">' + typeName + '</div>');
       renderPrimitiveObject(primitiveVal, d3DomElement.find('div.heapPrimitive'));
     }
     else {
@@ -2115,6 +2116,15 @@ ExecutionVisualizer.prototype.renderDataStructures = function() {
       d3DomElement.append('<div class="typeLabel">' + typeName + '</div>');
       d3DomElement.append('<table class="customObjTbl"><tr><td class="customObjElt">' + strRepr + '</td></tr></table>');
     }
+
+    // prepend the type label with a memory address label
+    if (myViz.textualMemoryLabels) {
+      var typeLabelPrefix = 'id' + objID + ':';
+
+      var labelD3 = d3DomElement.find('div.typeLabel');
+      assert(labelD3.length == 1); // everything should have exactly ONE type label
+      labelD3.html(typeLabelPrefix + labelD3.html());
+    }
   }
 
 
diff --git a/v3/pg_encoder.py b/v3/pg_encoder.py
@@ -38,7 +38,7 @@
 #     (json.dumps encodes these fine verbatim)
 #
 #   If render_heap_primitives is True, then primitive values are rendered
-#   on the heap as ['HEAP_PRIMITIVE', <value>]
+#   on the heap as ['HEAP_PRIMITIVE', <type name>, <value>]
 #
 #   Compound objects:
 #   * list     - ['LIST', elt1, elt2, elt3, ..., eltN]
@@ -219,7 +219,7 @@ def encode(self, dat, get_parent):
         new_obj.extend(['module', dat.__name__])
       elif typ in PRIMITIVE_TYPES:
         assert self.render_heap_primitives
-        new_obj.extend(['HEAP_PRIMITIVE', dat])
+        new_obj.extend(['HEAP_PRIMITIVE', type(dat).__name__, dat])
       else:
         typeStr = str(typ)
         m = typeRE.match(typeStr)
