Fixed a problem with the ubiquitous_idents change

git-svn-id: svn://svn.cc65.org/cc65/trunk@2983 b7a2c559-68d2-44c3-8de9-860c34a00d81

src/ca65/main.c

@@ -378,7 +378,6 @@ static void OneLine (void)
     Segment*      Seg   = 0;
     unsigned long PC    = 0;
     SymEntry*     Sym   = 0;
-    int           Done  = 0;
     int           Macro = 0;
     int           Instr = -1;
 
@@ -436,7 +435,8 @@ static void OneLine (void)
             /* Define the symbol with the expression following the '=' */
             SymDef (Sym, Expression(), ADDR_SIZE_DEFAULT, Flags);
             /* Don't allow anything after a symbol definition */
-            Done = 1;
+            ConsumeSep ();
+            return;
         } else {
             /* A label. Remember the current segment, so we can later
              * determine the size of the data stored under the label.
@@ -463,11 +463,26 @@ static void OneLine (void)
                 /* Skip the colon */
                 NextTok ();
             }
+
+            /* If we come here, a new identifier may be waiting, which may
+             * be a macro or instruction.
+             */
+            if (Tok == TOK_IDENT) {
+                if (!UbiquitousIdents) {
+                    /* Macros and symbols cannot use instruction names */
+                    Instr = FindInstruction (SVal);
+                    if (Instr < 0) {
+                        Macro = IsMacro (SVal);
+                    }
+                } else {
+                    /* Macros and symbols may use the names of instructions */
+                    Macro = IsMacro (SVal);
+                }
+            }
         }
     }
 
-    if (!Done) {
-
+    /* We've handled a possible label, now handle the remainder of the line */
     if (Tok >= TOK_FIRSTPSEUDO && Tok <= TOK_LASTPSEUDO) {
         /* A control command */
         HandlePseudo ();
@@ -506,7 +521,6 @@ static void OneLine (void)
         }
         DefSizeOfSymbol (Sym, Size);
     }
-    }
 
     /* Line separator must come here */
     ConsumeSep ();