~ chicken-core (chicken-5) 8aef6d9ac3a436126e76097d1d2633118147095b
commit 8aef6d9ac3a436126e76097d1d2633118147095b
Author: Evan Hanson <evhan@foldling.org>
AuthorDate: Sat Feb 17 17:08:51 2018 +1300
Commit: Peter Bex <peter@more-magic.net>
CommitDate: Sat Feb 24 15:00:45 2018 +0100
Move remaining parameters from toplevel to chicken.base
Signed-off-by: Peter Bex <peter@more-magic.net>
diff --git a/chicken.base.import.scm b/chicken.base.import.scm
index d1c04c42..19365c72 100644
--- a/chicken.base.import.scm
+++ b/chicken.base.import.scm
@@ -34,6 +34,7 @@
(bignum? . chicken.base#bignum?)
(butlast . chicken.base#butlast)
(call/cc . chicken.base#call/cc)
+ (case-sensitive . chicken.base#case-sensitive)
(char-name . chicken.base#char-name)
(chop . chicken.base#chop)
(complement . chicken.base#complement)
@@ -72,6 +73,7 @@
(input-port-open? . chicken.base#input-port-open?)
(intersperse . chicken.base#intersperse)
(join . chicken.base#join)
+ (keyword-style . chicken.base#keyword-style)
(list-of? . chicken.base#list-of?)
(make-parameter . chicken.base#make-parameter)
(make-promise . chicken.base#make-promise)
@@ -82,6 +84,7 @@
(open-input-string . chicken.base#open-input-string)
(open-output-string . chicken.base#open-output-string)
(output-port-open? . chicken.base#output-port-open?)
+ (parentheses-synonyms . chicken.base#parentheses-synonyms)
(port? . chicken.base#port?)
(port-closed? . chicken.base#port-closed?)
(print-call-chain . chicken.base#print-call-chain)
@@ -99,6 +102,7 @@
(sub1 . chicken.base#sub1)
(subvector . chicken.base#subvector)
(symbol-append . chicken.base#symbol-append)
+ (symbol-escape . chicken.base#symbol-escape)
(tail? . chicken.base#tail?)
(vector-copy! . chicken.base#vector-copy!)
(vector-resize . chicken.base#vector-resize)
diff --git a/chicken.import.scm b/chicken.import.scm
index 8e0020d8..c990a079 100644
--- a/chicken.import.scm
+++ b/chicken.import.scm
@@ -30,7 +30,7 @@
(bignum? . chicken.base#bignum?)
(build-platform . chicken.platform#build-platform)
(call/cc . chicken.base#call/cc)
- case-sensitive
+ (case-sensitive . chicken.base#case-sensitive)
(char-name . chicken.base#char-name)
(chicken-home . chicken.platform#chicken-home)
(chicken-version . chicken.platform#chicken-version)
@@ -102,7 +102,7 @@
(infinite? . chicken.base#infinite?)
(installation-repository . chicken.platform#installation-repository)
(ir-macro-transformer . chicken.syntax#ir-macro-transformer)
- keyword-style
+ (keyword-style . chicken.base#keyword-style)
(load-library . chicken.load#load-library)
(load-noisily . chicken.load#load-noisily)
(load-relative . chicken.load#load-relative)
@@ -121,7 +121,7 @@
(nan? . chicken.base#nan?)
(notice . chicken.base#notice)
(on-exit . chicken.base#on-exit)
- parentheses-synonyms
+ (parentheses-synonyms . chicken.base#parentheses-synonyms)
(provide . chicken.load#provide)
(provided? . chicken.load#provided?)
(print . chicken.base#print)
@@ -147,7 +147,7 @@
(sub1 . chicken.base#sub1)
(subvector . chicken.base#subvector)
(symbol-append . chicken.base#symbol-append)
- symbol-escape
+ (symbol-escape . chicken.base#symbol-escape)
(syntax-error . chicken.syntax#syntax-error)
(system . chicken.process#system)
(unregister-feature! . chicken.platform#unregister-feature!)
diff --git a/library.scm b/library.scm
index 01af674e..12bbe607 100644
--- a/library.scm
+++ b/library.scm
@@ -596,6 +596,8 @@ EOF
compress flatten intersperse join list-of? tail? constantly
complement compose conjoin disjoin each flip identity o
+ case-sensitive keyword-style parentheses-synonyms symbol-escape
+
on-exit exit exit-handler implicit-exit-handler emergency-exit
)
@@ -721,6 +723,12 @@ EOF
(##sys#check-fixnum code 'emergency-exit)
(##core#inline "C_exit_runtime" code))
+;;; Parameters:
+
+(define case-sensitive)
+(define keyword-style)
+(define parentheses-synonyms)
+(define symbol-escape)
;;; Combinators:
@@ -3718,10 +3726,11 @@ EOF
(define (##sys#sharp-number-hook port n)
(##sys#read-error port "invalid `#...' read syntax" n) )
-(define case-sensitive (make-parameter #t))
-(define keyword-style (make-parameter #:suffix))
-(define parentheses-synonyms (make-parameter #t))
-(define symbol-escape (make-parameter #t))
+(set! chicken.base#case-sensitive (make-parameter #t))
+(set! chicken.base#keyword-style (make-parameter #:suffix))
+(set! chicken.base#parentheses-synonyms (make-parameter #t))
+(set! chicken.base#symbol-escape (make-parameter #t))
+
(define ##sys#current-read-table (make-parameter (##sys#make-structure 'read-table #f #f #f)))
(define ##sys#read-warning
diff --git a/types.db b/types.db
index b87864e4..6c8e58b8 100644
--- a/types.db
+++ b/types.db
@@ -990,6 +990,11 @@
(chicken.base#string->uninterned-symbol (#(procedure #:clean #:enforce) chicken.base#string->uninterned-symbol (string) symbol))
(chicken.base#symbol-append (#(procedure #:clean #:enforce #:foldable) chicken.base#symbol-append (#!rest symbol) symbol))
+(chicken.base#case-sensitive (#(procedure #:clean) chicken.base#case-sensitive (#!optional *) *))
+(chicken.base#keyword-style (#(procedure #:clean) chicken.base#keyword-style (#!optional symbol) symbol))
+(chicken.base#parentheses-synonyms (#(procedure #:clean) chicken.base#parentheses-synonyms (#!optional *) *))
+(chicken.base#symbol-escape (#(procedure #:clean) chicken.base#symbol-escape (#!optional *) *))
+
(chicken.base#quotient&remainder (#(procedure #:clean #:enforce #:foldable) chicken.base#quotient&remainder ((or integer float) (or integer float)) (or integer float) (or integer float))
((float float) (float float)
(let ((#(tmp1) #(1)))
@@ -1114,8 +1119,6 @@
((fixnum) (##sys#make-blob #(1))))
(chicken.blob#string->blob (#(procedure #:clean #:enforce) chicken.blob#string->blob (string) blob))
-(case-sensitive (#(procedure #:clean) case-sensitive (#!optional *) *))
-
;; condition
(chicken.condition#abort (procedure chicken.condition#abort (*) noreturn))
@@ -1369,13 +1372,10 @@
(chicken.plist#symbol-plist (#(procedure #:clean #:enforce) chicken.plist#symbol-plist (symbol) list)
((symbol) (##sys#slot #(1) '2)))
-(keyword-style (#(procedure #:clean) keyword-style (#!optional symbol) symbol))
-
(chicken.flonum#maximum-flonum float)
(chicken.flonum#minimum-flonum float)
(chicken.fixnum#most-negative-fixnum fixnum)
(chicken.fixnum#most-positive-fixnum fixnum)
-(parentheses-synonyms (#(procedure #:clean) parentheses-synonyms (#!optional *) *))
;; gc
@@ -1393,8 +1393,6 @@
(chicken.repl#quit (procedure chicken.repl#quit (#!optional *) noreturn))
-(symbol-escape (#(procedure #:clean) symbol-escape (#!optional *) *))
-
(##sys#void (#(procedure #:pure) void (#!rest) undefined))
;; chicken (internal)
Trap