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

[sod] / src / method-aggregate.lisp

diff --git a/src/method-aggregate.lisp b/src/method-aggregate.lisp
index e374924e12ce9de6937ab61e862ad2333e134d4f..e2797baac536c2be38dfd43dd6e58ea61944af4a 100644 (file)
--- a/src/method-aggregate.lisp
+++ b/src/method-aggregate.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


@@ -28,11 +28,12 @@ (cl:in-package #:sod)
 ;;;--------------------------------------------------------------------------
 ;;; Classes and protocol.
 
 ;;;--------------------------------------------------------------------------
 ;;; Classes and protocol.
 

-(export 'aggregating-message)
+(export '(aggregating-message
+         sod-message-combination sod-message-kernel-function))

 (defclass aggregating-message (simple-message)
   ((combination :initarg :combination :type keyword
 (defclass aggregating-message (simple-message)
   ((combination :initarg :combination :type keyword

-               :reader message-combination)
-   (kernel-function :type function :reader message-kernel-function))
+               :reader sod-message-combination)
+   (kernel-function :type function :reader sod-message-kernel-function))

   (:documentation
    "Message class for aggregating method combinations.
 
   (:documentation
    "Message class for aggregating method combinations.
 


@@ -105,14 +106,14 @@ (defmethod check-message-type ((message aggregating-message) type)
   (with-slots (combination) message
     (check-aggregating-message-type message combination type)))
 
   (with-slots (combination) message
     (check-aggregating-message-type message combination type)))
 

-(defmethod message-effective-method-class ((message aggregating-message))
+(defmethod sod-message-effective-method-class ((message aggregating-message))

   'aggregating-effective-method)
 
 (defmethod simple-method-body
     ((method aggregating-effective-method) codegen target)
   (let ((argument-names (effective-method-basic-argument-names method))
        (primary-methods (effective-method-primary-methods method)))
   'aggregating-effective-method)
 
 (defmethod simple-method-body
     ((method aggregating-effective-method) codegen target)
   (let ((argument-names (effective-method-basic-argument-names method))
        (primary-methods (effective-method-primary-methods method)))

-    (funcall (message-kernel-function (effective-method-message method))
+    (funcall (sod-message-kernel-function (effective-method-message method))

             codegen target argument-names primary-methods)))
 
 (defmethod shared-initialize :before
             codegen target argument-names primary-methods)))
 
 (defmethod shared-initialize :before