cedet: Fix some remaining uses of obsolete object-name argscratch/cedet-object-name

* lisp/cedet/srecode/compile.el (srecode-compile-templates):
Delete obsolete object-name argument to `srecode-compile-state` and
`srecode-dictionary-compound-variable` constructors.
(srecode-compile-one-template-tag, srecode-compile-inserter):
Pass object name via explicit `:object-name` arg to `srecode-template`,
`srecode-template-inserter-variable`, and children of `srecode-template`.

* lisp/cedet/srecode/cpp.el (srecode-semantic-apply-tag-to-dict)
(srecode-c-apply-templates): Delete obsolete object-name argument to
`srecode-semantic-tag` constructors.

* lisp/cedet/srecode/dictionary.el (srecode-dictionary-add-entries)
(srecode-compound-toString): Delete obsolete object-name argument to
`srecode-dictionary-compound-variable` and `srecode-field` constructors.

* lisp/cedet/srecode/insert.el (srecode-insert-method-field):
Delete obsolete object-name argument to `srecode-field-value` constructor.
(srecode-parse-input): Pass object name via explicit `:object-name` arg
to `srecode-template`.

* lisp/cedet/srecode/semantic.el (srecode-semantic-handle-:tag)
(srecode-semantic-insert-tag, srecode-semantic-apply-tag-to-dict-default):
Delete obsolete object-name argument to `srecode-semantic-tag` constructors.

* lisp/cedet/srecode/table.el (srecode-mode-table-new): Delete
obsolete object-name argument to `srecode-template-table` constructor.

* lisp/emacs-lisp/eieio-base.el (make-instance):
Emit warning unconditionally.

7 files changed, 17 insertions, 23 deletions

diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index 08082b9ecc1..05f70583c2a 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -199,8 +199,7 @@ STATE is the current compilation state."
         (tag nil)
         (class nil)
         (table nil)
-        (STATE (srecode-compile-state (file-name-nondirectory
-                                       (buffer-file-name))))
+        (STATE (srecode-compile-state))
         (mode nil)
         (application nil)
         (framework nil)
@@ -263,7 +262,7 @@ STATE is the current compilation state."
             ;; Create a compound dictionary value from "value".
             (require 'srecode/dictionary)
             (let ((cv (srecode-dictionary-compound-variable
-                       name :value value)))
+                       :value value)))
               (setq vars (cons (cons name cv) vars)))
             ))
         )
@@ -361,7 +360,7 @@ STATE is the current compile state as an object of class
                              :where 'end)))))))
 
     ;; Construct and return the template object.
-    (srecode-template (semantic-tag-name tag)
+    (srecode-template :object-name (semantic-tag-name tag)
                       :context    context
                       :args       (nreverse addargs)
                       :dictionary root-dict
@@ -504,7 +503,8 @@ PROPS are additional properties that might need to be passed
 to the inserter constructor."
   ;;(message "Compile: %s %S" name props)
   (if (not key)
-      (apply #'make-instance 'srecode-template-inserter-variable name props)
+      (apply #'make-instance 'srecode-template-inserter-variable
+             :object-name name props)
     (let ((classes (eieio-class-children 'srecode-template-inserter))
           (new nil))
       ;; Loop over the various subclasses and
@@ -515,7 +515,8 @@ to the inserter constructor."
         (when (and (not (class-abstract-p (car classes)))
                    (equal (oref-default (car classes) key) key))
           ;; Create the new class, and apply state.
-          (setq new (apply #'make-instance (car classes) name props))
+          (setq new (apply #'make-instance (car classes)
+                           :object-name name props))
           (srecode-inserter-apply-state new STATE)
           )
         (setq classes (cdr classes)))
diff --git a/lisp/cedet/srecode/cpp.el b/lisp/cedet/srecode/cpp.el
index d49ccde24fa..63613969191 100644
--- a/lisp/cedet/srecode/cpp.el
+++ b/lisp/cedet/srecode/cpp.el
@@ -146,8 +146,7 @@ specified in a C file."
             (value-dict (srecode-dictionary-add-section-dictionary
                          dict "VALUE")))
         (srecode-semantic-apply-tag-to-dict
-         (srecode-semantic-tag (semantic-tag-name value-tag)
-                               :prime value-tag)
+         (srecode-semantic-tag :prime value-tag)
          value-dict))
 
       ;; Discriminate using statements referring to namespaces and
@@ -224,8 +223,7 @@ specified in a C file."
         (let ((template-dict (srecode-dictionary-add-section-dictionary
                               templates-dict "ARGS")))
           (srecode-semantic-apply-tag-to-dict
-           (srecode-semantic-tag (semantic-tag-name template)
-                                 :prime template)
+           (srecode-semantic-tag :prime template)
            template-dict)))))
   )
 
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index 2fbed835bdd..bac3b7c48d3 100644
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -369,7 +369,7 @@ values but STATE is nil."
         (srecode-dictionary-set-value
          dict name
          (srecode-dictionary-compound-variable
-          name :value value :state state)))))
+          :value value :state state)))))
     (setq entries (nthcdr 2 entries)))
   dict)
 
