tweaks for remote debugger inspector ...

dalehenrich · Sep 14, 2016 · bbf103d · bbf103d
1 parent e100b27
commit bbf103d
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 22 deletions.
diff --git a/...emStone-Remote-Server.package/TDRemoteObjectInspectorReference.class/instance/printOn..st b/...emStone-Remote-Server.package/TDRemoteObjectInspectorReference.class/instance/printOn..st
@@ -0,0 +1,3 @@
+printing
+printOn: aStream
+  aStream nextPutAll: (inspectorObject at: 'displayString')
diff --git a/...mStone-Remote-Server.package/TDRemoteObjectInspectorReference.class/methodProperties.json b/...mStone-Remote-Server.package/TDRemoteObjectInspectorReference.class/methodProperties.json
@@ -11,5 +11,6 @@
 		"inspectorObject:" : "dkh 09/09/2016 11:33",
 		"objectOop" : "dkh 09/09/2016 10:49",
 		"objectOop:" : "dkh 09/09/2016 10:49",
+		"printOn:" : "dkh 09/14/2016 06:53",
 		"session" : "dkh 09/09/2016 10:49",
 		"session:" : "dkh 09/09/2016 10:49" } }
diff --git a/...TDRemoteObjectInspectorReferenceNodeBuilder.class/instance/childNamed.parent.ifAbsent..st b/...TDRemoteObjectInspectorReferenceNodeBuilder.class/instance/childNamed.parent.ifAbsent..st
@@ -4,17 +4,20 @@ childNamed: elementName parent: parentNode ifAbsent: absentBlock
   elementName = '<<more>>'
     ifTrue: [ obj := 'You can only see the first 100 elements... for now' ]
     ifFalse: [ 
-      elementName isAllDigits
-        ifTrue: [ 
-          [ 
-          objOop := parentNode basicContents childNodeIndexableOops
-            at: elementName asNumber ]
-            on: Error
-            do: [ :ex | 'error accessing index: ' , elementName printString , ' --> ' , ex description ] ]
-        ifFalse: [ objOop := parentNode basicContents childNodeNamedOops at: elementName ].
-      obj := TDRemoteObjectInspectorReference
-        objectOop: objOop
-        session: parentNode basicContents session ].
+      elementName = '(oop)'
+        ifTrue: [ obj := parentNode basicContents childNodeNamedOops at: elementName ]
+        ifFalse: [ 
+          elementName isAllDigits
+            ifTrue: [ 
+              [ 
+              objOop := parentNode basicContents childNodeIndexableOops
+                at: elementName asNumber ]
+                on: Error
+                do: [ :ex | 'error accessing index: ' , elementName printString , ' --> ' , ex description ] ]
+            ifFalse: [ objOop := parentNode basicContents childNodeNamedOops at: elementName ].
+          obj := TDRemoteObjectInspectorReference
+            objectOop: objOop
+            session: parentNode basicContents session ] ].
   ^ (obj
     asTDObjectNode: parentNode
     topez: parentNode topez

diff --git a/...te-Server.package/TDRemoteObjectInspectorReferenceNodeBuilder.class/methodProperties.json b/...te-Server.package/TDRemoteObjectInspectorReferenceNodeBuilder.class/methodProperties.json
@@ -2,5 +2,5 @@
 	"class" : {
 		 },
 	"instance" : {
-		"childNamed:parent:ifAbsent:" : "dkh 09/09/2016 15:02",
+		"childNamed:parent:ifAbsent:" : "dkh 09/14/2016 07:00",
 		"childNodeNameList:" : "dkh 09/09/2016 14:12" } }
diff --git a/...tory/Tode-GemStone-Remote-Server.package/TDRemoteStackFrame.class/instance/baseNodeMap.st b/...tory/Tode-GemStone-Remote-Server.package/TDRemoteStackFrame.class/instance/baseNodeMap.st
@@ -3,22 +3,19 @@ baseNodeMap
   | map |
   map := Dictionary new.
   map
