diff options
Diffstat (limited to 'lisp/cedet/srecode/insert.el')
| -rw-r--r-- | lisp/cedet/srecode/insert.el | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el index c582e328b2b..e9c0a53721c 100644 --- a/lisp/cedet/srecode/insert.el +++ b/lisp/cedet/srecode/insert.el @@ -474,8 +474,8 @@ If SECONDNAME is nil, return VALUE." dictionary) "Insert the STI inserter." ;; Convert the name into a name/fcn pair - (let* ((name (oref sti :object-name)) - (fcnpart (oref sti :secondname)) + (let* ((name (slot-value sti 'object-name)) + (fcnpart (slot-value sti 'secondname)) (val (srecode-dictionary-lookup-name dictionary name)) (do-princ t) @@ -548,7 +548,7 @@ Loop over the prompts to see if we have a match." ) (while prompts (when (string= (semantic-tag-name (car prompts)) - (oref ins :object-name)) + (slot-value ins 'object-name)) (oset ins :prompt (semantic-tag-get-attribute (car prompts) :text)) (oset ins :defaultfcn @@ -564,7 +564,7 @@ Loop over the prompts to see if we have a match." dictionary) "Insert the STI inserter." (let ((val (srecode-dictionary-lookup-name - dictionary (oref sti :object-name)))) + dictionary (slot-value sti 'object-name)))) (if val ;; Does some extra work. Oh well. (cl-call-next-method) @@ -580,7 +580,7 @@ Loop over the prompts to see if we have a match." ;; the user can use the same name again later. (srecode-dictionary-set-value (srecode-root-dictionary dictionary) - (oref sti :object-name) val) + (slot-value sti 'object-name) val) ;; Now that this value is safely stowed in the dictionary, ;; we can do what regular inserters do. @@ -590,7 +590,7 @@ Loop over the prompts to see if we have a match." dictionary) "Derive the default value for an askable inserter STI. DICTIONARY is used to derive some values." - (let ((defaultfcn (oref sti :defaultfcn))) + (let ((defaultfcn (slot-value sti 'defaultfcn))) (cond ((stringp defaultfcn) defaultfcn) @@ -617,13 +617,13 @@ DICTIONARY is used to derive some values." Use DICTIONARY to resolve values." (let* ((prompt (oref sti prompt)) (default (srecode-insert-ask-default sti dictionary)) - (reader (oref sti :read-fcn)) + (reader (slot-value sti 'read-fcn)) (val nil) ) (cond ((eq reader 'y-or-n-p) (if (y-or-n-p (or prompt (format "%s? " - (oref sti :object-name)))) + (slot-value sti 'object-name)))) (setq val default) (setq val ""))) ((eq reader 'read-char) @@ -631,14 +631,14 @@ Use DICTIONARY to resolve values." "%c" (read-char (or prompt (format "Char for %s: " - (oref sti :object-name)))))) + (slot-value sti 'object-name)))))) ) (t (save-excursion (setq val (funcall reader (or prompt (format "Specify %s: " - (oref sti :object-name))) + (slot-value sti 'object-name))) default ))))) ;; Return our derived value. @@ -651,7 +651,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) + (srecode-field-value (slot-value sti 'object-name) :firstinserter sti :defaultvalue default)) ) @@ -819,12 +819,12 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use." Loops over the embedded CODE which was saved here during compilation. The template to insert is stored in SLOT." (let ((dicts (srecode-dictionary-lookup-name - dictionary (oref sti :object-name)))) + dictionary (slot-value sti 'object-name)))) (when (not (listp dicts)) (srecode-insert-report-error dictionary "Cannot insert section %S from non-section variable." - (oref sti :object-name))) + (slot-value sti 'object-name))) ;; If there is no section dictionary, then don't output anything ;; from this section. (while dicts @@ -832,7 +832,7 @@ The template to insert is stored in SLOT." (srecode-insert-report-error dictionary "Cannot insert section %S from non-section variable." - (oref sti :object-name))) + (slot-value sti 'object-name))) (srecode-insert-subtemplate sti (car dicts) slot) (setq dicts (cdr dicts))))) @@ -863,7 +863,7 @@ applied to the text between the section start and the Shorten input until the END token is found. Return the remains of INPUT." (let* ((out (srecode-compile-split-code tag input STATE - (oref ins :object-name)))) + (slot-value ins 'object-name)))) (oset ins template (srecode-template (eieio-object-name-string ins) :context nil @@ -896,7 +896,7 @@ are treated specially.") (cl-defmethod srecode-match-end ((ins srecode-template-inserter-section-end) name) "For the template inserter INS, do I end a section called NAME?" - (string= name (oref ins :object-name))) + (string= name (slot-value ins 'object-name))) (defclass srecode-template-inserter-include (srecode-template-inserter-subtemplate) ((key :initform ?> @@ -927,13 +927,13 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use." "For the template inserter STI, lookup the template to include. Finds the template with this macro function part and stores it in this template instance." - (let ((templatenamepart (oref sti :secondname))) + (let ((templatenamepart (slot-value sti 'secondname))) ;; If there was no template name, throw an error. (unless templatenamepart (srecode-insert-report-error dictionary "Include macro `%s' needs a template name" - (oref sti :object-name))) + (slot-value sti 'object-name))) ;; NOTE: We used to cache the template and not look it up a second time, ;; but changes in the template tables can change which template is @@ -978,7 +978,7 @@ this template instance." (srecode-insert-report-error dictionary "No template \"%s\" found for include macro `%s'" - templatenamepart (oref sti :object-name))))) + templatenamepart (slot-value sti 'object-name))))) (cl-defmethod srecode-insert-method ((sti srecode-template-inserter-include) dictionary) @@ -988,7 +988,7 @@ with the dictionaries found in the dictionary." (srecode-insert-include-lookup sti dictionary) ;; Insert the template. ;; Our baseclass has a simple way to do this. - (if (srecode-dictionary-lookup-name dictionary (oref sti :object-name)) + (if (srecode-dictionary-lookup-name dictionary (slot-value sti 'object-name)) ;; If we have a value, then call the next method (srecode-insert-method-helper sti dictionary 'includedtemplate) ;; If we don't have a special dictionary, then just insert with the @@ -1057,7 +1057,7 @@ template where a ^ inserter occurs." (lambda (dict) (let ((srecode-template-inserter-point-override nil)) (if (srecode-dictionary-lookup-name - dict (oref inserter1 :object-name)) + dict (slot-value inserter1 'object-name)) ;; Insert our sectional part with looping. (srecode-insert-method-helper inserter1 dict 'template) |