shithub: sl

Download patch

ref: e6f027b15cd680bee3447bbb96256fa8d9909030
parent: 13bcf7653e5ab5578b39662b4fb6b1e8a5c54b6b
author: Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>
date: Fri Mar 21 13:50:24 EDT 2025 

fix ugly named macros


--- a/src/sl.c
+++ b/src/sl.c
@@ -81,7 +81,7 @@
 	exits(status);
 }
 
-#define sl_TRY \
+#define SL_TRY \
 	sl_exctx _ctx; int l__tr, l__ca; \
 	_ctx.sp = sl.sp; _ctx.frame = sl.curr_frame; _ctx.rdst = sl.readstate; _ctx.prev = sl.exctx; \
 	_ctx.ngchnd = slg.ngchandles; sl.exctx = &_ctx; \
@@ -88,14 +88,14 @@
 	if(!sl_setjmp(_ctx.buf)) \
 		for(l__tr = 1; l__tr; l__tr = 0, (void)(sl.exctx = sl.exctx->prev))
 
-#define sl_CATCH_INC \
+#define SL_CATCH_INC \
 	l__ca = 0, sl.lasterror = sl_nil, sl.throwing_frame = 0, sl.sp = _ctx.sp, sl.curr_frame = _ctx.frame
 
-#define sl_CATCH \
+#define SL_CATCH \
 	else \
-		for(l__ca = 1; l__ca; sl_CATCH_INC)
+		for(l__ca = 1; l__ca; SL_CATCH_INC)
 
-#define sl_CATCH_NO_INC \
+#define SL_CATCH_NO_INC \
 	else \
 		for(l__ca = 1; l__ca;)
 
@@ -759,10 +759,10 @@
 	sl.sp[-2] = saveSP[-1];
 	sl.sp[-1] = thunk;
 
-	sl_TRY{
+	SL_TRY{
 		v = apply_cl(0);
 	}
-	sl_CATCH{
+	SL_CATCH{
 		v = saveSP[-2];
 		PUSH(v);
 		PUSH(sl.lasterror);
@@ -1348,7 +1348,7 @@
 	slg.loading = true;
 	PUSH(sys_image_io);
 	sl_v *saveSP = sl.sp;
-	sl_TRY{
+	SL_TRY{
 		while(1){
 			sl.sp = saveSP;
 			sl_v e = sl_read_sexpr(sl.sp[-1]);
@@ -1372,7 +1372,7 @@
 			}
 		}
 	}
-	sl_CATCH_NO_INC{
+	SL_CATCH_NO_INC{
 		ios_puts(ios_stderr, "fatal error during bootstrap: ");
 		sl_print(ios_stderr, sl.lasterror);
 		ios_putc(ios_stderr, '\n');
--- a/src/sl.h
+++ b/src/sl.h
@@ -241,7 +241,7 @@
 
 void free_readstate(sl_readstate *rs);
 
-#define sl_TRY_EXTERN \
+#define SL_TRY_EXTERN \
 	sl_exctx _ctx; \
 	sl_savestate(&_ctx); \
 	sl.exctx = &_ctx; \
@@ -249,11 +249,11 @@
 	if(!sl_setjmp(_ctx.buf)) \
 		for(int l__tr = 1; l__tr; l__tr = 0, sl.exctx = sl.exctx->prev)
 
-#define sl_CATCH_EXTERN_NO_RESTORE \
+#define SL_CATCH_EXTERN_NO_RESTORE \
 	else \
 		for(l__ca=1; l__ca;)
 
-#define sl_CATCH_EXTERN \
+#define SL_CATCH_EXTERN \
 	else \
 		for(l__ca=1; l__ca; l__ca=0, sl_restorestate(&_ctx))
 
--- a/src/slmain.c
+++ b/src/slmain.c
@@ -121,7 +121,7 @@
 	const char *status = nil;
 	sl_v args = argv_list(argc, argv);
 	sl_gc_handle(&args);
-	sl_TRY_EXTERN{
+	SL_TRY_EXTERN{
 		sl_v f = cvalue_from_ref(sl_iotype, &s, sizeof(sl_ios));
 		if(sl_load_system_image(f) == 0){
 			MEM_FREE(unpacked);
@@ -131,7 +131,7 @@
 			sl_applyn(2, sym_value(mk_sym("__start", false)), args, interactive);
 		}
 	}
-	sl_CATCH_EXTERN_NO_RESTORE{
+	SL_CATCH_EXTERN_NO_RESTORE{
 		ios_puts(ios_stderr, "fatal error:\n");
 		sl_print(ios_stderr, sl.lasterror);
 		ios_putc(ios_stderr, '\n');