From f3487b7c0fca54fe46ca2cf2193c19380b15bb7b Mon Sep 17 00:00:00 2001
From: uz <uz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Tue, 25 Jan 2011 16:26:50 +0000
Subject: [PATCH] No need to search for the correct line info entry, the source
 position is always in slot zero.

git-svn-id: svn://svn.cc65.org/cc65/trunk@4917 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 src/ca65/error.c | 48 ++++--------------------------------------------
 1 file changed, 4 insertions(+), 44 deletions(-)

diff --git a/src/ca65/error.c b/src/ca65/error.c
index 67bf29092..48a889b52 100644
--- a/src/ca65/error.c
+++ b/src/ca65/error.c
@@ -63,32 +63,6 @@ unsigned WarningCount	= 0;
 
 
 
-/*****************************************************************************/
-/*                             Helper functions                              */
-/*****************************************************************************/
-
-
-
-static int FindAsmEntry (const Collection* LineInfos)
-/* Return the last entry of type LI_TYPE_ASM in the given line infos. If none
- * was found, return -1.
- */
-{
-    unsigned I = CollCount (LineInfos);
-    while (I > 0) {
-        const LineInfo* LI = CollConstAt (LineInfos, --I);
-        if ((LI->Type & LI_MASK_TYPE) == LI_TYPE_ASM) {
-            /* Found */
-            return (int) I;
-        }
-    }
-
-    /* Not found */
-    return -1;
-}
-
-
-
 /*****************************************************************************/
 /*				   Warnings 				     */
 /*****************************************************************************/
@@ -141,17 +115,10 @@ void PWarning (const FilePos* Pos, unsigned Level, const char* Format, ...)
 void LIWarning (const Collection* LineInfos, unsigned Level, const char* Format, ...)
 /* Print warning message using the given line infos */
 {
-    const LineInfo* LI;
     va_list ap;
 
-    /* Search backwards in LI for the first entry of type LI_TYPE_ASM. */
-    int I = FindAsmEntry (LineInfos);
-
-    /* We must have such an entry */
-    CHECK (I >= 0);
-
-    /* Get the position for this entry */
-    LI = CollConstAt (LineInfos, I);
+    /* The first entry in the collection is that of the actual source pos */
+    const LineInfo* LI = CollConstAt (LineInfos, 0);
 
     /* Output a warning for this position */
     va_start (ap, Format);
@@ -210,17 +177,10 @@ void PError (const FilePos* Pos, const char* Format, ...)
 void LIError (const Collection* LineInfos, const char* Format, ...)
 /* Print an error message using the given line infos. */
 {
-    const LineInfo* LI;
     va_list ap;
 
-    /* Search backwards in LI for the first entry of type LI_TYPE_ASM. */
-    int I = FindAsmEntry (LineInfos);
-
-    /* We must have such an entry */
-    CHECK (I >= 0);
-
-    /* Get the position for this entry */
-    LI = CollConstAt (LineInfos, I);
+    /* The first entry in the collection is that of the actual source pos */
+    const LineInfo* LI = CollConstAt (LineInfos, 0);
 
     /* Output an error for this position */
     va_start (ap, Format);
-- 
2.39.5