Suppress CR in quiet mode, patch by Derek Fawcus.

[pforth] / fth / misc1.fth

diff --git a/fth/misc1.fth b/fth/misc1.fth
index 29e8ede..373e495 100644 (file)
--- a/fth/misc1.fth
+++ b/fth/misc1.fth
@@ -18,7 +18,6 @@ decimal
 \r
 : >> rshift ;\r
 : << lshift ;\r
 \r
 : >> rshift ;\r
 : << lshift ;\r

-: CELL* ( n -- n*cell )  2 lshift ;\r

 \r
 : (WARNING")  ( flag $message -- )\r
     swap\r
 \r
 : (WARNING")  ( flag $message -- )\r
     swap\r


@@ -37,7 +36,9 @@ decimal
 \r
 : (ABORT")  ( flag $message -- )\r
     swap\r
 \r
 : (ABORT")  ( flag $message -- )\r
     swap\r

-    IF count type cr abort\r
+    IF\r
+       count type cr\r
+       err_abortq throw\r

     ELSE drop\r
     THEN\r
 ;\r
     ELSE drop\r
     THEN\r
 ;\r


@@ -75,7 +76,7 @@ decimal
 \r
 : $ ( <number> -- N , convert next number as hex )\r
     base @ hex\r
 \r
 : $ ( <number> -- N , convert next number as hex )\r
     base @ hex\r

-    32 lword number? num_type_single = not\r
+    bl lword number? num_type_single = not\r

     abort" Not a single number!"\r
     swap base !\r
     state @\r
     abort" Not a single number!"\r
     swap base !\r
     state @\r