-    add: '(context)' -> #'methodOop';
+    add: '(context)' -> #'method';
     yourself.
   self isMethodForBlock
     ifTrue: [ 
       self rawReceiverOop ~~ self frameSelfOop
         ifTrue: [ 
           map
-            add: '(receiver)' -> #'receiverOop';
-            add: '(self)' -> #'frameSelfOop';
+            add: '(receiver)' -> #'receiver';
+            add: '(self)' -> #'frameSelf';
             yourself ]
-        ifFalse: [ map add: '(self)' -> #'frameSelfOop' ].
-      map
-        add: '(home)' -> #'homeMethodOop';
-        yourself ]
+        ifFalse: [ map add: '(self)' -> #'frameSelf' ] ]
     ifFalse: [ 
       map
-        add: '(self)' -> #'receiverOop';
+        add: '(self)' -> #'receiver';
         yourself ].
   ^ map
diff --git a/...sitory/Tode-GemStone-Remote-Server.package/TDRemoteStackFrame.class/instance/frameSelf.st b/...sitory/Tode-GemStone-Remote-Server.package/TDRemoteStackFrame.class/instance/frameSelf.st
@@ -0,0 +1,5 @@
+accessing
+frameSelf
+  ^ TDRemoteObjectInspectorReference
+    objectOop: self frameSelfOop
+    session: session
diff --git a/...sitory/Tode-GemStone-Remote-Server.package/TDRemoteStackFrame.class/methodProperties.json b/...sitory/Tode-GemStone-Remote-Server.package/TDRemoteStackFrame.class/methodProperties.json
@@ -7,7 +7,7 @@
 		"allSharedPoolNames" : "dkh 09/09/2016 17:08",
 		"argAndTempNames" : "dkh 09/08/2016 16:02",
 		"argAndTempNamesAt:" : "dkh 09/09/2016 10:55",
-		"baseNodeMap" : "dkh 09/12/2016 07:06",
+		"baseNodeMap" : "dkh 09/14/2016 06:46",
 		"baseNodeNames" : "dkh 09/08/2016 06:22",
 		"calculateSelectionRange" : "dkh 09/08/2016 16:02",
 		"calculateSourceRangeEnd:in:" : "dkh 09/08/2016 06:22",
@@ -20,6 +20,7 @@
 		"frameDict" : "dkh 09/09/2016 07:02",
 		"frameIndex" : "dkh 09/08/2016 06:22",
 		"frameIndex:" : "dkh 09/08/2016 06:22",
+		"frameSelf" : "dkh 09/14/2016 06:45",
 		"frameSelfClassName" : "dkh 09/08/2016 16:03",
 		"frameSelfClassOop" : "dkh 09/08/2016 16:41",
 		"frameSelfOop" : "dkh 09/08/2016 16:03",

diff --git a/repository/Tode-GemStone-Remote-Server.package/monticello.meta/version b/repository/Tode-GemStone-Remote-Server.package/monticello.meta/version
@@ -1 +1 @@
-(name 'Tode-GemStone-Remote-Server-dkh.8' message 'properly implement TDRemoteDebugger>>processOop' id '53f42a3a-72ec-4014-83b7-ab87b023ff2e' date '09/12/2016' time '17:36:44' author 'dkh' ancestors ((name 'Tode-GemStone-Remote-Server-dkh.7' message 'Cannot use remote debugger to debug 4000 series error numbers because the session is not alive' id '1d0c7d59-e15e-4e41-92f0-b3fa829b7859' date '09/12/2016' time '11:19:10' author 'dkh' ancestors ((name 'Tode-GemStone-Remote-Server-dkh.6' message 'tweak TDRemoteStackFrame>>inClassName' id '63e8e9de-0ec8-4575-861a-5a2659ced80a' date '09/12/2016' time '10:59:36' author 'dkh' ancestors ((name 'Tode-GemStone-Remote-Server-dkh.5' message 'reset error handling when remote debugger closed ... clean up TDRemoteStackFrame>>baseNodeMap' id 'a4689fd0-ab40-4f87-a427-8cb71bc8d255' date '09/12/2016' time '07:10:14' author 'dkh' ancestors ((name 'Tode-GemStone-Remote-Server-dkh.4' message 'do not log out of remote session when debugger is closed ' id '96e8fc7c-8941-458d-b72d-4711b65592eb' date '09/12/2016' time '06:55:01' author 'dkh' ancestors ((name 'Tode-GemStone-Remote-Server-dkh.3' message 'patch TDClientMethodElementBuilder>>clientSourceElement' id '8a743984-d74c-4893-a130-9be6f21d6684' date '09/12/2016' time '06:53:04' author 'dkh' ancestors ((name 'Tode-GemStone-Remote-Server-dkh.2' message 'more debugger work ... bugfixes' id '351e6feb-363a-4f69-9beb-e6a65c0fd265' date '09/12/2016' time '06:33:14' author 'dkh' ancestors ((name 'Tode-GemStone-Remote-Server-dkh.1' message 'add package Tode-GemStone-Remote-Server for the tode server side remote server code' id '75f3c430-e79f-423d-ae8e-4a0635514a26' date '09/10/2016' time '10:20:58' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
+(name 'Tode-GemStone-Remote-Server-dkh.9' message 'tweaks for remote debugger inspector ...' id 'a62204e4-9d43-4f2b-acc0-8b848d28ba9d' date '09/14/2016' time '07:03:16' author 'dkh' ancestors ((name 'Tode-GemStone-Remote-Server-dkh.8' message 'properly implement TDRemoteDebugger>>processOop' id '53f42a3a-72ec-4014-83b7-ab87b023ff2e' date '09/12/2016' time '17:36:44' author 'dkh' ancestors ((name 'Tode-GemStone-Remote-Server-dkh.7' message 'Cannot use remote debugger to debug 4000 series error numbers because the session is not alive' id '1d0c7d59-e15e-4e41-92f0-b3fa829b7859' date '09/12/2016' time '11:19:10' author 'dkh' ancestors ((name 'Tode-GemStone-Remote-Server-dkh.6' message 'tweak TDRemoteStackFrame>>inClassName' id '63e8e9de-0ec8-4575-861a-5a2659ced80a' date '09/12/2016' time '10:59:36' author 'dkh' ancestors ((name 'Tode-GemStone-Remote-Server-dkh.5' message 'reset error handling when remote debugger closed ... clean up TDRemoteStackFrame>>baseNodeMap' id 'a4689fd0-ab40-4f87-a427-8cb71bc8d255' date '09/12/2016' time '07:10:14' author 'dkh' ancestors ((name 'Tode-GemStone-Remote-Server-dkh.4' message 'do not log out of remote session when debugger is closed ' id '96e8fc7c-8941-458d-b72d-4711b65592eb' date '09/12/2016' time '06:55:01' author 'dkh' ancestors ((name 'Tode-GemStone-Remote-Server-dkh.3' message 'patch TDClientMethodElementBuilder>>clientSourceElement' id '8a743984-d74c-4893-a130-9be6f21d6684' date '09/12/2016' time '06:53:04' author 'dkh' ancestors ((name 'Tode-GemStone-Remote-Server-dkh.2' message 'more debugger work ... bugfixes' id '351e6feb-363a-4f69-9beb-e6a65c0fd265' date '09/12/2016' time '06:33:14' author 'dkh' ancestors ((name 'Tode-GemStone-Remote-Server-dkh.1' message 'add package Tode-GemStone-Remote-Server for the tode server side remote server code' id '75f3c430-e79f-423d-ae8e-4a0635514a26' date '09/10/2016' time '10:20:58' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())