Fixed an error in macro expansion: If the first token after the macro name was

a .define style macro, the assembler run into an internal error, because the
expansion of the second macro was started before the first one

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

diff --git a/src/ca65/macro.c b/src/ca65/macro.c
index 68c200c5ed2cf1b514bac2ec705c6ade691cf917..4babea30f36fe099155d80d954a4c44c96ce8596 100644 (file)
--- a/src/ca65/macro.c
+++ b/src/ca65/macro.c
@@ -677,12 +677,12 @@ static void StartExpClassic (Macro* M)
     token_t     Term;
 
 
-    /* Skip the macro name */
-    NextTok ();
-
     /* Create a structure holding expansion data */
     E = NewMacExp (M);
 
+    /* Skip the macro name */
+    NextTok ();
+
     /* Read the actual parameters */
     while (!TokIsSep (CurTok.Tok)) {
 

diff --git a/src/ca65/make/gcc.mak b/src/ca65/make/gcc.mak
index b82923bafe3a7116ef8ddf3c25536696dd91c1e5..788ba8cd896fd1f379f914886e2b32468a9bf5a1 100644 (file)
--- a/src/ca65/make/gcc.mak
+++ b/src/ca65/make/gcc.mak
@@ -15,7 +15,7 @@ CA65_INC = \"/usr/lib/cc65/asminc/\"
 
 #
 CC     = gcc
-CFLAGS         = -g -O2 -Wall -W -std=c89
+CFLAGS         = -g -Wall -W -std=c89
 override CFLAGS += -I$(COMMON)
 override CFLAGS += -DCA65_INC=$(CA65_INC)
 EBIND  = emxbind