Suppress CR in quiet mode, patch by Derek Fawcus.

[pforth] / csrc / pf_core.c

diff --git a/csrc/pf_core.c b/csrc/pf_core.c
index f7bf38f..19e75a8 100644 (file)
--- a/csrc/pf_core.c
+++ b/csrc/pf_core.c
@@ -496,13 +496,19 @@ cell_t pfDoForth( const char *DicFileName, const char *SourceName, cell_t IfInit
                        if( DicFileName )\r
                        {\r
                                pfDebugMessage("DicFileName = "); pfDebugMessage(DicFileName); pfDebugMessage("\n");\r
                        if( DicFileName )\r
                        {\r
                                pfDebugMessage("DicFileName = "); pfDebugMessage(DicFileName); pfDebugMessage("\n");\r

-                               EMIT_CR;\r
+                               if( !gVarQuiet )\r
+                               {\r
+                                       EMIT_CR;\r
+                               }\r

                                dic = pfLoadDictionary( DicFileName, &EntryPoint );\r
                        }\r
                        else\r
                        {\r
                                dic = pfLoadDictionary( DicFileName, &EntryPoint );\r
                        }\r
                        else\r
                        {\r

-                               MSG(" (static)");\r
-                               EMIT_CR;\r
+                               if( !gVarQuiet )\r
+                               {\r
+                                       MSG(" (static)");\r
+                                       EMIT_CR;\r
+                               }\r

                                dic = pfLoadStaticDictionary();                 \r
                        }\r
                }\r
                                dic = pfLoadStaticDictionary();                 \r
                        }\r
                }\r


@@ -572,3 +578,13 @@ error1:
 \r
        return -1;\r
 }\r
 \r
        return -1;\r
 }\r

+\r
+\r
+#ifdef PF_UNIT_TEST\r
+cell_t pfUnitTest( void )\r
+{\r
+       cell_t numErrors = 0;\r
+       numErrors += pfUnitTestText();\r
+       return numErrors;\r
+}\r
+#endif\r