Commit 32801332 authored by Dave Cooper's avatar Dave Cooper
Browse files

finished the define-object-toplevel-macro

parent f0b92f8c
...@@ -121,12 +121,13 @@ compared to applications compiled with it set to T. Defaults to NIL.") ...@@ -121,12 +121,13 @@ compared to applications compiled with it set to T. Defaults to NIL.")
(list :required-input-slots :optional-input-slots :settable-optional-input-slots (list :required-input-slots :optional-input-slots :settable-optional-input-slots
:defaulted-input-slots :settable-defaulted-input-slots :computed-slots :settable-computed-slots :defaulted-input-slots :settable-defaulted-input-slots :computed-slots :settable-computed-slots
:uncached-computed-slots :uncached-computed-slots
:objects :quantified-objects :hidden-objects :quantified-hidden-objects :functions :objects :quantified-objects :hidden-objects :quantified-hidden-objects
:query-slots)) :functions :query-slots))
(defparameter *allowed-define-object-toplevel-keywords* (defparameter *allowed-define-object-toplevel-keywords*
(list :input-slots :computed-slots :objects :hidden-objects :functions (list :input-slots :computed-slots :objects :hidden-objects :functions
:methods :trickle-down-slots :cached-functions :cached-methods)) :methods :trickle-down-slots :cached-functions :cached-methods
:documentation :no-vanilla-mixin?))
(defparameter *define-object-toplevel-macros* (make-hash-table)) (defparameter *define-object-toplevel-macros* (make-hash-table))
......
...@@ -390,8 +390,6 @@ You have a dependency on caffeine. Your children are your dependants. ...@@ -390,8 +390,6 @@ You have a dependency on caffeine. Your children are your dependants.
;; FLAG - call recursively until no more non-standard keywords remain. ;; FLAG - call recursively until no more non-standard keywords remain.
(setq plist (expand-define-object-macros-toplevel plist)) (setq plist (expand-define-object-macros-toplevel plist))
(print-variables plist)
(let ((ht (make-hash-table)) result) (let ((ht (make-hash-table)) result)
(mapc #'(lambda(key value) (let ((current (gethash key ht))) (mapc #'(lambda(key value) (let ((current (gethash key ht)))
;; FLAG consider nconc here. ;; FLAG consider nconc here.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment