Merge jv
authorMerge Script
Wed, 13 Jul 2016 07:01:20 +0200
branchjv
changeset 4000 da23c6d5b93d
parent 3998 449f65604169 (current diff)
parent 3999 86895a4f348a (diff)
child 4003 8d89173109ff
Merge
--- a/UUID.st	Tue Jul 12 06:40:13 2016 +0200
+++ b/UUID.st	Wed Jul 13 07:01:20 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2002 by eXept Software AG
               All Rights Reserved
@@ -822,37 +824,26 @@
 !
 
 printOn:aStream
-    |d tmpStream|
-
-    tmpStream := '' writeStream.
-
     1 to:4 do:[:idx|
-        d := self at:idx.
-        d printOn:tmpStream base:16 size:2 fill:$0.
+        (self basicAt:idx) printOn:aStream base:-16 size:2 fill:$0.
     ].
-    tmpStream nextPut:$-.
+    aStream nextPut:$-.
     5 to:6 do:[:idx|
-        d := self at:idx.
-        d printOn:tmpStream base:16 size:2 fill:$0.
+        (self basicAt:idx) printOn:aStream base:-16 size:2 fill:$0.
     ].
-    tmpStream nextPut:$-.
+    aStream nextPut:$-.
     7 to:8 do:[:idx|
-        d := self at:idx.
-        d printOn:tmpStream base:16 size:2 fill:$0.
-    ].
-    tmpStream nextPut:$-.
-    9 to:10 do:[:idx|
-        d := self at:idx.
-        d printOn:tmpStream base:16 size:2 fill:$0.
+        (self basicAt:idx) printOn:aStream base:-16 size:2 fill:$0.
     ].
-    tmpStream nextPut:$-.
+    aStream nextPut:$-.
+    9 to:10 do:[:idx|
+        (self basicAt:idx) printOn:aStream base:-16 size:2 fill:$0.
+    ].
+    aStream nextPut:$-.
     11 to:16 do:[:idx|
-        d := self at:idx.
-        d printOn:tmpStream base:16 size:2 fill:$0.
+        (self basicAt:idx) printOn:aStream base:-16 size:2 fill:$0.
     ].
 
-    aStream nextPutAll:(tmpStream contents asLowercase).
-
     "
      UUID genUUID printString 
      UUID genUUID asString