X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/155af98de2d41917730964947d990b7fb70ddc01..ed62d3fbeda6bb085991cdd683ceacfc57f7afbe:/src/llerror.c

diff --git a/src/llerror.c b/src/llerror.c
index 3b00e7e..4e2fc30 100644
--- a/src/llerror.c
+++ b/src/llerror.c
@@ -1,6 +1,6 @@
 /*
 ** Splint - annotation-assisted static program checker
-** Copyright (C) 1994-2002 University of Virginia,
+** Copyright (C) 1994-2003 University of Virginia,
 **         Massachusetts Institute of Technology
 **
 ** This program is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
 # include "splintMacros.nf"
 # include <string.h>
 # include <errno.h>
-# include "llbasic.h"
+# include "basic.h"
 # include "llmain.h"
 # include "cpperror.h"
 # include "Headers/version.h" /* Visual C++ finds a different version.h on some path! */
@@ -42,33 +42,39 @@
 static void printIndentMessage (FILE *p_stream, /*@only@*/ cstring p_sc, int p_indent)
    /*@modifies *p_stream@*/ ;
 
-# ifndef NOLCL
-static int lclerrors = 0;
-# endif
-
-static int lastfileloclen = 10;
-static /*@only@*/ cstring lastmsg = cstring_undefined;
-static int mcount = 0;
+static bool s_scanOpen = FALSE;
+static int s_lclerrors = 0;
+static size_t s_lastfileloclen = 10;
+static /*@only@*/ cstring s_lastmsg = cstring_undefined;
+static int s_mcount = 0;
 static /*@only@*/ cstring saveOneMessage = cstring_undefined;
 static /*@only@*/ fileloc lastparseerror = fileloc_undefined;
 static /*@only@*/ fileloc lastbug = fileloc_undefined;
-static bool llgenerrorreal (char *p_srcFile, int p_srcLine, 
-			    /*@only@*/ cstring p_s, fileloc p_fl, bool p_iserror, bool p_indent)
-                 /*@modifies g_msgstream@*/ ;
-static bool llgenerroraux (char *p_srcFile, int p_srcLine, 
-			   /*@only@*/ cstring p_s, fileloc p_fl, bool p_iserror, bool p_indent)
-                 /*@modifies g_msgstream@*/ ;
+static bool llgenerrorreal (flagcode p_code, 
+			    char *p_srcFile, int p_srcLine, 
+			    /*@only@*/ cstring p_s,
+			    /*@temp@*/ cstring p_addtext,
+			    fileloc p_fl, bool p_iserror, bool p_indent)
+                 /*@modifies g_warningstream@*/ ;
+static bool llgenerroraux (flagcode p_code, char *p_srcFile, int p_srcLine, 
+			   /*@only@*/ cstring p_s,
+			   /*@temp@*/ cstring p_addtext,
+			   fileloc p_fl, bool p_iserror, bool p_indent)
+                 /*@modifies g_warningstream@*/ ;
+
+static void generateCSV (flagcode p_code, cstring p_s, cstring p_addtext, fileloc p_fl) 
+     /*@modifies g_csvstream@*/ ;
 
 static void printError (FILE *p_stream, /*@only@*/ cstring p_sc)
-   /*@globals lastfileloclen @*/
+   /*@globals s_lastfileloclen @*/
    /*@modifies *p_stream@*/ ;
 static void printMessage (FILE *p_stream, /*@only@*/ cstring p_s)
    /*@modifies *p_stream@*/ ;
 
-static void llgenhint (/*@only@*/ cstring p_s) /*@modifies g_msgstream@*/ ;
+static void llgenhint (/*@only@*/ cstring p_s) /*@modifies g_warningstream@*/ ;
 
 static void showSourceLoc (char *srcFile, int srcLine)
