src/{builtin,c-types-{impl,parse}}.lisp: Add some more builtin types.

[sod] / src / module-parse.lisp

diff --git a/src/module-parse.lisp b/src/module-parse.lisp
index 0713b76f2c893d3a6af0de897055042003e1dbb4..d9bde3045379e1bcbcc71826f33576a6e66e362e 100644 (file)
--- a/src/module-parse.lisp
+++ b/src/module-parse.lisp
@@ -7,7 +7,7 @@
 
 ;;;----- Licensing notice ---------------------------------------------------
 ;;;
 
 ;;;----- Licensing notice ---------------------------------------------------
 ;;;

-;;; This file is part of the Sensble Object Design, an object system for C.
+;;; This file is part of the Sensible Object Design, an object system for C.

 ;;;
 ;;; SOD is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
 ;;;
 ;;; SOD is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by


@@ -167,6 +167,8 @@ (define-pluggable-parser module lisp (scanner pset)
 ;;;--------------------------------------------------------------------------
 ;;; Class declarations.
 
 ;;;--------------------------------------------------------------------------
 ;;; Class declarations.
 

+(export 'class-item)
+

 (defun parse-class-body (scanner pset name supers)
   ;; class-body ::= `{' class-item* `}'
   ;;
 (defun parse-class-body (scanner pset name supers)
   ;; class-body ::= `{' class-item* `}'
   ;;


@@ -342,13 +344,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