From 6318503f0ac39f4bffa88fa922952224621b1b83 Mon Sep 17 00:00:00 2001 From: Peter Bex Date: Mon, 21 Aug 2017 21:12:59 +0200 Subject: [PATCH] Rename (chicken lolevel) to (chicken memory representation) This module was already finalized, we just hadn't decided on a final name yet. --- README | 2 +- c-platform.scm | 18 ++++++++++-------- defaults.make | 8 ++++---- distribution/manifest | 4 ++-- lolevel.scm | 4 ++-- modules.scm | 1 - rules.make | 5 +++-- tests/lolevel-tests.scm | 3 ++- tests/posix-tests.scm | 2 +- types.db | 38 +++++++++++++++++++------------------- 10 files changed, 44 insertions(+), 41 deletions(-) diff --git a/README b/README index d6305711..251debe8 100644 --- a/README +++ b/README @@ -306,8 +306,8 @@ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/_/ | | |-- chicken.keyword.import.so | | |-- chicken.load.import.so | | |-- chicken.locative.import.so - | | |-- chicken.lolevel.import.so | | |-- chicken.memory.import.so + | | |-- chicken.memory.representation.import.so | | |-- chicken.pathname.import.so | | |-- chicken.platform.import.so | | |-- chicken.plist.import.so diff --git a/c-platform.scm b/c-platform.scm index 9f0554e7..46572b91 100644 --- a/c-platform.scm +++ b/c-platform.scm @@ -178,8 +178,6 @@ srfi-4#blob->u32vector/shared srfi-4#blob->s32vector/shared srfi-4#blob->u64vector/shared srfi-4#blob->s64vector/shared srfi-4#blob->f32vector/shared srfi-4#blob->f64vector/shared - chicken.lolevel#number-of-slots chicken.lolevel#make-record-instance - chicken.lolevel#block-ref chicken.lolevel#block-set! chicken.memory#u8vector-ref chicken.memory#s8vector-ref chicken.memory#u16vector-ref chicken.memory#s16vector-ref chicken.memory#u32vector-ref chicken.memory#s32vector-ref @@ -190,6 +188,10 @@ chicken.memory#u16vector-set! chicken.memory#s16vector-set! chicken.memory#u32vector-set! chicken.memory#s32vector-set! chicken.memory#u64vector-set! chicken.memory#s64vector-set! + chicken.memory.representation#number-of-slots + chicken.memory.representation#make-record-instance + chicken.memory.representation#block-ref + chicken.memory.representation#block-set! chicken.locative#locative-ref chicken.locative#locative-set! chicken.locative#locative->object chicken.locative#locative? chicken.memory#pointer+ chicken.memory#pointer=? @@ -560,8 +562,8 @@ (rewrite 'list-tail 2 2 "C_i_list_tail" #t) (rewrite '##sys#structure? 2 2 "C_i_structurep" #t) (rewrite '##sys#bytevector? 2 2 "C_bytevectorp" #t) -(rewrite 'chicken.lolevel#block-ref 2 2 "C_slot" #f) ; ok to be unsafe, lolevel is anyway -(rewrite 'chicken.lolevel#number-of-slots 2 1 "C_block_size" #f) +(rewrite 'chicken.memory.representation#block-ref 2 2 "C_slot" #f) ; ok to be unsafe, lolevel is anyway +(rewrite 'chicken.memory.representation#number-of-slots 2 1 "C_block_size" #f) (rewrite 'assv 14 'fixnum 2 "C_i_assq" "C_u_i_assq") (rewrite 'assv 2 2 "C_i_assv" #t) @@ -648,9 +650,9 @@ (rewrite 'setter 11 1 '##sys#setter #t) (rewrite 'for-each 11 2 '##sys#for-each #t) (rewrite 'map 11 2 '##sys#map #t) -(rewrite 'chicken.lolevel#block-set! 11 3 '##sys#setslot #t) +(rewrite 'chicken.memory.representation#block-set! 11 3 '##sys#setslot #t) (rewrite '##sys#block-set! 11 3 '##sys#setslot #f) -(rewrite 'chicken.lolevel#make-record-instance 11 #f '##sys#make-structure #f) +(rewrite 'chicken.memory.representation#make-record-instance 11 #f '##sys#make-structure #f) (rewrite 'substring 11 3 '##sys#substring #f) (rewrite 'string-append 11 2 '##sys#string-append #f) (rewrite 'string->list 11 1 '##sys#string->list #t) @@ -964,7 +966,6 @@ (srfi-4#f32vector-ref . srfi-4#f32vector-set!) (srfi-4#f64vector-ref . srfi-4#f64vector-set!) (chicken.locative#locative-ref . chicken.locative#locative-set!) - (chicken.lolevel#block-ref . chicken.lolevel#block-set!) (chicken.memory#pointer-u8-ref . chicken.memory#pointer-u8-set!) (chicken.memory#pointer-s8-ref . chicken.memory#pointer-s8-set!) (chicken.memory#pointer-u16-ref . chicken.memory#pointer-u16-set!) @@ -972,7 +973,8 @@ (chicken.memory#pointer-u32-ref . chicken.memory#pointer-u32-set!) (chicken.memory#pointer-s32-ref . chicken.memory#pointer-s32-set!) (chicken.memory#pointer-f32-ref . chicken.memory#pointer-f32-set!) - (chicken.memory#pointer-f64-ref . chicken.memory#pointer-f64-set!))) + (chicken.memory#pointer-f64-ref . chicken.memory#pointer-f64-set!) + (chicken.memory.representation#block-ref . chicken.memory.representation#block-set!) )) (rewrite '##sys#setter 8 diff --git a/defaults.make b/defaults.make index a20d4cd5..88ba514c 100644 --- a/defaults.make +++ b/defaults.make @@ -267,12 +267,12 @@ PRIMITIVE_IMPORT_LIBRARIES = chicken chicken.condition chicken.csi chicken.forei DYNAMIC_IMPORT_LIBRARIES = srfi-4 DYNAMIC_CHICKEN_IMPORT_LIBRARIES = bitwise blob errno file.posix \ fixnum flonum format gc io keyword load locative memory \ - platform plist posix pretty-print process process.signal \ - process-context random syntax sort string time time.posix + memory.representation platform plist posix pretty-print \ + process process.signal process-context random syntax \ + sort string time time.posix DYNAMIC_CHICKEN_COMPILER_IMPORT_LIBRARIES = user-pass DYNAMIC_CHICKEN_UNIT_IMPORT_LIBRARIES = continuation data-structures \ - eval file internal irregex lolevel pathname port \ - read-syntax repl tcp + eval file internal irregex pathname port read-syntax repl tcp # targets diff --git a/distribution/manifest b/distribution/manifest index a3f57dbf..55d86ed0 100644 --- a/distribution/manifest +++ b/distribution/manifest @@ -308,10 +308,10 @@ chicken.load.import.scm chicken.load.import.c chicken.locative.import.scm chicken.locative.import.c -chicken.lolevel.import.scm -chicken.lolevel.import.c chicken.memory.import.scm chicken.memory.import.c +chicken.memory.representation.import.scm +chicken.memory.representation.import.c chicken.pathname.import.scm chicken.pathname.import.c chicken.platform.import.scm diff --git a/lolevel.scm b/lolevel.scm index ce99b23f..d1483496 100644 --- a/lolevel.scm +++ b/lolevel.scm @@ -407,7 +407,7 @@ EOF ) ; chicken.memory -(module chicken.lolevel +(module chicken.memory.representation (block-ref block-set! extend-procedure extended-procedure? make-record-instance mutate-procedure! number-of-bytes number-of-slots object-become! object-copy procedure-data @@ -558,7 +558,7 @@ EOF (##sys#become! (list (cons old (proc new)))) new ) ) -) ; chicken.lolevel +) ; chicken.memory.representation (module chicken.locative diff --git a/modules.scm b/modules.scm index a9d36706..441e85ae 100644 --- a/modules.scm +++ b/modules.scm @@ -969,7 +969,6 @@ (##sys#register-module-alias 'irregex 'chicken.irregex) (##sys#register-module-alias 'keyword 'chicken.keyword) (##sys#register-module-alias 'locative 'chicken.locative) -(##sys#register-module-alias 'lolevel 'chicken.lolevel) (##sys#register-module-alias 'memory 'chicken.memory) (##sys#register-module-alias 'pathname 'chicken.pathname) (##sys#register-module-alias 'platform 'chicken.platform) diff --git a/rules.make b/rules.make index 18f9b025..43242be6 100644 --- a/rules.make +++ b/rules.make @@ -521,6 +521,7 @@ $(eval $(call declare-emitted-import-lib-dependency,chicken.pretty-print,extras) $(eval $(call declare-emitted-import-lib-dependency,chicken.random,extras)) $(eval $(call declare-emitted-import-lib-dependency,chicken.locative,lolevel)) $(eval $(call declare-emitted-import-lib-dependency,chicken.memory,lolevel)) +$(eval $(call declare-emitted-import-lib-dependency,chicken.memory.representation,lolevel)) $(eval $(call declare-emitted-import-lib-dependency,chicken.syntax,expand)) $(eval $(call declare-emitted-import-lib-dependency,chicken.sort,data-structures)) $(eval $(call declare-emitted-import-lib-dependency,chicken.string,data-structures)) @@ -864,8 +865,8 @@ file.c: $(SRCDIR)file.scm $(SRCDIR)common-declarations.scm lolevel.c: $(SRCDIR)lolevel.scm $(SRCDIR)common-declarations.scm $(bootstrap-lib) \ -emit-import-library chicken.locative \ - -emit-import-library chicken.lolevel \ - -emit-import-library chicken.memory + -emit-import-library chicken.memory \ + -emit-import-library chicken.memory.representation tcp.c: $(SRCDIR)tcp.scm $(SRCDIR)common-declarations.scm $(bootstrap-lib) -emit-import-library chicken.tcp srfi-4.c: $(SRCDIR)srfi-4.scm $(SRCDIR)common-declarations.scm diff --git a/tests/lolevel-tests.scm b/tests/lolevel-tests.scm index 1896b4cd..88c84bf6 100644 --- a/tests/lolevel-tests.scm +++ b/tests/lolevel-tests.scm @@ -1,6 +1,7 @@ ;;;; Unit lolevel testing -(use chicken.memory chicken.platform format locative lolevel srfi-4) +(use chicken.format chicken.locative chicken.platform + chicken.memory chicken.memory.representation srfi-4) (define-syntax assert-error (syntax-rules () diff --git a/tests/posix-tests.scm b/tests/posix-tests.scm index 3063f47c..381b7ff7 100644 --- a/tests/posix-tests.scm +++ b/tests/posix-tests.scm @@ -2,7 +2,7 @@ (chicken file) (chicken platform) (chicken posix) - (chicken lolevel)) + (chicken memory representation)) (define-syntax assert-error (syntax-rules () diff --git a/types.db b/types.db index 85fb1fb4..0fb983f8 100644 --- a/types.db +++ b/types.db @@ -1775,43 +1775,43 @@ (((or locative procedure port)) (let ((#(tmp) #(1))) '#f))) -;; lolevel +;; memory.representation -(chicken.lolevel#block-ref (#(procedure #:clean #:enforce) chicken.lolevel#block-ref (* fixnum) *)) -(chicken.lolevel#block-set! (#(procedure #:enforce) chicken.lolevel#block-set! (* fixnum *) *)) -(chicken.lolevel#extend-procedure (#(procedure #:clean #:enforce) chicken.lolevel#extend-procedure (procedure *) procedure)) -(chicken.lolevel#extended-procedure? (#(procedure #:clean) chicken.lolevel#extended-procedure (*) boolean)) +(chicken.memory.representation#block-ref (#(procedure #:clean #:enforce) chicken.memory.representation#block-ref (* fixnum) *)) +(chicken.memory.representation#block-set! (#(procedure #:enforce) chicken.memory.representation#block-set! (* fixnum *) *)) +(chicken.memory.representation#extend-procedure (#(procedure #:clean #:enforce) chicken.memory.representation#extend-procedure (procedure *) procedure)) +(chicken.memory.representation#extended-procedure? (#(procedure #:clean) chicken.memory.representation#extended-procedure (*) boolean)) -(chicken.lolevel#mutate-procedure! - (#(procedure #:enforce) chicken.lolevel#mutate-procedure! (procedure (procedure (procedure) . *)) procedure)) +(chicken.memory.representation#mutate-procedure! + (#(procedure #:enforce) chicken.memory.representation#mutate-procedure! (procedure (procedure (procedure) . *)) procedure)) -(chicken.lolevel#number-of-bytes (#(procedure #:clean) chicken.lolevel#number-of-bytes (*) fixnum) +(chicken.memory.representation#number-of-bytes (#(procedure #:clean) chicken.memory.representation#number-of-bytes (*) fixnum) (((or blob string)) (##sys#size #(1))) (((or port procedure symbol pair vector locative float pointer-vector)) ;; would be applicable to all structure types, but we can't specify ;; "(struct *)" (yet) (##core#inline "C_bytes" (##sys#size #(1))))) -(chicken.lolevel#number-of-slots (#(procedure #:clean #:foldable) chicken.lolevel#number-of-slots (*) fixnum) +(chicken.memory.representation#number-of-slots (#(procedure #:clean #:foldable) chicken.memory.representation#number-of-slots (*) fixnum) (((or vector symbol pair)) (##sys#size #(1)))) -(chicken.lolevel#object-become! (procedure chicken.lolevel#object-become! (list) *)) -(chicken.lolevel#object-copy (#(procedure #:clean) chicken.lolevel#object-copy (*) *)) -(chicken.lolevel#procedure-data (#(procedure #:clean #:enforce) chicken.lolevel#procedure-data (procedure) *)) -(chicken.lolevel#record->vector (#(procedure #:clean) chicken.lolevel#record->vector (*) vector)) +(chicken.memory.representation#object-become! (procedure chicken.memory.representation#object-become! (list) *)) +(chicken.memory.representation#object-copy (#(procedure #:clean) chicken.memory.representation#object-copy (*) *)) +(chicken.memory.representation#procedure-data (#(procedure #:clean #:enforce) chicken.memory.representation#procedure-data (procedure) *)) +(chicken.memory.representation#record->vector (#(procedure #:clean) chicken.memory.representation#record->vector (*) vector)) -(chicken.lolevel#record-instance? (#(procedure #:clean) chicken.lolevel#record-instance? (* #!optional symbol) boolean) +(chicken.memory.representation#record-instance? (#(procedure #:clean) chicken.memory.representation#record-instance? (* #!optional symbol) boolean) ((* symbol) (##sys#structure? #(1) #(2))) ((*) (let ((#(tmp) #(1))) (if (##sys#immediate? #(tmp)) '#f (##sys#generic-structure? #(tmp)))))) -(chicken.lolevel#record-instance-length (#(procedure #:clean) chicken.lolevel#record-instance-length (*) fixnum)) -(chicken.lolevel#record-instance-slot (#(procedure #:clean #:enforce) chicken.lolevel#record-instance-slot (* fixnum) *)) -(chicken.lolevel#record-instance-slot-set! (#(procedure #:clean #:enforce) chicken.lolevel#record-instance-slot-set! (* fixnum *) undefined)) -(chicken.lolevel#record-instance-type (#(procedure #:clean) chicken.lolevel#record-instance-type (*) *)) -(chicken.lolevel#set-procedure-data! (#(procedure #:clean #:enforce) chicken.lolevel#set-procedure-data! (procedure *) undefined)) +(chicken.memory.representation#record-instance-length (#(procedure #:clean) chicken.memory.representation#record-instance-length (*) fixnum)) +(chicken.memory.representation#record-instance-slot (#(procedure #:clean #:enforce) chicken.memory.representation#record-instance-slot (* fixnum) *)) +(chicken.memory.representation#record-instance-slot-set! (#(procedure #:clean #:enforce) chicken.memory.representation#record-instance-slot-set! (* fixnum *) undefined)) +(chicken.memory.representation#record-instance-type (#(procedure #:clean) chicken.memory.representation#record-instance-type (*) *)) +(chicken.memory.representation#set-procedure-data! (#(procedure #:clean #:enforce) chicken.memory.representation#set-procedure-data! (procedure *) undefined)) ;; locative -- 2.11.0