@@ -536,7 +536,7 @@ inserted with a new editable field.")
         (error "Unknown default value for value %S" name)))
 
       ;; Create a field from the inserter.
-      (srecode-field name :name name
+      (srecode-field :name name
                      :start start
                      :end (point)
                      :prompt (oref sti prompt)
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 2e70469fa39..ab6ab986f6a 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -648,8 +648,7 @@ Use DICTIONARY to resolve values."
 Use DICTIONARY to resolve values."
   (let* ((default (srecode-insert-ask-default sti dictionary))
          (compound-value
-          (srecode-field-value (oref sti object-name)
-                               :firstinserter sti
+          (srecode-field-value :firstinserter sti
                                :defaultvalue default))
          )
     ;; Return this special compound value as the thing to insert.
@@ -863,7 +862,7 @@ Return the remains of INPUT."
   (let* ((out (srecode-compile-split-code tag input STATE
                                           (oref ins object-name))))
     (oset ins template (srecode-template
-                        (eieio-object-name-string ins)
+                        :object-name (slot-value ins 'object-name)
                         :context nil
                         :args nil
                         :code (cdr out)))
diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el
index bfacda54557..1db041cdfd0 100644
--- a/lisp/cedet/srecode/semantic.el
+++ b/lisp/cedet/srecode/semantic.el
@@ -129,8 +129,7 @@ variable default values, and other things."
                             larg nil nil)))
             ;; Apply the sub-argument to the subdictionary.
             (srecode-semantic-apply-tag-to-dict
-             (srecode-semantic-tag (semantic-tag-name larg)
-                                   :prime larg)
+             (srecode-semantic-tag :prime larg)
              subdict)
             )
           ;; Next!
@@ -203,8 +202,7 @@ variable default values, and other things."
     (when (not tag)
       (error "No tag for current template.  Use the semantic kill-ring"))
     (srecode-semantic-apply-tag-to-dict
-     (srecode-semantic-tag (semantic-tag-name tag)
-                           :prime tag)
+     (srecode-semantic-tag :prime tag)
      dict)))
 
 ;;; :tagtype ARGUMENT HANDLING
@@ -394,7 +392,7 @@ as `function' will leave point where code might be inserted."
     ;; Resolve TAG into the dictionary.  We may have a :tag arg
     ;; from the macro such that we don't need to do this.
     (when (not (srecode-dictionary-lookup-name dict "TAG"))
-      (let ((tagobj (srecode-semantic-tag (semantic-tag-name tag) :prime tag))
+      (let ((tagobj (srecode-semantic-tag :prime tag))
             )
         (srecode-semantic-apply-tag-to-dict tagobj dict)))
 
diff --git a/lisp/cedet/srecode/table.el b/lisp/cedet/srecode/table.el
index ba87c0a01d2..6f98038b614 100644
--- a/lisp/cedet/srecode/table.el
+++ b/lisp/cedet/srecode/table.el
@@ -180,7 +180,6 @@ INIT are the initialization parameters for the new template table."
          (old (srecode-mode-table-find mt file))
          (attr (file-attributes file))
          (new (apply #'srecode-template-table
-                     (file-name-nondirectory file)
                      :file file
                      :filesize (file-attribute-size attr)
                      :filedate (file-attribute-modification-time attr)
diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el
index 7975cdf280d..e032a9effdf 100644
--- a/lisp/emacs-lisp/eieio-base.el
+++ b/lisp/emacs-lisp/eieio-base.el
@@ -209,8 +209,7 @@ All slots are unbound, except those initialized with PARAMS."
 (cl-defmethod make-instance ((class (subclass eieio-named)) &rest args)
   (if (not (stringp (car args)))
       (cl-call-next-method)
-    (funcall (if eieio-backward-compatibility #'ignore #'message)
-             "Obsolete: name passed without :object-name to %S constructor"
+    (message "Obsolete: name passed without :object-name to %S constructor"
              class)
     (apply #'cl-call-next-method class :object-name args)))