From ad6e86db12e39fed8782f83057388ea619a44236 Mon Sep 17 00:00:00 2001 From: marcobaye Date: Mon, 29 Jul 2024 17:32:32 +0000 Subject: [PATCH] fixed bug where "--dialect future" with file refs in macros could cause crashes git-svn-id: https://svn.code.sf.net/p/acme-crossass/code-0/trunk@379 4df02467-bbd4-4a76-a152-e7ce94205b78 --- src/input.c | 1 + src/macro.c | 1 + src/version.h | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/input.c b/src/input.c index d45b6f6..8fe5ba6 100644 --- a/src/input.c +++ b/src/input.c @@ -844,6 +844,7 @@ void inputchange_new_file(struct inputchange_buf *icb, FILE *fd, const char *ete { // TODO: in future, really buffer old data here! (instead of storing new data and changing pointer) // setup new input + icb->new_input = *input_now; // copy current input structure into new icb->new_input.plat_pathref_filename = eternal_plat_filename; icb->new_input.location.plat_filename = eternal_plat_filename; icb->new_input.location.line_number = 1; diff --git a/src/macro.c b/src/macro.c index c5df90c..516e575 100644 --- a/src/macro.c +++ b/src/macro.c @@ -243,6 +243,7 @@ void macro_parse_call(void) // Now GotByte = first char of macro name local_gotbyte = GotByte; // CAUTION - ugly kluge // set up new input + new_input = *input_now; // copy current input structure into new new_input.location = actual_macro->definition; new_input.source = INPUTSRC_RAM; new_input.state = INPUTSTATE_NORMAL; // FIXME - fix others! diff --git a/src/version.h b/src/version.h index a3aa8c1..f5b6ac9 100644 --- a/src/version.h +++ b/src/version.h @@ -9,7 +9,7 @@ #define RELEASE "0.97" // update before release FIXME #define CODENAME "Zem" // update before release -#define CHANGE_DATE "16 Jul" // update before release FIXME +#define CHANGE_DATE "17 Jul" // update before release FIXME #define CHANGE_YEAR "2024" // update before release //#define HOME_PAGE "http://home.pages.de/~mac_bacon/smorbrod/acme/" #define HOME_PAGE "http://sourceforge.net/p/acme-crossass/" // FIXME