Skip to content

Commit 5d315c8

Browse files
authored
Fixing c2mop:direct-slot-definition-class methods to return a class (#187)
Right now they return symbols, which is not the correct return type based on the AMOP Book Specification which is the official specification adopted by the ANSI Spec. See https://lisp-docs.github.io/cl-language-reference/meta-object-protocol/dictionary/direct-slot-definition-class and https://lisp-docs.github.io/cl-language-reference/meta-object-protocol/dictionary/effective-slot-definition-class Or http://metamodular.com/CLOS-MOP/direct-slot-definition-class.html and http://metamodular.com/CLOS-MOP/effective-slot-definition-class.html
1 parent eb433e4 commit 5d315c8

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/core/class/table.lisp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
class)))
142142

143143
(defmethod c2mop:direct-slot-definition-class ((class table-class) &key &allow-other-keys)
144-
'table-column-class)
144+
(find-class 'table-column-class))
145145

146146
(defmethod c2mop:effective-slot-definition-class ((class table-class) &rest initargs)
147147
(declare (ignorable initargs))

src/core/dao/mixin.lisp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
(defclass dao-table-mixin (table-class) ())
7777

7878
(defmethod c2mop:direct-slot-definition-class ((class dao-table-mixin) &key)
79-
'dao-table-column-class)
79+
(find-class 'dao-table-column-class))
8080

8181
(defmethod c2mop:effective-slot-definition-class ((class dao-table-mixin) &rest initargs)
8282
(declare (ignorable initargs))

src/core/dao/table.lisp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
:initform '(t))))
4040

4141
(defmethod c2mop:direct-slot-definition-class ((class dao-table-class) &key)
42-
'dao-table-column-class)
42+
(find-class 'dao-table-column-class))
4343

4444
(defmethod c2mop:effective-slot-definition-class ((class dao-table-class) &rest initargs)
4545
(declare (ignorable initargs))

src/core/dao/view.lisp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
:reader dao-table-view-as-query)))
2020

2121
(defmethod c2mop:direct-slot-definition-class ((class dao-table-view) &key)
22-
'dao-table-column-class)
22+
(find-class 'dao-table-column-class))
2323

2424
(defmethod c2mop:effective-slot-definition-class ((class dao-table-view) &rest initargs)
2525
(declare (ignorable initargs))

0 commit comments

Comments
 (0)