diff options
Diffstat (limited to 'lisp/cedet/srecode/compile.el')
| -rw-r--r-- | lisp/cedet/srecode/compile.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el index 170b99c1fd2..0d68036c433 100644 --- a/lisp/cedet/srecode/compile.el +++ b/lisp/cedet/srecode/compile.el | |||
| @@ -510,12 +510,12 @@ to the inserter constructor." | |||
| 510 | ;;(message "Compile: %s %S" name props) | 510 | ;;(message "Compile: %s %S" name props) |
| 511 | (if (not key) | 511 | (if (not key) |
| 512 | (apply 'srecode-template-inserter-variable name props) | 512 | (apply 'srecode-template-inserter-variable name props) |
| 513 | (let ((classes (class-children srecode-template-inserter)) | 513 | (let ((classes (eieio-class-children srecode-template-inserter)) |
| 514 | (new nil)) | 514 | (new nil)) |
| 515 | ;; Loop over the various subclasses and | 515 | ;; Loop over the various subclasses and |
| 516 | ;; create the correct inserter. | 516 | ;; create the correct inserter. |
| 517 | (while (and (not new) classes) | 517 | (while (and (not new) classes) |
| 518 | (setq classes (append classes (class-children (car classes)))) | 518 | (setq classes (append classes (eieio-class-children (car classes)))) |
| 519 | ;; Do we have a match? | 519 | ;; Do we have a match? |
| 520 | (when (and (not (class-abstract-p (car classes))) | 520 | (when (and (not (class-abstract-p (car classes))) |
| 521 | (equal (oref (car classes) key) key)) | 521 | (equal (oref (car classes) key) key)) |
| @@ -594,7 +594,7 @@ A list of defined variables VARS provides a variable table." | |||
| 594 | (defmethod srecode-dump ((tmp srecode-template)) | 594 | (defmethod srecode-dump ((tmp srecode-template)) |
| 595 | "Dump the contents of the SRecode template tmp." | 595 | "Dump the contents of the SRecode template tmp." |
| 596 | (princ "== Template \"") | 596 | (princ "== Template \"") |
| 597 | (princ (object-name-string tmp)) | 597 | (princ (eieio-object-name-string tmp)) |
| 598 | (princ "\" in context ") | 598 | (princ "\" in context ") |
| 599 | (princ (oref tmp context)) | 599 | (princ (oref tmp context)) |
| 600 | (princ "\n") | 600 | (princ "\n") |
| @@ -640,12 +640,12 @@ Argument INDENT specifies the indentation level for the list." | |||
| 640 | (defmethod srecode-dump ((ins srecode-template-inserter) indent) | 640 | (defmethod srecode-dump ((ins srecode-template-inserter) indent) |
| 641 | "Dump the state of the SRecode template inserter INS." | 641 | "Dump the state of the SRecode template inserter INS." |
| 642 | (princ "INS: \"") | 642 | (princ "INS: \"") |
| 643 | (princ (object-name-string ins)) | 643 | (princ (eieio-object-name-string ins)) |
| 644 | (when (oref ins :secondname) | 644 | (when (oref ins :secondname) |
| 645 | (princ "\" : \"") | 645 | (princ "\" : \"") |
| 646 | (princ (oref ins :secondname))) | 646 | (princ (oref ins :secondname))) |
| 647 | (princ "\" type \"") | 647 | (princ "\" type \"") |
| 648 | (let* ((oc (symbol-name (object-class ins))) | 648 | (let* ((oc (symbol-name (eieio-object-class ins))) |
| 649 | (junk (string-match "srecode-template-inserter-" oc)) | 649 | (junk (string-match "srecode-template-inserter-" oc)) |
| 650 | (on (if junk | 650 | (on (if junk |
| 651 | (substring oc (match-end 0)) | 651 | (substring oc (match-end 0)) |