/* common */
#include "check.h"
#include "coll.h"
-#include "filepos.h"
#include "xmalloc.h"
/* ca65 */
#include "error.h"
#include "expr.h"
+#include "lineinfo.h"
#include "scanner.h"
#include "ulabel.h"
/* Struct that describes an unnamed label */
typedef struct ULabel ULabel;
struct ULabel {
- FilePos Pos; /* Position of the label in the source */
- ExprNode* Val; /* The label value - may be NULL */
- unsigned Ref; /* Number of references */
+ Collection LineInfos; /* Position of the label in the source */
+ ExprNode* Val; /* The label value - may be NULL */
+ unsigned Ref; /* Number of references */
};
/* List management */
ULabel* L = xmalloc (sizeof (ULabel));
/* Initialize the fields */
- L->Pos = CurTok.Pos;
- L->Val = Val;
- L->Ref = 0;
+ L->LineInfos = EmptyCollection;
+ GetFullLineInfo (&L->LineInfos, 0);
+ L->Val = Val;
+ L->Ref = 0;
/* Insert the label into the collection */
CollAppend (&ULabList, L);
ULabel* L = CollAtUnchecked (&ULabList, ULabDefCount);
CHECK (L->Val == 0);
L->Val = GenCurrentPC ();
- L->Pos = CurTok.Pos;
+ GetFullLineInfo (&L->LineInfos, 0);
} else {
/* There is no such label, create it */
NewULabel (GenCurrentPC ());
unsigned I = ULabDefCount;
while (I < CollCount (&ULabList)) {
ULabel* L = CollAtUnchecked (&ULabList, I);
- PError (&L->Pos, "Undefined label");
+ LIError (&L->LineInfos, "Undefined label");
++I;
}
for (I = 0; I < CollCount (&ULabList); ++I) {
ULabel* L = CollAtUnchecked (&ULabList, I);
if (L->Ref == 0) {
- PWarning (&L->Pos, 1, "No reference to unnamed label");
+ LIWarning (&L->LineInfos, 1, "No reference to unnamed label");
}
}
}
+