Revert "Prevent name clashes between CL structures and builtin types"

This reverts commit 151496a4b9.
That commit breaks bootstrap builds due to a cyclic dependency.
This commit is contained in:
Philipp Stephani 2018-01-07 14:14:38 +01:00
parent 6735df4443
commit 610dad1102
5 changed files with 0 additions and 58 deletions

View file

@ -43,7 +43,6 @@
;;; Code:
(require 'cl-generic)
(require 'cl-lib)
(require 'macroexp)
;; `gv' is required here because cl-macs can be loaded before loaddefs.el.
@ -2664,9 +2663,6 @@ non-nil value, that slot cannot be set via `setf'.
(forms nil)
(docstring (if (stringp (car descs)) (pop descs)))
pred-form pred-check)
;; Can't use `cl-check-type' yet.
(unless (cl--struct-name-p name)
(signal 'wrong-type-argument (list 'cl-struct-name-p name 'name)))
(setq descs (cons '(cl-tag-slot)
(mapcar (function (lambda (x) (if (consp x) x (list x))))
descs)))

View file

@ -36,7 +36,6 @@
;;; Code:
(eval-when-compile (require 'cl-generic))
(eval-when-compile (require 'cl-lib))
(eval-when-compile (require 'cl-macs)) ;For cl--struct-class.
@ -51,12 +50,6 @@
(apply #'error string (append sargs args))
(signal 'cl-assertion-failed `(,form ,@sargs)))))
(defun cl--struct-name-p (name)
"Return t if NAME is a valid structure name for `cl-defstruct'."
(and name (symbolp name) (not (keywordp name))
(not (memq name (eval-when-compile cl--generic-all-builtin-types)))
t))
;; When we load this (compiled) file during pre-loading, the cl--struct-class
;; code below will need to access the `cl-struct' info, since it's considered
;; already as its parent (because `cl-struct' was defined while the file was
@ -117,7 +110,6 @@
;;;###autoload
(defun cl-struct-define (name docstring parent type named slots children-sym
tag print)
(cl-check-type name cl--struct-name)
(unless type
;; Legacy defstruct, using tagged vectors. Enable backward compatibility.
(cl-old-struct-compat-mode 1))