src/module-parse.lisp: Factor out slot and maybe-initializer creation.

diff --git a/src/module-parse.lisp b/src/module-parse.lisp
index e175a5b3ffe1be8d2ab4d6952577d80ffb7d5985..028ad8774303a34c1d84dbdac7a25fa6bcbaa640 100644 (file)
--- a/src/module-parse.lisp
+++ b/src/module-parse.lisp
@@ -334,24 +334,24 @@ (defun parse-class-body (scanner pset name supers)
                 ;;             [`,' list[init-declarator]] `;'
                 ;;
                 ;; init-declarator ::= declarator [initializer]
-                (parse (and (seq ((init (? (parse-initializer))))
-                              (make-sod-slot class name type
-                                             sub-pset scanner)
-                              (when init
-                                (make-sod-instance-initializer
-                                 class nick name init sub-pset scanner)))
-                            (skip-many ()
-                              (seq (#\,
-                                    (ds (parse-declarator scanner
-                                                          base-type))
-                                    (init (? (parse-initializer))))
-                                (make-sod-slot class (cdr ds) (car ds)
-                                               sub-pset scanner)
-                                (when init
-                                  (make-sod-instance-initializer
-                                   class nick (cdr ds) init
-                                   sub-pset scanner))))
-                            #\;)))
+                (flet ((make-it (name type init)
+                         (make-sod-slot class name type
+                                        sub-pset scanner)
+                         (when init
+                           (make-sod-instance-initializer class
+                                                          nick name
+                                                          init
+                                                          sub-pset
+                                                          scanner))))
+                  (parse (and (seq ((init (? (parse-initializer))))
+                                (make-it name type init))
+                              (skip-many ()
+                                (seq (#\,
+                                      (ds (parse-declarator scanner
+                                                            base-type))
+                                      (init (? (parse-initializer))))
+                                  (make-it (cdr ds) (car ds) init)))
+                              #\;))))
 
               (parse-initializer-item (sub-pset must-init-p constructor)
                 ;; initializer-item ::=