EIEIO: Change class's representation to unify instance & class slots

* lisp/emacs-lisp/eieio-core.el (eieio--class): Change field names and order
to match those of cl--class; use cl--slot for both instance slots and
class slots.
(eieio--object-num-slots): Use cl-struct-slot-info.
(eieio--object-class): Rename from eieio--object-class-object.
(eieio--object-class-name): Remove.
(eieio-defclass-internal): Adjust to new slot representation.
Store doc in class rather than in `variable-documentation'.
(eieio--perform-slot-validation-for-default): Change API to take
a slot object.
(eieio--slot-override): New function.
(eieio--add-new-slot): Rewrite.
(eieio-copy-parents-into-subclass): Rewrite.
(eieio--validate-slot-value, eieio--validate-class-slot-value)
(eieio-oref-default, eieio-oset-default)
(eieio--class-slot-name-index, eieio-set-defaults): Adjust to new
slot representation.
(eieio--c3-merge-lists): Simplify.
(eieio--class/struct-parents): New function.
(eieio--class-precedence-bfs): Use it.

* lisp/emacs-lisp/eieio.el (with-slots): Use macroexp-let2.
(object-class-fast): Change recommend replacement.
(eieio-object-class): Rewrite.
(slot-exists-p): Adjust to new slot representation.
(initialize-instance): Adjust to new slot representation.
(object-write): Adjust to new slot representation.

* lisp/emacs-lisp/eieio-base.el (eieio-persistent-convert-list-to-object):
Manually map initargs to slot names.
(eieio-persistent-validate/fix-slot-value): Adjust to new
slot representation.

* lisp/emacs-lisp/eieio-compat.el (eieio--generic-static-symbol-specializers):
Extract from eieio--generic-static-symbol-generalizer.
(eieio--generic-static-symbol-generalizer): Use it.

* lisp/emacs-lisp/eieio-custom.el (eieio-object-value-create)
(eieio-object-value-get): Adjust to new slot representation.

* lisp/emacs-lisp/eieio-datadebug.el (data-debug/eieio-insert-slots):
Declare to silence warnings.
(data-debug-insert-object-button): Avoid `object-slots'.
(data-debug/eieio-insert-slots): Adjust to new slot representation.

* lisp/emacs-lisp/eieio-opt.el (eieio--help-print-slot): New function
extracted from eieio-help-class-slots.
(eieio-help-class-slots): Use it.  Adjust to new slot representation.

* test/automated/eieio-test-methodinvoke.el (make-instance): Use new-style
`subclass' specializer for a change.

* test/automated/eieio-test-persist.el (persist-test-save-and-compare):
Adjust to new slot representation.

* test/automated/eieio-tests.el (eieio-test-17-virtual-slot): Don't use
initarg in `oset'.
(eieio-test-32-slot-attribute-override-2): Adjust to new
slot representation.

* lisp/emacs-lisp/cl-preloaded.el (cl--class): Fix type of `parents'.

lisp/ChangeLog

@@ -1,3 +1,57 @@
+2015-03-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/eieio.el (with-slots): Use macroexp-let2.
+	(object-class-fast): Change recommend replacement.
+	(eieio-object-class): Rewrite.
+	(slot-exists-p): Adjust to new slot representation.
+	(initialize-instance): Adjust to new slot representation.
+	(object-write): Adjust to new slot representation.
+
+	* emacs-lisp/eieio-opt.el (eieio--help-print-slot): New function
+	extracted from eieio-help-class-slots.
+	(eieio-help-class-slots): Use it.  Adjust to new slot representation.
+
+	* emacs-lisp/eieio-datadebug.el (data-debug/eieio-insert-slots):
+	Declare to silence warnings.
+	(data-debug-insert-object-button): Avoid `object-slots'.
+	(data-debug/eieio-insert-slots): Adjust to new slot representation.
+
+	* emacs-lisp/eieio-custom.el (eieio-object-value-create)
+	(eieio-object-value-get): Adjust to new slot representation.
+
+	EIEIO: Change class's representation to unify instance and class slots
+	* emacs-lisp/eieio-core.el (eieio--class): Change field names and order
+	to match those of cl--class; use cl--slot for both instance slots and
+	class slots.
+	(eieio--object-num-slots): Use cl-struct-slot-info.
+	(eieio--object-class): Rename from eieio--object-class-object.
+	(eieio--object-class-name): Remove.
+	(eieio-defclass-internal): Adjust to new slot representation.
+	Store doc in class rather than in `variable-documentation'.
+	(eieio--perform-slot-validation-for-default): Change API to take
+	a slot object.
+	(eieio--slot-override): New function.
+	(eieio--add-new-slot): Rewrite.
+	(eieio-copy-parents-into-subclass): Rewrite.
+	(eieio--validate-slot-value, eieio--validate-class-slot-value)
+	(eieio-oref-default, eieio-oset-default)
+	(eieio--class-slot-name-index, eieio-set-defaults): Adjust to new
+	slot representation.
+	(eieio--c3-merge-lists): Simplify.
+	(eieio--class/struct-parents): New function.
+	(eieio--class-precedence-bfs): Use it.
+
+	* emacs-lisp/eieio-compat.el (eieio--generic-static-symbol-specializers):
+	Extract from eieio--generic-static-symbol-generalizer.
+	(eieio--generic-static-symbol-generalizer): Use it.
+
+	* emacs-lisp/eieio-base.el (eieio-persistent-convert-list-to-object):
+	Manually map initargs to slot names.
+	(eieio-persistent-validate/fix-slot-value): Adjust to new
+	slot representation.
+
+	* emacs-lisp/cl-preloaded.el (cl--class): Fix type of `parents'.
+
 2015-03-19  Vibhav Pant  <vibhavp@gmail.com>
 
 	* lisp/leim/quail/hangul.el

