Merge jv
authorMerge Script
Fri, 16 Oct 2015 07:01:59 +0200
branchjv
changeset 18830 ab7f93fb9554
parent 18827 6de13b865dbb (current diff)
parent 18829 1f56d744775b (diff)
child 18858 2968df243134
Merge
ExternalAddress.st
ExternalBytes.st
--- a/ExternalAddress.st	Thu Oct 15 06:57:29 2015 +0200
+++ b/ExternalAddress.st	Fri Oct 16 07:01:59 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1995 by Claus Gittinger
 	      All Rights Reserved
@@ -11,6 +13,8 @@
 "
 "{ Package: 'stx:libbasic' }"
 
+"{ NameSpace: Smalltalk }"
+
 Object subclass:#ExternalAddress
 	instanceVariableNames:'address*'
 	classVariableNames:''
@@ -142,7 +146,6 @@
     "
 ! !
 
-
 !ExternalAddress methodsFor:'Compatibility-Squeak'!
 
 beNull
@@ -282,8 +285,12 @@
     "return a printed representation of the receiver"
 
     self class name printOn:aStream.
-    aStream nextPutAll:' at:'.
+    aStream nextPutAll:'@'.
     self address printOn:aStream base:16.
+
+    "
+        self new printString
+    "
 ! !
 
 !ExternalAddress methodsFor:'private-accessing'!
@@ -333,9 +340,10 @@
 !ExternalAddress class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ExternalAddress.st,v 1.31 2013-01-11 11:46:17 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/ExternalAddress.st,v 1.31 2013-01-11 11:46:17 cg Exp $'
+    ^ '$Header$'
 ! !
+
--- a/ExternalBytes.st	Thu Oct 15 06:57:29 2015 +0200
+++ b/ExternalBytes.st	Fri Oct 16 07:01:59 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
@@ -1153,26 +1155,32 @@
     "/ what a kludge - Dolphin and Squeak mean: printOn: a stream;
     "/ ST/X (and some old ST80's) mean: draw-yourself on a GC.
     (aGCOrStream isStream) ifFalse:[
-	^ super displayOn:aGCOrStream
+        ^ super displayOn:aGCOrStream
     ].
 
     aGCOrStream nextPutAll:self className.
     addr := self address.
     addr isNil ifTrue:[
-	aGCOrStream nextPutAll:'[free]'.
+        aGCOrStream nextPutAll:'[free]'.
     ] ifFalse:[
-	size notNil ifTrue:[
-	    aGCOrStream nextPutAll:'[sz:'.
-	    size printOn:aGCOrStream.
-	    aGCOrStream space.
-	] ifFalse:[
-	    aGCOrStream nextPut:$[.
-	].
-	aGCOrStream nextPutAll:'at:'.
-	addr printOn:aGCOrStream base:16.
-	aGCOrStream nextPut:$].
+        size notNil ifTrue:[
+            aGCOrStream nextPutAll:'[sz:'.
+            size printOn:aGCOrStream.
+            aGCOrStream space.
+        ] ifFalse:[
+            aGCOrStream nextPut:$[.
+        ].
+        aGCOrStream nextPutAll:'@'.
+        addr printOn:aGCOrStream base:16.
+        aGCOrStream nextPut:$].
     ].
 
+    "
+        self new printString
+        (self new:5) displayString
+    "
+
+
     "Modified: / 24.2.2000 / 19:02:19 / cg"
 ! !