class: Date
authorStefan Vogel <sv@exept.de>
Fri, 12 Sep 2014 16:44:33 +0200
changeset 16834 496a11689ccd
parent 16833 b4052d675866
child 16835 08f60ee0a4ed
class: Date comment/format in: #readFrom:printFormat:language:onError:
Date.st
--- a/Date.st	Fri Sep 12 16:41:27 2014 +0200
+++ b/Date.st	Fri Sep 12 16:44:33 2014 +0200
@@ -474,9 +474,9 @@
     "Modified: 8.10.1996 / 19:25:39 / cg"
 !
 
-readFrom:aStringOrStream printFormat:aSqueakFormatArrayOrFormatString language:languageOrNil onError:exceptionBlock
+readFrom:aStringOrStream printFormat:aFormatStringOrSqueakFormatArray language:languageOrNil onError:exceptionBlock
     "return a new Date, reading a printed representation from aStream.
-     aSqueakFormatArrayOrFormatString may either be a squeak formatArray
+     aFormatStringOrSqueakFormatArray may either be a squeak formatArray
          1   day position (1, 2 or 3)
          2   month position (1..3)
          3   year position (1..3)
@@ -492,7 +492,7 @@
 
     str := aStringOrStream readStream.
 
-    aSqueakFormatArrayOrFormatString isArray 
+    aFormatStringOrSqueakFormatArray isArray 
         ifTrue:[
             [
                 |arg|
@@ -506,15 +506,15 @@
                                            ifFalse:[str nextAlphaNumericWord].
                     arg at:i put:v
                 ].
-                year := arg at:(aSqueakFormatArrayOrFormatString at:3).
-                day := arg at:(aSqueakFormatArrayOrFormatString at:1).
-                month := arg at:(aSqueakFormatArrayOrFormatString at:2).
+                year := arg at:(aFormatStringOrSqueakFormatArray at:3).
+                day := arg at:(aFormatStringOrSqueakFormatArray at:1).
+                month := arg at:(aFormatStringOrSqueakFormatArray at:2).
             ] on:Error do:[:ex| ^ exceptionBlock value].
         ] ifFalse:[
             [
                 |formatStream fc c sel|
 
-                formatStream := aSqueakFormatArrayOrFormatString readStream.
+                formatStream := aFormatStringOrSqueakFormatArray readStream.
                 
                 [formatStream atEnd] whileFalse:[
                     fc := formatStream next.
@@ -3172,11 +3172,11 @@
 !Date class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Date.st,v 1.149 2014-09-12 14:41:27 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Date.st,v 1.150 2014-09-12 14:44:33 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Date.st,v 1.149 2014-09-12 14:41:27 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Date.st,v 1.150 2014-09-12 14:44:33 stefan Exp $'
 ! !