diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-02-04 13:49:49 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-02-04 13:49:49 -0500 |
| commit | 73b17f7c2b723a0ad4ea04cf1a5a8be5bbdf6121 (patch) | |
| tree | fc2ee663521960bf1c102bb98a72f31903e5110b /lisp/cedet/srecode/extract.el | |
| parent | 102a21d68976ab9dc85304e0bc47b7562d3cf93f (diff) | |
| download | emacs-73b17f7c2b723a0ad4ea04cf1a5a8be5bbdf6121.tar.gz emacs-73b17f7c2b723a0ad4ea04cf1a5a8be5bbdf6121.tar.bz2 emacs-73b17f7c2b723a0ad4ea04cf1a5a8be5bbdf6121.zip | |
* lisp/cedet: Use cl-generic instead of EIEIO's defgeneric/defmethod
* lisp/cedet/**/*.el: Mechanically replace all calls to defmethod/defgeneric
by calls to cl-defmethod/cl-defgeneric.
* lisp/cedet/srecode/table.el:
* lisp/cedet/srecode/fields.el:
* lisp/cedet/srecode/dictionary.el:
* lisp/cedet/srecode/compile.el:
* lisp/cedet/semantic/debug.el:
* lisp/cedet/semantic/db-ref.el:
* lisp/cedet/ede/base.el:
* lisp/cedet/ede/auto.el:
* lisp/cedet/ede.el: Require `cl-generic'.
Diffstat (limited to 'lisp/cedet/srecode/extract.el')
| -rw-r--r-- | lisp/cedet/srecode/extract.el | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el index c3b1f6e6da1..027ae0c25dd 100644 --- a/lisp/cedet/srecode/extract.el +++ b/lisp/cedet/srecode/extract.el @@ -55,16 +55,16 @@ ) "The current extraction state.") -(defmethod srecode-extract-state-set ((st srecode-extract-state) ins dict) +(cl-defmethod srecode-extract-state-set ((st srecode-extract-state) ins dict) "Set onto the extract state ST a new inserter INS and dictionary DICT." (oset st lastinserter ins) (oset st lastdict dict)) -(defmethod srecode-extract-state-set-anchor ((st srecode-extract-state)) +(cl-defmethod srecode-extract-state-set-anchor ((st srecode-extract-state)) "Reset the anchor point on extract state ST." (oset st anchor (point))) -(defmethod srecode-extract-state-extract ((st srecode-extract-state) +(cl-defmethod srecode-extract-state-extract ((st srecode-extract-state) endpoint) "Perform an extraction on the extract state ST with ENDPOINT. If there was no waiting inserter, do nothing." @@ -94,7 +94,7 @@ the dictionary entries were for that block of text." (srecode-extract-method template dict state) dict)))) -(defmethod srecode-extract-method ((st srecode-template) dictionary +(cl-defmethod srecode-extract-method ((st srecode-template) dictionary state) "Extract template ST and store extracted text in DICTIONARY. Optional STARTRETURN is a symbol in which the start of the first @@ -139,11 +139,11 @@ Uses STATE to maintain the current extraction state." ;;; Inserter Base Extractors ;; -(defmethod srecode-inserter-do-extract-p ((ins srecode-template-inserter)) +(cl-defmethod srecode-inserter-do-extract-p ((ins srecode-template-inserter)) "Return non-nil if this inserter can extract values." nil) -(defmethod srecode-inserter-extract ((ins srecode-template-inserter) +(cl-defmethod srecode-inserter-extract ((ins srecode-template-inserter) start end dict state) "Extract text from START/END and store in DICT. Return nil as this inserter will extract nothing." @@ -151,11 +151,11 @@ Return nil as this inserter will extract nothing." ;;; Variable extractor is simple and can extract later. ;; -(defmethod srecode-inserter-do-extract-p ((ins srecode-template-inserter-variable)) +(cl-defmethod srecode-inserter-do-extract-p ((ins srecode-template-inserter-variable)) "Return non-nil if this inserter can extract values." 'later) -(defmethod srecode-inserter-extract ((ins srecode-template-inserter-variable) +(cl-defmethod srecode-inserter-extract ((ins srecode-template-inserter-variable) start end vdict state) "Extract text from START/END and store in VDICT. Return t if something was extracted. @@ -169,11 +169,11 @@ Return nil if this inserter doesn't need to extract anything." ;;; Section Inserter ;; -(defmethod srecode-inserter-do-extract-p ((ins srecode-template-inserter-section-start)) +(cl-defmethod srecode-inserter-do-extract-p ((ins srecode-template-inserter-section-start)) "Return non-nil if this inserter can extract values." 'now) -(defmethod srecode-inserter-extract ((ins srecode-template-inserter-section-start) +(cl-defmethod srecode-inserter-extract ((ins srecode-template-inserter-section-start) start end indict state) "Extract text from START/END and store in INDICT. Return the starting location of the first plain-text match. @@ -203,11 +203,11 @@ Return nil if nothing was extracted." ;;; Include Extractor must extract now. ;; -(defmethod srecode-inserter-do-extract-p ((ins srecode-template-inserter-include)) +(cl-defmethod srecode-inserter-do-extract-p ((ins srecode-template-inserter-include)) "Return non-nil if this inserter can extract values." 'now) -(defmethod srecode-inserter-extract ((ins srecode-template-inserter-include) +(cl-defmethod srecode-inserter-extract ((ins srecode-template-inserter-include) start end dict state) "Extract text from START/END and store in DICT. Return the starting location of the first plain-text match. |