-(defun %sort-types-topologicaly (unsorted)
- (let ((sorted ()))
- (loop while unsorted do
- (dolist (type unsorted)
- (let ((dependencies
- (append (rest (type-hierarchy type)) (type-interfaces type))))
+(defun find-type-dependencies (type)
+ (let ((list-dependencies (second (find-type-info type))))
+ (when list-dependencies
+ (funcall list-dependencies (find-type-number type t)))))
+
+(defun %sort-types-topologicaly (types)
+ (let ((unsorted (mapcar
+ #'(lambda (type)
+ (cons type (remove-if #'(lambda (dep)
+ (not (find dep types)))
+ (find-type-dependencies type))))
+ types))
+ (forward-define ())
+ (sorted ()))
+
+ (loop
+ as tmp = unsorted then (or (rest tmp) unsorted)
+ while tmp
+ do (destructuring-bind (type . dependencies) (first tmp)