Fix macro output in the listing

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

diff --git a/src/ca65/istack.c b/src/ca65/istack.c
index 5ba35a9069fa1fb137bca8bc729934731df6143f..18b4031c260005ad57dd1e5716ce05dd39883afa 100644 (file)
--- a/src/ca65/istack.c
+++ b/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.

diff --git a/src/ca65/istack.h b/src/ca65/istack.h
index 0e8d893e9cc4b3e7d82411da39f139889f5d7463..5529c7911c741a8e5373808e0ef1cb1bf4f01e96 100644 (file)
--- a/src/ca65/istack.h
+++ b/src/ca65/istack.h
@@ -53,7 +53,10 @@ void PopInput (void);
 int InputFromStack (void);
 /* Try to get input from the input stack. Return true if we had such input,
  * 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

diff --git a/src/ca65/main.c b/src/ca65/main.c
index b754950c0af0521cb7a4e79fea551d9d3baf4d90..f28224cb9b78b66fc4990ce94a84946a38550975 100644 (file)
--- a/src/ca65/main.c
+++ b/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 */
-    InitListingLine ();
+    /* 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 */
@@ -342,41 +347,36 @@ static void OneLine (void)
                 * without a colon if there is no whitespace before the
                 * identifier.
                 */
-               if (Tok != TOK_COLON) {
-                   if (HadWS || !NoColonLabels) {
-                       Error (ERR_COLON_EXPECTED);
-                   }
-                   if (Tok == TOK_NAMESPACE) {
-                       /* Smart :: handling */
-                       NextTok ();
-                   }
-               } else {
-                   /* Skip the colon */
-                   NextTok ();
-               }
-           }
-       }
+               if (Tok != TOK_COLON) {
+                   if (HadWS || !NoColonLabels) {
+                       Error (ERR_COLON_EXPECTED);
+                   }
+                   if (Tok == TOK_NAMESPACE) {
+                       /* Smart :: handling */
+                       NextTok ();
+                   }
+               } else {
+                   /* Skip the colon */
+                   NextTok ();
+               }
+           }
+       }
     }
 
     if (!Done) {
 
-       if (TokIsPseudo (Tok)) {
-           /* A control command, IVal is index into table */
-           HandlePseudo ();
-       } else if (Tok == TOK_MNEMO) {
-           /* A mnemonic - assemble one instruction */
-           HandleInstruction (IVal);
-       } else if (Tok == TOK_IDENT && IsMacro (SVal)) {
-           /* A macro expansion */
-           MacExpandStart ();
-       }
+       if (TokIsPseudo (Tok)) {
+           /* A control command, IVal is index into table */
+           HandlePseudo ();
+       } else if (Tok == TOK_MNEMO) {
+           /* A mnemonic - assemble one instruction */
+           HandleInstruction (IVal);
+       } else if (Tok == TOK_IDENT && IsMacro (SVal)) {
+           /* A macro expansion */
+           MacExpandStart ();
+       }
     }
 
-    /* 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 ();
 }