Mercurial Mercurial > hg > stx-libtool / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
authorclaus
Wed, 22 Feb 1995 02:24:46 +0100
changeset 69 0d6acfdae045
parent 68 b70257a99e48
child 70 56194ff36d57
*** empty log message ***
DebugView.st file | annotate | diff | comparison | revisions
DiffTextView.st file | annotate | diff | comparison | revisions
DiffTxtV.st file | annotate | diff | comparison | revisions
InspView.st file | annotate | diff | comparison | revisions
InspectorView.st file | annotate | diff | comparison | revisions
MemUsageV.st file | annotate | diff | comparison | revisions
MemoryUsageView.st file | annotate | diff | comparison | revisions 
--- a/DebugView.st	Sun Feb 19 16:54:18 1995 +0100
+++ b/DebugView.st	Wed Feb 22 02:24:46 1995 +0100
@@ -31,7 +31,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.25 1995-02-16 16:33:19 claus Exp $
+$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.26 1995-02-22 01:24:35 claus Exp $
 '!
 
 !DebugView class methodsFor:'documentation'!
@@ -52,7 +52,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.25 1995-02-16 16:33:19 claus Exp $
+$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.26 1995-02-22 01:24:35 claus Exp $
 "
 !
 
@@ -1602,6 +1602,11 @@
      is cached for reuse - thus the memory would not be collectable
      otherwise.
     "
+    codeView acceptAction:nil.
+    codeView doItAction:nil.
+    codeView contents:nil.
+    catchBlock := nil.
+
     receiverInspector release.
     contextInspector release.
     inspectedProcess := nil.
--- a/DiffTextView.st	Sun Feb 19 16:54:18 1995 +0100
+++ b/DiffTextView.st	Wed Feb 22 02:24:46 1995 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1994 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.4 1994-11-17 14:46:45 claus Exp $
+$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.5 1995-02-22 01:24:40 claus Exp $
 '!
 
 !DiffTextView class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.4 1994-11-17 14:46:45 claus Exp $
+$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.5 1995-02-22 01:24:40 claus Exp $
 "
 !
 
@@ -69,6 +69,9 @@
 !DiffTextView methodsFor:'private'!
 
 updateListsFrom:text1 and:text2 diffs:diffList
+    "given the two texts in text1 and text2, and the diff-output in diffList,
+     update my views contents"
+
     |idx1 idx2 dIdx dEnd state s nr1 nr2 nr3 op entry c l1 l2 any delta|
 
     l1 := OrderedCollection new.
@@ -233,24 +236,23 @@
 !DiffTextView methodsFor:'accessing'!
 
 text1:t1 text2:t2
-    |tmpName1 tmpName2 stream line text1 text2 diffList|
+    |tmpFile1 tmpFile2 Name1 tmpName2 stream line text1 text2 diffList pidString|
 
-    text1 := t1 asText.
-    text2 := t2 asText.
+    text1 := t1 asStringCollection.
+    text2 := t2 asStringCollection.
 
     "
      save them texts in two temporary files ...
     "
-    tmpName1 := '/tmp/sta_' , OperatingSystem getProcessId printString , '.tmp'.
-    tmpName2 := '/tmp/stb_' , OperatingSystem getProcessId printString , '.tmp'.
-
-    stream := tmpName1 asFilename writeStream.
+    tmpFile1 := Filename newTemporary.
+    stream := tmpFile1 writeStream.
     text1 do:[:line |
 	stream nextPutAll:line; cr
     ].
     stream close.
 
-    stream := tmpName2 asFilename writeStream.
+    tmpFile2 := Filename newTemporary.
+    stream := tmpFile2 writeStream.
     text2 do:[:line |
 	stream nextPutAll:line; cr
     ].
@@ -261,7 +263,7 @@
     "
     stream := PipeStream 
 		readingFrom:self class diffCommand , ' ' , 
-			    tmpName1 , ' ' , tmpName2.
+			    tmpFile1 asString, ' ' , tmpFile2 asString.
     stream isNil ifTrue:[
 	self error:'cannot execute diff'.
 	text1 := text2 := nil.
@@ -274,8 +276,8 @@
 	stream close.
     ].
 
-    tmpName1 asFilename delete.
-    tmpName2 asFilename delete.
+    tmpFile1 delete.
+    tmpFile2 delete.
 
     self updateListsFrom:text1 and:text2 diffs:diffList
 
@@ -308,6 +310,6 @@
 
      v := DiffTextView new.
      v text1:t1 text2:t2.
-     v
+     v open
     "
 ! !
--- a/DiffTxtV.st	Sun Feb 19 16:54:18 1995 +0100
+++ b/DiffTxtV.st	Wed Feb 22 02:24:46 1995 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1994 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libtool/Attic/DiffTxtV.st,v 1.4 1994-11-17 14:46:45 claus Exp $
+$Header: /cvs/stx/stx/libtool/Attic/DiffTxtV.st,v 1.5 1995-02-22 01:24:40 claus Exp $
 '!
 
 !DiffTextView class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libtool/Attic/DiffTxtV.st,v 1.4 1994-11-17 14:46:45 claus Exp $
