6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-02-27 14:29:52 +00:00
Code Issues Projects Releases Wiki Activity

No need to search for the correct line info entry, the source position is

Browse Source 
always in slot zero.


git-svn-id: svn://svn.cc65.org/cc65/trunk@4917 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz 2011-01-25 16:26:50 +00:00
parent 8ef8f42f01
commit f3487b7c0f
1 changed files with 4 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/ca65/error.c
View File

@ -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 */ /* 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, ...) void LIWarning (const Collection* LineInfos, unsigned Level, const char* Format, ...)
/* Print warning message using the given line infos */ /* Print warning message using the given line infos */
{ {
const LineInfo* LI;
va_list ap; va_list ap;
/* Search backwards in LI for the first entry of type LI_TYPE_ASM. */ /* The first entry in the collection is that of the actual source pos */
int I = FindAsmEntry (LineInfos); const LineInfo* LI = CollConstAt (LineInfos, 0);
/* We must have such an entry */
CHECK (I >= 0);
/* Get the position for this entry */
LI = CollConstAt (LineInfos, I);
/* Output a warning for this position */ /* Output a warning for this position */
va_start (ap, Format); va_start (ap, Format);
@ -210,17 +177,10 @@ void PError (const FilePos* Pos, const char* Format, ...)
void LIError (const Collection* LineInfos, const char* Format, ...) void LIError (const Collection* LineInfos, const char* Format, ...)
/* Print an error message using the given line infos. */ /* Print an error message using the given line infos. */
{ {
const LineInfo* LI;
va_list ap; va_list ap;
/* Search backwards in LI for the first entry of type LI_TYPE_ASM. */ /* The first entry in the collection is that of the actual source pos */
int I = FindAsmEntry (LineInfos); const LineInfo* LI = CollConstAt (LineInfos, 0);
/* We must have such an entry */
CHECK (I >= 0);
/* Get the position for this entry */
LI = CollConstAt (LineInfos, I);
/* Output an error for this position */ /* Output an error for this position */
va_start (ap, Format); va_start (ap, Format);