/* Initialize elements */
ID->Flags = NeedTerm? ifNeedTerm : ifNone;
- ID->Pos = CurPos;
+ ID->Pos = CurTok.Pos;
ID->Name = Directive;
/* Return the result */
/*****************************************************************************/
-/* Code */
+/* Code */
/*****************************************************************************/
int IfCond = GetCurrentIfCond ();
do {
- switch (Tok) {
+ switch (CurTok.Tok) {
case TOK_ELSE:
D = GetCurrentIf ();
/* Allow an .ELSE */
InvertIfCond (D);
SetElse (D, 1);
- D->Pos = CurPos;
+ D->Pos = CurTok.Pos;
D->Name = ".ELSE";
IfCond = GetCurrentIfCond ();
}
D = AllocIf (".IFBLANK", 1);
NextTok ();
if (IfCond) {
- if (TokIsSep (Tok)) {
+ if (TokIsSep (CurTok.Tok)) {
SetIfCond (D, 1);
} else {
SetIfCond (D, 0);
D = AllocIf (".IFNBLANK", 1);
NextTok ();
if (IfCond) {
- if (TokIsSep (Tok)) {
+ if (TokIsSep (CurTok.Tok)) {
SetIfCond (D, 0);
} else {
SetIfCond (D, 1);
}
- } while (IfCond == 0 && Tok != TOK_EOF);
+ } while (IfCond == 0 && CurTok.Tok != TOK_EOF);
}
* return false otherwise.
*/
{
- switch (Tok) {
+ switch (CurTok.Tok) {
case TOK_ELSE:
case TOK_ELSEIF:
case TOK_ENDIF:
break;
}
- if (D->Pos.Name != CurPos.Name) {
+ if (D->Pos.Name != CurTok.Pos.Name) {
/* The .if is from another file, bail out */
break;
}
+