* arith.c (neg): Floating-point support.

* parser.l: FLO and FLODOT cases had to be reordered because
the lex trailing context counts as part of the match length,
causing 3.0 to be matched as three characters with 0 as
the trailing context. The cases are split up to eliminate
a flex warning.

* stream.c (vformat): Support bignum in floating point
conversion. Bugfixes: floating point conversion was
accessing obj->fl.n instead of using n.
Changed some if/else ladders to switches.

1 files changed, 13 insertions, 7 deletions

diff --git a/arith.c b/arith.c
index f2f033ea..838d39dd 100644
--- a/arith.c
+++ b/arith.c
@@ -490,13 +490,19 @@ tail:
 
 val neg(val anum)
 {
-  if (bignump(anum)) {
-    val n = make_bignum();
-    mp_neg(mp(anum), mp(n));
-    return n;
-  } else {
-    cnum n = c_num(anum);
-    return num(-n);
+  switch (type(anum)) {
+  case BGNUM:
+    {
+      val n = make_bignum();
+      mp_neg(mp(anum), mp(n));
+      return n;
+    }
+  case FLNUM:
+    return flo(-c_flo(anum));
+  case NUM:
+    return num(-c_num(anum));
+  default:
+    uw_throwf(error_s, lit("neg: ~s is not a number"), anum, nao);
   }
 }