From 16ea370778dcd9943fb11767992aebf6263acfd4 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Wed, 21 Jul 2021 06:55:45 -0700 Subject: compat: fix glaringly broken init-time handling. We are doing numerous compat_ver checks in various init functions, to enact alternative symbol registrations. Only problem is, compat_ver is always zero during initialization; it is not set until the -C option is processed in txr_main. Registrations must be fixed up after initialization; that's what the compat_fixup mechanism is for. This is an long-standing problem which affects compatibility operation going back over 150 versions. * arith.c (arith_init): Move compat logic to arith_compat_fixup. (arith_compat_fixup): New function. * arith.h (arith_compat_fixup): Declared. * eval.c (eval_init): Move compat logic to eval_compat_fixup. * ffi.c (ffi_init): Move compat logic to ffi_compat_fixup. (ffi_compat_fixup): New function. * ffi.h (ffi_compat_fixup): Declared. * regex.c (regex_init): Move compat logic to regex_compat_fixup. (regex_compat_fixup): New function. * regex.h (regex_compat_fixup): Declared. * stream.c (stream_init): Move compat logic to stream_compat_fixup. (stream_compat_fixup): New function. * stream.h (stream_compat_fixup): Declared. * struct.c (struct_init): Move compat logic to struct_compat_fixup. (struct_compat_fixup): New function. * struct.h (stream_compat_fixup): Declared. * lib.c (compat_fixup): Call arith_compat_fixup, ffi_compat_fixup, regex_compat_fixup, stream_compat_fixup and struct_compat_fixup. --- lib.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib.c') diff --git a/lib.c b/lib.c index 274d3956..38f19af7 100644 --- a/lib.c +++ b/lib.c @@ -14053,6 +14053,12 @@ int compat_fixup(int compat_ver) eval_compat_fixup(compat_ver); rand_compat_fixup(compat_ver); parse_compat_fixup(compat_ver); + arith_compat_fixup(compat_ver); + ffi_compat_fixup(compat_ver); + regex_compat_fixup(compat_ver); + stream_compat_fixup(compat_ver); + struct_compat_fixup(compat_ver); + return 0; } -- cgit v1.2.3