WebSVN – Kolibri OS – Diff – /programs/develop/oberon07/source/ARITH.ob07

 (*
     BSD 2-Clause License
-    Copyright (c) 2018-2021, Anton Krotov
+    Copyright (c) 2018-2022, Anton Krotov
     All rights reserved.
 *)
 PROCEDURE fconv* (s: ARRAY OF CHAR; VAR v: VALUE; VAR error: INTEGER);
-VAR
-    value:    REAL;
+VAR
-    frac:     REAL;
+    value:    REAL;
     exp10:    REAL;
     i, n, d:  INTEGER;
     minus:    BOOLEAN;
-BEGIN
-    error := 0;
-    value := 0.0;
+BEGIN
-    frac  := 0.0;
+    error := 0;
-    exp10 := 1.0;
+    value := 0.0;
     minus := FALSE;
     n := 0;
     exp10 := 0.0;
-    i := 0;
+    WHILE (error = 0) & (STRINGS.digit(s[i]) OR (s[i] = ".")) DO
-    WHILE (error = 0) & STRINGS.digit(s[i]) DO
-        IF opFloat2(value, 10.0, "*") & opFloat2(value, FLT(digit[ORD(s[i])]), "+") THEN
-            INC(i)
-        ELSE
-            error := 4
-        END
-    END;
+        IF s[i] = "." THEN
-    INC(i);
             exp10 := 1.0;
-    WHILE (error = 0) & STRINGS.digit(s[i]) DO
+            INC(i)
-        IF opFloat2(frac, 10.0, "*") & opFloat2(frac, FLT(digit[ORD(s[i])]), "+") THEN
+        ELSE
-            exp10 := exp10 * 10.0;
+            IF opFloat2(value, 10.0, "*") & opFloat2(value, FLT(digit[ORD(s[i])]), "+") & opFloat2(exp10, 10.0, "*") THEN
+                INC(i)
-            INC(i)
+            ELSE
-        ELSE
+                error := 4
-            error := 4
+            END
         END
     END;

Subversion Repositories Kolibri OS