1
0
mirror of https://github.com/cc65/cc65.git synced 2025-08-15 21:27:43 +00:00

Merge branch 'cc65:master' into lynx-upload

This commit is contained in:
Alex Thissen
2024-01-19 09:49:20 +01:00
committed by GitHub

View File

@@ -685,9 +685,6 @@ void NewFunc (SymEntry* Func, FuncDesc* D)
/* Leave the lexical level */ /* Leave the lexical level */
LeaveFunctionLevel (); LeaveFunctionLevel ();
/* Eat the closing brace */
ConsumeRCurly ();
/* Restore the old literal pool, remembering the one for the function */ /* Restore the old literal pool, remembering the one for the function */
Func->V.F.LitPool = PopLiteralPool (); Func->V.F.LitPool = PopLiteralPool ();
@@ -699,6 +696,12 @@ void NewFunc (SymEntry* Func, FuncDesc* D)
/* Switch back to the old segments */ /* Switch back to the old segments */
PopSegContext (); PopSegContext ();
/* Eat the closing brace after we've done everything with the function
** definition. This way we won't have troubles with pragmas right after
** the closing brace.
*/
ConsumeRCurly();
/* Reset the current function pointer */ /* Reset the current function pointer */
FreeFunction (CurrentFunc); FreeFunction (CurrentFunc);
CurrentFunc = 0; CurrentFunc = 0;