ref: 93bd3615bb21d25526198596a09a3ac4815fd1bc
parent: be64464f816097083ea2dd347c90665e56883be8
author: Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>
date: Mon Feb 17 00:22:38 EST 2025
fix bootstrap Got broken by 8eed926101b183ab1c3933b2ab918ed81a5ce2d4
--- a/src/flisp.c
+++ b/src/flisp.c
@@ -1351,14 +1351,13 @@
int
fl_load_system_image(value_t sys_image_iostream)
{- value_t e;
- symbol_t *sym;
-
FL(loading) = true;
PUSH(sys_image_iostream);
+ uint32_t saveSP = FL(sp);
FL_TRY{ while(1){- e = fl_read_sexpr(FL(stack)[FL(sp)-1]);
+ FL(sp) = saveSP;
+ value_t e = fl_read_sexpr(FL(stack)[FL(sp)-1]);
if(ios_eof(value2c(ios_t*, FL(stack)[FL(sp)-1])))
break;
if(isfunction(e)){@@ -1368,7 +1367,7 @@
}else{// stage 1 format: list alternating symbol/value
while(iscons(e)){- sym = tosymbol(car_(e));
+ symbol_t *sym = tosymbol(car_(e));
e = cdr_(e);
if(sym->binding != UNBOUND)
ios_printf(ios_stderr, "%s redefined on boot\n", sym->name);
@@ -1386,7 +1385,7 @@
return 1;
}
ios_close(value2c(ios_t*, FL(stack)[FL(sp)-1]));
- POPN(1);
+ FL(sp) = saveSP-1;
FL(loading) = false;
return 0;
}