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/pseudo.c

@@ -49,9 +49,9 @@
 #include "listing.h"
 #include "macpack.h"
 #include "macro.h"
+#include "nexttok.h"
 #include "objcode.h"
 #include "options.h"
-#include "scanner.h"
 #include "strexpr.h"
 #include "symtab.h"
 #include "pseudo.h"
@@ -789,6 +789,16 @@ static void DoMacro (void)
 
 
 
+static void DoMid (void)
+/* Handle .MID - this should never happen, since the keyword is actually
+ * handled on a much lower level of the expression hierarchy.
+ */
+{
+    Internal ("Unexpected token: .MID");
+}
+
+
+
 static void DoNull (void)
 /* Switch to the NULL segment */
 {
@@ -1119,6 +1129,7 @@ static CtrlDesc CtrlCmdTab [] = {
     { ccNone,		DoMacPack	},
     { ccNone,		DoMacro		},
     { ccNone,  	       	DoUnexpected	},	/* .MATCH */
+    { ccNone,  	       	DoMid		},
     { ccNone,		DoNull		},
     { ccNone,		DoOrg		},
     { ccNone,		DoOut		},