-static void FormatVMsg (StrBuf* S, const FilePos* Pos, const char* Desc,
- const char* Format, va_list ap)
-/* Format an error/warning message into S. A trailing newline and a NUL
- * terminator will be added to S.
- */
+static void VPrintMsg (const FilePos* Pos, const char* Desc,
+ const char* Format, va_list ap)
+/* Format and output an error/warning message. */
{
+ StrBuf S = STATIC_STRBUF_INITIALIZER;
+
/* Format the actual message */
StrBuf Msg = STATIC_STRBUF_INITIALIZER;
SB_VPrintf (&Msg, Format, ap);
SB_Terminate (&Msg);
/* Format the message header */
- SB_Printf (S, "%s(%lu): %s: ",
+ SB_Printf (&S, "%s(%lu): %s: ",
SB_GetConstBuf (GetFileName (Pos->Name)),
Pos->Line,
Desc);
/* Append the message to the message header */
- SB_Append (S, &Msg);
+ SB_Append (&S, &Msg);
/* Delete the formatted message */
SB_Done (&Msg);
- /* Add a new line and terminate the generated message */
- SB_AppendChar (S, '\n');
- SB_Terminate (S);
+ /* Add a new line and terminate the generated full message */
+ SB_AppendChar (&S, '\n');
+ SB_Terminate (&S);
+
+ /* Output the full message */
+ fputs (SB_GetConstBuf (&S), stderr);
+
+ /* Delete the buffer for the full message */
+ SB_Done (&S);
}
-static void FormatMsg (StrBuf* S, const FilePos* Pos, const char* Desc,
- const char* Format, ...)
-/* Format an error/warning message into S. A trailing newline and a NUL
- * terminator will be added to S.
- */
+static void PrintMsg (const FilePos* Pos, const char* Desc,
+ const char* Format, ...)
+/* Format and output an error/warning message. */
{
va_list ap;
va_start (ap, Format);
- FormatVMsg (S, Pos, Desc, Format, ap);
+ VPrintMsg (Pos, Desc, Format, ap);
va_end (ap);
}
static void AddNotifications (const Collection* LineInfos)
/* Output additional notifications for an error or warning */
{
- StrBuf Msg = STATIC_STRBUF_INITIALIZER;
-
/* The basic line info is always in slot zero. It has been used to
* output the actual error or warning. The following slots may contain
* more information. Check them and additional notifications if they're
/* Check the type and output an appropriate note */
unsigned Type = GetLineInfoType (LI);
if (Type == LI_TYPE_EXT) {
- FormatMsg (&Msg, GetSourcePos (LI), "Note",
- "Assembler code generated from this line");
- fputs (SB_GetConstBuf (&Msg), stderr);
-
+ PrintMsg (GetSourcePos (LI), "Note",
+ "Assembler code generated from this line");
} else if (Type == LI_TYPE_MACRO) {
-
+ PrintMsg (GetSourcePos (LI), "Note",
+ "Macro expansion was here");
}
}
-
- SB_Done (&Msg);
}
/*****************************************************************************/
-/* Warnings */
+/* Warnings */
/*****************************************************************************/
-void WarningMsg (const FilePos* Pos, unsigned Level, const char* Format, va_list ap)
+static void WarningMsg (const Collection* LineInfos, const char* Format, va_list ap)
/* Print warning message. */
{
- if (Level <= WarnLevel) {
+ /* The first entry in the collection is that of the actual source pos */
+ const LineInfo* LI = CollConstAt (LineInfos, 0);
- StrBuf Msg = STATIC_STRBUF_INITIALIZER;
- FormatVMsg (&Msg, Pos, "Warning", Format, ap);
- fputs (SB_GetConstBuf (&Msg), stderr);
- SB_Done (&Msg);
+ /* Output a warning for this position */
+ VPrintMsg (GetSourcePos (LI), "Warning", Format, ap);
- ++WarningCount;
- }
+ /* Add additional notifications if necessary */
+ AddNotifications (LineInfos);
+
+ /* Count warnings */
+ ++WarningCount;
}
void Warning (unsigned Level, const char* Format, ...)
/* Print warning message. */
{
- va_list ap;
- va_start (ap, Format);
- WarningMsg (&CurTok.Pos, Level, Format, ap);
- va_end (ap);
+ if (Level <= WarnLevel) {
+
+ va_list ap;
+ Collection LineInfos = STATIC_COLLECTION_INITIALIZER;
+
+ /* Get line infos for the current position */
+ GetFullLineInfo (&LineInfos, 0);
+
+ /* Output the message */
+ va_start (ap, Format);
+ WarningMsg (&LineInfos, Format, ap);
+ va_end (ap);
+
+ /* Free the line info list */
+ DoneCollection (&LineInfos);
+ }
}
void PWarning (const FilePos* Pos, unsigned Level, const char* Format, ...)
/* Print warning message giving an explicit file and position. */
{
- va_list ap;
- va_start (ap, Format);
- WarningMsg (Pos, Level, Format, ap);
- va_end (ap);
+ if (Level <= WarnLevel) {
+ va_list ap;
+ va_start (ap, Format);
+ VPrintMsg (Pos, "Warning", Format, ap);
+ va_end (ap);
+
+ /* Count warnings */
+ ++WarningCount;
+ }
}
/* Print warning message using the given line infos */
{
if (Level <= WarnLevel) {
-
+ /* Output the message */
va_list ap;
-
- /* 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);
- WarningMsg (GetSourcePos (LI), Level, Format, ap);
+ WarningMsg (LineInfos, Format, ap);
va_end (ap);
-
- /* Add additional notifications if necessary */
- AddNotifications (LineInfos);
}
}
-void ErrorMsg (const FilePos* Pos, const char* Format, va_list ap)
+void ErrorMsg (const Collection* LineInfos, const char* Format, va_list ap)
/* Print an error message */
{
- StrBuf Msg = STATIC_STRBUF_INITIALIZER;
- FormatVMsg (&Msg, Pos, "Error", Format, ap);
- fputs (SB_GetConstBuf (&Msg), stderr);
- SB_Done (&Msg);
+ /* 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 */
+ VPrintMsg (GetSourcePos (LI), "Error", Format, ap);
+ /* Add additional notifications if necessary */
+ AddNotifications (LineInfos);
+
+ /* Count errors */
++ErrorCount;
}
/* Print an error message */
{
va_list ap;
- va_start (ap, Format);
- ErrorMsg (&CurTok.Pos, Format, ap);
- va_end (ap);
-}
-
+ Collection LineInfos = STATIC_COLLECTION_INITIALIZER;
+ /* Get line infos for the current position */
+ GetFullLineInfo (&LineInfos, 0);
-void PError (const FilePos* Pos, const char* Format, ...)
-/* Print an error message giving an explicit file and position. */
-{
- va_list ap;
+ /* Output the message */
va_start (ap, Format);
- ErrorMsg (Pos, Format, ap);
+ ErrorMsg (&LineInfos, Format, ap);
va_end (ap);
+
+ /* Free the line info list */
+ DoneCollection (&LineInfos);
}
void LIError (const Collection* LineInfos, const char* Format, ...)
/* Print an error message using the given line infos. */
{
- va_list ap;
-
- /* 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_list ap;
va_start (ap, Format);
- ErrorMsg (GetSourcePos (LI), Format, ap);
+ ErrorMsg (LineInfos, Format, ap);
va_end (ap);
-
- /* Add additional notifications if necessary */
- AddNotifications (LineInfos);
}
/* Print an error message and skip the rest of the line */
{
va_list ap;
+ Collection LineInfos = STATIC_COLLECTION_INITIALIZER;
+
+ /* Get line infos for the current position */
+ GetFullLineInfo (&LineInfos, 0);
+
+ /* Output the message */
va_start (ap, Format);
- ErrorMsg (&CurTok.Pos, Format, ap);
+ ErrorMsg (&LineInfos, Format, ap);
va_end (ap);
+ /* Free the line info list */
+ DoneCollection (&LineInfos);
+
+ /* Skip tokens until we reach the end of the line */
SkipUntilSep ();
}
LI->Index = INV_LINEINFO_INDEX;
LI->Pos = *Pos;
+ /* Add the line info to the list of all line infos */
+ CollAppend (&LineInfoColl, LI);
+
/* Return the new struct */
return LI;
}
-static void FreeLineInfo (LineInfo* LI)
-/* "Free" line info. If the usage counter is non zero, move it to the
- * collection that contains all line infos, otherwise delete it.
- * The function handles a NULL pointer transparently.
- */
-{
- if (LI) {
- if (LI->Usage > 0) {
- CollAppend (&LineInfoColl, LI);
- } else {
- xfree (LI);
- }
- }
-}
-
-
-
/*****************************************************************************/
/* Code */
/*****************************************************************************/
{
static const FilePos DefaultPos = STATIC_FILEPOS_INITIALIZER;
+ /* Increase the initial count of the line info collection */
+ CollGrow (&LineInfoColl, 200);
+
/* Allocate 8 slots */
AllocatedSlots = 8;
CurLineInfo = xmalloc (AllocatedSlots * sizeof (LineInfoSlot));
PRECONDITION (Slot == UsedSlots - 1);
/* Free the last entry */
- FreeLineInfo (CurLineInfo[Slot].Info);
+ CurLineInfo[Slot].Info = 0;
--UsedSlots;
}
/* Get a pointer to the slot */
LineInfoSlot* S = CurLineInfo + Slot;
- /* Check if we already have data */
- if (S->Info) {
- /* Generate new data only if it is different from the existing. */
- if (CompareFilePos (&S->Info->Pos, Pos) == 0) {
- /* Already there */
- return;
- }
-
- /* We have data, but it's not identical. If it is in use, copy it to
- * line info collection, otherwise delete it.
- */
- FreeLineInfo (S->Info);
-
+ /* Generate new data only if it is different from the existing. */
+ if (S->Info && CompareFilePos (&S->Info->Pos, Pos) == 0) {
+ /* Already there */
+ return;
}
/* Allocate new data */
void ClearLineInfo (unsigned Slot)
/* Clear the line info in the given slot */
{
- /* Get a pointer to the slot */
- LineInfoSlot* S = CurLineInfo + Slot;
-
- /* Free the struct and zero the pointer */
- FreeLineInfo (S->Info);
- S->Info = 0;
+ /* Zero the pointer */
+ CurLineInfo[Slot].Info = 0;
}
-void GetFullLineInfo (Collection* LineInfos)
+void GetFullLineInfo (Collection* LineInfos, unsigned IncUsage)
/* Return full line infos, that is line infos for all slots in LineInfos. The
- * function does also increase the usage counter for all line infos returned.
+ * function will clear LineInfos before usage and will increment the usage
+ * counter by IncUsage for all line infos returned.
*/
{
- unsigned I;
+ unsigned I;
+
+ /* Clear the collection */
+ CollDeleteAll (LineInfos);
/* Copy all valid line infos to the collection */
for (I = 0; I < UsedSlots; ++I) {
- /* Get the slot */
- LineInfoSlot* S = CurLineInfo + I;
+ /* Get the line info from the slot */
+ LineInfo* LI = CurLineInfo[I].Info;
/* Ignore empty slots */
- if (S->Info) {
- ++S->Info->Usage;
- CollAppend (LineInfos, S->Info);
+ if (LI) {
+ LI->Usage += IncUsage;
+ CollAppend (LineInfos, LI);
}
}
}
{
unsigned I;
- /* Be sure to move pending line infos to the global list */
- for (I = 0; I < UsedSlots; ++I) {
- FreeLineInfo (CurLineInfo[I].Info);
- }
-
- /* Sort the collection */
+ /* Sort the line info list */
CollSort (&LineInfoColl, CmpLineInfo, 0);
/* Walk over the list, index the line infos and count the used ones */
projects / cc65 / commitdiff