aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/cedet/srecode/compile.el
diff options
context:
space:
mode:
authorStefan Monnier2025-04-06 17:25:43 -0400
committerStefan Monnier2025-04-06 17:25:43 -0400
commit3723aabe504a95bf6c5a8aa9ce34d967ca37a159 (patch)
treeb32169b6876595c8a08ff16bbb3caf97c8c00b74 /lisp/cedet/srecode/compile.el
parentba13e7de32d08028ab7bffdd73dab271a95ea453 (diff)
downloademacs-scratch/cedet-object-name.tar.gz
emacs-scratch/cedet-object-name.zip
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.
Diffstat (limited to 'lisp/cedet/srecode/compile.el')
-rw-r--r--lisp/cedet/srecode/compile.el13
1 files changed, 7 insertions, 6 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."
199 (tag nil) 199 (tag nil)
200 (class nil) 200 (class nil)
201 (table nil) 201 (table nil)
202 (STATE (srecode-compile-state (file-name-nondirectory 202 (STATE (srecode-compile-state))
203 (buffer-file-name))))
204 (mode nil) 203 (mode nil)
205 (application nil) 204 (application nil)
206 (framework nil) 205 (framework nil)
@@ -263,7 +262,7 @@ STATE is the current compilation state."
263 ;; Create a compound dictionary value from "value". 262 ;; Create a compound dictionary value from "value".
264 (require 'srecode/dictionary) 263 (require 'srecode/dictionary)
265 (let ((cv (srecode-dictionary-compound-variable 264 (let ((cv (srecode-dictionary-compound-variable
266 name :value value))) 265 :value value)))
267 (setq vars (cons (cons name cv) vars))) 266 (setq vars (cons (cons name cv) vars)))
268 )) 267 ))
269 ) 268 )
@@ -361,7 +360,7 @@ STATE is the current compile state as an object of class
361 :where 'end))))))) 360 :where 'end)))))))
362 361
363 ;; Construct and return the template object. 362 ;; Construct and return the template object.
364 (srecode-template (semantic-tag-name tag) 363 (srecode-template :object-name (semantic-tag-name tag)
365 :context context 364 :context context
366 :args (nreverse addargs) 365 :args (nreverse addargs)
367 :dictionary root-dict 366 :dictionary root-dict
@@ -504,7 +503,8 @@ PROPS are additional properties that might need to be passed
504to the inserter constructor." 503to the inserter constructor."
505 ;;(message "Compile: %s %S" name props) 504 ;;(message "Compile: %s %S" name props)
506 (if (not key) 505 (if (not key)
507 (apply #'make-instance 'srecode-template-inserter-variable name props) 506 (apply #'make-instance 'srecode-template-inserter-variable
507 :object-name name props)
508 (let ((classes (eieio-class-children 'srecode-template-inserter)) 508 (let ((classes (eieio-class-children 'srecode-template-inserter))
509 (new nil)) 509 (new nil))
510 ;; Loop over the various subclasses and 510 ;; Loop over the various subclasses and
@@ -515,7 +515,8 @@ to the inserter constructor."
515 (when (and (not (class-abstract-p (car classes))) 515 (when (and (not (class-abstract-p (car classes)))
516 (equal (oref-default (car classes) key) key)) 516 (equal (oref-default (car classes) key) key))
517 ;; Create the new class, and apply state. 517 ;; Create the new class, and apply state.
518 (setq new (apply #'make-instance (car classes) name props)) 518 (setq new (apply #'make-instance (car classes)
519 :object-name name props))
519 (srecode-inserter-apply-state new STATE) 520 (srecode-inserter-apply-state new STATE)
520 ) 521 )
521 (setq classes (cdr classes))) 522 (setq classes (cdr classes)))