bslathi19/cc65
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed a problem with recursive macro expansions. They didn't work if the same

Browse Source 
macro was involved more than one time.


git-svn-id: svn://svn.cc65.org/cc65/trunk@3911 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz
2009-01-24 16:31:18 +00:00
parent dd5e5c43d8
commit 1a54f34a84
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cc65/preproc.c
View File

@@ -446,7 +446,7 @@ static void ReadMacroArgs (MacroExp* E)
} }
/* Check for end of macro param list */ /* Check for end of macro param list */
if (CurC == ')') { if (CurC == ')') {
NextChar (); NextChar ();
break; break;
} }
@@ -504,6 +504,7 @@ static void MacroArgSubst (MacroExp* E)
/* Remember the current input and switch to the macro replacement. */ /* Remember the current input and switch to the macro replacement. */
int OldIndex = SB_GetIndex (&E->M->Replacement);
SB_Reset (&E->M->Replacement); SB_Reset (&E->M->Replacement);
OldSource = InitLine (&E->M->Replacement); OldSource = InitLine (&E->M->Replacement);
@@ -623,6 +624,7 @@ static void MacroArgSubst (MacroExp* E)
/* Switch back the input */ /* Switch back the input */
InitLine (OldSource); InitLine (OldSource);
SB_SetIndex (&E->M->Replacement, OldIndex);
} }
@@ -674,7 +676,10 @@ static void MacroCall (StrBuf* Target, Macro* M)
static void ExpandMacro (StrBuf* Target, Macro* M) static void ExpandMacro (StrBuf* Target, Macro* M)
/* Expand a macro into Target */ /* Expand a macro into Target */
{ {
/* ### printf ("Expanding %s(%u)\n", M->Name, ++V); */ #if 0
static unsigned V = 0;
printf ("Expanding %s(%u)\n", M->Name, ++V);
#endif
/* Check if this is a function like macro */ /* Check if this is a function like macro */
if (M->ArgCount >= 0) { if (M->ArgCount >= 0) {
@@ -713,7 +718,9 @@ static void ExpandMacro (StrBuf* Target, Macro* M)
DoneMacroExp (&E); DoneMacroExp (&E);
} }
/* ### printf ("Done with %s(%u)\n", M->Name, V--); */ #if 0
printf ("Done with %s(%u)\n", M->Name, V--);
#endif
} }
@@ -829,8 +836,9 @@ static void DefineMacro (void)
while (IsSpace (SB_LookAtLast (&M->Replacement))) { while (IsSpace (SB_LookAtLast (&M->Replacement))) {
SB_Drop (&M->Replacement, 1); SB_Drop (&M->Replacement, 1);
} }
#if 0
/* ### printf ("%s: <%.*s>\n", M->Name, SB_GetLen (&M->Replacement), SB_GetConstBuf (&M->Replacement)); */ printf ("%s: <%.*s>\n", M->Name, SB_GetLen (&M->Replacement), SB_GetConstBuf (&M->Replacement));
#endif
/* If we have an existing macro, check if the redefinition is identical. /* If we have an existing macro, check if the redefinition is identical.
* Print a diagnostic if not. * Print a diagnostic if not.