-     /*@modifies g_msgstream@*/
+     /*@modifies g_warningstream@*/
 {
   if (context_getFlag (FLG_SHOWSOURCELOC)) {
     llgenhint (message ("%s:%d: Source code error generation point.",
@@ -87,7 +93,7 @@ maxcp (/*@null@*/ /*@returned@*/ char *a, /*@null@*/ /*@returned@*/ char *b)
 static void
 printBugReport (void)
 {
-  fprintf (stderr, "     *** Please report bug to %s ***\n",
+  fprintf (g_errorstream, "     *** Please report bug to %s ***\n",
 	   SPLINT_MAINTAINER);
   llflush ();
   /* don't exit (EXIT_FAILURE); */
@@ -95,17 +101,17 @@ printBugReport (void)
 
 static bool s_needsPrepare = TRUE;
 
-void prepareMessage (void)
+void prepareMessage ()
 {
   DPRINTF (("Prepare message: %s", bool_unparse (context_loadingLibrary ())));
   showHerald ();
 
   if ((context_isPreprocessing () || context_loadingLibrary ())
       && s_needsPrepare
-      && context_getDebug (FLG_SHOWSCAN))
+      && context_getFlag (FLG_SHOWSCAN))
     {
       llflush ();
-      fprintf (stderr, " >\n");
+      displayScanClose ();
       s_needsPrepare = FALSE;
     }
 
@@ -115,11 +121,10 @@ void prepareMessage (void)
 void closeMessage (void)
 {
   if (context_isPreprocessing ()
-      && context_getDebug (FLG_SHOWSCAN))
+      && context_getFlag (FLG_SHOWSCAN))
     {
       llflush ();
-      fprintf (stderr, "< more preprocessing .");
-
+      displayScanOpen (cstring_makeLiteral ("more preprocessing ."));
       llassertprotect (!s_needsPrepare);
       s_needsPrepare = TRUE;
     }
@@ -134,7 +139,7 @@ llmsg (/*@only@*/ cstring s)
 {
   context_setNeednl ();
   prepareMessage ();
-  printMessage (g_msgstream, s);
+  printMessage (g_messagestream, s);
   closeMessage ();
 }
 
@@ -145,7 +150,9 @@ lldiagmsg (/*@only@*/ cstring s)
 
   if (inmsg)
     {
-      fprintf (stderr, "Recursive message call detected: %s\n", cstring_toCharsSafe (s));
+      fprintf (g_errorstream,
+	       "Recursive message call detected: %s\n", 
+	       cstring_toCharsSafe (s));
       llexit (LLFAILURE);
     }
 
@@ -153,7 +160,7 @@ lldiagmsg (/*@only@*/ cstring s)
 
   context_setNeednl ();
   prepareMessage ();
-  printMessage (stderr, s);
+  printMessage (g_messagestream, s);
   closeMessage ();
 
   inmsg = FALSE;
@@ -164,7 +171,7 @@ llmsgplain (/*@only@*/ cstring s)
 {
   context_setNeednl ();
   prepareMessage ();
-  printMessage (g_msgstream, s);
+  printMessage (g_messagestream, s);
   closeMessage ();
 }
 
@@ -172,16 +179,7 @@ void llerror_flagWarning (cstring s)
 {
   if (context_getFlag (FLG_WARNFLAGS))
     {
-      showHerald ();
-
-      if (fileloc_isBuiltin (g_currentloc))
-	{
-	  llmsg (message ("Warning: %q", s));
-	}
-      else
-	{
-	  llgenmsg (message ("Warning: %q", s), g_currentloc);
-	}
+      llgenmsg (s, g_currentloc);
     }
   else
     {
@@ -190,14 +188,14 @@ void llerror_flagWarning (cstring s)
 }
 
 static void
-llgenhint (/*@only@*/ cstring s) /*@modifies g_msgstream@*/
+llgenhint (/*@only@*/ cstring s) /*@modifies g_warningstream@*/
 {
   int indent = context_getIndentSpaces () - 1;
 
   if (indent < 0) indent = 0;
 
   context_setNeednl ();
-  printIndentMessage (g_msgstream, s, indent);
+  printIndentMessage (g_warningstream, s, indent);
 }
 
 void
@@ -243,7 +241,7 @@ llsuppresshint2 (char c, flagcode f1, flagcode f2)
 	{
 	  cstring desc = flagcodeHint (f1);
 	  context_setNeednl ();
-	  lastfileloclen = 8;
+	  s_lastfileloclen = 8;
 
 	  if (cstring_isUndefined (desc))
 	    {
@@ -304,7 +302,7 @@ llsuppresshint (char c, flagcode f)
 	{
 	  cstring desc = flagcodeHint (f);
 	  context_setNeednl ();
-	  lastfileloclen = 8;
+	  s_lastfileloclen = 8;
 
 	  if (flagcode_isNamePrefixFlag (f))
 	    {
@@ -332,11 +330,11 @@ llnosuppresshint (flagcode f)
     {
       cstring desc = flagcodeHint (f);
       context_setNeednl ();
-      lastfileloclen = 8;
+      s_lastfileloclen = 8;
 
       if (cstring_isDefined (desc))
 	{
-	  printError (g_msgstream, message ("    %s", desc));
+	  printError (g_warningstream, message ("    %s", desc));
 	}
     }
 }
@@ -349,6 +347,17 @@ llnosuppresshint (flagcode f)
 
 typedef /*@null@*/ /*@dependent@*/ char *nd_charp;
 
+/*
+** mstring_split
+**
+** Divides a string into lines of up to maxline characters.
+**
+** Initial string: *sp
+**
+** Output split: *sp / *tp
+**                     possibly null
+*/
+
 static void
 mstring_split (/*@returned@*/ char **sp,
 	       /*@out@*/ nd_charp *tp,
@@ -374,14 +383,12 @@ mstring_split (/*@returned@*/ char **sp,
       osp = s;
     }
 
-  nl = strchr (s, '\n');
-
   /*
   ** splitting:
   **
   **    if there is a newline in first maxline characters, split there
   **    if line len is <= maxline, return no split
-  **    if there is a ':' or ';' followed by ' ' in first maxline characters,
+  **    if there is a ':' or ';' or ',' followed by ' ' in first maxline characters,
   **       split there unless the ' ' is followed by a '}', then
   **       split after '}'
   **       of the ';' is inside quotation marks
@@ -392,6 +399,8 @@ mstring_split (/*@returned@*/ char **sp,
   **
   */
 
+  nl = strchr (s, '\n');
+
   if ((nl != NULL) && ((nl - s) < maxline))
     {
       *nl = '\0';
@@ -414,15 +423,16 @@ mstring_split (/*@returned@*/ char **sp,
     }
   else if (size_toInt (strlen (s)) < maxline)
     {
-      llassertprotect (*tp == NULL || (*tp > osp));
+      llassertprotect (*tp == NULL);
       return;
     }
   else
     {
       int i = 0;
       char savechar;
-      char *lcolon, *lsemi, *splitat;
-
+      char *lcolon, *lsemi, *lcomma;
+      char *splitat;
+      
       splitat = NULL;
 
       t = s + maxline - 1;
@@ -431,6 +441,8 @@ mstring_split (/*@returned@*/ char **sp,
       *t = '\0';
       lcolon = strrchr (s, ':');
       lsemi = strrchr (s, ';');
+      lcomma = strrchr (s, ',');
+
       *t = savechar;
 
       splitat = maxcp (lcolon, lsemi);
@@ -438,7 +450,9 @@ mstring_split (/*@returned@*/ char **sp,
       if (splitat != NULL && ((int)(splitat - s) > MINLINE)
 	  && *(splitat) != '\0'
 	  && *(splitat + 1) == ' ' 
-	  && (*(splitat + 2) != '}' && (*(splitat + 2) != '\0'))) 
+	  && (*(splitat + 2) != '}'
+	      && *(splitat + 2) != ',' 
+	      && (*(splitat + 2) != '\0'))) 
 	{
 	  *(splitat + 1) = '\0';
 	  t = splitat + 2;
@@ -447,7 +461,29 @@ mstring_split (/*@returned@*/ char **sp,
 	  return;
 	}
 
-      while (*t != ' ' && *t != '\t' && i < MAXSEARCH)
+      if (lcomma != NULL && ((lcomma - s) > maxline - 5))
+	{
+	  splitat = lcomma;
+	  
+	  if (splitat != NULL && ((int)(splitat - s) > MINLINE)
+	      && *(splitat) != '\0'
+	      && *(splitat + 1) == ' ' 
+	      && (*(splitat + 2) != '}'
+		  && (*(splitat + 2) != '\0'))) 
+	    {
+	      *(splitat + 1) = '\0';
+	      t = splitat + 2;
+	      *tp = t;
+	      llassertprotect (*tp == NULL || (*tp > osp));
+	      return;
+	    }
+	}
+      
+      /*
+      ** Search for any breaking point (at least 4 letters past s)
+      */
+
+      while (*t != ' ' && *t != '\t' && i < MAXSEARCH && t > (s + 4))
 	{
 	  t--;
 	  i++;
@@ -485,16 +521,7 @@ mstring_split (/*@returned@*/ char **sp,
 
 	  *tp = t;
 
-# if 0
-	  /* Hack to prevent error case for wierd strings. */
-	  if (t <= osp)
-	    {
-	      *tp = NULL;
-	      return;
-	    }
-	  llassertprotect (*tp == NULL || (*tp > osp));
-# endif	  
-
+	  llassert (*sp != *tp);
 	  return;
 	}
     }
@@ -505,7 +532,7 @@ mstring_split (/*@returned@*/ char **sp,
 static
 void limitmessage (/*@only@*/ cstring s, fileloc loc)
 {
-  if (mcount > context_getLimit () + 1)
+  if (s_mcount > context_getLimit () + 1)
     {
       cstring_free (s);
     }
@@ -513,7 +540,7 @@ void limitmessage (/*@only@*/ cstring s, fileloc loc)
     {
       cstring flstring = fileloc_unparse (loc);
 
-      lastfileloclen = cstring_length (flstring);
+      s_lastfileloclen = cstring_length (flstring);
       cstring_free (saveOneMessage);
       saveOneMessage = message ("%q: %q", flstring, s);
     }
@@ -531,14 +558,14 @@ void cleanupMessages ()
     }
   else
     {
-      int unprinted = mcount - context_getLimit ();
+      int unprinted = s_mcount - context_getLimit ();
 
       if (unprinted > 0)
 	{
 	  if (unprinted == 1 && cstring_isDefined (saveOneMessage))
 	    {
 	      prepareMessage ();
-	      printError (g_msgstream, saveOneMessage);
+	      printError (g_warningstream, saveOneMessage);
 	      closeMessage ();
 	      saveOneMessage = cstring_undefined;
 	    }
@@ -550,24 +577,24 @@ void cleanupMessages ()
 		  saveOneMessage = cstring_undefined;
 		}
 
-	      fprintf (g_msgstream, "%s: (%d more similar errors unprinted)\n",
+	      fprintf (g_warningstream, "%s: (%d more similar errors unprinted)\n",
 		       cstring_toCharsSafe (fileloc_filename (g_currentloc)),
-		       mcount - context_getLimit ());
+		       s_mcount - context_getLimit ());
 	    }
 	}
     }
 
-  mcount = 0;
+  s_mcount = 0;
 }
 
 void
 llgenmsg (/*@only@*/ cstring s, fileloc fl)
 {
   cstring flstring = fileloc_unparse (fl);
-  lastfileloclen = cstring_length (flstring);
+  s_lastfileloclen = cstring_length (flstring);
 
   prepareMessage ();
-  (void) printError (g_msgstream, message ("%q: %q", flstring, s));
+  (void) printError (g_warningstream, message ("%q: %q", flstring, s));
   closeMessage ();
 }
 
@@ -575,9 +602,12 @@ void
 llgenindentmsg (/*@only@*/ cstring s, fileloc fl)
 {
   cstring flstring = fileloc_unparse (fl);
-
+  int indentspaces = context_getLocIndentSpaces ();
   prepareMessage ();
-  (void) printIndentMessage (g_msgstream, message ("%q: %q", flstring, s), context_getIndentSpaces ());
+  
+  (void) printIndentMessage (g_warningstream, message ("%q: %q", flstring, s),
+			     indentspaces);
+
   closeMessage ();
 }
 
@@ -585,7 +615,7 @@ void
 llgenindentmsgnoloc (/*@only@*/ cstring s)
 {
   prepareMessage ();
-  (void) printIndentMessage (g_msgstream, s, context_getIndentSpaces ());
+  (void) printIndentMessage (g_warningstream, s, context_getIndentSpaces ());
   closeMessage ();
 }
 
@@ -618,18 +648,22 @@ llgentypeerroraux (char *srcFile, int srcLine,
     ut2 = ctype_baseArrayPtr (ut2);
   }
 
-  if ((ctype_isFloat (ut1) && ctype_isDouble (ut2))
-      || (ctype_isFloat (ut1) && ctype_isDouble (ut2)))
+  if (ctype_isRealNumAbstract (ut1) && exprNode_isNumLiteral (e2)) 
+    {
+      hcode = FLG_NUMABSTRACTLIT;
+    }
+  else if ((ctype_isFloat (ut1) && ctype_isDouble (ut2))
+	   || (ctype_isFloat (ut1) && ctype_isDouble (ut2)))
     {
       hcode = FLG_FLOATDOUBLE;
     }
-  else if ((exprNode_isCharLit (e1) && ctype_isInt (ut2))
-	   || (exprNode_isCharLit (e2) && ctype_isInt (ut1)))
+  else if ((exprNode_isCharLiteral (e1) && ctype_isInt (ut2))
+	   || (exprNode_isCharLiteral (e2) && ctype_isInt (ut1)))
     {
       hcode = FLG_CHARINTLITERAL;
     }
-  else if ((exprNode_isNumLit (e1) && ctype_isReal (ut2))
-	   || (exprNode_isNumLit (e2) && ctype_isReal (ut1)))
+  else if ((exprNode_isNumLiteral (e1) && ctype_isReal (ut2))
+	   || (exprNode_isNumLiteral (e2) && ctype_isReal (ut1)))
     {
       hcode = FLG_NUMLITERAL;
     }
@@ -650,7 +684,20 @@ llgentypeerroraux (char *srcFile, int srcLine,
     {
       if (!bool_equal (ctype_isSigned (ut1), ctype_isSigned (ut2)))
 	{
-	  hcode = FLG_IGNORESIGNS;
+	  if (ctype_isArbitraryIntegral (ctype_realType (ut1))
+	      && !ctype_isArbitraryIntegral (ctype_realType (ut2)))
+	    {
+	      hcode = FLG_MATCHANYINTEGRAL;
+	    }
+	  else if (ctype_isArbitraryIntegral (ctype_realType (ut2))
+		   && !ctype_isArbitraryIntegral (ctype_realType (ut1)))
+	    {
+	      hcode = FLG_MATCHANYINTEGRAL;
+	    }
+	  else
+	    {
+	      hcode = FLG_IGNORESIGNS;
+	    }
 	}
       else
 	{
@@ -760,10 +807,32 @@ llgentypeerroraux (char *srcFile, int srcLine,
 	  
 	  if (ctype_match (ct, ut1))
 	    {
-	      code = FLG_ABSTRACT;
-	      hint = message ("Underlying types match, but %s is an "
-			      "abstract type that is not accessible here.",
-			      ctype_unparse (t2));
+	      if (ctype_isNumAbstract (ut2)) 
+		{
+		  if (exprNode_isNumLiteral (e1))
+		    {
+		      code = FLG_NUMABSTRACTLIT;
+		      hint = message ("Underlying types match, but %s is a "
+				      "numabstract type that is not accessible here. "
+				      "(Use +numabstractlit to allow numeric literals "
+				      "to be used as numabstract type values.)",
+				      ctype_unparse (t2));
+		    }
+		  else
+		    {
+		      code = FLG_NUMABSTRACT;
+		      hint = message ("Underlying types match, but %s is a "
+				      "numabstract type that is not accessible here.",
+				      ctype_unparse (t2));
+		    }
+		}
+	      else
+		{
+		  code = FLG_ABSTRACT;
+		  hint = message ("Underlying types match, but %s is an "
+				  "abstract type that is not accessible here.",
+				  ctype_unparse (t2));
+		}
 	    }
 	}
       else
@@ -806,7 +875,7 @@ llgentypeerroraux (char *srcFile, int srcLine,
     {
       if (!context_suppressFlagMsg (ocode, fl))
 	{
-	  return llgenhinterror (code, s, hint, fl);
+	  return xllgenhinterror (srcFile, srcLine, code, s, hint, fl);
 	}
       else
 	{
@@ -817,14 +886,27 @@ llgentypeerroraux (char *srcFile, int srcLine,
     }
   else
     {
-      if (llgenerroraux (srcFile, srcLine, s, fl, TRUE, FALSE))
+      if (hcode != INVALID_FLAG && hcode != ocode)
+	{
+	  code = hcode;
+	}
+      
+      if (llgenerroraux (ocode, srcFile, srcLine, s,
+			 flagcodeHint (code), fl, TRUE, FALSE))
 	{
-	  if (hcode != INVALID_FLAG && hcode != ocode)
+	  if (code != ocode) 
 	    {
-	      code = hcode;
-	      llshowhint (code);
-
-	    }
+	      if (context_flagOn (code, fl))
+		{
+		  /* The flag is alreay set, something buggy in the flag code */
+		  llcontbug (message ("No hint available, flag %s is already set.",
+				      flagcode_unparse (code)));
+		}
+	      else
+		{
+		  llshowhint (code);
+		}
+	  } 
 	  else
 	    {
 	      llsuppresshint ('-', code);
@@ -853,7 +935,22 @@ xllgenformattypeerror (char *srcFile, int srcLine,
 {
   if (!context_suppressFlagMsg (FLG_FORMATTYPE, fl))
     {
-      return llgentypeerroraux (srcFile, srcLine, FLG_FORMATTYPE, t1, e1, t2, e2, s, fl);
+      if (ctype_isInt (t1)
+	  && ctype_isNumAbstract (t2))
+	{
+	  if (!context_suppressFlagMsg (FLG_NUMABSTRACTPRINT, fl))
+	    {
+	      return llgentypeerroraux (srcFile, srcLine, FLG_NUMABSTRACTPRINT, t1, e1, t2, e2, s, fl);
+	    }
+	  else
+	    {
+	      return FALSE;
+	    }
+	}
+      else
+	{
+	  return llgentypeerroraux (srcFile, srcLine, FLG_FORMATTYPE, t1, e1, t2, e2, s, fl);
+	}
     }
   else
     {
@@ -865,7 +962,7 @@ xllgenformattypeerror (char *srcFile, int srcLine,
 bool
 xllgenerror (char *srcFile, int srcLine, flagcode o, /*@only@*/ cstring s, fileloc fl)
 {
-  if (llgenerroraux (srcFile, srcLine, s, fl, TRUE, FALSE))
+  if (llgenerroraux (o, srcFile, srcLine, s, flagcodeHint (o), fl, TRUE, FALSE))
     {
       llnosuppresshint (o);
       flagcode_recordError (o);
@@ -886,7 +983,7 @@ xllgenhinterror (char *srcFile, int srcLine,
 {
   if (!context_suppressFlagMsg (o, fl))
     {
-      if (llgenerroraux (srcFile, srcLine, s, fl, TRUE, FALSE))
+      if (llgenerroraux (o, srcFile, srcLine, s, hint, fl, TRUE, FALSE))
 	{
 	  flagcode_recordError (o);
 
@@ -916,14 +1013,17 @@ xllgenhinterror (char *srcFile, int srcLine,
 }
 
 static bool
-llrealerror (char *srcFile, int srcLine, /*@only@*/ cstring s, fileloc fl)
+llrealerror (flagcode code, char *srcFile, int srcLine, /*@only@*/ cstring s, /*@temp@*/ cstring addtext, fileloc fl)
 {
-  return (llgenerrorreal (srcFile, srcLine, s, fl, TRUE, FALSE));
+  return (llgenerrorreal (code, srcFile, srcLine, s, addtext, fl, TRUE, FALSE));
 }
 
 static bool
-llgenerroraux (char *srcFile, int srcLine,
-	       /*@only@*/ cstring s, fileloc fl, bool iserror, bool indent)
+llgenerroraux (flagcode code,
+	       char *srcFile, int srcLine,
+	       /*@only@*/ cstring s, 
+	       cstring addtext,
+	       fileloc fl, bool iserror, bool indent)
 {
   if (context_inSuppressZone (fl))
     {
@@ -931,7 +1031,7 @@ llgenerroraux (char *srcFile, int srcLine,
       return FALSE;
     }
   
-  if (llgenerrorreal (srcFile, srcLine, s, fl, iserror, indent)) {
+  if (llgenerrorreal (code, srcFile, srcLine, s, addtext, fl, iserror, indent)) {
     return TRUE;
   } else {
     return FALSE;
@@ -944,7 +1044,7 @@ xllforceerror (char *srcFile, int srcLine,
 {
   flagcode_recordError (code);
 
-  if (llgenerrorreal (srcFile, srcLine, s, fl, TRUE, FALSE)) {
+  if (llgenerrorreal (code, srcFile, srcLine, s, cstring_undefined, fl, TRUE, FALSE)) {
     closeMessage ();
     return TRUE;
   } else {
@@ -952,9 +1052,34 @@ xllforceerror (char *srcFile, int srcLine,
   }
 }
 
+static void generateCSV (flagcode code, cstring s, cstring addtext, fileloc fl)
+{
+
+  if (g_csvstream != NULL) {
+    /* Warning, Flag Code, Flag Name, Priority, File, Line, Column, Warning Text, Additional Text */
+    fprintf (g_csvstream, "%d,%d,%s,%d,%s,%d,%d,\"%s\"",
+	     context_numErrors (),
+	     (int) code, /* flag code */
+	     cstring_toCharsSafe (flagcode_unparse (code)), /* flag name */
+	     flagcode_priority (code), /* priority */
+	     cstring_toCharsSafe (fileloc_outputFilename (fl)),
+	     fileloc_lineno (fl),
+	     fileloc_column (fl),
+	     cstring_toCharsSafe (s));
+
+    if (cstring_isDefined (addtext)) {
+      fprintf (g_csvstream, ",\"%s\"\n", cstring_toCharsSafe (addtext));
+    } else {
+      fprintf (g_csvstream, "\n");
+    }
+  }
+}
+
 static bool
-llgenerrorreal (char *srcFile, int srcLine, 
-		/*@only@*/ cstring s, fileloc fl, bool iserror, bool indent)
+llgenerrorreal (flagcode code, char *srcFile, int srcLine, 
+		/*@only@*/ cstring s, 
+		cstring addtext,
+		fileloc fl, bool iserror, bool indent)
 {
   cstring flstring;
 
@@ -1003,16 +1128,16 @@ llgenerrorreal (char *srcFile, int srcLine,
 	  *savechar = ':';
 	}
 
-      if (cstring_equal (lastmsg, cstring_fromChars (tmpmsg)))
+      if (cstring_equal (s_lastmsg, cstring_fromChars (tmpmsg)))
 	{
-	  mcount++;
-	  if (mcount == (context_getLimit () + 1))
+	  s_mcount++;
+	  if (s_mcount == (context_getLimit () + 1))
 	    {
 	      limitmessage (s, fl);
 	      return FALSE;
 	    }
 
-	  if (mcount > (context_getLimit ()))
+	  if (s_mcount > (context_getLimit ()))
 	    {
 	      cstring_free (s);
 	      return FALSE;
@@ -1021,9 +1146,9 @@ llgenerrorreal (char *srcFile, int srcLine,
       else
 	{
 	  cleanupMessages ();
-	  mcount = 0;
-	  cstring_free (lastmsg);
-	  lastmsg = cstring_fromCharsNew (tmpmsg);
+	  s_mcount = 0;
+	  cstring_free (s_lastmsg);
+	  s_lastmsg = cstring_fromCharsNew (tmpmsg);
 	}
     }
 
@@ -1085,24 +1210,24 @@ llgenerrorreal (char *srcFile, int srcLine,
 
       if (context_inIterDef ())
 	{
-	  fprintf (g_msgstream, "%s: (in iter %s)\n",
+	  fprintf (g_warningstream, "%s: (in iter %s)\n",
 		   cstring_toCharsSafe (fname),
 		   cstring_toCharsSafe (context_inFunctionName ()));
 	}
       else if (context_inIterEnd ())
 	{
-	  fprintf (g_msgstream, "%s: (in iter finalizer %s)\n",
+	  fprintf (g_warningstream, "%s: (in iter finalizer %s)\n",
 		   cstring_toCharsSafe (fname),
 		   cstring_toCharsSafe (context_inFunctionName ()));
 	}
       else if (context_inMacro ())
 	{
-	  fprintf (g_msgstream, "%s: (in macro %s)\n", cstring_toCharsSafe (fname),
+	  fprintf (g_warningstream, "%s: (in macro %s)\n", cstring_toCharsSafe (fname),
 		   cstring_toCharsSafe (context_inFunctionName ()));
 	}
       else
 	{
-	  fprintf (g_msgstream, "%s: (in function %s)\n",
+	  fprintf (g_warningstream, "%s: (in function %s)\n",
 		   cstring_toCharsSafe (fname),
 		   cstring_toCharsSafe (context_inFunctionName ()));
 	}
@@ -1112,18 +1237,21 @@ llgenerrorreal (char *srcFile, int srcLine,
     }
 
   flstring = fileloc_unparse (fl);
-  lastfileloclen = cstring_length (flstring);
+  s_lastfileloclen = cstring_length (flstring);
+
+  generateCSV (code, s, addtext, fl);
 
   if (indent)
     {
-      printError (g_msgstream, message ("   %q: %q", flstring, s));
+      printError (g_warningstream, message ("   %q: %q", flstring, s));
     }
   else
     {
-      printError (g_msgstream, message ("%q: %q", flstring, s));
+      printError (g_warningstream, message ("%q: %q", flstring, s));
     }
 
   showSourceLoc (srcFile, srcLine);
+	     
   return TRUE;
 }
 
@@ -1175,9 +1303,9 @@ static
 void printError (FILE *stream, /*@only@*/ cstring sc)
 {
   int maxlen = context_getLineLen ();
-  int nspaces = lastfileloclen + 5;
-  int nextlen = maxlen - nspaces;
-  int len = cstring_length (sc);
+  size_t nspaces = s_lastfileloclen + 5;
+  int nextlen = maxlen - size_toInt (nspaces);
+  size_t len = cstring_length (sc);
   int indent = 0;
   char *s = cstring_toCharsSafe (sc);
   char *os = s;
@@ -1185,7 +1313,7 @@ void printError (FILE *stream, /*@only@*/ cstring sc)
 
   DPRINTF (("Print error: [%s]", sc));
 
-  if (len < (maxlen + nextlen) && (strchr (s, '\n') == NULL))
+  if (size_toInt (len) < (maxlen + nextlen) && (strchr (s, '\n') == NULL))
     {
       mstring_split (&s, &t, maxlen, &indent);
 
@@ -1195,8 +1323,8 @@ void printError (FILE *stream, /*@only@*/ cstring sc)
 	{
 	  len = mstring_length (t);
 
-	  if (len < (maxlen - 3) && (strchr (t, '\n') == NULL)
-	      && len > (nextlen - 1))
+	  if (size_toInt (len) < (maxlen - 3) && (strchr (t, '\n') == NULL)
+	      && size_toInt (len) > (nextlen - 1))
 	    {
 	      fprintf (stream, "    %s\n", t);
 	    }
@@ -1205,7 +1333,7 @@ void printError (FILE *stream, /*@only@*/ cstring sc)
 	      char *spaces = (char *) dmalloc ((nspaces + 1) * sizeof (*spaces));
 	      int i;
 
-	      for (i = 0; i < nspaces; i++)
+	      for (i = 0; i < size_toInt (nspaces); i++)
 		{
 		  spaces[i] = ' ';
 		}
@@ -1227,13 +1355,13 @@ void printError (FILE *stream, /*@only@*/ cstring sc)
     {
       DPRINTF (("Here 1: [%s]", sc));
 
-      if (len < (maxlen + maxlen - 1) && (strchr (s, '\n') != NULL))
+      if (size_toInt (len) < (maxlen + maxlen - 1) && (strchr (s, '\n') != NULL))
 	{
 	  nspaces = ((maxlen + maxlen - 1) - len) / 2;
 
 	  if (nspaces < 1) nspaces = 1;
 
-	  nextlen = maxlen - nspaces;
+	  nextlen = size_toInt (maxlen - nspaces);
 
 	  mstring_split (&s, &t, maxlen, &indent);
 
@@ -1244,7 +1372,7 @@ void printError (FILE *stream, /*@only@*/ cstring sc)
 	      char *spaces = (char *) dmalloc ((nspaces + 1) * sizeof (*spaces));
 	      int i;
 
-	      for (i = 0; i < nspaces; i++)
+	      for (i = 0; i < size_toInt (nspaces); i++)
 		{
 		  spaces[i] = ' ';
 		}
@@ -1265,7 +1393,7 @@ void printError (FILE *stream, /*@only@*/ cstring sc)
       else
 	{
 	  nspaces = 4;
-	  nextlen = maxlen - nspaces;
+	  nextlen = size_toInt (maxlen - nspaces);
 
 	  DPRINTF (("Here 2: [%s]", s));
 	  mstring_split (&s, &t, maxlen, &indent);
@@ -1276,7 +1404,7 @@ void printError (FILE *stream, /*@only@*/ cstring sc)
 	  if (t != NULL)
 	    {
   	      char *spaces = (char *) dmalloc ((nspaces + 1) * sizeof (*spaces));
-	      int i;
+	      size_t i;
 
 	      for (i = 0; i < nspaces; i++)
 		{
@@ -1308,26 +1436,24 @@ void
 xllfatalbug (char *srcFile, int srcLine, /*@only@*/ cstring s)
 {
   prepareMessage ();
-  printError (stderr, message ("%q: *** Fatal bug: %q",
-			       fileloc_unparse (g_currentloc), s));
+  printError (g_errorstream, message ("%q: *** Fatal bug: %q",
+				      fileloc_unparse (g_currentloc), s));
   showSourceLoc (srcFile, srcLine);
   printCodePoint ();
   printBugReport ();
   llexit (LLFAILURE);
 }
 
-# ifndef NOLCL
 void
 lclfatalbug (char *msg)
 {
   prepareMessage ();
-  printError (stderr,
+  printError (g_errorstream,
 	      message ("*** Fatal Bug: %s", cstring_fromChars (msg)));
   printCodePoint ();
   printBugReport ();
   llexit (LLFAILURE);
 }
-# endif
 
 void
 checkParseError (void)
@@ -1349,7 +1475,8 @@ void llbugaux (cstring file, int line, /*@only@*/ cstring s)
     {
       cstring temps = fileloc_unparseRaw (file, line);
 
-      fprintf (stderr, "%s: Recursive bug detected: %s\n",
+      fprintf (g_errorstream,
+	       "%s: Recursive bug detected: %s\n",
 	       cstring_toCharsSafe (temps),
 	       cstring_toCharsSafe (s));
       cstring_free (temps);
@@ -1361,95 +1488,92 @@ void llbugaux (cstring file, int line, /*@only@*/ cstring s)
 
   prepareMessage ();
 
-  /*@i3232@*/
-  /*
-  if (fileloc_isRealLib (g_currentloc))
-    {
-      DPRINTF (("Here we are!"));
-      llfatalerror (message ("%q: Library file appears to be corrupted.  Error: %q: %s",
-			fileloc_unparse (g_currentloc), 
-			fileloc_unparseRaw (file, line), 
-			s));
-    }
-  */
-
   if (fileloc_withinLines (lastparseerror, g_currentloc, 7))
     {
       llfatalerror (message ("%q: Cannot recover from parse error.",
 			     fileloc_unparse (g_currentloc)));
     }
 
-  (void) fflush (g_msgstream);
-  printError (stderr, message ("%q: *** Internal Bug at %q: %q [errno: %d]",
-			       fileloc_unparse (g_currentloc),
-			       fileloc_unparseRaw (file, line),
-			       s, errno));
-  printCodePoint ();
+  (void) fflush (g_warningstream);
+
+  printError (g_errorstream,
+	      message ("%q: *** Internal Bug at %q: %q [errno: %d]",
+		       fileloc_unparse (g_currentloc),
+		       fileloc_unparseRaw (file, line),
+		       s, errno));
+  
+  /* printCodePoint (); no longer useful */
+
+  llflush ();
+  
+  /*
+  ** This is confusing, and hardly ever useful.
 
-  (void) fflush (stderr);
   if (errno != 0)
     {
       perror ("Possible system error diagnostic: ");
     }
-  (void) fflush (stderr);
+
+  **
+  */
 
   printBugReport ();
+  llflush ();
 
   numbugs++;
 
   if (numbugs > context_getBugsLimit () && fileloc_withinLines (lastbug, g_currentloc, 2))
     {
-      llfatalerror (message ("%q: Cannot recover from last bug. (If you really want Splint to try to continue, use -bugslimit <n>.)",
-			     fileloc_unparse (g_currentloc)));
+      llfatalerror
+	(message ("%q: Cannot recover from last bug. "
+		  "(If you really want Splint to try to continue, use -bugslimit <n>.)",
+		  fileloc_unparse (g_currentloc)));
     }
   
-  fprintf (stderr, "       (attempting to continue, results may be incorrect)\n");
+  fprintf (g_errorstream, "       (attempting to continue, results may be incorrect)\n");
   fileloc_free (lastbug);
   lastbug = fileloc_copy (g_currentloc);
   closeMessage ();
-
-  (void) fflush (stderr);
   inbug = FALSE;
 }
 
-# ifndef NOLCL
 void
 lclbug (/*@only@*/ cstring s)
 {
   prepareMessage ();
-  printError (stderr, message ("*** Internal Bug: %q", s));
+  printError (g_errorstream, message ("*** Internal Bug: %q", s));
   printCodePoint ();
   printBugReport ();
-  fprintf (stderr, "       (attempting to continue, results may be incorrect)\n");
+  fprintf (g_errorstream, "       (attempting to continue, results may be incorrect)\n");
   closeMessage ();
 }
-# endif
 
 void
-llfatalerror (cstring s)
+xllfatalerror (char *srcFile, int srcLine, cstring s)
 {
   prepareMessage ();
-  printError (stderr, s);
-  printError (stderr, cstring_makeLiteral ("*** Cannot continue."));
+  printError (g_errorstream, s);
+  printError (g_errorstream, cstring_makeLiteral ("*** Cannot continue."));
+  showSourceLoc (srcFile, srcLine);
   llexit (LLFAILURE);
 }
 
 void
-llfatalerrorLoc (/*@only@*/ cstring s)
+xllfatalerrorLoc (char *srcFile, int srcLine, /*@only@*/ cstring s)
 {
   prepareMessage ();
-  (void) fflush (g_msgstream);
-  printError (stderr, message ("%q: %q", fileloc_unparse (g_currentloc), s));
-  printError (stderr, cstring_makeLiteral ("*** Cannot continue."));
-  (void) fflush (g_msgstream);
+  (void) fflush (g_warningstream);
+  printError (g_errorstream, message ("%q: %q", fileloc_unparse (g_currentloc), s));
+  printError (g_errorstream, cstring_makeLiteral ("*** Cannot continue."));
+  showSourceLoc (srcFile, srcLine);
+  (void) fflush (g_warningstream);
   llexit (LLFAILURE);
 }
 
-# ifndef NOLCL
 bool
 lclHadError (void)
 {
-  return (lclerrors > 0);
+  return (s_lclerrors > 0);
 }
 
 bool
@@ -1457,9 +1581,9 @@ lclHadNewError (void)
 {
   static int lastcall = 0;
 
-  if (lclerrors > lastcall)
+  if (s_lclerrors > lastcall)
     {
-      lastcall = lclerrors;
+      lastcall = s_lclerrors;
       return TRUE;
     }
   else
@@ -1471,26 +1595,25 @@ lclHadNewError (void)
 int
 lclNumberErrors (void)
 {
-  return (lclerrors);
+  return (s_lclerrors);
 }
 
 void
 xlclerror (char *srcFile, int srcLine, ltoken t, /*@only@*/ cstring msg)
 {
-  lclerrors++;
+  s_lclerrors++;
 
   if (ltoken_getCode (t) != NOTTOKEN)
     {
       cstring loc = ltoken_unparseLoc (t);
+      s_lastfileloclen = cstring_length (loc);
 
-      lastfileloclen = cstring_length (loc);
-
-      printError (g_msgstream, message ("%q: %q", loc, msg));
+      printError (g_warningstream, message ("%q: %q", loc, msg));
       showSourceLoc (srcFile, srcLine);
     }
   else
     {
-      printError (g_msgstream, msg);
+      printError (g_warningstream, msg);
       showSourceLoc (srcFile, srcLine);
     }
 }
@@ -1498,25 +1621,33 @@ xlclerror (char *srcFile, int srcLine, ltoken t, /*@only@*/ cstring msg)
 void
 lclplainerror (/*@only@*/ cstring msg)
 {
-  lclerrors++;
-
-  printError (g_msgstream, msg);
+  s_lclerrors++;
+  printError (g_warningstream, msg);
 }
 
 void
 lclfatalerror (ltoken t, /*@only@*/ cstring msg)
 {
-  lclerror (t, msg);
-  (void) fflush (g_msgstream);
-  printError (stderr, cstring_makeLiteral ("*** Cannot continue"));
+  if (ltoken_getCode (t) != NOTTOKEN)
+    {
+      cstring loc = ltoken_unparseLoc (t);
+      s_lastfileloclen = cstring_length (loc);
+      printError (g_errorstream, message ("%q: %q", loc, msg));
+    }
+  else
+    {
+      printError (g_errorstream, msg);
+    }
+
+  printError (g_errorstream, cstring_makeLiteral ("*** Cannot continue"));
   llexit (LLFAILURE);
 }
 
 void
 lclplainfatalerror (/*@only@*/ cstring msg)
 {
-  (void) fflush (g_msgstream);
-  printError (stderr, message ("*** Cannot continue: %q", msg));
+  (void) fflush (g_warningstream);
+  printError (g_errorstream, message ("*** Cannot continue: %q", msg));
   llexit (LLFAILURE);
 }
 
@@ -1540,7 +1671,6 @@ lclRedeclarationError (ltoken id)
       lclerror (id, message ("Identifier redeclared: %s", s));
     }
 }
-# endif
 
 void genppllerror (flagcode code, /*@only@*/ cstring s)
 {
@@ -1552,9 +1682,9 @@ void genppllerror (flagcode code, /*@only@*/ cstring s)
     {
       if (context_getFlag (code))
 	{
-	  if (context_getFlag (FLG_SHOWSCAN) && !context_isInCommandLine ())
+	  if (s_scanOpen)
 	    {
-	      fprintf (g_msgstream, " >\n");
+	      displayScanClose ();
 	    }
 
 	  llerror (code, s);
@@ -1564,9 +1694,9 @@ void genppllerror (flagcode code, /*@only@*/ cstring s)
 	      llsuppresshint ('-', code);
 	    }
 
-	  if (context_getFlag (FLG_SHOWSCAN) && !context_isInCommandLine ())
+	  if (!context_isInCommandLine ())
 	    {
-	      fprintf (stderr, "< more preprocessing .");
+	      displayScanOpen (cstring_makeLiteral ("< more preprocessing ."));
 	    }
 	}
       else
@@ -1588,6 +1718,7 @@ void genppllerrorhint (flagcode code, /*@only@*/ cstring s,
     {
       if (context_getFlag (code))
 	{
+	  generateCSV (code, s, hint, g_currentloc);
 	  prepareMessage ();
 	  context_clearPreprocessing ();
 	  llerror (code, s);
@@ -1610,11 +1741,15 @@ void ppllerror (/*@only@*/ cstring s)
 
 void pplldiagmsg (cstring s)
 {
-  if (context_getDebug (FLG_SHOWSCAN) && !context_isInCommandLine ())
+  if (!context_isInCommandLine ())
     {
-      fprintf (stderr, " >\n");
+      if (s_scanOpen) 
+	{
+	  displayScanClose ();
+	}
+
       lldiagmsg (s);
-      fprintf (stderr, "< more preprocessing .");
+      displayScanOpen (cstring_makeLiteral ("< more preprocessing ."));
     }
   else
     {
@@ -1624,16 +1759,9 @@ void pplldiagmsg (cstring s)
 
 void loadllmsg (cstring s)
 {
-  if (context_getDebug (FLG_SHOWSCAN))
-    {
-      fprintf (stderr, " >\n");
-      lldiagmsg (s);
-      fprintf (stderr, "< .");
-    }
-  else
-    {
-      lldiagmsg (s);
-    }
+  displayScanClose ();
+  lldiagmsg (s);
+  displayScanOpen (cstring_makeLiteral ("< ."));
 }
 
 static void llreportparseerror (/*@only@*/ cstring s)
@@ -1682,7 +1810,7 @@ bool xlloptgenerror (char *srcFile, int srcLine,
 {
   DPRINTF (("xllopt: %s", s));
 
-  if (llrealerror (srcFile, srcLine, s, loc))
+  if (llrealerror (o, srcFile, srcLine, s, flagcodeHint (o), loc))
     {
       DPRINTF (("Here we are!"));
       llsuppresshint ('-', o);
@@ -1715,7 +1843,7 @@ bool xoptgenerror2 (char *srcFile, int srcLine,
 	}
       else
 	{
-	  if (llrealerror (srcFile, srcLine, s, loc))
+	  if (llrealerror (f1, srcFile, srcLine, s, flagcodeHint (f1), loc))
 	    {
 	      llsuppresshint2 ('-', f1, f2);
 	      flagcode_recordError (f2);
@@ -1750,7 +1878,7 @@ bool xoptgenerror2n (char *srcFile, int srcLine,
 	}
       else
 	{
-	  if (llrealerror (srcFile, srcLine, s, loc))
+	  if (llrealerror (f1, srcFile, srcLine, s, flagcodeHint (f2), loc))
 	    {
 	      llsuppresshint ('+', f2);
 	      flagcode_recordError (f2);
@@ -1767,7 +1895,7 @@ bool xoptgenerror2n (char *srcFile, int srcLine,
 bool xllnoptgenerror (char *srcFile, int srcLine,
 		      flagcode o, /*@only@*/ cstring s, fileloc loc)
 {
-  if (llrealerror (srcFile, srcLine, s, loc))
+  if (llrealerror (o, srcFile, srcLine, s, flagcodeHint (o), loc))
     {
       llsuppresshint ('+', o);
       flagcode_recordError (o);
@@ -1779,7 +1907,7 @@ bool xllnoptgenerror (char *srcFile, int srcLine,
   return FALSE;
 }
 
-void llparseerror (cstring s)
+void xllparseerror (char *srcFile, int srcLine, cstring s)
 {
   if (context_getFlag (FLG_TRYTORECOVER))
     {
@@ -1789,14 +1917,16 @@ void llparseerror (cstring s)
 	{
 	  if (cstring_isDefined (s))
 	    {
-	      llfatalerror (message ("%q: Parse Error: %q.  "
-				     "Too many errors, giving up.",
-				     fileloc_unparse (g_currentloc), s));
+	      xllfatalerror (srcFile, srcLine,
+			     message ("%q: Parse Error: %q.  "
+				      "Too many errors, giving up.",
+				      fileloc_unparse (g_currentloc), s));
 	    }
 	  else
 	    {
-	      llfatalerror (message ("%q: Parse Error.  Too many errors, giving up.",
-				     fileloc_unparse (g_currentloc)));
+	      xllfatalerror (srcFile, srcLine,
+			     message ("%q: Parse Error.  Too many errors, giving up.",
+				      fileloc_unparse (g_currentloc)));
 	    }
 	}
       else
@@ -1805,10 +1935,12 @@ void llparseerror (cstring s)
 	    {
 	      llreportparseerror (message ("Parse Error: %q. Attempting to continue.",
 					   s));
+	      showSourceLoc (srcFile, srcLine);
 	    }
 	  else
 	    {
 	      llreportparseerror (message ("Parse Error. Attempting to continue."));
+	      showSourceLoc (srcFile, srcLine);
 	    }
 	}
     }
@@ -1825,27 +1957,32 @@ void llparseerror (cstring s)
 	  msg = message ("Parse Error.");
 	}
 
-      llfatalerror
-	(message ("%q: %s (For help on parse errors, "
+      xllfatalerror
+	(srcFile, srcLine,
+	 message ("%q: %s (For help on parse errors, "
 		  "see splint -help parseerrors.)",
 		  fileloc_unparse (g_currentloc), msg));
     }
 }
 
 bool xfsgenerror (char *srcFile, int srcLine,
-		   flagSpec fs, /*@only@*/ cstring s, fileloc fl) 
+		  flagSpec fs, /*@only@*/ cstring s, fileloc fl) 
 {
   if (flagSpec_isOn (fs, fl))
     {
-      if (llgenerroraux (srcFile, srcLine, s, fl, TRUE, FALSE))
+      flagcode firston = flagSpec_getFirstOn (fs, fl);
+
+      if (llgenerroraux (firston, srcFile, srcLine, s, 
+			 flagcodeHint (firston),
+			 fl, TRUE, FALSE))
 	{
-	  llsuppresshint ('-', flagSpec_getFirstOn (fs, fl));
-	  flagcode_recordError (flagSpec_getFirstOn (fs, fl));
+	  llsuppresshint ('-', firston);
+	  flagcode_recordError (firston);
 	  return TRUE;
 	}
       else
 	{
-	  flagcode_recordSuppressed (flagSpec_getFirstOn (fs, fl));
+	  flagcode_recordSuppressed (firston);
 	  return FALSE;
 	}
     }
@@ -1902,10 +2039,10 @@ void llquietbugaux (cstring s, /*@unused@*/ cstring file, /*@unused@*/ int line)
 # if 0
 # ifdef HOMEVERSION
   llflush ();
-  printError (stderr, message ("%q: *** Internal Bug at %q: %q [errno: %d]",
-			       fileloc_unparse (g_currentloc),
-			       fileloc_unparseRaw (file, line),
-			       s, errno));
+  printError (g_errorstream, message ("%q: *** Internal Bug at %q: %q [errno: %d]",
+				      fileloc_unparse (g_currentloc),
+				      fileloc_unparseRaw (file, line),
+				      s, errno));
   printCodePoint ();
   llflush ();
 # endif
@@ -1916,6 +2053,88 @@ void llquietbugaux (cstring s, /*@unused@*/ cstring file, /*@unused@*/ int line)
 
 void llflush (void)
 {
-  (void) fflush (g_msgstream);
-  (void) fflush (stderr);
+  (void) fflush (g_warningstream);
+  (void) fflush (g_messagestream);
 }
+
+void displayScan (cstring msg)
+{
+  if (s_scanOpen)
+    {
+      displayScanClose ();
+    }
+
+  llassert (!s_scanOpen);
+
+  if (context_getFlag (FLG_SHOWSCAN))
+    {
+      showHerald ();
+      fprintf (g_messagestream, "< %s >\n", cstring_toCharsSafe (msg));
+      (void) fflush (g_messagestream);
+    }
+
+  cstring_free (msg);
+}
+
+void displayScanOpen (cstring msg)
+{
+  if (s_scanOpen)
+    {
+      displayScanClose ();
+    }
+
+  llassert (!s_scanOpen);
+  s_scanOpen = TRUE;
+
+  if (context_getFlag (FLG_SHOWSCAN))
+    {
+      fprintf (g_messagestream, "< %s", cstring_toCharsSafe (msg));
+      (void) fflush (g_messagestream);
+    }
+
+  cstring_free (msg);
+}
+
+void displayScanContinue (/*@temp@*/ cstring msg)
+{
+  if (context_getFlag (FLG_SHOWSCAN))
+    {
+      if (s_scanOpen) 
+	{
+	  fprintf (g_messagestream, "%s", cstring_toCharsSafe (msg));
+	  (void) fflush (g_messagestream);
+	}
+      else
+	{
+	  /*
+	  ** Don't call bug recursively
+	  */
+
+	  fprintf (stderr, "*** Bug: scan continue scan not open\n");
+	}
+    }
+}
+
+void displayScanClose (void)
+{
+  if (s_scanOpen)
+    {
+      if (context_getFlag (FLG_SHOWSCAN))
+	{
+	  fprintf (g_messagestream, " >\n");
+	  (void) fflush (g_messagestream);
+	}
+    }
+  else
+    {
+      /*
+      ** Don't call bug recursively
+      */
+      
+      fprintf (stderr, "*** Bug: scan close scan not open\n");
+    }
+  
+  s_scanOpen = FALSE;
+}
+
+