Fix macro output in the listing

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

src/ca65/istack.c

@@ -136,6 +136,14 @@ int InputFromStack (void)
 
 
 
+int HavePushedInput (void)
+/* Return true if we have stacked input available, return false if not */
+{
+    return (IStack != 0);
+}
+
+
+
 void CheckInputStack (void)
 /* Called from the scanner before closing an input file. Will check for any
  * stuff on the input stack.

src/ca65/istack.h

@@ -55,6 +55,9 @@ int InputFromStack (void);
  * return false otherwise.
  */
 
+int HavePushedInput (void);
+/* Return true if we have stacked input available, return false if not */
+
 void CheckInputStack (void);
 /* Called from the scanner before closing an input file. Will check for any
  * stuff on the input stack.

src/ca65/main.c

@@ -47,6 +47,7 @@
 #include "global.h"
 #include "incpath.h"
 #include "instr.h"
+#include "istack.h"
 #include "listing.h"
 #include "macro.h"
 #include "nexttok.h"
@@ -299,8 +300,12 @@ static void OneLine (void)
     char Ident [MAX_STR_LEN+1];
     int Done = 0;
 
-    /* Initialize the listing line */
+    /* Initialize the new listing line if we are actually reading from file
+     * and not from internally pushed input.				    
+     */
+    if (!HavePushedInput ()) {
 	InitListingLine ();
+    }
 
     if (Tok == TOK_COLON) {
 	/* An unnamed label */
@@ -372,11 +377,6 @@ static void OneLine (void)
      	}
     }
 
-    /* Calling InitListingLine again here is part of a hack that introduces
-     * enough magic to make the PC output in the listing work.
-     */
-    InitListingLine ();
-
     /* Line separator must come here */
     ConsumeSep ();
 }