exact-closed feature removed; cleanup

This commit is contained in:
ESL 2024-07-28 15:59:05 -04:00
parent 6ee96c8f71
commit 0336adcff9
4 changed files with 3 additions and 11 deletions

7
i.h
View file

@ -13,25 +13,19 @@
#if defined(VM_GEN_DEFGLOBAL) #if defined(VM_GEN_DEFGLOBAL)
#define declare_instruction(name, enc, etyp, igname, arity, lcode) \ #define declare_instruction(name, enc, etyp, igname, arity, lcode) \
declare_instruction_global(name) declare_instruction_global(name)
#define declare_instrshadow(name, enc, etyp, igname, arity, lcode)
#define declare_integrable(name, enc, etyp, igname, arity, lcode) #define declare_integrable(name, enc, etyp, igname, arity, lcode)
#elif defined(VM_GEN_ENCTABLE) #elif defined(VM_GEN_ENCTABLE)
#define declare_instruction(name, enc, etyp, igname, arity, lcode) \ #define declare_instruction(name, enc, etyp, igname, arity, lcode) \
declare_enctable_entry(name, enc, etyp) declare_enctable_entry(name, enc, etyp)
#define declare_instrshadow(name, enc, etyp, igname, arity, lcode) \
declare_enctable_entry(name, enc, etyp)
#define declare_integrable(name, enc, etyp, igname, arity, lcode) #define declare_integrable(name, enc, etyp, igname, arity, lcode)
#elif defined(VM_GEN_INTGTABLE) #elif defined(VM_GEN_INTGTABLE)
#define declare_instruction(name, enc, etyp, igname, arity, lcode) \ #define declare_instruction(name, enc, etyp, igname, arity, lcode) \
declare_intgtable_entry(enc, igname, arity, lcode) declare_intgtable_entry(enc, igname, arity, lcode)
#define declare_instrshadow(name, enc, etyp, igname, arity, lcode) \
declare_intgtable_entry(enc, igname, arity, lcode)
#define declare_integrable(name, enc, etyp, igname, arity, lcode) \ #define declare_integrable(name, enc, etyp, igname, arity, lcode) \
declare_intgtable_entry(enc, igname, arity, lcode) declare_intgtable_entry(enc, igname, arity, lcode)
#else /* regular include */ #else /* regular include */
#define declare_instruction(name, enc, etyp, igname, arity, lcode) \ #define declare_instruction(name, enc, etyp, igname, arity, lcode) \
extern obj glue(cx_ins_2D, name); extern obj glue(cx_ins_2D, name);
#define declare_instrshadow(name, enc, etyp, igname, arity, lcode)
#define declare_integrable(name, enc, etyp, igname, arity, lcode) #define declare_integrable(name, enc, etyp, igname, arity, lcode)
extern obj vmcases[]; /* vm host */ extern obj vmcases[]; /* vm host */
#endif #endif
@ -595,5 +589,4 @@ declare_integrable(NULL, NULL, 0, "call-with-values",
declare_integrable(NULL, NULL, 0, "values", '@', "K6") declare_integrable(NULL, NULL, 0, "values", '@', "K6")
#undef declare_instruction #undef declare_instruction
#undef declare_instrshadow
#undef declare_integrable #undef declare_integrable

View file

@ -2030,7 +2030,7 @@
(define command-line (make-parameter (%command-line))) ; can be changed later in (main) (define command-line (make-parameter (%command-line))) ; can be changed later in (main)
(define *features* (list r7rs exact-closed skint skint-1.0.0)) (define *features* (list r7rs skint skint-1.0.0))
(define features (define features
(case-lambda (case-lambda

View file

@ -233,7 +233,7 @@
; EIOD Copyright notice (amended with the author's permission): ; EIOD Copyright notice (amended with the author's permission):
; Copyright 2002, 2004, 2005 Al Petrofsky <al@petrofsky.org> ; Copyright 2002, 2004, 2005 Al Petrofsky <al@petrofsky.org>
; LICENSING (3-clause BSD or GNU GPL 2 and up) ; LICENSING (3-clause BSD or GNU GPL 2 and up)
; <the text of the 3-clause BSD license is in the LICENSE file> ; <terms of the 3-clause BSD license are in the LICENSE file>
; An environment is a procedure that accepts any identifier and access type and returns a ; An environment is a procedure that accepts any identifier and access type and returns a
; denotation. Access type is one of these symbols: ref, set!, define, define-syntax. ; denotation. Access type is one of these symbols: ref, set!, define, define-syntax.

3
s.c
View file

@ -1052,8 +1052,7 @@ char *s_code[] = {
"-line)", "-line)",
"C", 0, "C", 0,
"@(y11:skint-1.0.0),@(y5:skint),@(y12:exact-closed),@(y4:r7rs),l4@!(y10" "@(y11:skint-1.0.0),@(y5:skint),@(y4:r7rs),l3@!(y10:*features*)",
":*features*)",
"C", 0, "C", 0,
"&0{%2.1?{.0,@(y8:features)[21}.0]2}%x,&0{%1.0L0?{.0@!(y10:*features*)]" "&0{%2.1?{.0,@(y8:features)[21}.0]2}%x,&0{%1.0L0?{.0@!(y10:*features*)]"