Updating std.decimal.

Scotch/Eval/Eval.hs

@@ -296,7 +296,7 @@ eval oexp vars settings rw =
   EagerDef f x y ->     case fullEval x eval' of
                           Val v -> next
                           List l -> next
-                          otherwise -> EagerDef f otherwise y
+                          otherwise -> next--EagerDef f otherwise y
                         where next = evalWithNewDefs y [(f, fullEval x eval')]
   If cond x y ->        case fullEval cond eval' of
                           Val (Bit True) -> x

scotch.lib/std/decimal.sco

@@ -7,12 +7,12 @@ read_decimal(h:t, a) = case h of
 read_decimal([], a) = Decimal(int(a), 0)
 decimal(s) = read_decimal(s, "0")
 
-print(Decimal(a,b)) = print((if l > b then left(s, l - b) else "0") +
-                              "." + 
-                              case ("0" * (b - l)) + right(s, b) of 
-                                "" -> "0", 
-                                otherwise -> otherwise
-                             where s = str(a), l := len(s))
+print(Decimal(a,b)) = print(((if l > b then left(s, l - b) else "0") +
+                               "." +
+                               case str([for i in [2..b], "0"]) + str(right(s, b)) of 
+                                 "" -> "0", 
+                                 otherwise -> otherwise)
+                              where s = str(a), l := len(s))
 
 float(Decimal(a,b)) = (a * (10 ^ (-b)))
 

scotch.lib/std/lib.sco

@@ -92,7 +92,7 @@ only([], s) = []
 left(h:t, n) = take n from h:t
 left(h:t, 0) = []
 left([], n) = []
-right(h:t, n) = [for i in [l - n .. l - 1], (h:t) @ i] where l := len(h:t)
+right(h:t, n) = [for i in [if l > n then (l - n) else 0 .. l - 1], (h:t) @ i] where l := len(h:t)
 
 foldl(f, h:t, z) = foldl(f, t, f(z, h))
 foldl(f, [], z) = z