From: Daniel Kochmański <daniel@turtleware.eu>
Date: Tue, 18 Aug 2015 10:07:57 +0000 (+0200)
Subject: cosmetic: deduplicate expand-deftype function definition
X-Git-Tag: ECL-16.0.0~1^2~32
X-Git-Url: http://git.pulsar-zone.net/?a=commitdiff_plain;h=64a96a537bd8f3b531c9ceae86770040641f59bf;p=ecl.git

cosmetic: deduplicate expand-deftype function definition

Signed-off-by: Daniel Kochmański <daniel@turtleware.eu>
---

diff --git a/src/cmp/cmpprop.lsp b/src/cmp/cmpprop.lsp
index 17bf4ea..a676e2a 100644
--- a/src/cmp/cmpprop.lsp
+++ b/src/cmp/cmpprop.lsp
@@ -339,7 +339,7 @@ compute it. This version only handles the simplest cases."
                  'character)
                 ((eq array 'base-string)
                  'base-char)
-                ((member (setf array (expand-deftype array))
+                ((member (setf array (si::expand-deftype array))
                          '(array vector simple-array))
                  t)
                 ((atom array)
diff --git a/src/cmp/cmptype.lsp b/src/cmp/cmptype.lsp
index 13f5538..6faa196 100644
--- a/src/cmp/cmptype.lsp
+++ b/src/cmp/cmptype.lsp
@@ -42,16 +42,6 @@
         (c1constant-value new-value :only-small-values t)
         (c1nil))))
 
-(defun expand-deftype (type)
-  (let (base args)
-    (if (atom type)
-        (setf base type args nil)
-        (setf base (car type) args (cdr type)))
-    (let ((fn (get-sysprop base 'SI::DEFTYPE-DEFINITION)))
-      (if fn
-          (expand-deftype (apply fn args))
-          type))))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; TYPE CHECKING