~ chicken-core (chicken-5) db2608b1fa26860ce3f11808704e198c5650ae32
commit db2608b1fa26860ce3f11808704e198c5650ae32
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Thu May 23 11:22:38 2019 +0200
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Thu May 23 11:22:38 2019 +0200
Having keywords as a subtype of symbols is problematic. This is most
obvious with identifiers, which may be any symbol, but cannot be
keywords. Keywords also no longer have plists, so it makes less and
less sense to treat these two object types as almost the same.
There are several Schemes which treat them as distinct types. Having
keywords be a subtype of symbols is more of a old school Lisp thing,
like treating () and 'nil as the same, falsy values. It's cleaner to
separate them, this also allows the scrutinizer to treat them more
cleanly as different things.
(Patch by Peter Bex, manually applied by Felix, due to git-fatigue)
Signed-off-by: felix <felix@call-with-current-continuation.org>
diff --git a/NEWS b/NEWS
index 7b3a9790..ee173e0c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
5.0.3
+
- Runtime system
+ - Keywords are now distinct types; they are not a subtype of symbols.
- Use arc4random on FreeBSD (thanks to Tobias Kortkamp and gahr)
5.0.2
diff --git a/c-backend.scm b/c-backend.scm
index b13e6e72..2ef2337f 100644
--- a/c-backend.scm
+++ b/c-backend.scm
@@ -705,6 +705,7 @@
((bignum? lit) 2) ; internal vector statically allocated
((flonum? lit) words-per-flonum)
((symbol? lit) 7) ; size of symbol, and possibly a bucket
+ ((keyword? lit) 7) ; size of keyword (symbol), and possibly a bucket
((pair? lit) (+ 3 (literal-size (car lit)) (literal-size (cdr lit))))
((vector? lit)
(+ 1 (vector-length lit)
@@ -739,7 +740,7 @@
(gen #t to #\= (if lit "C_SCHEME_TRUE" "C_SCHEME_FALSE") #\;) )
((char? lit)
(gen #t to "=C_make_character(" (char->integer lit) ");") )
- ((symbol? lit) ; handled slightly specially (see C_h_intern_in)
+ ((or (keyword? lit) (symbol? lit)) ; handled slightly specially (see C_h_intern_in)
(let* ((str (##sys#slot lit 1))
(cstr (c-ify-string str))
(len (##sys#size str))
@@ -1484,7 +1485,7 @@ return((C_header_bits(lit) >> 24) & 0xff);
(string-append "\xc2" (encode-size (string-length str)) str)))
((flonum? lit)
(string-append "\x55" (number->string lit) "\x00") )
- ((symbol? lit)
+ ((or (keyword? lit) (symbol? lit))
(let ((str (##sys#slot lit 1)))
(string-append
"\x01"
diff --git a/chicken.h b/chicken.h
index 259208ec..a4801784 100644
--- a/chicken.h
+++ b/chicken.h
@@ -583,7 +583,7 @@ void *alloca ();
#define C_BAD_MINIMUM_ARGUMENT_COUNT_ERROR 2
#define C_BAD_ARGUMENT_TYPE_ERROR 3
#define C_UNBOUND_VARIABLE_ERROR 4
-#define C_BAD_ARGUMENT_TYPE_SYMBOL_IS_KEYWORD_ERROR 5
+#define C_BAD_ARGUMENT_TYPE_NO_KEYWORD_ERROR 5
#define C_OUT_OF_MEMORY_ERROR 6
#define C_DIVISION_BY_ZERO_ERROR 7
#define C_OUT_OF_RANGE_ERROR 8
@@ -1388,6 +1388,7 @@ typedef void (C_ccall *C_proc)(C_word, C_word *) C_noret;
#define C_i_check_number(x) C_i_check_number_2(x, C_SCHEME_FALSE)
#define C_i_check_string(x) C_i_check_string_2(x, C_SCHEME_FALSE)
#define C_i_check_bytevector(x) C_i_check_bytevector_2(x, C_SCHEME_FALSE)
+#define C_i_check_keyword(x) C_i_check_keyword_2(x, C_SCHEME_FALSE)
#define C_i_check_symbol(x) C_i_check_symbol_2(x, C_SCHEME_FALSE)
#define C_i_check_list(x) C_i_check_list_2(x, C_SCHEME_FALSE)
#define C_i_check_pair(x) C_i_check_pair_2(x, C_SCHEME_FALSE)
@@ -2008,6 +2009,7 @@ C_fctexport C_word C_fcall C_i_check_number_2(C_word x, C_word loc) C_regparm;
C_fctexport C_word C_fcall C_i_check_string_2(C_word x, C_word loc) C_regparm;
C_fctexport C_word C_fcall C_i_check_bytevector_2(C_word x, C_word loc) C_regparm;
C_fctexport C_word C_fcall C_i_check_symbol_2(C_word x, C_word loc) C_regparm;
+C_fctexport C_word C_fcall C_i_check_keyword_2(C_word x, C_word loc) C_regparm;
C_fctexport C_word C_fcall C_i_check_list_2(C_word x, C_word loc) C_regparm;
C_fctexport C_word C_fcall C_i_check_pair_2(C_word x, C_word loc) C_regparm;
C_fctexport C_word C_fcall C_i_check_boolean_2(C_word x, C_word loc) C_regparm;
@@ -2194,11 +2196,6 @@ inline static C_word C_u_i_namespaced_symbolp(C_word x)
return C_mk_bool(C_memchr(C_data_pointer(s), '#', C_header_size(s)));
}
-inline static C_word C_u_i_keywordp(C_word x)
-{
- return C_mk_bool(C_symbol_plist(x) == C_SCHEME_FALSE);
-}
-
inline static C_word C_flonum(C_word **ptr, double n)
{
C_word
@@ -2653,7 +2650,16 @@ inline static C_word C_i_eqvp(C_word x, C_word y)
inline static C_word C_i_symbolp(C_word x)
{
- return C_mk_bool(!C_immediatep(x) && C_block_header(x) == C_SYMBOL_TAG);
+ return C_mk_bool(!C_immediatep(x) &&
+ C_block_header(x) == C_SYMBOL_TAG &&
+ C_symbol_plist(x) != C_SCHEME_FALSE);
+}
+
+inline static C_word C_i_keywordp(C_word x)
+{
+ return C_mk_bool(!C_immediatep(x) &&
+ C_block_header(x) == C_SYMBOL_TAG &&
+ C_symbol_plist(x) == C_SCHEME_FALSE);
}
inline static int C_persistable_symbol(C_word x)
@@ -2661,7 +2667,7 @@ inline static int C_persistable_symbol(C_word x)
/* Symbol is bound, or has a non-empty plist (but is not a keyword) */
return ((C_truep(C_boundp(x)) ||
C_symbol_plist(x) != C_SCHEME_END_OF_LIST) &&
- !C_truep(C_u_i_keywordp(x)));
+ C_symbol_plist(x) != C_SCHEME_FALSE);
}
inline static C_word C_i_pairp(C_word x)
diff --git a/core.scm b/core.scm
index c08d301b..c659691d 100644
--- a/core.scm
+++ b/core.scm
@@ -524,7 +524,7 @@
(else (find-id id (cdr se)))))
(define (lookup id)
- (cond ((keyword? id) id)
+ (cond ((keyword? id) id) ; DEPRECATED
((find-id id (##sys#current-environment)))
((##sys#get id '##core#macro-alias) symbol? => values)
(else id)))
@@ -1145,10 +1145,6 @@
((assq var0 (##sys#current-environment))
(warning
(sprintf "~aassignment to imported value binding `~S'"
- (if ln (sprintf "(~a) - " ln) "") var0)))
- ((keyword? var0)
- (warning
- (sprintf "~aassignment to keyword `~S'"
(if ln (sprintf "(~a) - " ln) "") var0)))))
`(set! ,var ,(walk val e var0 (memq var e) h ln #f))))))
diff --git a/expand.scm b/expand.scm
index 6647c870..74e85714 100644
--- a/expand.scm
+++ b/expand.scm
@@ -771,7 +771,7 @@
(else #f) ) ) ) )
(define (variable? v)
- (and (symbol? v) (not (##core#inline "C_u_i_keywordp" v))))
+ (symbol? v))
(define (proper-list? x)
(let loop ((x x))
diff --git a/extras.scm b/extras.scm
index 29961cc2..e6dd7918 100644
--- a/extras.scm
+++ b/extras.scm
@@ -248,7 +248,7 @@
(module chicken.pretty-print
(pp pretty-print pretty-print-width)
-(import scheme chicken.base chicken.fixnum chicken.string)
+(import scheme chicken.base chicken.fixnum chicken.keyword chicken.string)
(define generic-write
(lambda (obj display? width output)
@@ -298,8 +298,8 @@
((vector? obj) (wr-lst (vector->list obj) (out "#" col)))
((boolean? obj) (out (if obj "#t" "#f") col))
((##sys#number? obj) (out (##sys#number->string obj) col))
- ((symbol? obj)
- (let ([s (open-output-string)])
+ ((or (keyword? obj) (symbol? obj))
+ (let ((s (open-output-string)))
(##sys#print obj #t s)
(out (get-output-string s) col) ) )
((procedure? obj) (out (##sys#procedure->string obj) col))
diff --git a/lfa2.scm b/lfa2.scm
index 212b7585..5d739d9a 100644
--- a/lfa2.scm
+++ b/lfa2.scm
@@ -45,7 +45,8 @@
chicken.base
chicken.compiler.support
chicken.fixnum
- chicken.format)
+ chicken.format
+ chicken.keyword)
(include "tweaks")
(include "mini-srfi-1.scm")
@@ -61,6 +62,7 @@
("C_i_check_string" string)
("C_i_check_bytevector" blob)
("C_i_check_symbol" symbol)
+ ("C_i_check_keyword" keyword)
("C_i_check_list" null pair list)
("C_i_check_pair" pair)
("C_i_check_locative" locative)
@@ -75,6 +77,7 @@
("C_i_check_string_2" string)
("C_i_check_bytevector_2" blob)
("C_i_check_symbol_2" symbol)
+ ("C_i_check_keyword_2" keyword)
("C_i_check_list_2" null pair list)
("C_i_check_pair_2" pair)
("C_i_check_locative_2" locative)
@@ -97,6 +100,7 @@
("C_i_cplxnump" cplxnum)
("C_stringp" string)
("C_bytevectorp" blob)
+ ("C_i_keywordp" keyword)
("C_i_symbolp" symbol)
("C_i_listp" list)
("C_i_pairp" pair)
@@ -235,6 +239,7 @@
(define (constant-result lit)
;; a simplified variant of the one in scrutinizer.scm
(cond ((string? lit) 'string)
+ ((keyword? lit) 'keyword)
((symbol? lit) 'symbol)
;; Do not assume fixnum width matches target platforms!
((or (big-fixnum? lit) (small-bignum? lit)) 'integer)
diff --git a/library.scm b/library.scm
index 4b51354f..3716fe52 100644
--- a/library.scm
+++ b/library.scm
@@ -1156,6 +1156,11 @@ EOF
(##core#inline "C_i_check_symbol_2" x (car loc))
(##core#inline "C_i_check_symbol" x) ) )
+(define (##sys#check-keyword x . loc)
+ (if (pair? loc)
+ (##core#inline "C_i_check_keyword_2" x (car loc))
+ (##core#inline "C_i_check_keyword" x) ) )
+
(define (##sys#check-vector x . loc)
(if (pair? loc)
(##core#inline "C_i_check_vector_2" x (car loc))
@@ -2729,8 +2734,7 @@ EOF
(import scheme)
(import chicken.fixnum)
-(define (keyword? x)
- (and (symbol? x) (##core#inline "C_u_i_keywordp" x)) )
+(define (keyword? x) (##core#inline "C_i_keywordp" x) )
(define string->keyword
(let ([string string] )
@@ -2748,6 +2752,7 @@ EOF
(define get-keyword
(let ((tag (list 'tag)))
(lambda (key args #!optional thunk)
+ (##sys#check-keyword key 'get-keyword)
(##sys#check-list args 'get-keyword)
(let ((r (##core#inline "C_i_get_keyword" key args tag)))
(if (eq? r tag) ; not found
@@ -4539,21 +4544,19 @@ EOF
((##core#inline "C_unboundvaluep" x) (outstr port "#<unbound value>"))
((not (##core#inline "C_blockp" x)) (outstr port "#<invalid immediate object>"))
((##core#inline "C_forwardedp" x) (outstr port "#<invalid forwarded object>"))
- ((##core#inline "C_symbolp" x)
- (cond ((##core#inline "C_u_i_keywordp" x)
- ;; Force portable #: style for readable output
- (case (and (not readable) ksp)
- ((#:prefix)
- (outchr port #\:)
- (outsym port x))
- ((#:suffix)
- (outsym port x)
- (outchr port #\:))
- (else
- (outstr port "#:")
- (outsym port x))))
- (else
- (outsym port x))))
+ ((##core#inline "C_i_keywordp" x)
+ ;; Force portable #: style for readable output
+ (case (and (not readable) ksp)
+ ((#:prefix)
+ (outchr port #\:)
+ (outsym port x))
+ ((#:suffix)
+ (outsym port x)
+ (outchr port #\:))
+ (else
+ (outstr port "#:")
+ (outsym port x))))
+ ((##core#inline "C_i_symbolp" x) (outsym port x))
((##sys#number? x) (outstr port (##sys#number->string x)))
((##core#inline "C_anypointerp" x) (outstr port (##sys#pointer->string x)))
((##core#inline "C_stringp" x)
@@ -5377,7 +5380,7 @@ EOF
(if fn (list fn) '()))))
((3) (apply ##sys#signal-hook #:type-error loc "bad argument type" args))
((4) (apply ##sys#signal-hook #:runtime-error loc "unbound variable" args))
- ((5) (apply ##sys#signal-hook #:type-error loc "symbol is a keyword, which has no plist" args))
+ ((5) (apply ##sys#signal-hook #:type-error loc "bad argument type - not a keyword" args))
((6) (apply ##sys#signal-hook #:limit-error loc "out of memory" args))
((7) (apply ##sys#signal-hook #:arithmetic-error loc "division by zero" args))
((8) (apply ##sys#signal-hook #:bounds-error loc "out of range" args))
diff --git a/runtime.c b/runtime.c
index c25276ea..8a51fd82 100644
--- a/runtime.c
+++ b/runtime.c
@@ -1693,8 +1693,8 @@ void barf(int code, char *loc, ...)
c = 1;
break;
- case C_BAD_ARGUMENT_TYPE_SYMBOL_IS_KEYWORD_ERROR:
- msg = C_text("symbol is a keyword, which has no plist");
+ case C_BAD_ARGUMENT_TYPE_NO_KEYWORD_ERROR:
+ msg = C_text("bad argument type - not a keyword");
c = 1;
break;
@@ -7408,7 +7408,7 @@ C_regparm C_word C_fcall C_i_check_locative_2(C_word x, C_word loc)
C_regparm C_word C_fcall C_i_check_symbol_2(C_word x, C_word loc)
{
- if(C_immediatep(x) || C_block_header(x) != C_SYMBOL_TAG) {
+ if(!C_truep(C_i_symbolp(x))) {
error_location = loc;
barf(C_BAD_ARGUMENT_TYPE_NO_SYMBOL_ERROR, NULL, x);
}
@@ -7417,6 +7417,16 @@ C_regparm C_word C_fcall C_i_check_symbol_2(C_word x, C_word loc)
}
+C_regparm C_word C_fcall C_i_check_keyword_2(C_word x, C_word loc)
+{
+ if(!C_truep(C_i_keywordp(x))) {
+ error_location = loc;
+ barf(C_BAD_ARGUMENT_TYPE_NO_KEYWORD_ERROR, NULL, x);
+ }
+
+ return C_SCHEME_UNDEFINED;
+}
+
C_regparm C_word C_fcall C_i_check_list_2(C_word x, C_word loc)
{
if(x != C_SCHEME_END_OF_LIST && (C_immediatep(x) || C_block_header(x) != C_PAIR_TAG)) {
@@ -12837,9 +12847,6 @@ C_i_getprop(C_word sym, C_word prop, C_word def)
{
C_word pl = C_symbol_plist(sym);
- if (pl == C_SCHEME_FALSE)
- barf(C_BAD_ARGUMENT_TYPE_SYMBOL_IS_KEYWORD_ERROR, "get", sym);
-
while(pl != C_SCHEME_END_OF_LIST) {
if(C_block_item(pl, 0) == prop)
return C_u_i_car(C_u_i_cdr(pl));
@@ -12855,9 +12862,6 @@ C_putprop(C_word **ptr, C_word sym, C_word prop, C_word val)
{
C_word pl = C_symbol_plist(sym);
- if (pl == C_SCHEME_FALSE)
- barf(C_BAD_ARGUMENT_TYPE_SYMBOL_IS_KEYWORD_ERROR, "put", sym);
-
/* Newly added plist? Ensure the symbol stays! */
if (pl == C_SCHEME_END_OF_LIST) C_i_persist_symbol(sym);
diff --git a/scrutinizer.scm b/scrutinizer.scm
index 10cb5407..8f5923d5 100644
--- a/scrutinizer.scm
+++ b/scrutinizer.scm
@@ -41,6 +41,7 @@
chicken.format
chicken.internal
chicken.io
+ chicken.keyword
chicken.pathname
chicken.platform
chicken.plist
@@ -84,7 +85,8 @@
; | (refine (SYMBOL ...) VALUE)
; | deprecated
; | (deprecated NAME)
-; VALUE = string | symbol | char | number | boolean | true | false |
+; VALUE = string | symbol | keyword | char | number |
+; boolean | true | false |
; null | eof | blob | pointer | port | locative | fixnum |
; float | bignum | ratnum | cplxnum | integer | pointer-vector
; BASIC = * | list | pair | procedure | vector | undefined | noreturn | values
@@ -130,8 +132,9 @@
(define-constant +maximal-complex-object-constructor-result-type-length+ 256)
(define-constant value-types
- '(string symbol char null boolean true false blob eof fixnum float number
- integer bignum ratnum cplxnum pointer-vector port pointer locative))
+ '(string symbol keyword char null boolean true false blob eof
+ fixnum float number integer bignum ratnum cplxnum
+ pointer-vector port pointer locative))
(define-constant basic-types
'(* list pair procedure vector undefined deprecated noreturn values))
@@ -190,6 +193,7 @@
(define (constant-result lit)
(cond ((string? lit) 'string)
+ ((keyword? lit) 'keyword)
((symbol? lit) 'symbol)
;; Do not assume fixnum width matches target platforms!
((or (big-fixnum? lit) (small-bignum? lit)) 'integer)
diff --git a/synrules.scm b/synrules.scm
index d3453fe7..d0919862 100644
--- a/synrules.scm
+++ b/synrules.scm
@@ -64,9 +64,6 @@
(import scheme)
-(define (plain-symbol? x)
- (and (symbol? x) (not (##core#inline "C_u_i_keywordp" x))) )
-
(define (syntax-rules-mismatch input)
(##sys#syntax-error-hook "no rule matches form" input))
@@ -163,7 +160,7 @@
;; Generate code to test whether input expression matches pattern
(define (process-match input pattern seen-segment?)
- (cond ((plain-symbol? pattern)
+ (cond ((symbol? pattern)
(if (memq pattern subkeywords)
`((,%compare ,input (,%rename (##core#syntax ,pattern))))
`()))
@@ -202,7 +199,7 @@
;; This is pretty bad, but it seems to work (can't say why).
(define (process-pattern pattern path mapit seen-segment?)
- (cond ((plain-symbol? pattern)
+ (cond ((symbol? pattern)
(if (memq pattern subkeywords)
'()
(list (list pattern (mapit path)))))
@@ -233,7 +230,7 @@
;; Generate code to compose the output expression according to template
(define (process-template template dim env)
- (cond ((plain-symbol? template)
+ (cond ((symbol? template)
(let ((probe (assq template env)))
(if probe
(if (<= (cdr probe) dim)
@@ -253,7 +250,7 @@
env))
(gen (if (and (pair? vars)
(null? (cdr vars))
- (plain-symbol? x)
+ (symbol? x)
(eq? x (car vars)))
x ;+++
`(,%map (,%lambda ,vars ,x)
@@ -278,7 +275,7 @@
;; Return an association list of (var . dim)
(define (meta-variables pattern dim vars seen-segment?)
- (cond ((plain-symbol? pattern)
+ (cond ((symbol? pattern)
(if (memq pattern subkeywords)
vars
(cons (cons pattern dim) vars)))
@@ -295,7 +292,7 @@
;; Return a list of meta-variables of given higher dim
(define (free-meta-variables template dim env free)
- (cond ((plain-symbol? template)
+ (cond ((symbol? template)
(if (and (not (memq template free))
(let ((probe (assq template env)))
(and probe (>= (cdr probe) dim))))
diff --git a/tests/library-tests.scm b/tests/library-tests.scm
index 1e19a632..fa56e820 100644
--- a/tests/library-tests.scm
+++ b/tests/library-tests.scm
@@ -348,21 +348,21 @@
(parameterize ((keyword-style #:suffix))
(assert (string=? "abc:" (symbol->string (with-input-from-string "|abc:|" read))))
- (assert (string=? "abc" (symbol->string (with-input-from-string "|abc|:" read)))) ; keyword
+ (assert (string=? "abc" (keyword->string (with-input-from-string "|abc|:" read)))) ; keyword
(let ((kw (with-input-from-string "|foo bar|:" read)))
(assert (eq? kw (with-input-from-string "#:|foo bar|" read)))
- (assert (string=? "foo bar" (symbol->string kw)))
+ (assert (string=? "foo bar" (keyword->string kw)))
(assert (string=? "foo bar:"
(with-output-to-string (lambda () (display kw)))))
(assert (string=? "#:|foo bar|"
(with-output-to-string (lambda () (write kw)))))))
(parameterize ((keyword-style #:prefix))
- (assert (string=? "abc" (symbol->string (with-input-from-string ":|abc|" read))))
+ (assert (string=? "abc" (keyword->string (with-input-from-string ":|abc|" read))))
(assert (string=? ":abc" (symbol->string (with-input-from-string "|:abc|" read))))
(let ((kw (with-input-from-string ":|foo bar|" read)))
(assert (eq? kw (with-input-from-string "#:|foo bar|" read)))
- (assert (string=? "foo bar" (symbol->string kw)))
+ (assert (string=? "foo bar" (keyword->string kw)))
(assert (string=? ":foo bar"
(with-output-to-string (lambda () (display kw)))))
(assert (string=? "#:|foo bar|"
@@ -413,6 +413,7 @@
(assert-fail (with-input-from-string "#:" read))
(let ((empty-kw (with-input-from-string "#:||" read)))
+ (assert (not (symbol? empty-kw)))
(assert (keyword? empty-kw))
(assert (string=? "" (keyword->string empty-kw))))
@@ -427,6 +428,11 @@
(assert (equal? (cons 1 2) (with-input-from-string "(1 . 2)" read)))
(assert (every keyword? (with-input-from-string "(42: abc: .: #:: ::)" read)))
+;; symbols and keywords are now distinct
+(assert (not (symbol? #:foo)))
+(assert (not (symbol? (string->keyword "foo"))))
+(assert (not (keyword? 'foo)))
+(assert (not (keyword? (string->symbol "foo"))))
;;; reading unterminated objects
diff --git a/tests/version-tests.scm b/tests/version-tests.scm
index c6c3ce7d..2a786dc8 100644
--- a/tests/version-tests.scm
+++ b/tests/version-tests.scm
@@ -1,4 +1,4 @@
-(import chicken.irregex chicken.platform chicken.string)
+(import chicken.irregex chicken.platform chicken.keyword chicken.string)
(let* ((version-tokens (string-split (chicken-version) "."))
(major (string->number (car version-tokens)))
@@ -13,7 +13,7 @@
(let loop ((features (features)))
(if (null? features)
(error "Could not find feature chicken-<major>.<minor>")
- (let ((feature (symbol->string (car features))))
+ (let ((feature (keyword->string (car features))))
(cond ((irregex-match "chicken-(\\d+)\\.(\\d+)" feature)
=> (lambda (match)
(assert (= (string->number
@@ -28,7 +28,7 @@
(let loop ((features (features)))
(if (null? features)
(error "Could not find feature chicken-<major>")
- (let ((feature (symbol->string (car features))))
+ (let ((feature (keyword->string (car features))))
(cond ((irregex-match "chicken-(\\d+)" feature)
=> (lambda (match)
(assert (= (string->number
diff --git a/types.db b/types.db
index 6eff7d1f..2e34d99d 100644
--- a/types.db
+++ b/types.db
@@ -1322,10 +1322,10 @@
;; keyword
-(chicken.keyword#get-keyword (#(procedure #:clean #:enforce) chicken.keyword#get-keyword (symbol list #!optional *) *))
-(chicken.keyword#keyword->string (#(procedure #:clean #:enforce) chicken.keyword#keyword->string (symbol) string))
-(chicken.keyword#keyword? (#(procedure #:pure) chicken.keyword#keyword? (*) boolean))
-(chicken.keyword#string->keyword (#(procedure #:clean #:enforce) chicken.keyword#string->keyword (string) symbol))
+(chicken.keyword#get-keyword (#(procedure #:clean #:enforce) chicken.keyword#get-keyword (keyword list #!optional *) *))
+(chicken.keyword#keyword->string (#(procedure #:clean #:enforce) chicken.keyword#keyword->string (keyword) string))
+(chicken.keyword#keyword? (#(procedure #:pure #:predicate keyword) chicken.keyword#keyword? (*) boolean))
+(chicken.keyword#string->keyword (#(procedure #:clean #:enforce) chicken.keyword#string->keyword (string) keyword))
;; load
@@ -1346,12 +1346,12 @@
(chicken.platform#build-platform (#(procedure #:pure) chicken.platform#build-platform () symbol))
(chicken.platform#chicken-version (#(procedure #:pure) chicken.platform#chicken-version (#!optional *) string))
(chicken.platform#chicken-home (#(procedure #:clean) chicken.platform#chicken-home () string))
-(chicken.platform#feature? (#(procedure #:clean) chicken.platform#feature? (#!rest symbol) boolean))
-(chicken.platform#features (#(procedure #:clean) chicken.platform#features () (list-of symbol)))
+(chicken.platform#feature? (#(procedure #:clean) chicken.platform#feature? (#!rest (or keyword symbol string)) boolean))
+(chicken.platform#features (#(procedure #:clean) chicken.platform#features () (list-of keyword)))
(chicken.platform#software-type (#(procedure #:pure) chicken.platform#software-type () symbol))
(chicken.platform#software-version (#(procedure #:pure) chicken.platform#software-version () symbol))
-(chicken.platform#register-feature! (#(procedure #:clean #:enforce) chicken.platform#register-feature! (#!rest symbol) undefined))
-(chicken.platform#unregister-feature! (#(procedure #:clean #:enforce) chicken.platform#unregister-feature! (#!rest symbol) undefined))
+(chicken.platform#register-feature! (#(procedure #:clean #:enforce) chicken.platform#register-feature! (#!rest (or keyword symbol string)) undefined))
+(chicken.platform#unregister-feature! (#(procedure #:clean #:enforce) chicken.platform#unregister-feature! (#!rest (or keyword symbol string)) undefined))
(chicken.platform#machine-byte-order (#(procedure #:pure) chicken.platform#machine-byte-order () symbol))
(chicken.platform#machine-type (#(procedure #:pure) chicken.platform#machine-type () symbol))
(chicken.platform#repository-path (#(procedure #:clean) chicken.platform#repository-path (#!optional *) *))
Trap