From e8f931c4842e6388eaaa49dcb785efc03bf28642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= Date: Fri, 21 Jul 2023 11:48:12 +0200 Subject: [PATCH] subtypep: fix the expansion of the type STRING The type STRING was defined as an alias to (ARRAY CHARACTER (*)) and that was inconsistent with the type definition for unicode builds, it should be: (OR (ARRAY CHARACTER (*)) (ARRAY BASE-CHAR (*))) --- src/lsp/predlib.lsp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lsp/predlib.lsp b/src/lsp/predlib.lsp index 9ffbaaee9..acbc8f1e5 100644 --- a/src/lsp/predlib.lsp +++ b/src/lsp/predlib.lsp @@ -1349,12 +1349,11 @@ if not possible." (SIMPLE-VECTOR (SIMPLE-ARRAY T (*))) (SIMPLE-BIT-VECTOR (SIMPLE-ARRAY BIT (*))) (VECTOR (ARRAY * (*))) - (STRING (ARRAY CHARACTER (*))) - #+unicode - (BASE-STRING (ARRAY BASE-CHAR (*))) + #-unicode (STRING (ARRAY CHARACTER (*))) + #+unicode (STRING (OR (ARRAY CHARACTER (*)) (ARRAY BASE-CHAR (*)))) + #+unicode (BASE-STRING (ARRAY BASE-CHAR (*))) (SIMPLE-STRING (SIMPLE-ARRAY CHARACTER (*))) - #+unicode - (SIMPLE-BASE-STRING (SIMPLE-ARRAY BASE-CHAR (*))) + #+unicode (SIMPLE-BASE-STRING (SIMPLE-ARRAY BASE-CHAR (*))) (BIT-VECTOR (ARRAY BIT (*))) (SEQUENCE (OR CONS (MEMBER NIL) (ARRAY * (*))))