+$Header: /cvs/stx/stx/libtool/Attic/DiffTxtV.st,v 1.5 1995-02-22 01:24:40 claus Exp $
 "
 !
 
@@ -69,6 +69,9 @@
 !DiffTextView methodsFor:'private'!
 
 updateListsFrom:text1 and:text2 diffs:diffList
+    "given the two texts in text1 and text2, and the diff-output in diffList,
+     update my views contents"
+
     |idx1 idx2 dIdx dEnd state s nr1 nr2 nr3 op entry c l1 l2 any delta|
 
     l1 := OrderedCollection new.
@@ -233,24 +236,23 @@
 !DiffTextView methodsFor:'accessing'!
 
 text1:t1 text2:t2
-    |tmpName1 tmpName2 stream line text1 text2 diffList|
+    |tmpFile1 tmpFile2 Name1 tmpName2 stream line text1 text2 diffList pidString|
 
-    text1 := t1 asText.
-    text2 := t2 asText.
+    text1 := t1 asStringCollection.
+    text2 := t2 asStringCollection.
 
     "
      save them texts in two temporary files ...
     "
-    tmpName1 := '/tmp/sta_' , OperatingSystem getProcessId printString , '.tmp'.
-    tmpName2 := '/tmp/stb_' , OperatingSystem getProcessId printString , '.tmp'.
-
-    stream := tmpName1 asFilename writeStream.
+    tmpFile1 := Filename newTemporary.
+    stream := tmpFile1 writeStream.
     text1 do:[:line |
 	stream nextPutAll:line; cr
     ].
     stream close.
 
-    stream := tmpName2 asFilename writeStream.
+    tmpFile2 := Filename newTemporary.
+    stream := tmpFile2 writeStream.
     text2 do:[:line |
 	stream nextPutAll:line; cr
     ].
@@ -261,7 +263,7 @@
     "
     stream := PipeStream 
 		readingFrom:self class diffCommand , ' ' , 
-			    tmpName1 , ' ' , tmpName2.
+			    tmpFile1 asString, ' ' , tmpFile2 asString.
     stream isNil ifTrue:[
 	self error:'cannot execute diff'.
 	text1 := text2 := nil.
@@ -274,8 +276,8 @@
 	stream close.
     ].
 
-    tmpName1 asFilename delete.
-    tmpName2 asFilename delete.
+    tmpFile1 delete.
+    tmpFile2 delete.
 
     self updateListsFrom:text1 and:text2 diffs:diffList
 
@@ -308,6 +310,6 @@
 
      v := DiffTextView new.
      v text1:t1 text2:t2.
-     v
+     v open
     "
 ! !
--- a/InspView.st	Sun Feb 19 16:54:18 1995 +0100
+++ b/InspView.st	Wed Feb 22 02:24:46 1995 +0100
@@ -23,7 +23,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libtool/Attic/InspView.st,v 1.14 1995-02-15 10:39:53 claus Exp $
+$Header: /cvs/stx/stx/libtool/Attic/InspView.st,v 1.15 1995-02-22 01:24:42 claus Exp $
 '!
 
 !InspectorView class methodsFor:'documentation'!
@@ -44,7 +44,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libtool/Attic/InspView.st,v 1.14 1995-02-15 10:39:53 claus Exp $
+$Header: /cvs/stx/stx/libtool/Attic/InspView.st,v 1.15 1995-02-22 01:24:42 claus Exp $
 "
 !
 
@@ -121,6 +121,7 @@
     "kludge: must realize first, to be able to set menu again"
     topView open.
     inspectorView inspect:anObject.
+    ^ inspectorView
 
     "
      InspectorView openOn:(5 @ 7)
@@ -358,6 +359,10 @@
     inspectedObject := nil.
     inspectedValues := valueArray.
     selectedLine := nil
+!
+
+listView
+    ^ listView
 ! !
 
 !InspectorView methodsFor:'user interaction'!
--- a/InspectorView.st	Sun Feb 19 16:54:18 1995 +0100
+++ b/InspectorView.st	Wed Feb 22 02:24:46 1995 +0100
@@ -23,7 +23,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.14 1995-02-15 10:39:53 claus Exp $
+$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.15 1995-02-22 01:24:42 claus Exp $
 '!
 
 !InspectorView class methodsFor:'documentation'!
@@ -44,7 +44,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.14 1995-02-15 10:39:53 claus Exp $
+$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.15 1995-02-22 01:24:42 claus Exp $
 "
 !
 
@@ -121,6 +121,7 @@
     "kludge: must realize first, to be able to set menu again"
     topView open.
     inspectorView inspect:anObject.
+    ^ inspectorView
 
     "
      InspectorView openOn:(5 @ 7)
@@ -358,6 +359,10 @@
     inspectedObject := nil.
     inspectedValues := valueArray.
     selectedLine := nil
