[int] some more minor refactorings

Author: digikar99

polymorphic-functions-lite.asd

@@ -1,6 +1,6 @@
 (asdf:defsystem "polymorphic-functions-lite"
   :license "MIT"
-  :version "0.5.0"                      ; beta
+  :version "0.5.1"                      ; beta
   :author "Shubhamkar Ayare (shubhamayare@yahoo.co.in)"
   :description "Variant of polymorphic-functions with no support for static dispatch. This lets it have minimal dependencies."
   :depends-on ("alexandria"

polymorphic-functions.asd

@@ -1,6 +1,6 @@
 (asdf:defsystem "polymorphic-functions"
   :license "MIT"
-  :version "0.5.0"                      ; beta
+  :version "0.5.1"                      ; beta
   :author "Shubhamkar Ayare (shubhamayare@yahoo.co.in)"
   :description "Type based dispatch for Common Lisp"
   :depends-on ("polymorphic-functions-lite"
@@ -14,10 +14,11 @@
                (:file "conditions"                 :depends-on ("polymorph-compiler-macro"))
                (:file "compiler-macro"             :depends-on ("conditions"))
                #+sbcl
-               (:file "sbcl-transform"             :depends-on ("conditions"))
+               (:file "sbcl-deftransform"          :depends-on ("conditions"))
                (:file "dispatch"                   :depends-on ("conditions"
                                                                 "compiler-macro"
-                                                                #+sbcl "sbcl-transform"))
+                                                                #+sbcl
+                                                                "sbcl-deftransform"))
                (:file "misc-tests"                 :depends-on ("dispatch"))
                (:file "benchmark"                  :depends-on ("misc-tests")))
   :perform (test-op (o c)

src/ensure-type-form.lisp

@@ -172,5 +172,3 @@ as well as the type enhanced using TYPE."
       (values `(with-return-type ,type
                  (block ,block-name (locally ,@body)))
               type)))
-
-

src/lambda-lists/base.lisp

@@ -240,4 +240,3 @@ of the following types:~%  ~S~%  ~S"
         proclaimation
         `(handler-bind ((warning #'muffle-warning))
            ,proclaimation))))
-

src/lambda-lists/parameters.lisp

@@ -130,36 +130,6 @@
                         normalized-list)))
     (nreverse normalized-list)))
 
-(defun sort-untyped-lambda-list (untyped-lambda-list)
-  "Sorts keyword arguments (if any) according to STRING<"
-  (if (member '&key untyped-lambda-list)
-      (let* ((key-position (position '&key untyped-lambda-list)))
-        (append (subseq untyped-lambda-list 0 key-position)
-                '(&key)
-                (sort (subseq untyped-lambda-list (1+ key-position))
-                      #'string<
-                      :key (lambda (param)
-                             (if (and (listp param)
-                                      (null (cddr param)))
-                                 (car param)
-                                 param)))))
-      untyped-lambda-list))
-
-(defun sort-typed-lambda-list (typed-lambda-list)
-  "Sorts keyword arguments (if any) according to STRING<"
-  (if (member '&key typed-lambda-list)
-      (let ((key-position
-              (position '&key
-                        typed-lambda-list)))
-        (append (subseq typed-lambda-list
-                        0 key-position)
-                '(&key)
-                (sort (subseq typed-lambda-list
-                              (1+ key-position))
-                      #'string<
-                      :key #'caar)))
-      typed-lambda-list))
-
 (def-test normalize-typed-lambda-list (:suite lambda-list)
   (5am:is-true (equal '((a t))
                       (normalize-typed-lambda-list '(a))))
@@ -196,6 +166,36 @@
   (is (equal '(a &key c) (untyped-lambda-list '((a number) &key ((c string))))))
   (is (equal '(a &rest args) (untyped-lambda-list '((a number) &rest args)))))
 
+(defun sort-untyped-lambda-list (untyped-lambda-list)
+  "Sorts keyword arguments (if any) according to STRING<"
+  (if (member '&key untyped-lambda-list)
+      (let* ((key-position (position '&key untyped-lambda-list)))
+        (append (subseq untyped-lambda-list 0 key-position)
+                '(&key)
+                (sort (subseq untyped-lambda-list (1+ key-position))
+                      #'string<
+                      :key (lambda (param)
+                             (if (and (listp param)
+                                      (null (cddr param)))
+                                 (car param)
+                                 param)))))
+      untyped-lambda-list))
+
+(defun sort-typed-lambda-list (typed-lambda-list)
+  "Sorts keyword arguments (if any) according to STRING<"
+  (if (member '&key typed-lambda-list)
+      (let ((key-position
+              (position '&key
+                        typed-lambda-list)))
+        (append (subseq typed-lambda-list
+                        0 key-position)
+                '(&key)
+                (sort (subseq typed-lambda-list
+                              (1+ key-position))
+                      #'string<
+                      :key #'caar)))
+      typed-lambda-list))
+
 (declaim (ftype (function (list list) polymorph-parameters)
                 make-polymorph-parameters-from-lambda-lists))
 (defun make-polymorph-parameters-from-lambda-lists (polymorphic-function-lambda-list

src/nonlite/ensure-type-form.lisp

@@ -1,6 +1,7 @@
 (in-package :polymorphic-functions)
 
 (defmacro with-return-type-in-env ((&key variable declare) return-type &body body)
+  ;; We put the &BODY only for good indentation
   "Returns two values: a form that has ASSERTs with SIMPLE-TYPE-ERROR to check the type
 as well as the type enhanced using TYPE."
   (declare (optimize debug))