projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.16.25:
[sbcl.git]
/
src
/
compiler
/
generic
/
late-type-vops.lisp
diff --git
a/src/compiler/generic/late-type-vops.lisp
b/src/compiler/generic/late-type-vops.lisp
index
b782be5
..
c9a9602
100644
(file)
--- a/
src/compiler/generic/late-type-vops.lisp
+++ b/
src/compiler/generic/late-type-vops.lisp
@@
-66,7
+66,8
@@
(!define-type-vops simple-string-p check-simple-string nil
object-not-simple-string-error
(!define-type-vops simple-string-p check-simple-string nil
object-not-simple-string-error
- (simple-base-string-widetag simple-array-nil-widetag))
+ (#!+sb-unicode simple-character-string-widetag
+ simple-base-string-widetag simple-array-nil-widetag))
(macrolet
((define-simple-array-type-vops ()
(macrolet
((define-simple-array-type-vops ()
@@
-109,11
+110,15
@@
(funcallable-instance-header-widetag))
(!define-type-vops array-header-p nil nil nil
(funcallable-instance-header-widetag))
(!define-type-vops array-header-p nil nil nil
- (simple-array-widetag complex-base-string-widetag complex-bit-vector-widetag
+ (simple-array-widetag
+ #!+sb-unicode complex-character-string-widetag
+ complex-base-string-widetag complex-bit-vector-widetag
complex-vector-widetag complex-array-widetag complex-vector-nil-widetag))
(!define-type-vops stringp check-string nil object-not-string-error
complex-vector-widetag complex-array-widetag complex-vector-nil-widetag))
(!define-type-vops stringp check-string nil object-not-string-error
- (simple-base-string-widetag complex-base-string-widetag
+ (#!+sb-unicode simple-character-string-widetag
+ #!+sb-unicode complex-character-string-widetag
+ simple-base-string-widetag complex-base-string-widetag
simple-array-nil-widetag complex-vector-nil-widetag))
(!define-type-vops base-string-p check-base-string nil object-not-base-string-error
simple-array-nil-widetag complex-vector-nil-widetag))
(!define-type-vops base-string-p check-base-string nil object-not-base-string-error
@@
-127,6
+132,11
@@
object-not-vector-nil-error
(simple-array-nil-widetag complex-vector-nil-widetag))
object-not-vector-nil-error
(simple-array-nil-widetag complex-vector-nil-widetag))
+#!+sb-unicode
+(!define-type-vops character-string-p check-character-string nil
+ object-not-character-string-error
+ (simple-character-string-widetag complex-character-string-widetag))
+
(!define-type-vops vectorp check-vector nil object-not-vector-error
(complex-vector-widetag .
#.(append
(!define-type-vops vectorp check-vector nil object-not-vector-error
(complex-vector-widetag .
#.(append