diff options
Diffstat (limited to 'lisp/cedet/srecode/compile.el')
| -rw-r--r-- | lisp/cedet/srecode/compile.el | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el index d2e2807b248..80b267b8c23 100644 --- a/lisp/cedet/srecode/compile.el +++ b/lisp/cedet/srecode/compile.el @@ -31,7 +31,6 @@ ;; The output are a series of EIEIO objects which represent the ;; templates in a way that could be inserted later. -(eval-when-compile (require 'cl)) (require 'semantic) (require 'eieio) (require 'cl-generic) @@ -132,18 +131,6 @@ STATE is the current compilation state." "For the template inserter INS, apply information from STATE." nil) -(cl-defmethod srecode-inserter-prin-example ((ins (subclass srecode-template-inserter)) - escape-start escape-end) - "Insert an example using inserter INS. -Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use." - (princ " ") - (princ escape-start) - (when (and (slot-exists-p ins 'key) (oref ins key)) - (princ (format "%c" (oref ins key)))) - (princ "VARNAME") - (princ escape-end) - (terpri) - ) ;;; Compile State @@ -547,8 +534,8 @@ A list of defined variables VARS provides a variable table." (while lp - (let* ((objname (oref (car lp) :object-name)) - (context (oref (car lp) :context)) + (let* ((objname (oref (car lp) object-name)) + (context (oref (car lp) context)) (globalname (concat context ":" objname)) ) @@ -583,7 +570,7 @@ A list of defined variables VARS provides a variable table." (tmpl (oref table templates))) ;; Loop over all the templates, and xref. (while tmpl - (oset (car tmpl) :table table) + (oset (car tmpl) table table) (setq tmpl (cdr tmpl)))) )) @@ -629,7 +616,7 @@ Argument INDENT specifies the indentation level for the list." (princ ") ") (cond ((stringp (car code)) (prin1 (car code))) - ((srecode-template-inserter-child-p (car code)) + ((cl-typep (car code) 'srecode-template-inserter) (srecode-dump (car code) indent)) (t (princ "Unknown Code: ") @@ -644,9 +631,9 @@ Argument INDENT specifies the indentation level for the list." "Dump the state of the SRecode template inserter INS." (princ "INS: \"") (princ (eieio-object-name-string ins)) - (when (oref ins :secondname) + (when (oref ins secondname) (princ "\" : \"") - (princ (oref ins :secondname))) + (princ (oref ins secondname))) (princ "\" type \"") (let* ((oc (symbol-name (eieio-object-class ins))) (junk (string-match "srecode-template-inserter-" oc)) |