Merge remote-tracking branch 'upstream/master' into a5200

[cc65] / src / ca65 / error.c

diff --git a/src/ca65/error.c b/src/ca65/error.c
index b042581504a6f9c45f75e5b3da81eba1327c8c27..6731aa0e574e4abc01277c5ec65146d7ff5a3a3e 100644 (file)
--- a/src/ca65/error.c
+++ b/src/ca65/error.c
@@ -1,12 +1,12 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                 error.c                                  */
+/*                                  error.c                                  */
 /*                                                                           */
-/*               Error handling for the ca65 macroassembler                 */
+/*                Error handling for the ca65 macroassembler                 */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2011, Ullrich von Bassewitz                                      */
+/* (C) 1998-2012, Ullrich von Bassewitz                                      */
 /*                Roemerstrasse 52                                           */
 /*                D-70794 Filderstadt                                        */
 /* EMail:         uz@cc65.org                                                */
@@ -49,20 +49,20 @@
 
 
 /*****************************************************************************/
-/*                                  Data                                    */
+/*                                   Data                                    */
 /*****************************************************************************/
 
 
 
 /* Warning level */
-unsigned WarnLevel     = 1;
+unsigned WarnLevel      = 1;
 
 /* Statistics */
-unsigned ErrorCount    = 0;
-unsigned WarningCount  = 0;
+unsigned ErrorCount     = 0;
+unsigned WarningCount   = 0;
 
 /* Maximum number of additional notifications */
-#define MAX_NOTES       6
+#define MAX_NOTES       8
 
 
 
@@ -139,6 +139,10 @@ static void AddNotifications (const Collection* LineInfos)
         const char* Msg;
         switch (GetLineInfoType (LI)) {
 
+            case LI_TYPE_ASM:
+                Msg = "Expanded from here";
+                break;
+
             case LI_TYPE_EXT:
                 Msg = "Assembler code generated from this line";
                 break;
@@ -147,6 +151,10 @@ static void AddNotifications (const Collection* LineInfos)
                 Msg = "Macro was defined here";
                 break;
 
+            case LI_TYPE_MACPARAM:
+                Msg = "Macro parameter came from here";
+                break;
+
             default:
                 /* No output */
                 Msg = 0;
@@ -176,7 +184,7 @@ static void AddNotifications (const Collection* LineInfos)
 
 
 /*****************************************************************************/
-/*                                        Warnings                                  */
+/*                                 Warnings                                  */
 /*****************************************************************************/
 
 
@@ -254,7 +262,7 @@ void LIWarning (const Collection* LineInfos, unsigned Level, const char* Format,
 
 
 /*****************************************************************************/
-/*                                 Errors                                   */
+/*                                  Errors                                   */
 /*****************************************************************************/
 
 
@@ -349,7 +357,7 @@ void ErrorSkip (const char* Format, ...)
 
 
 /*****************************************************************************/
-/*                                  Code                                    */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
@@ -392,6 +400,3 @@ void Internal (const char* Format, ...)
 
     exit (EXIT_FAILURE);
 }
-
-
-