+!
+
+listView
+    ^ listView
 ! !
 
 !InspectorView methodsFor:'user interaction'!
--- a/MemUsageV.st	Sun Feb 19 16:54:18 1995 +0100
+++ b/MemUsageV.st	Wed Feb 22 02:24:46 1995 +0100
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libtool/Attic/MemUsageV.st,v 1.5 1995-02-06 01:00:10 claus Exp $
+$Header: /cvs/stx/stx/libtool/Attic/MemUsageV.st,v 1.6 1995-02-22 01:24:46 claus Exp $
 "
 !
 
@@ -102,7 +102,7 @@
 !
 
 inspectOwners
-    |class|
+    |class inspector|
 
     list selection notNil ifTrue:[
 	class := (info at:(list selection)) at:1.
@@ -133,21 +133,29 @@
 		"
 		(owner isMemberOf:WeakArray) ifFalse:[
 		    set := Set new.
-		    names := owner class allInstVarNames.
-		    oClass := owner class.
-		    1 to:oClass instSize do:[:i |
-			((owner instVarAt:i) isMemberOf:class) ifTrue:[
-			    set add:(names at:i).
+		    owner == Smalltalk ifTrue:[
+			owner keysAndValuesDo:[:key :val |
+			    (val isMemberOf:class) ifTrue:[
+				set add:key
+			    ]
+			]
+		    ] ifFalse:[
+			names := owner class allInstVarNames.
+			oClass := owner class.
+			1 to:oClass instSize do:[:i |
+			    ((owner instVarAt:i) isMemberOf:class) ifTrue:[
+				set add:(names at:i).
+			    ].
 			].
-		    ].
-		    oClass isVariable ifTrue:[
-			oClass isPointers ifTrue:[
-			    1 to:owner basicSize do:[:i |
-				((owner basicAt:i) isMemberOf:class) ifTrue:[
-				    set add:i
+			oClass isVariable ifTrue:[
+			    oClass isPointers ifTrue:[
+				1 to:owner basicSize do:[:i |
+				    ((owner basicAt:i) isMemberOf:class) ifTrue:[
+					set add:i
+				    ]
 				]
 			    ]
-			]
+			].
 		    ].
 		    "
 		     put a describing string into the dictionary
@@ -164,7 +172,8 @@
 "/                            dict at:owner put:set
 		]
 	    ].
-	    dict inspect
+	    inspector := DictionaryInspectorView openOn:dict.
+	    inspector listView doubleClickAction:[:lineNr | inspector doInspectKey].
 	]
     ]
 !
--- a/MemoryUsageView.st	Sun Feb 19 16:54:18 1995 +0100
+++ b/MemoryUsageView.st	Wed Feb 22 02:24:46 1995 +0100
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libtool/MemoryUsageView.st,v 1.5 1995-02-06 01:00:10 claus Exp $
+$Header: /cvs/stx/stx/libtool/MemoryUsageView.st,v 1.6 1995-02-22 01:24:46 claus Exp $
 "
 !
 
@@ -102,7 +102,7 @@
 !
 
 inspectOwners
-    |class|
+    |class inspector|
 
     list selection notNil ifTrue:[
 	class := (info at:(list selection)) at:1.
@@ -133,21 +133,29 @@
 		"
 		(owner isMemberOf:WeakArray) ifFalse:[
 		    set := Set new.
-		    names := owner class allInstVarNames.
-		    oClass := owner class.
-		    1 to:oClass instSize do:[:i |
-			((owner instVarAt:i) isMemberOf:class) ifTrue:[
-			    set add:(names at:i).
+		    owner == Smalltalk ifTrue:[
+			owner keysAndValuesDo:[:key :val |
+			    (val isMemberOf:class) ifTrue:[
+				set add:key
+			    ]
+			]
+		    ] ifFalse:[
+			names := owner class allInstVarNames.
+			oClass := owner class.
+			1 to:oClass instSize do:[:i |
+			    ((owner instVarAt:i) isMemberOf:class) ifTrue:[
+				set add:(names at:i).
+			    ].
 			].
-		    ].
-		    oClass isVariable ifTrue:[
-			oClass isPointers ifTrue:[
-			    1 to:owner basicSize do:[:i |
-				((owner basicAt:i) isMemberOf:class) ifTrue:[
-				    set add:i
+			oClass isVariable ifTrue:[
+			    oClass isPointers ifTrue:[
+				1 to:owner basicSize do:[:i |
+				    ((owner basicAt:i) isMemberOf:class) ifTrue:[
+					set add:i
+				    ]
 				]
 			    ]
-			]
+			].
 		    ].
 		    "
 		     put a describing string into the dictionary
@@ -164,7 +172,8 @@
 "/                            dict at:owner put:set
 		]
 	    ].
-	    dict inspect
+	    inspector := DictionaryInspectorView openOn:dict.
+	    inspector listView doubleClickAction:[:lineNr | inspector doInspectKey].
 	]
     ]
 !
hg/stx-libtool