renamed vars for WIN32
authorClaus Gittinger <cg@exept.de>
Thu, 21 Nov 1996 16:36:35 +0100
changeset 868 b5f5f5723793
parent 867 373b7810615c
child 869 ffb9085ad3e5
renamed vars for WIN32
ConInspV.st
ContextInspectorView.st
--- a/ConInspV.st	Thu Nov 21 15:19:40 1996 +0100
+++ b/ConInspV.st	Thu Nov 21 16:36:35 1996 +0100
@@ -52,13 +52,13 @@
 
 !ContextInspectorView methodsFor:'accessing'!
 
-inspect:con
+inspect:aContext
     "set the context to be inspected"
 
     |homeContext method homeNames rec sel implementorClass 
      argNames varNames tmpNames m argsOnly blockNode vars|
 
-    (con == inspectedContext) ifTrue:[
+    (aContext == inspectedContext) ifTrue:[
         listView selection notNil ifTrue:[
             self showSelection:(listView selection).
         ].
@@ -67,9 +67,9 @@
 
     hasMore := argsOnly := false.
     inspectedObject := nil.
-    inspectedContext := con.
+    inspectedContext := aContext.
 
-    con isNil ifTrue:[
+    aContext isNil ifTrue:[
         names := nil.
         listView list:nil. 
         ^ self
@@ -77,12 +77,12 @@
 
 "/    realized ifFalse:[^ self].
 
-    homeContext := con methodHome.
+    homeContext := aContext methodHome.
 
     homeContext isNil ifTrue:[
         "its a cheap blocks context"
-        rec := con receiver.
-        sel := con selector.
+        rec := aContext receiver.
+        sel := aContext selector.
         homeNames := OrderedCollection new.
     ] ifFalse:[
         rec := homeContext receiver.
@@ -148,23 +148,23 @@
      stupid: should find the block via the contexts
      method-home and put real names in here
     "
-    con isBlockContext ifTrue:[
+    aContext isBlockContext ifTrue:[
         method notNil ifTrue:[
-            (con numArgs > 0
-             or:[con numVars > 0]) ifTrue:[
+            (aContext numArgs > 0
+             or:[aContext numVars > 0]) ifTrue:[
                 blockNode := Compiler 
-                                blockAtLine:(con lineNumber)
+                                blockAtLine:(aContext lineNumber)
                                 in:method
-                                numArgs:con numArgs
-                                numVars:con numVars.
+                                numArgs:aContext numArgs
+                                numVars:aContext numVars.
                 blockNode notNil ifTrue:[
-                    con numArgs > 0 ifTrue:[
+                    aContext numArgs > 0 ifTrue:[
                         vars := blockNode arguments.
                         vars size > 0 ifTrue:[
                             argNames := vars collect:[:var | var name]
                         ]
                     ].
-                    con numVars > 0 ifTrue:[
+                    aContext numVars > 0 ifTrue:[
                         vars := blockNode variables.
                         vars size > 0 ifTrue:[
                             varNames := vars collect:[:var | var name].
@@ -177,16 +177,16 @@
         names := OrderedCollection new.
 
         argNames isNil ifTrue:[
-            argNames := (1 to:(con numArgs)) collect:[:i | 'arg' , i printString].
+            argNames := (1 to:(aContext numArgs)) collect:[:i | 'arg' , i printString].
         ].
 
         names addAll:argNames.
         varNames isNil ifTrue:[
-            varNames := (1 to:(con numVars)) collect:[:i | 'var' , i printString].
+            varNames := (1 to:(aContext numVars)) collect:[:i | 'var' , i printString].
         ] ifFalse:[
-            varNames size ~~ con numVars ifTrue:[
+            varNames size ~~ aContext numVars ifTrue:[
                 varNames := varNames asOrderedCollection.
-                varNames size+1 to:con numVars do:[:i |
+                varNames size+1 to:aContext numVars do:[:i |
                     varNames add:('var' , i printString)
                 ]
             ]
@@ -195,7 +195,7 @@
         names addAll:varNames.
 
         showingTemporaries ifTrue:[
-            tmpNames := (1 to:(con numTemps)) collect:[:i | 'tmp' , i printString].
+            tmpNames := (1 to:(aContext numTemps)) collect:[:i | 'tmp' , i printString].
             names addAll:tmpNames.
         ].
 
@@ -207,7 +207,7 @@
     listView list:names. 
 
     workspace contents:nil.
-    self setDoitActionIn:workspace for:con.
+    self setDoitActionIn:workspace for:aContext.
 
     "Modified: 7.11.1996 / 17:21:21 / cg"
 !
@@ -302,18 +302,18 @@
 valueAtLine:lineNr
     "helper - return the value of the selected entry"
 
-    |homeContext con values|
+    |homeContext theContext values|
 
     inspectedContext isNil ifTrue:[^ nil].
 
     argsOnly := false.
-    con := inspectedContext.
-    homeContext := con methodHome.
+    theContext := inspectedContext.
+    homeContext := theContext methodHome.
 
-    con isBlockContext ifTrue:[
-        values := Array withAll:(con argsAndVars).
-        (showingTemporaries and:[con numTemps ~~ 0]) ifTrue:[
-            values := values , con temporaries
+    theContext isBlockContext ifTrue:[
+        values := Array withAll:(theContext argsAndVars).
+        (showingTemporaries and:[theContext numTemps ~~ 0]) ifTrue:[
+            values := values , theContext temporaries
         ].
         homeContext notNil ifTrue:[
             values := values , homeContext args.
@@ -373,5 +373,5 @@
 !ContextInspectorView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/ConInspV.st,v 1.28 1996-11-07 16:28:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/ConInspV.st,v 1.29 1996-11-21 15:36:35 cg Exp $'
 ! !
--- a/ContextInspectorView.st	Thu Nov 21 15:19:40 1996 +0100
+++ b/ContextInspectorView.st	Thu Nov 21 16:36:35 1996 +0100
@@ -52,13 +52,13 @@
 
 !ContextInspectorView methodsFor:'accessing'!
 
-inspect:con
+inspect:aContext
     "set the context to be inspected"
 
     |homeContext method homeNames rec sel implementorClass 
      argNames varNames tmpNames m argsOnly blockNode vars|
 
-    (con == inspectedContext) ifTrue:[
+    (aContext == inspectedContext) ifTrue:[
         listView selection notNil ifTrue:[
             self showSelection:(listView selection).
         ].
@@ -67,9 +67,9 @@
 
     hasMore := argsOnly := false.
     inspectedObject := nil.
-    inspectedContext := con.
+    inspectedContext := aContext.
 
-    con isNil ifTrue:[
+    aContext isNil ifTrue:[
         names := nil.
         listView list:nil. 
         ^ self
@@ -77,12 +77,12 @@
 
 "/    realized ifFalse:[^ self].
 
-    homeContext := con methodHome.
+    homeContext := aContext methodHome.
 
     homeContext isNil ifTrue:[
         "its a cheap blocks context"
-        rec := con receiver.
-        sel := con selector.
+        rec := aContext receiver.
+        sel := aContext selector.
         homeNames := OrderedCollection new.
     ] ifFalse:[
         rec := homeContext receiver.
@@ -148,23 +148,23 @@
      stupid: should find the block via the contexts
      method-home and put real names in here
     "
-    con isBlockContext ifTrue:[
+    aContext isBlockContext ifTrue:[
         method notNil ifTrue:[
-            (con numArgs > 0
-             or:[con numVars > 0]) ifTrue:[
+            (aContext numArgs > 0
+             or:[aContext numVars > 0]) ifTrue:[
                 blockNode := Compiler 
-                                blockAtLine:(con lineNumber)
+                                blockAtLine:(aContext lineNumber)
                                 in:method
-                                numArgs:con numArgs
-                                numVars:con numVars.
+                                numArgs:aContext numArgs
+                                numVars:aContext numVars.
                 blockNode notNil ifTrue:[
-                    con numArgs > 0 ifTrue:[
+                    aContext numArgs > 0 ifTrue:[
                         vars := blockNode arguments.
                         vars size > 0 ifTrue:[
                             argNames := vars collect:[:var | var name]
                         ]
                     ].
-                    con numVars > 0 ifTrue:[
+                    aContext numVars > 0 ifTrue:[
                         vars := blockNode variables.
                         vars size > 0 ifTrue:[
                             varNames := vars collect:[:var | var name].
@@ -177,16 +177,16 @@
         names := OrderedCollection new.
 
         argNames isNil ifTrue:[
-            argNames := (1 to:(con numArgs)) collect:[:i | 'arg' , i printString].
+            argNames := (1 to:(aContext numArgs)) collect:[:i | 'arg' , i printString].
         ].
 
         names addAll:argNames.
         varNames isNil ifTrue:[
-            varNames := (1 to:(con numVars)) collect:[:i | 'var' , i printString].
+            varNames := (1 to:(aContext numVars)) collect:[:i | 'var' , i printString].
         ] ifFalse:[
-            varNames size ~~ con numVars ifTrue:[
+            varNames size ~~ aContext numVars ifTrue:[
                 varNames := varNames asOrderedCollection.
-                varNames size+1 to:con numVars do:[:i |
+                varNames size+1 to:aContext numVars do:[:i |
                     varNames add:('var' , i printString)
                 ]
             ]
@@ -195,7 +195,7 @@
         names addAll:varNames.
 
         showingTemporaries ifTrue:[
-            tmpNames := (1 to:(con numTemps)) collect:[:i | 'tmp' , i printString].
+            tmpNames := (1 to:(aContext numTemps)) collect:[:i | 'tmp' , i printString].
             names addAll:tmpNames.
         ].
 
@@ -207,7 +207,7 @@
     listView list:names. 
 
     workspace contents:nil.
-    self setDoitActionIn:workspace for:con.
+    self setDoitActionIn:workspace for:aContext.
 
     "Modified: 7.11.1996 / 17:21:21 / cg"
 !
@@ -302,18 +302,18 @@
 valueAtLine:lineNr
     "helper - return the value of the selected entry"
 
-    |homeContext con values|
+    |homeContext theContext values|
 
     inspectedContext isNil ifTrue:[^ nil].
 
     argsOnly := false.
-    con := inspectedContext.
-    homeContext := con methodHome.
+    theContext := inspectedContext.
+    homeContext := theContext methodHome.
 
-    con isBlockContext ifTrue:[
-        values := Array withAll:(con argsAndVars).
-        (showingTemporaries and:[con numTemps ~~ 0]) ifTrue:[
-            values := values , con temporaries
+    theContext isBlockContext ifTrue:[
+        values := Array withAll:(theContext argsAndVars).
+        (showingTemporaries and:[theContext numTemps ~~ 0]) ifTrue:[
+            values := values , theContext temporaries
         ].
         homeContext notNil ifTrue:[
             values := values , homeContext args.
@@ -373,5 +373,5 @@
 !ContextInspectorView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ContextInspectorView.st,v 1.28 1996-11-07 16:28:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ContextInspectorView.st,v 1.29 1996-11-21 15:36:35 cg Exp $'
 ! !