FixedPoint.st
changeset 13147 b262e06ef444
parent 12724 f4f74122418b
child 15613 f3247f1af412
child 18011 deb0c3355881
--- a/FixedPoint.st	Tue Nov 23 14:35:52 2010 +0100
+++ b/FixedPoint.st	Tue Nov 23 14:39:59 2010 +0100
@@ -163,17 +163,6 @@
 
 !FixedPoint class methodsFor:'instance creation'!
 
-fromSchemaString: aString
-	"Answer an instance. (keeping the scale)"
-
-	#swAdded.
-
-	Smalltalk isSmalltalkX ifTrue:[
-	    ^super fromString: aString
-	].
-	^super fromString: aString , 's'
-!
-
 numerator:n denominator:d
     "redefined to block the inherited instance creation method from fraction.
      Raises an error - you must give a scale"
@@ -206,6 +195,7 @@
     ^ self readFrom:aStringOrStream onError:0
 
     "
+     FixedPoint readFrom:'.456'  
      FixedPoint readFrom:'123.456'  
      FixedPoint readFrom:'3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679821480865132823066470938446095505822317253594081284811174502841027019385211055596446229489549303819644288109756659334461284756482337867831652712019091456485669234603486104543266482133936072602491412737245870066063155881748815209209628292540917153643678925903600113305305488204665213841469519415116094330572703657595919530921861173819326117931051185480744623799627495673518857527248912279381830119491298336733624406566430860213949463952247371907021798609437027705392171762931767523846748184676694051320005681271452635608277857713427577896091736371787214684409012249534301465495853710507922796892589235420199561121290219608640344181598136297747713099605187072113499999983729780499510597317328160963185950244594553469083026425223082533446850352619311881710100031378387528865875332083814206171776691473035982534904287554687311595628638823537875937519577818577805321712268066130019278766111959092164201989380952572010654858632788'
      FixedPoint readFrom:(ReadStream on:'foobar')     
@@ -216,7 +206,7 @@
      FixedPoint readFrom:'1.5'    
     "
 
-    "Modified: / 25.10.1997 / 15:30:29 / cg"
+    "Modified: / 23-11-2010 / 14:39:29 / cg"
 !
 
 readFrom:aStringOrStream decimalPointCharacters:decimalPointCharacters onError:exceptionBlock
@@ -236,8 +226,13 @@
     ].
 
     (aStream atEnd or:[aStream peek isLetter]) ifTrue: [^ exceptionBlock value].
-
-    integerPart := Number readFromString:(aStream upToAny:decimalPointCharacters).
+    (decimalPointCharacters includes:aStream peek) ifTrue:[
+        "/ no integer part
+        integerPart := 0.
+        aStream next.
+    ] ifFalse:[
+        integerPart := Number readFromString:(aStream upToAny:decimalPointCharacters).
+    ].
     (aStream atEnd or: [aStream peek isLetter]) ifTrue: [
         fractionPart := 0.
         scale := 1.
@@ -271,8 +266,8 @@
      FixedPoint readFrom:'foot' onError:['bad fixedpoint'] 
     "
 
-    "Created: / 25.10.1997 / 15:28:59 / cg"
-    "Modified: / 25.10.1997 / 15:31:47 / cg"
+    "Created: / 25-10-1997 / 15:28:59 / cg"
+    "Modified: / 23-11-2010 / 14:38:12 / cg"
 ! !
 
 !FixedPoint class methodsFor:'constants'!
@@ -1356,9 +1351,9 @@
 !FixedPoint class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/FixedPoint.st,v 1.44 2010-02-10 17:46:09 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/FixedPoint.st,v 1.45 2010-11-23 13:39:59 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/FixedPoint.st,v 1.44 2010-02-10 17:46:09 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/FixedPoint.st,v 1.45 2010-11-23 13:39:59 cg Exp $'
 ! !