mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 19:50:24 +02:00
Code Activity

Types refactor for unboxed char ranges

Browse source 
* module/language/cps/types.scm (*max-codepoint*): Factor codepoint
  range restrictions to use this value.
This commit is contained in:
Andy Wingo 2016-06-10 07:46:24 +02:00
parent 6788faba7a
commit 1a2ab83bcf
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
module/language/cps/types.scm
View file

@ -220,6 +220,7 @@
(define *max-size-t* (define *max-size-t*
(min (+ (ash most-positive-fixnum 3) #b111) (min (+ (ash most-positive-fixnum 3) #b111)
(1- (ash 1 48)))) (1- (ash 1 48))))
(define *max-codepoint* #x10ffff)
(define-inlinable (make-unclamped-type-entry type min max) (define-inlinable (make-unclamped-type-entry type min max)
(vector type min max)) (vector type min max))
@ -693,8 +694,6 @@ minimum, and maximum."
;;; Strings. ;;; Strings.
;;; ;;;
(define *max-char* (1- (ash 1 24)))
(define-type-checker (string-ref s idx) (define-type-checker (string-ref s idx)
(and (check-type s &string 0 *max-size-t*) (and (check-type s &string 0 *max-size-t*)
(check-type idx &u64 0 *max-size-t*) (check-type idx &u64 0 *max-size-t*)
@ -702,17 +701,17 @@ minimum, and maximum."
(define-type-inferrer (string-ref s idx result) (define-type-inferrer (string-ref s idx result)
(restrict! s &string (1+ (&min/0 idx)) *max-size-t*) (restrict! s &string (1+ (&min/0 idx)) *max-size-t*)
(restrict! idx &u64 0 (1- (&max/size s))) (restrict! idx &u64 0 (1- (&max/size s)))
(define! result &char 0 *max-char*)) (define! result &char 0 *max-codepoint*))
(define-type-checker (string-set! s idx val) (define-type-checker (string-set! s idx val)
(and (check-type s &string 0 *max-size-t*) (and (check-type s &string 0 *max-size-t*)
(check-type idx &exact-integer 0 *max-size-t*) (check-type idx &exact-integer 0 *max-size-t*)
(check-type val &char 0 *max-char*) (check-type val &char 0 *max-codepoint*)
(< (&max idx) (&min s)))) (< (&max idx) (&min s))))
(define-type-inferrer (string-set! s idx val) (define-type-inferrer (string-set! s idx val)
(restrict! s &string (1+ (&min/0 idx)) *max-size-t*) (restrict! s &string (1+ (&min/0 idx)) *max-size-t*)
(restrict! idx &exact-integer 0 (1- (&max/size s))) (restrict! idx &exact-integer 0 (1- (&max/size s)))
(restrict! val &char 0 *max-char*)) (restrict! val &char 0 *max-codepoint*))
(define-simple-type-checker (string-length &string)) (define-simple-type-checker (string-length &string))
(define-type-inferrer (string-length s result) (define-type-inferrer (string-length s result)
@ -1422,15 +1421,15 @@ minimum, and maximum."
((logior &true &false) 0 0)) ((logior &true &false) 0 0))
(define-type-aliases char<? char<=? char>=? char>?) (define-type-aliases char<? char<=? char>=? char>?)
(define-simple-type-checker (integer->char (&u64 0 #x10ffff))) (define-simple-type-checker (integer->char (&u64 0 *max-codepoint*)))
(define-type-inferrer (integer->char i result) (define-type-inferrer (integer->char i result)
(restrict! i &u64 0 #x10ffff) (restrict! i &u64 0 *max-codepoint*)
(define! result &char (&min/0 i) (min (&max i) #x10ffff))) (define! result &char (&min/0 i) (min (&max i) *max-codepoint*)))
(define-simple-type-checker (char->integer &char)) (define-simple-type-checker (char->integer &char))
(define-type-inferrer (char->integer c result) (define-type-inferrer (char->integer c result)
(restrict! c &char 0 #x10ffff) (restrict! c &char 0 *max-codepoint*)
(define! result &u64 (&min/0 c) (min (&max c) #x10ffff))) (define! result &u64 (&min/0 c) (min (&max c) *max-codepoint*)))