More lineinfo usage.

[cc65] / src / ca65 / condasm.c

diff --git a/src/ca65/condasm.c b/src/ca65/condasm.c
index 0aef3b364ed11e89fe27f94cfa97a49f42c0a657..28c9f4bd4016cd515b0f19304b6f3db7adda5ae1 100644 (file)
--- a/src/ca65/condasm.c
+++ b/src/ca65/condasm.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2003 Ullrich von Bassewitz                                       */
-/*               Römerstraße 52                                              */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2000-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -98,7 +98,7 @@ static IfDesc* AllocIf (const char* Directive, int NeedTerm)
 
     /* Initialize elements */
     ID->Flags = NeedTerm? ifNeedTerm : ifNone;
-    ID->Pos   = CurPos;
+    ID->Pos   = CurTok.Pos;
     ID->Name  = Directive;
 
     /* Return the result */
@@ -122,7 +122,7 @@ static IfDesc* GetCurrentIf (void)
 static void FreeIf (void)
 /* Free all .IF descriptors until we reach one with the NeedTerm bit set */
 {
-    int Done = 0;
+    int Done;
     do {
                IfDesc* D = GetCurrentIf();
                if (D == 0) {
@@ -192,7 +192,7 @@ static void SetElse (IfDesc* ID, int E)
 
 
 /*****************************************************************************/
-/*                                          Code                                    */
+/*                                          Code                                    */
 /*****************************************************************************/
 
 
@@ -205,12 +205,12 @@ void DoConditionals (void)
     int IfCond = GetCurrentIfCond ();
     do {
 
-       switch (Tok) {
+       switch (CurTok.Tok) {
 
            case TOK_ELSE:
                        D = GetCurrentIf ();
                if (D == 0) {
-                   Error ("Unexpected .ELSE");
+                           Error ("Unexpected .ELSE");
                        } else if (GetElse(D)) {
                    /* We already had a .ELSE ! */
                    Error ("Duplicate .ELSE");
@@ -218,11 +218,12 @@ void DoConditionals (void)
                    /* Allow an .ELSE */
                    InvertIfCond (D);
                    SetElse (D, 1);
-                   D->Pos = CurPos;
+                   D->Pos = CurTok.Pos;
                    D->Name = ".ELSE";
                    IfCond = GetCurrentIfCond ();
                }
                NextTok ();
+               ExpectSep ();
                        break;
 
                    case TOK_ELSEIF:
@@ -247,6 +248,7 @@ void DoConditionals (void)
                     */
                    if (IfCond == 0) {
                        SetIfCond (D, ConstExpression ());
+                       ExpectSep ();
                    }
 
                    /* Get the new overall condition */
@@ -262,6 +264,7 @@ void DoConditionals (void)
                 * has been cleanup up, since we may be at end of file.
                 */
                NextTok ();
+               ExpectSep ();
 
                /* Get the new overall condition */
                IfCond = GetCurrentIfCond ();
@@ -272,6 +275,7 @@ void DoConditionals (void)
                NextTok ();
                if (IfCond) {
                    SetIfCond (D, ConstExpression ());
+                   ExpectSep ();
                }
                IfCond = GetCurrentIfCond ();
                break;
@@ -280,7 +284,7 @@ void DoConditionals (void)
                D = AllocIf (".IFBLANK", 1);
                NextTok ();
                if (IfCond) {
-                    if (TokIsSep (Tok)) {
+                    if (TokIsSep (CurTok.Tok)) {
                         SetIfCond (D, 1);
                     } else {
                        SetIfCond (D, 0);
@@ -295,8 +299,9 @@ void DoConditionals (void)
                NextTok ();
                if (IfCond) {
                    ExprNode* Expr = Expression();
-                   SetIfCond (D, IsConstExpr (Expr));
+                   SetIfCond (D, IsConstExpr (Expr, 0));
                    FreeExpr (Expr);
+                   ExpectSep ();
                }
                IfCond = GetCurrentIfCond ();
                break;
@@ -305,7 +310,7 @@ void DoConditionals (void)
                D = AllocIf (".IFDEF", 1);
                NextTok ();
                if (IfCond) {
-                   SymEntry* Sym = ParseScopedSymName (SYM_FIND_EXISTING);
+                           SymEntry* Sym = ParseAnySymName (SYM_FIND_EXISTING);
                    SetIfCond (D, Sym != 0 && SymIsDef (Sym));
                }
                IfCond = GetCurrentIfCond ();
@@ -315,13 +320,13 @@ void DoConditionals (void)
                D = AllocIf (".IFNBLANK", 1);
                NextTok ();
                if (IfCond) {
-                    if (TokIsSep (Tok)) {
+                    if (TokIsSep (CurTok.Tok)) {
                         SetIfCond (D, 0);
                     } else {
                        SetIfCond (D, 1);
                         SkipUntilSep ();
                     }
-               }
+               }
                IfCond = GetCurrentIfCond ();
                break;
 
@@ -330,8 +335,9 @@ void DoConditionals (void)
                NextTok ();
                if (IfCond) {
                    ExprNode* Expr = Expression();
-                   SetIfCond (D, !IsConstExpr (Expr));
+                   SetIfCond (D, !IsConstExpr (Expr, 0));
                    FreeExpr (Expr);
+                   ExpectSep ();
                }
                IfCond = GetCurrentIfCond ();
                break;
@@ -340,8 +346,9 @@ void DoConditionals (void)
                D = AllocIf (".IFNDEF", 1);
                NextTok ();
                if (IfCond) {
-                   SymEntry* Sym = ParseScopedSymName (SYM_FIND_EXISTING);
+                   SymEntry* Sym = ParseAnySymName (SYM_FIND_EXISTING);
                    SetIfCond (D, Sym == 0 || !SymIsDef (Sym));
+                   ExpectSep ();
                }
                IfCond = GetCurrentIfCond ();
                break;
@@ -350,8 +357,9 @@ void DoConditionals (void)
                D = AllocIf (".IFNREF", 1);
                NextTok ();
                if (IfCond) {
-                   SymEntry* Sym = ParseScopedSymName (SYM_FIND_EXISTING);
+                   SymEntry* Sym = ParseAnySymName (SYM_FIND_EXISTING);
                    SetIfCond (D, Sym == 0 || !SymIsRef (Sym));
+                   ExpectSep ();
                }
                IfCond = GetCurrentIfCond ();
                break;
@@ -363,15 +371,17 @@ void DoConditionals (void)
                    SetIfCond (D, GetCPU() == CPU_6502);
                }
                IfCond = GetCurrentIfCond ();
+               ExpectSep ();
                break;
 
            case TOK_IFP816:
                D = AllocIf (".IFP816", 1);
-               NextTok ();
+               NextTok ();
                if (IfCond) {
                            SetIfCond (D, GetCPU() == CPU_65816);
                }
                IfCond = GetCurrentIfCond ();
+               ExpectSep ();
                break;
 
            case TOK_IFPC02:
@@ -381,6 +391,7 @@ void DoConditionals (void)
                            SetIfCond (D, GetCPU() == CPU_65C02);
                }
                IfCond = GetCurrentIfCond ();
+               ExpectSep ();
                break;
 
            case TOK_IFPSC02:
@@ -390,14 +401,16 @@ void DoConditionals (void)
                            SetIfCond (D, GetCPU() == CPU_65SC02);
                }
                IfCond = GetCurrentIfCond ();
+               ExpectSep ();
                break;
 
            case TOK_IFREF:
                D = AllocIf (".IFREF", 1);
                NextTok ();
                if (IfCond) {
-                   SymEntry* Sym = ParseScopedSymName (SYM_FIND_EXISTING);
+                   SymEntry* Sym = ParseAnySymName (SYM_FIND_EXISTING);
                    SetIfCond (D, Sym != 0 && SymIsRef (Sym));
+                   ExpectSep ();
                }
                IfCond = GetCurrentIfCond ();
                break;
@@ -408,7 +421,40 @@ void DoConditionals (void)
 
        }
 
-    } while (IfCond == 0 && Tok != TOK_EOF);
+    } while (IfCond == 0 && CurTok.Tok != TOK_EOF);
+}
+
+
+
+int CheckConditionals (void)
+/* Check if the current token is one that starts a conditional directive, and
+ * call DoConditionals if so. Return true if a conditional directive was found,
+ * return false otherwise.
+ */
+{
+    switch (CurTok.Tok) {
+        case TOK_ELSE:
+        case TOK_ELSEIF:
+        case TOK_ENDIF:
+        case TOK_IF:
+        case TOK_IFBLANK:
+        case TOK_IFCONST:
+        case TOK_IFDEF:
+        case TOK_IFNBLANK:
+        case TOK_IFNCONST:
+        case TOK_IFNDEF:
+        case TOK_IFNREF:
+        case TOK_IFP02:
+        case TOK_IFP816:
+        case TOK_IFPC02:
+        case TOK_IFPSC02:
+        case TOK_IFREF:
+            DoConditionals ();
+            return 1;
+
+        default:
+            return 0;
+    }
 }
 
 
@@ -428,7 +474,7 @@ void CheckOpenIfs (void)
            break;
        }
 
-       if (D->Pos.Name != CurPos.Name) {
+       if (D->Pos.Name != CurTok.Pos.Name) {
            /* The .if is from another file, bail out */
            break;
        }
@@ -459,3 +505,4 @@ void CleanupIfStack (unsigned SP)
 
 
 
+