Suppress CR in quiet mode, patch by Derek Fawcus.

[pforth] / fth / system.fth

diff --git a/fth/system.fth b/fth/system.fth
index 0223ab0..5cf36f8 100644 (file)
--- a/fth/system.fth
+++ b/fth/system.fth
@@ -227,6 +227,7 @@
 \r
 \ Error codes defined in ANSI Exception word set.\r
 : ERR_ABORT         -1 ;   \ general abort\r
 \r
 \ Error codes defined in ANSI Exception word set.\r
 : ERR_ABORT         -1 ;   \ general abort\r

+: ERR_ABORTQ        -2 ;   \ for abort"\r

 : ERR_EXECUTING    -14 ;   \ compile time word while not compiling\r
 : ERR_PAIRS        -22 ;   \ mismatch in conditional\r
 : ERR_DEFER       -258 ;  \ not a deferred word\r
 : ERR_EXECUTING    -14 ;   \ compile time word while not compiling\r
 : ERR_PAIRS        -22 ;   \ mismatch in conditional\r
 : ERR_DEFER       -258 ;  \ not a deferred word\r


@@ -738,16 +739,14 @@ variable TRACE-INCLUDE
                 drop ." Could not find file " $type cr abort\r
         ELSE ( -- $filename good-fid )\r
                 swap include.mark.start\r
                 drop ." Could not find file " $type cr abort\r
         ELSE ( -- $filename good-fid )\r
                 swap include.mark.start\r

-                dup >r   \ save fid for close-file\r

                 depth >r\r
                 depth >r\r

-                include-file\r
+                include-file    \ will also close the file\r

                 depth 1+ r> -\r
                 IF\r
                         ." Warning: stack depth changed during include!" cr\r
                         .s cr\r
                         0sp\r
                 THEN\r
                 depth 1+ r> -\r
                 IF\r
                         ." Warning: stack depth changed during include!" cr\r
                         .s cr\r
                         0sp\r
                 THEN\r

-                r> close-file drop\r

                 include.mark.end\r
         THEN\r
         trace-include @\r
                 include.mark.end\r
         THEN\r
         trace-include @\r


@@ -811,7 +810,8 @@ auto.init
 \ Now that we can load from files, load remainder of dictionary.\r
 \r
 trace-include on\r
 \ Now that we can load from files, load remainder of dictionary.\r
 \r
 trace-include on\r

-trace-stack on\r
+\ Turn this OFF if you do not want to see the contents of the stack after each entry.\r
+trace-stack off\r

 \r
 include loadp4th.fth\r
 \r
 \r
 include loadp4th.fth\r
 \r


@@ -822,6 +822,3 @@ FREEZE    \ prevent forgetting below this point
 \r
 .( Dictionary compiled, save in "pforth.dic".) cr\r
 c" pforth.dic" save-forth\r
 \r
 .( Dictionary compiled, save in "pforth.dic".) cr\r
 c" pforth.dic" save-forth\r

-\r
-\ Save the dictionary in "pfdicdat.h" file so pForth can be compiled for standalone mode.\r
-SDAD\r