From 71a9ed04a227bbb42effe4a4b9590b2689d0d4b7 Mon Sep 17 00:00:00 2001 From: Marco Aurelio da Costa Date: Sun, 7 Aug 2022 11:24:47 -0300 Subject: [PATCH] Revert: Parse file included inside a macro at definition time The reverted change broke too many use cases where users where expecting the compiler quirky behavior to be the correct behavior. A better solution is needed for the quirk which does not break current usage. --- src/ca65/macro.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/ca65/macro.c b/src/ca65/macro.c index d9f1f385c..4812b12c4 100644 --- a/src/ca65/macro.c +++ b/src/ca65/macro.c @@ -489,23 +489,6 @@ void MacDef (unsigned Style) ** the .LOCAL command is detected and removed, at this time. */ while (1) { - /* Check for include */ - if (CurTok.Tok == TOK_INCLUDE && Style == MAC_STYLE_CLASSIC) { - /* Include another file */ - NextTok (); - /* Name must follow */ - if (CurTok.Tok != TOK_STRCON) { - ErrorSkip ("String constant expected"); - } else { - SB_Terminate (&CurTok.SVal); - if (NewInputFile (SB_GetConstBuf (&CurTok.SVal)) == 0) { - /* Error opening the file, skip remainder of line */ - SkipUntilSep (); - } - } - NextTok (); - } - /* Check for end of macro */ if (Style == MAC_STYLE_CLASSIC) { /* In classic macros, only .endmacro is allowed */