aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/cedet/srecode
diff options
context:
space:
mode:
authorKenichi Handa2010-01-15 14:13:05 +0900
committerKenichi Handa2010-01-15 14:13:05 +0900
commitfa0cff43e861a49d9f992ffccbe4f71e29d71e1a (patch)
tree2a2bf41b76f624200d873bd604176cc6b7237f69 /lisp/cedet/srecode
parentcc320f07d4d1c0033c1728d22421462ab1fcc04e (diff)
parent56a03f46b825f2c22c7a982e8d4bcb5545908a09 (diff)
downloademacs-fa0cff43e861a49d9f992ffccbe4f71e29d71e1a.tar.gz
emacs-fa0cff43e861a49d9f992ffccbe4f71e29d71e1a.zip
from trunk
Diffstat (limited to 'lisp/cedet/srecode')
-rw-r--r--lisp/cedet/srecode/args.el2
-rw-r--r--lisp/cedet/srecode/insert.el26
2 files changed, 14 insertions, 14 deletions
diff --git a/lisp/cedet/srecode/args.el b/lisp/cedet/srecode/args.el
index 30a836c89b2..bb15bf50110 100644
--- a/lisp/cedet/srecode/args.el
+++ b/lisp/cedet/srecode/args.el
@@ -33,7 +33,7 @@
33;; 33;;
34;; Using :blank means that the template should force blank lines 34;; Using :blank means that the template should force blank lines
35;; before and after the template, reguardless of where the insertion 35;; before and after the template, reguardless of where the insertion
36;; is occuring. 36;; is occurring.
37(defun srecode-semantic-handle-:blank (dict) 37(defun srecode-semantic-handle-:blank (dict)
38 "Add macros into the dictionary DICT specifying blank line spacing. 38 "Add macros into the dictionary DICT specifying blank line spacing.
39The wrapgap means make sure the first and last lines of the macro 39The wrapgap means make sure the first and last lines of the macro
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 4777470d473..1ccd4e8d393 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -201,7 +201,7 @@ Apply anything learned to the dictionary DICT."
201 "Resolve arguments in the argument list ARGS. 201 "Resolve arguments in the argument list ARGS.
202ARGS is a list of symbols, such as :blank, or :file. 202ARGS is a list of symbols, such as :blank, or :file.
203Apply values to DICT. 203Apply values to DICT.
204Optional argument TEMP is the template that is getting it's arguments resolved." 204Optional argument TEMP is the template that is getting its arguments resolved."
205 (let ((fcn nil)) 205 (let ((fcn nil))
206 (while args 206 (while args
207 (setq fcn (intern-soft (concat "srecode-semantic-handle-" 207 (setq fcn (intern-soft (concat "srecode-semantic-handle-"
@@ -334,14 +334,14 @@ occur in your template.")
334 ((key :initform "\r" 334 ((key :initform "\r"
335 :allocation :class 335 :allocation :class
336 :documentation 336 :documentation
337 "The character represeinting this inserter style. 337 "The character representing this inserter style.
338Can't be blank, or it might be used by regular variable insertion.") 338Can't be blank, or it might be used by regular variable insertion.")
339 (where :initform 'begin 339 (where :initform 'begin
340 :initarg :where 340 :initarg :where
341 :documentation 341 :documentation
342 "This should be 'begin or 'end, indicating where to insrt a CR. 342 "This should be 'begin or 'end, indicating where to insert a CR.
343When set to 'begin, it will insert a CR if we are not at 'bol'. 343When set to 'begin, it will insert a CR if we are not at 'bol'.
344When set to 'end it will insert a CR if we are not at 'eol'") 344When set to 'end it will insert a CR if we are not at 'eol'.")
345 ;; @TODO - Add slot and control for the number of blank 345 ;; @TODO - Add slot and control for the number of blank
346 ;; lines before and after point. 346 ;; lines before and after point.
347 ) 347 )
@@ -407,7 +407,7 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
407 :allocation :class 407 :allocation :class
408 :documentation 408 :documentation
409 "The character code used to identify inserters of this style.")) 409 "The character code used to identify inserters of this style."))
410 "Insert the value of a dictionary entry 410 "Insert the value of a dictionary entry.
411If there is no entry, insert nothing.") 411If there is no entry, insert nothing.")
412 412
413(defvar srecode-inserter-variable-current-dictionary nil 413(defvar srecode-inserter-variable-current-dictionary nil
@@ -493,7 +493,7 @@ If SECONDNAME is nil, return VALUE."
493 :documentation 493 :documentation
494 "The function used to read in the text for this prompt.") 494 "The function used to read in the text for this prompt.")
495 ) 495 )
496 "Insert the value of a dictionary entry 496 "Insert the value of a dictionary entry.
497If there is no entry, prompt the user for the value to use. 497If there is no entry, prompt the user for the value to use.
498The prompt text used is derived from the previous PROMPT command in the 498The prompt text used is derived from the previous PROMPT command in the
499template file.") 499template file.")
@@ -626,8 +626,8 @@ Use DICTIONARY to resolve values."
626 "The character code used to identify inserters of this style.") 626 "The character code used to identify inserters of this style.")
627 ) 627 )
628 "Inserts the value of a dictionary variable with a specific width. 628 "Inserts the value of a dictionary variable with a specific width.
629The second argument specifies the width, and a pad, seperated by a colon. 629The second argument specifies the width, and a pad, separated by a colon.
630thus a specification of `10:left' will insert the value of A 630Thus a specification of `10:left' will insert the value of A
631to 10 characters, with spaces added to the left. Use `right' for adding 631to 10 characters, with spaces added to the left. Use `right' for adding
632spaces to the right.") 632spaces to the right.")
633 633
@@ -771,7 +771,7 @@ Calls back to `srecode-insert-method-helper' for this class."
771 "The character code used to identify inserters of this style.") 771 "The character code used to identify inserters of this style.")
772 (template :initarg :template 772 (template :initarg :template
773 :documentation 773 :documentation
774 "A Template used to frame the codes from this inserter.") 774 "A template used to frame the codes from this inserter.")
775 ) 775 )
776 "Apply values from a sub-dictionary to a template section. 776 "Apply values from a sub-dictionary to a template section.
777The dictionary saved at the named dictionary entry will be 777The dictionary saved at the named dictionary entry will be
@@ -806,7 +806,7 @@ Return the remains of INPUT."
806 :documentation 806 :documentation
807 "The character code used to identify inserters of this style.") 807 "The character code used to identify inserters of this style.")
808 ) 808 )
809 "All template segments between the secion-start and section-end 809 "All template segments between the section-start and section-end
810are treated specially.") 810are treated specially.")
811 811
812(defmethod srecode-insert-method ((sti srecode-template-inserter-section-end) 812(defmethod srecode-insert-method ((sti srecode-template-inserter-section-end)
@@ -881,7 +881,7 @@ this template instance."
881 (setq active (cdr active))) 881 (setq active (cdr active)))
882 (when (not tmpl) 882 (when (not tmpl)
883 ;; If it wasn't in this context, look to see if it 883 ;; If it wasn't in this context, look to see if it
884 ;; defines it's own context 884 ;; defines its own context
885 (setq tmpl (srecode-template-get-table (srecode-table) 885 (setq tmpl (srecode-template-get-table (srecode-table)
886 templatenamepart))) 886 templatenamepart)))
887 ) 887 )
@@ -897,7 +897,7 @@ this template instance."
897 dictionary) 897 dictionary)
898 "Insert the STI inserter. 898 "Insert the STI inserter.
899Finds the template with this macro function part, and inserts it 899Finds the template with this macro function part, and inserts it
900with the dictionaries found in the dictinary." 900with the dictionaries found in the dictionary."
901 (srecode-insert-include-lookup sti dictionary) 901 (srecode-insert-include-lookup sti dictionary)
902 ;; Insert the template. 902 ;; Insert the template.
903 ;; Our baseclass has a simple way to do this. 903 ;; Our baseclass has a simple way to do this.
@@ -952,7 +952,7 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
952 "Insert the template STI. 952 "Insert the template STI.
953This will first insert the include part via inheritance, then 953This will first insert the include part via inheritance, then
954insert the section it wraps into the location in the included 954insert the section it wraps into the location in the included
955template where a ^ inserter occurs." 955template where a ^ inserter occurs."
956 ;; Step 1: Look up the included inserter 956 ;; Step 1: Look up the included inserter
957 (srecode-insert-include-lookup sti dictionary) 957 (srecode-insert-include-lookup sti dictionary)
958 ;; Step 2: Temporarilly override the point inserter. 958 ;; Step 2: Temporarilly override the point inserter.