lisp/emacs-lisp/cl-preloaded.el

@@ -212,7 +212,9 @@
   ;; Intended to be shared between defstruct and defclass.
   (name nil :type symbol)               ;The type name.
   (docstring nil :type string)
-  (parents nil :type (or cl--class (list-of cl--class)))
+  ;; For structs there can only be one parent, but when EIEIO classes inherit
+  ;; from cl--class, we'll need this to hold a list.
+  (parents nil :type (list-of cl--class))
   (slots nil :type (vector cl-slot-descriptor))
   (index-table nil :type hash-table))
 

lisp/emacs-lisp/eieio-base.el

@@ -254,25 +254,28 @@ malicious code.
 
 Note: This function recurses when a slot of :type of some object is
 identified, and needing more object creation."
-  (let ((objclass (nth 0 inputlist))
-	;; (objname (nth 1 inputlist))
-	(slots (nthcdr 2 inputlist))
-	(createslots nil))
-
-    ;; If OBJCLASS is an eieio autoload object, then we need to load it.
-    (eieio-class-un-autoload objclass)
+  (let* ((objclass (nth 0 inputlist))
+	 ;; (objname (nth 1 inputlist))
+	 (slots (nthcdr 2 inputlist))
+	 (createslots nil)
+	 (class
+	  (progn
+	    ;; If OBJCLASS is an eieio autoload object, then we need to
+	    ;; load it.
+	    (eieio-class-un-autoload objclass)
+	    (eieio--class-object objclass))))
 
     (while slots
-      (let ((name (car slots))
+      (let ((initarg (car slots))
 	    (value (car (cdr slots))))
 
 	;; Make sure that the value proposed for SLOT is valid.
 	;; In addition, strip out quotes, list functions, and update
 	;; object constructors as needed.
 	(setq value (eieio-persistent-validate/fix-slot-value
-		     (eieio--class-v objclass) name value))
+		     class (eieio--initarg-to-attribute class initarg) value))
 
-	(push name createslots)
+	(push initarg createslots)
 	(push value createslots)
 	)
 
@@ -290,16 +293,11 @@ constructor functions are considered valid.
 Second, any text properties will be stripped from strings."
   (cond ((consp proposed-value)
 	 ;; Lists with something in them need special treatment.
-	 (let ((slot-idx (eieio--slot-name-index class slot))
-	       (type nil)
-	       (classtype nil))
-	   (setq slot-idx (- slot-idx
+	 (let* ((slot-idx (- (eieio--slot-name-index class slot)
                              (eval-when-compile eieio--object-num-slots)))
-	   (setq type (aref (eieio--class-public-type class)
-			    slot-idx))
-
-	   (setq classtype (eieio-persistent-slot-type-is-class-p
-			    type))
+                (type (cl--slot-descriptor-type (aref (eieio--class-slots class)
+                                                      slot-idx)))
+                (classtype (eieio-persistent-slot-type-is-class-p type)))
 
 	   (cond ((eq (car proposed-value) 'quote)
 		  (car (cdr proposed-value)))

lisp/emacs-lisp/eieio-compat.el

@@ -124,19 +124,22 @@ Summary:
        (defgeneric ,method ,args)
        (eieio--defmethod ',method ',key ',class #',code))))
 
+(defun eieio--generic-static-symbol-specializers (tag)
+  (cl-assert (or (null tag) (eieio--class-p tag)))
+  (when (eieio--class-p tag)
+    (let ((superclasses (eieio--generic-subclass-specializers tag))
+	  (specializers ()))
+      (dolist (superclass superclasses)
+	(push superclass specializers)
+	(push `(eieio--static ,(cadr superclass)) specializers))
+      (nreverse specializers))))
+
 (defconst eieio--generic-static-symbol-generalizer
   (cl-generic-make-generalizer
    ;; Give it a slightly higher priority than `subclass' so that the
    ;; interleaved list comes before subclass's non-interleaved list.
    61 (lambda (name) `(and (symbolp ,name) (eieio--class-v ,name)))
-   (lambda (tag)
-     (when (eieio--class-p tag)
-       (let ((superclasses (eieio--generic-subclass-specializers tag))
-             (specializers ()))
-         (dolist (superclass superclasses)
-           (push superclass specializers)
-           (push `(eieio--static ,(cadr superclass)) specializers))
-         (nreverse specializers))))))
+   #'eieio--generic-static-symbol-specializers))
 (defconst eieio--generic-static-object-generalizer
   (cl-generic-make-generalizer
    ;; Give it a slightly higher priority than `class' so that the
@@ -148,7 +151,7 @@ Summary:
           (let ((superclasses (eieio--class-precedence-list tag))
                 (specializers ()))
             (dolist (superclass superclasses)
-              (setq superclass (eieio--class-symbol superclass))
+              (setq superclass (eieio--class-name superclass))
               (push superclass specializers)
               (push `(eieio--static ,superclass) specializers))
             (nreverse specializers))))))