Added a more generic way to push sources that deliver a token stream

independent of the actual input from the file. Change macro handling
to use the new input stack.
Fixed an error in FreeIf: If an unexpected .ENDIF was reached, the
assembler started an endless loop printing error messages.


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

src/ca65/make/gcc.mak

@@ -15,11 +15,13 @@ OBJS =  condasm.o	\
         global.o       	\
 	incpath.o	\
         instr.o	      	\
+	istack.o	\
 	listing.o	\
 	macpack.o     	\
        	macro.o	      	\
-        main.o	      	\
-        mem.o	      	\
+        main.o 	      	\
+        mem.o  	      	\
+	nexttok.o	\
         objcode.o     	\
         objfile.o	\
        	options.o	\
@@ -27,7 +29,7 @@ OBJS =  condasm.o	\
         scanner.o	\
 	strexpr.o	\
         symtab.o	\
-       	toknode.o	\
+       	toklist.o      	\
 	ulabel.o
 
 LIBS = ../common/common.a
@@ -62,3 +64,4 @@ depend dep:	$(OBJS:.o=.c)
 	@echo "Creating dependency information"
 	$(CC) -MM $^ > .depend
 
+

src/ca65/make/watcom.mak

@@ -72,11 +72,13 @@ OBJS = 	condasm.obj	\
 	global.obj	\
 	incpath.obj	\
        	instr.obj	\
+	istack.obj	\
 	listing.obj	\
 	macpack.obj	\
 	macro.obj	\
 	main.obj	\
 	mem.obj		\
+	nexttok.obj	\
 	objcode.obj	\
 	objfile.obj	\
 	options.obj	\
@@ -84,7 +86,7 @@ OBJS = 	condasm.obj	\
 	scanner.obj	\
 	strexpr.obj	\
 	symtab.obj	\
-	toknode.obj	\
+	toklist.obj	\
 	ulabel.obj
 
 LIBS = ..\common\common.lib
@@ -116,11 +118,13 @@ FILE fragment.obj
 FILE global.obj
 FILE incpath.obj
 FILE instr.obj
+FILE istack.obj
 FILE listing.obj
 FILE macpack.obj
 FILE macro.obj
 FILE main.obj
 FILE mem.obj
+FILE nexttok.obj
 FILE objcode.obj
 FILE objfile.obj
 FILE options.obj
@@ -128,7 +132,7 @@ FILE pseudo.obj
 FILE scanner.obj
 FILE strexpr.obj
 FILE symtab.obj
-FILE toknode.obj
+FILE toklist.obj
 FILE ulabel.obj
 LIBRARY ..\common\common.lib
 |