src/module-parse.lisp (parse-class-body): Refactor superclass list.

Arrange to be able to do more computation on the direct superclass
list.  No functional change for now.

diff --git a/src/module-parse.lisp b/src/module-parse.lisp
index c5b28a610e59fc8a9068e73317087a9a27fcd0fc..0a3cd28296adcfbb129cbf61cc5a8641bf584d9e 100644 (file)
--- a/src/module-parse.lisp
+++ b/src/module-parse.lisp
@@ -260,6 +260,14 @@ (defun parse-class-body (scanner pset name supers)
   (with-parser-context (token-scanner-context :scanner scanner)
     (when name (make-class-type name))
     (let* ((duff (null name))
   (with-parser-context (token-scanner-context :scanner scanner)
     (when name (make-class-type name))
     (let* ((duff (null name))

+          (superclasses
+           (let ((superclasses (restart-case
+                                   (mapcar #'find-sod-class
+                                           (or supers (list "SodObject")))
+                                 (continue ()
+                                   (setf duff t)
+                                   (list (find-sod-class "SodObject"))))))
+             superclasses))

           (synthetic-name (or name
                               (let ((var (synthetic-name)))
                                 (unless pset
           (synthetic-name (or name
                               (let ((var (synthetic-name)))
                                 (unless pset


@@ -267,14 +275,7 @@ (defun parse-class-body (scanner pset name supers)
                                 (unless (pset-get pset "nick")
                                   (add-property pset "nick" var :type :id))
                                 var)))
                                 (unless (pset-get pset "nick")
                                   (add-property pset "nick" var :type :id))
                                 var)))

-          (class (make-sod-class synthetic-name
-                                 (restart-case
-                                     (mapcar #'find-sod-class
-                                             (or supers (list "SodObject")))
-                                   (continue ()
-                                     (setf duff t)
-                                     (list (find-sod-class "SodObject"))))
-                                 pset scanner))
+          (class (make-sod-class synthetic-name superclasses pset scanner))

           (nick (sod-class-nickname class)))
 
       (labels ((must-id ()
           (nick (sod-class-nickname class)))
 
       (labels ((must-id ()