Update automatically managed build utilities.

[sod] / src / module-parse.lisp

diff --git a/src/module-parse.lisp b/src/module-parse.lisp
index df4ea277de7c0078f736a1927d548ad067300f2c..9cad3d4871dd9aba0bf2dc9294d1530773690e1c 100644 (file)
--- a/src/module-parse.lisp
+++ b/src/module-parse.lisp
@@ -197,9 +197,16 @@ (defun parse-class-body (scanner pset name supers)
               (parse-message-item (sub-pset type name)
                 ;; message-item ::=
                 ;;     declspec+ declarator -!- (method-body | `;')
               (parse-message-item (sub-pset type name)
                 ;; message-item ::=
                 ;;     declspec+ declarator -!- (method-body | `;')

-                (make-sod-message class name type sub-pset scanner)
-                (parse (or #\; (parse-method-item sub-pset
-                                                  type nick name))))
+                ;;
+                ;; Don't allow a method-body here if the message takes a
+                ;; varargs list, because we don't have a name for the
+                ;; `va_list' parameter.
+                (let ((message (make-sod-message class name type
+                                                 sub-pset scanner)))
+                  (if (varargs-message-p message)
+                      (parse #\;)
+                      (parse (or #\; (parse-method-item sub-pset
+                                                        type nick name))))))

 
               (parse-method-item (sub-pset type sub-nick name)
                 ;; method-item ::=
 
               (parse-method-item (sub-pset type sub-nick name)
                 ;; method-item ::=


@@ -335,13 +342,13 @@ (defun parse-class-body (scanner pset name supers)
                 ;; (which might be dotted).  So we parse that here and
                 ;; dispatch based on what we find.
                 (parse (or (plug class-item scanner class sub-pset)
                 ;; (which might be dotted).  So we parse that here and
                 ;; dispatch based on what we find.
                 (parse (or (plug class-item scanner class sub-pset)

-                           ;(peek
+                           (peek

                             (seq ((ds (parse-c-type scanner))
                                   (dc (parse-maybe-dotted-declarator ds))
                                   (nil (class-item-dispatch sub-pset
                                                             ds
                                                             (car dc)
                             (seq ((ds (parse-c-type scanner))
                                   (dc (parse-maybe-dotted-declarator ds))
                                   (nil (class-item-dispatch sub-pset
                                                             ds
                                                             (car dc)

-                                                            (cdr dc)))));)
+                                                            (cdr dc))))))

                            (and "class"
                                 (parse-initializer-item
                                  sub-pset
                            (and "class"
                                 (parse-initializer-item
                                  sub-pset