diff options
Diffstat (limited to 'lisp/cedet/semantic')
27 files changed, 115 insertions, 96 deletions
diff --git a/lisp/cedet/semantic/analyze/complete.el b/lisp/cedet/semantic/analyze/complete.el index ccf405d62e2..5c3228ae166 100644 --- a/lisp/cedet/semantic/analyze/complete.el +++ b/lisp/cedet/semantic/analyze/complete.el @@ -70,7 +70,8 @@ context. Passing in a context is useful if the caller also needs to access parts of the analysis. The remaining FLAGS arguments are passed to the mode specific completion engine. Bad flags should be ignored by modes that don't use them. -See `semantic-analyze-possible-completions-default' for details on the default FLAGS. +See `semantic-analyze-possible-completions-default' for details +on the default FLAGS. Completions run through the following filters: * Elements currently in scope @@ -107,7 +108,7 @@ in a buffer." ;; Buffer was not parsed by Semantic. ;; Raise error if called interactively. (when (called-interactively-p 'any) - (error "Buffer was not parsed by Semantic.")))) + (error "Buffer was not parsed by Semantic")))) (defvar semantic--prefixtypes) diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index e7ecb61513f..c7d59def1f1 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el @@ -1937,7 +1937,7 @@ For types with a :parent, create faux namespaces to put TAG into." (define-mode-local-override semanticdb-find-table-for-include c-mode (includetag &optional table) - "For a single INCLUDETAG found in TABLE, find a `semanticdb-table' object + "For a single INCLUDETAG found in TABLE, find a `semanticdb-table' object. INCLUDETAG is a semantic TAG of class `include'. TABLE is a semanticdb table that identifies where INCLUDETAG came from. TABLE is optional if INCLUDETAG has an overlay of :filename attribute. @@ -2034,7 +2034,7 @@ for arguments compared." (if blankok t (semantic--tag-similar-names-p-default tag1 tag2 nil))) (define-mode-local-override semantic--tag-similar-types-p c-mode (tag1 tag2) - "For c-mode, deal with TAG1 and TAG2 being used in different namespaces. + "For `c-mode', deal with TAG1 and TAG2 being used in different namespaces. In this case, one type will be shorter than the other. Instead of fully resolving all namespaces currently in scope for both types, we simply compare as many elements as the shorter type @@ -2064,7 +2064,7 @@ provides." (define-mode-local-override semantic--tag-attribute-similar-p c-mode (attr value1 value2 ignorable-attributes) - "For c-mode, allow function :arguments to ignore the :name attributes." + "For `c-mode', allow function :arguments to ignore the :name attributes." (cond ((eq attr :arguments) (semantic--tag-attribute-similar-p-default attr value1 value2 (cons :name ignorable-attributes))) diff --git a/lisp/cedet/semantic/bovine/debug.el b/lisp/cedet/semantic/bovine/debug.el index 47850a5d1f4..64ccbb45195 100644 --- a/lisp/cedet/semantic/bovine/debug.el +++ b/lisp/cedet/semantic/bovine/debug.el @@ -113,7 +113,7 @@ LEXTOKEN, is a token returned by the lexer which is being matched." :documentation "An error condition caught in an action.") ) - "Debugger frame representation of a lisp error thrown during parsing.") + "Debugger frame representation of a Lisp error thrown during parsing.") (defun semantic-create-bovine-debug-error-frame (condition) "Create an error frame for bovine debugger. diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index d6ef7960473..375b97a7a5d 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el @@ -198,7 +198,7 @@ Argument COLLECTOR is an object which can be used to calculate a list of possible hits. See `semantic-completion-collector-engine' for details on COLLECTOR. Argument DISPLAYER is an object used to display a list of possible -completions for a given prefix. See`semantic-completion-display-engine' +completions for a given prefix. See `semantic-completion-display-engine' for details on DISPLAYER. PROMPT is a string to prompt with. DEFAULT-TAG is a semantic tag or string to use as the default value. @@ -224,11 +224,10 @@ HISTORY is a symbol representing a variable to story the history in." ;; @todo - move from () to into the editable area (if (string-match ":" prompt) - (setq prompt (concat - (substring prompt 0 (match-beginning 0)) - " (default " default-as-string ")" - (substring prompt (match-beginning 0)))) - (setq prompt (concat prompt " (" default-as-string "): ")))) + (setq prompt (format-prompt + (substring prompt 0 (match-beginning 0)) + default-as-string)) + (setq prompt (format-prompt prompt default-as-string)))) ;; ;; Perform the Completion ;; @@ -746,7 +745,7 @@ Argument COLLECTOR is an object which can be used to calculate a list of possible hits. See `semantic-completion-collector-engine' for details on COLLECTOR. Argument DISPLAYER is an object used to display a list of possible -completions for a given prefix. See`semantic-completion-display-engine' +completions for a given prefix. See `semantic-completion-display-engine' for details on DISPLAYER. BUFFER is the buffer in which completion will take place. START is a location for the start of the full symbol. @@ -930,7 +929,7 @@ inserted into the current context.") (cl-defmethod semantic-collector-calculate-completions-raw ((obj semantic-collector-analyze-completions) prefix _completionlist) - "calculate the completions for prefix from COMPLETIONLIST." + "Calculate the completions for prefix from COMPLETIONLIST." ;; if there are no completions yet, calculate them. (if (not (slot-boundp obj 'first-pass-completions)) (oset obj first-pass-completions diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el index 41e48b0bc30..c9ae68e9fa7 100644 --- a/lisp/cedet/semantic/db-el.el +++ b/lisp/cedet/semantic/db-el.el @@ -328,7 +328,7 @@ Like `semanticdb-find-tags-for-completion-method' for Emacs Lisp." ;; (cl-defmethod semanticdb-find-tags-external-children-of-type-method ((_table semanticdb-table-emacs-lisp) type &optional tags) - "Find all nonterminals which are child elements of TYPE + "Find all nonterminals which are child elements of TYPE. Optional argument TAGS is a list of tags to search. Return a list of tags." (if tags (cl-call-next-method) diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index c96a426280e..e6a7879775e 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el @@ -315,7 +315,7 @@ Default action as described in `semanticdb-find-translate-path'." ;;;###autoload (define-overloadable-function semanticdb-find-table-for-include (includetag &optional table) - "For a single INCLUDETAG found in TABLE, find a `semanticdb-table' object + "For a single INCLUDETAG found in TABLE, find a `semanticdb-table' object. INCLUDETAG is a semantic TAG of class `include'. TABLE is a semanticdb table that identifies where INCLUDETAG came from. TABLE is optional if INCLUDETAG has an overlay of :filename attribute." @@ -914,7 +914,7 @@ but should be good enough for debugging assertions." (null (car (cdr (car resultp))))))) (defun semanticdb-find-result-prin1-to-string (result) - "Presuming RESULT satisfies `semanticdb-find-results-p', provide a short PRIN1 output." + "If RESULT satisfies `semanticdb-find-results-p', provide a short PRIN1 output." (if (< (length result) 2) (concat "#<FIND RESULT " (mapconcat (lambda (a) diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el index c0fee3b2bd9..03158171a29 100644 --- a/lisp/cedet/semantic/db-typecache.el +++ b/lisp/cedet/semantic/db-typecache.el @@ -547,8 +547,7 @@ found tag to be loaded." (cl-defmethod semanticdb-typecache-for-database ((db semanticdb-project-database) &optional mode) "Return the typecache for the project database DB. -If there isn't one, create it. -" +If there isn't one, create it." (let ((lmode (or mode major-mode)) (cache (semanticdb-get-typecache db)) (stream nil) diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el index 4f96746166b..c13952265e6 100644 --- a/lisp/cedet/semantic/debug.el +++ b/lisp/cedet/semantic/debug.el @@ -108,7 +108,7 @@ These buffers are brought into view when layout occurs.") :documentation "Any active overlays being used to show the debug position.") ) - "Controls action when in `semantic-debug-mode'") + "Controls action when in `semantic-debug-mode'.") ;; Methods (cl-defmethod semantic-debug-set-frame ((iface semantic-debug-interface) frame) @@ -559,10 +559,8 @@ down to your parser later." (cl-defmethod semantic-debug-parser-frames ((_parser semantic-debug-parser)) "Return a list of frames for the current parser. A frame is of the form: - ( .. .what ? .. ) -" - (error "Parser has not implemented frame values") - ) + ( .. .what ? .. )" + (error "Parser has not implemented frame values")) (provide 'semantic/debug) diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el index a3bf4e252f7..ae2895c2b93 100644 --- a/lisp/cedet/semantic/decorate/include.el +++ b/lisp/cedet/semantic/decorate/include.el @@ -66,7 +66,7 @@ Used by the decoration style: `semantic-decoration-on-includes'." (easy-menu-define semantic-decoration-on-include-menu semantic-decoration-on-include-map - "Include Menu" + "Include Menu." (list "Include" ["What Is This?" semantic-decoration-include-describe @@ -124,7 +124,7 @@ Used by the decoration style: `semantic-decoration-on-unknown-includes'." (easy-menu-define semantic-decoration-on-unknown-include-menu semantic-decoration-on-unknown-include-map - "Unknown Include Menu" + "Unknown Include Menu." (list "Unknown Include" ["What Is This?" semantic-decoration-unknown-include-describe @@ -179,7 +179,7 @@ Used by the decoration style: `semantic-decoration-on-fileless-includes'." (easy-menu-define semantic-decoration-on-fileless-include-menu semantic-decoration-on-fileless-include-map - "Fileless Include Menu" + "Fileless Include Menu." (list "Fileless Include" ["What Is This?" semantic-decoration-fileless-include-describe @@ -234,7 +234,7 @@ Used by the decoration style: `semantic-decoration-on-unparsed-includes'." (easy-menu-define semantic-decoration-on-unparsed-include-menu semantic-decoration-on-unparsed-include-map - "Unparsed Include Menu" + "Unparsed Include Menu." (list "Unparsed Include" ["What Is This?" semantic-decoration-unparsed-include-describe @@ -514,9 +514,7 @@ See the Semantic manual node on SemanticDB for more about search paths.") Argument EVENT describes the event that caused this function to be called." (interactive "e") (let* ((startwin (selected-window)) - ;; This line has an issue in XEmacs. - (win (semantic-event-window event)) - ) + (win (semantic-event-window event))) (select-window win t) (save-excursion ;(goto-char (window-start win)) @@ -557,9 +555,7 @@ searches, but you cannot visit this include.\n\n") Argument EVENT describes the event that caused this function to be called." (interactive "e") (let* ((startwin (selected-window)) - ;; This line has an issue in XEmacs. - (win (semantic-event-window event)) - ) + (win (semantic-event-window event))) (select-window win t) (save-excursion ;(goto-char (window-start win)) diff --git a/lisp/cedet/semantic/decorate/mode.el b/lisp/cedet/semantic/decorate/mode.el index c6bf15205fd..0a234b3000d 100644 --- a/lisp/cedet/semantic/decorate/mode.el +++ b/lisp/cedet/semantic/decorate/mode.el @@ -391,6 +391,7 @@ etc., found in the semantic-decorate library. To add other kind of decorations on a tag, `NAME-highlight' must use `semantic-decorate-tag', and other functions of the semantic decoration API found in this library." + (declare (indent 1)) (let ((predicate (semantic-decorate-style-predicate name)) (highlighter (semantic-decorate-style-highlighter name)) (predicatedef (semantic-decorate-style-predicate-default name)) @@ -409,8 +410,11 @@ decoration API found in this library." ;; Create an override method to specify if a given tag belongs ;; to this type of decoration (define-overloadable-function ,predicate (tag) - ,(format "Return non-nil to decorate TAG with `%s' style.\n%s" - name doc)) + ,(concat + (internal--format-docstring-line + "Return non-nil to decorate TAG with `%s' style." + name) + "\n" doc)) ;; Create an override method that will perform the highlight ;; operation if the -p method returns non-nil. (define-overloadable-function ,highlighter (tag) diff --git a/lisp/cedet/semantic/dep.el b/lisp/cedet/semantic/dep.el index efebe21a945..cae38e6f111 100644 --- a/lisp/cedet/semantic/dep.el +++ b/lisp/cedet/semantic/dep.el @@ -82,6 +82,7 @@ users will customize. Creates a customizable variable users can customize that will keep semantic data structures up to date." + (declare (indent defun)) `(progn ;; Create a variable users can customize. (defcustom ,name ,value @@ -133,7 +134,7 @@ Changes made by this function are not persistent." ;;;###autoload (defun semantic-remove-system-include (dir &optional mode) "Add a system include DIR to path for MODE. -Modifies a mode-local version of`semantic-dependency-system-include-path'. +Modifies a mode-local version of `semantic-dependency-system-include-path'. Changes made by this function are not persistent." (interactive (list diff --git a/lisp/cedet/semantic/ede-grammar.el b/lisp/cedet/semantic/ede-grammar.el index 19d4184fa45..9a4d412d5d3 100644 --- a/lisp/cedet/semantic/ede-grammar.el +++ b/lisp/cedet/semantic/ede-grammar.el @@ -185,7 +185,7 @@ max-lisp-eval-depth 700)'\n" (cl-defmethod ede-proj-makefile-insert-dist-dependencies ((this semantic-ede-proj-target-grammar)) "Insert dist dependencies, or intermediate targets. -This makes sure that all grammar lisp files are created before the dist +This makes sure that all grammar Lisp files are created before the dist runs, so they are always up to date. Argument THIS is the target that should insert stuff." (cl-call-next-method) diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el index 4ad70ff7c64..16e8ce8de95 100644 --- a/lisp/cedet/semantic/fw.el +++ b/lisp/cedet/semantic/fw.el @@ -284,7 +284,7 @@ later installation should be done in MODE hook." (defvar semantic-current-input-throw-symbol nil "The current throw symbol for `semantic-exit-on-input'.") (defvar semantic--on-input-start-marker nil - "The marker when starting a semantic-exit-on-input form.") + "The marker when starting a `semantic-exit-on-input' form.") (defmacro semantic-exit-on-input (symbol &rest forms) "Using SYMBOL as an argument to `throw', execute FORMS. diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el index 4c3bb6c238b..33c66da9a62 100644 --- a/lisp/cedet/semantic/grammar.el +++ b/lisp/cedet/semantic/grammar.el @@ -840,7 +840,7 @@ If optional argument FORCE is non-nil, unconditionally re-generate the Lisp code." (interactive "P") (unless (semantic-active-p) - (error "You have to activate semantic-mode to create a package.")) + (error "You have to activate semantic-mode to create a package")) (setq force (or force current-prefix-arg)) (semantic-fetch-tags) (let* ( diff --git a/lisp/cedet/semantic/grm-wy-boot.el b/lisp/cedet/semantic/grm-wy-boot.el index a6bf211713a..ce63421fb37 100644 --- a/lisp/cedet/semantic/grm-wy-boot.el +++ b/lisp/cedet/semantic/grm-wy-boot.el @@ -149,10 +149,10 @@ ((type_decl)) ((use_macros_decl))) (default_prec_decl - ((DEFAULT-PREC) - `(wisent-raw-tag - (semantic-tag "default-prec" 'assoc :value - '("t"))))) + ((DEFAULT-PREC) + `(wisent-raw-tag + (semantic-tag "default-prec" 'assoc :value + '("t"))))) (no_default_prec_decl ((NO-DEFAULT-PREC) `(wisent-raw-tag diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el index b883573a30f..a14994424d7 100644 --- a/lisp/cedet/semantic/idle.el +++ b/lisp/cedet/semantic/idle.el @@ -102,7 +102,6 @@ it is unlikely the user would be ready to type again right away." (defun semantic-idle-scheduler-setup-timers () "Lazy initialization of the auto parse idle timer." - ;; REFRESH THIS FUNCTION for XEMACS FOIBLES (or (timerp semantic-idle-scheduler-timer) (setq semantic-idle-scheduler-timer (run-with-idle-timer @@ -578,10 +577,11 @@ This routine creates the following functions and variables:" `(progn (define-minor-mode ,global ,(concat "Toggle " (symbol-name global) ". -With ARG, turn the minor mode on if ARG is positive, off otherwise. - -When this minor mode is enabled, `" (symbol-name mode) "' is -turned on in every Semantic-supported buffer.") +With ARG, turn the minor mode on if ARG is positive, off otherwise.\n\n" + (internal--format-docstring-line + "When this minor mode is enabled, `%s' is \ +turned on in every Semantic-supported buffer." + (symbol-name mode))) :global t :group 'semantic :group 'semantic-modes @@ -619,8 +619,9 @@ turned on in every Semantic-supported buffer.") "") ; idle schedulers are quiet? (defun ,func () - ,(concat "Perform idle activity for the minor mode `" - (symbol-name mode) "'.") + ,(internal--format-docstring-line + "Perform idle activity for the minor mode `%s'." + (symbol-name mode)) ,@forms)))) ;;; SUMMARY MODE @@ -1071,7 +1072,7 @@ be called." (easy-menu-define semantic-idle-breadcrumbs-popup-menu semantic-idle-breadcrumbs-popup-map - "Semantic Breadcrumbs Mode Menu" + "Semantic Breadcrumbs Mode Menu." (list "Breadcrumb Tag" (vector diff --git a/lisp/cedet/semantic/java.el b/lisp/cedet/semantic/java.el index f48b835fe39..0c2fb843f0b 100644 --- a/lisp/cedet/semantic/java.el +++ b/lisp/cedet/semantic/java.el @@ -141,7 +141,7 @@ corresponding compound declaration." (semantic-tag-put-attribute clone :dereference (+ dim0 (cdr dim))) (semantic-tag-set-bounds clone start end))) - ((and (eq class 'type) (string-match "\\." (semantic-tag-name tag))) + ((and (eq class 'type) (string-search "." (semantic-tag-name tag))) ;; javap outputs files where the package name is stuck onto the class or interface ;; name. To make this more regular, we extract the package name into a package statement, ;; then make the class name regular. diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el index 8073640a8bd..3297367db90 100644 --- a/lisp/cedet/semantic/lex-spp.el +++ b/lisp/cedet/semantic/lex-spp.el @@ -1165,7 +1165,8 @@ of type `spp-macro-def' is to be created. VALFORM are forms that return the value to be saved for this macro, or nil. When implementing a macro, you can use `semantic-lex-spp-stream-for-macro' to convert text into a lexical stream for storage in the macro." - (declare (debug (&define name stringp stringp form def-body))) + (declare (debug (&define name stringp stringp form def-body)) + (indent 1)) (let ((start (make-symbol "start")) (end (make-symbol "end")) (val (make-symbol "val")) @@ -1199,7 +1200,8 @@ REGEXP is a regular expression for the analyzer to match. See `define-lex-regex-analyzer' for more on regexp. TOKIDX is an index into REGEXP for which a new lexical token of type `spp-macro-undef' is to be created." - (declare (debug (&define name stringp stringp form))) + (declare (debug (&define name stringp stringp form)) + (indent 1)) (let ((start (make-symbol "start")) (end (make-symbol "end"))) `(define-lex-regex-analyzer ,name @@ -1260,7 +1262,8 @@ type of include. The return value should be of the form: (NAME . TYPE) where NAME is the name of the include, and TYPE is the type of the include, where a valid symbol is `system', or nil." - (declare (debug (&define name stringp stringp form def-body))) + (declare (debug (&define name stringp stringp form def-body)) + (indent 1)) (let ((start (make-symbol "start")) (end (make-symbol "end")) (val (make-symbol "val")) diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el index 69f20deeb76..d524b733db5 100644 --- a/lisp/cedet/semantic/lex.el +++ b/lisp/cedet/semantic/lex.el @@ -760,7 +760,7 @@ If two analyzers can match the same text, it is important to order the analyzers so that the one you want to match first occurs first. For example, it is good to put a number analyzer in front of a symbol analyzer which might mistake a number for a symbol." - (declare (debug (&define name stringp (&rest symbolp)))) + (declare (debug (&define name stringp (&rest symbolp))) (indent 1)) `(defun ,name (start end &optional depth length) ,(concat doc "\nSee `semantic-lex' for more information.") ;; Make sure the state of block parsing starts over. @@ -1096,7 +1096,7 @@ Proper action in FORMS is to move the value of `semantic-lex-end-point' to after the location of the analyzed entry, and to add any discovered tokens at the beginning of `semantic-lex-token-stream'. This can be done by using `semantic-lex-push-token'." - (declare (debug (&define name stringp form def-body))) + (declare (debug (&define name stringp form def-body)) (indent 1)) `(eval-and-compile ;; This is the real info used by `define-lex' (via semantic-lex-one-token). (defconst ,name '(,condition ,@forms) ,doc) @@ -1118,7 +1118,7 @@ This can be done by using `semantic-lex-push-token'." "Create a lexical analyzer with NAME and DOC that will match REGEXP. FORMS are evaluated upon a successful match. See `define-lex-analyzer' for more about analyzers." - (declare (debug (&define name stringp form def-body))) + (declare (debug (&define name stringp form def-body)) (indent 1)) `(define-lex-analyzer ,name ,doc (looking-at ,regexp) @@ -1137,7 +1137,8 @@ FORMS are evaluated upon a successful match BEFORE the new token is created. It is valid to ignore FORMS. See `define-lex-analyzer' for more about analyzers." (declare (debug - (&define name stringp form symbolp [ &optional form ] def-body))) + (&define name stringp form symbolp [ &optional form ] def-body)) + (indent 1)) `(define-lex-analyzer ,name ,doc (looking-at ,regexp) @@ -1162,7 +1163,8 @@ where BLOCK-SYM is the symbol returned in a block token. OPEN-DELIM and CLOSE-DELIM are respectively the open and close delimiters identifying a block. OPEN-SYM and CLOSE-SYM are respectively the symbols returned in open and close tokens." - (declare (debug (&define name stringp form (&rest form)))) + (declare (debug (&define name stringp form (&rest form))) + (indent 1)) (let ((specs (cons spec1 specs)) spec open olist clist) (while specs @@ -1471,6 +1473,7 @@ syntax as specified by the syntax table." (defmacro define-lex-keyword-type-analyzer (name doc syntax) "Define a keyword type analyzer NAME with DOC string. SYNTAX is the regexp that matches a keyword syntactic expression." + (declare (indent 1)) (let ((key (make-symbol "key"))) `(define-lex-analyzer ,name ,doc @@ -1486,6 +1489,7 @@ SYNTAX is the regexp that matches a keyword syntactic expression." "Define a sexp type analyzer NAME with DOC string. SYNTAX is the regexp that matches the beginning of the s-expression. TOKEN is the lexical token returned when SYNTAX matches." + (declare (indent 1)) `(define-lex-regex-analyzer ,name ,doc ,syntax @@ -1504,6 +1508,7 @@ SYNTAX is the regexp that matches a syntactic expression. MATCHES is an alist of lexical elements used to refine the syntactic expression. DEFAULT is the default lexical token returned when no MATCHES." + (declare (indent 1)) (if matches (let* ((val (make-symbol "val")) (lst (make-symbol "lst")) @@ -1536,6 +1541,7 @@ SYNTAX is the regexp that matches a syntactic expression. MATCHES is an alist of lexical elements used to refine the syntactic expression. DEFAULT is the default lexical token returned when no MATCHES." + (declare (indent 1)) (if matches (let* ((val (make-symbol "val")) (lst (make-symbol "lst")) @@ -1633,6 +1639,7 @@ When the lexer encounters the open-paren delimiter \"(\": - If the maximum depth of parenthesis tracking is reached (current depth >= max depth), it returns the whole parenthesis block as a (PAREN_BLOCK start . end) token." + (declare (indent 1)) (let* ((val (make-symbol "val")) (lst (make-symbol "lst")) (elt (make-symbol "elt"))) diff --git a/lisp/cedet/semantic/sb.el b/lisp/cedet/semantic/sb.el index debdfd1dc04..fe981d34fb7 100644 --- a/lisp/cedet/semantic/sb.el +++ b/lisp/cedet/semantic/sb.el @@ -279,7 +279,7 @@ Optional MODIFIERS is additional text needed for variables." (defun semantic-sb-show-extra (text token indent) "Display additional information about the token as an expansion. TEXT TOKEN and INDENT are the details." - (cond ((string-match "\\+" text) ;we have to expand this file + (cond ((string-search "+" text) ;we have to expand this file (speedbar-change-expand-button-char ?-) (speedbar-with-writable (save-excursion @@ -288,7 +288,7 @@ TEXT TOKEN and INDENT are the details." (narrow-to-region (point) (point)) ;; Add in stuff specific to this type of token. (semantic-sb-insert-details token (1+ indent)))))) - ((string-match "-" text) ;we have to contract this node + ((string-search "-" text) ;we have to contract this node (speedbar-change-expand-button-char ?+) (speedbar-delete-subblock indent)) (t (error "Ooops... not sure what to do"))) @@ -325,7 +325,7 @@ TEXT TOKEN and INDENT are the details." (defun semantic-sb-expand-group (text token indent) "Expand a group which has semantic tokens. TEXT TOKEN and INDENT are the details." - (cond ((string-match "\\+" text) ;we have to expand this file + (cond ((string-search "+" text) ;we have to expand this file (speedbar-change-expand-button-char ?-) (speedbar-with-writable (save-excursion @@ -333,7 +333,7 @@ TEXT TOKEN and INDENT are the details." (save-restriction (narrow-to-region (point-min) (point)) (semantic-sb-buttons-plain (1+ indent) token))))) - ((string-match "-" text) ;we have to contract this node + ((string-search "-" text) ;we have to contract this node (speedbar-change-expand-button-char ?+) (speedbar-delete-subblock indent)) (t (error "Ooops... not sure what to do"))) diff --git a/lisp/cedet/semantic/symref/grep.el b/lisp/cedet/semantic/symref/grep.el index 180d779a780..077a2d48615 100644 --- a/lisp/cedet/semantic/symref/grep.el +++ b/lisp/cedet/semantic/symref/grep.el @@ -39,7 +39,7 @@ ) "A symref tool implementation using grep. This tool uses EDE to find the root of the project, then executes -find-grep in the project. The output is parsed for hits and +`find-grep' in the project. The output is parsed for hits and those hits returned.") (defvar semantic-symref-filepattern-alist @@ -87,7 +87,7 @@ Optional argument MODE specifies the `major-mode' to test." (if (null (cdr pat)) args `("(" ,@args - ,@(mapcan (lambda (s) `("-o" "-name" ,s)) pat) + ,@(mapcan (lambda (s) `("-o" "-name" ,s)) (cdr pat)) ")")))))) (defvar semantic-symref-grep-flags) @@ -133,6 +133,12 @@ This shell should support pipe redirect syntax." :group 'semantic :type 'string) +(defun semantic-symref-grep--quote-grep (string) + "Quote STRING as a grep-syntax regexp." + (replace-regexp-in-string (rx (in ".^$*[\\")) + (lambda (s) (concat "\\" s)) + string nil t)) + (cl-defmethod semantic-symref-perform-search ((tool semantic-symref-tool-grep)) "Perform a search with Grep." ;; Grep doesn't support some types of searches. @@ -150,15 +156,11 @@ This shell should support pipe redirect syntax." "-l ") ((eq (oref tool searchtype) 'regexp) "-nE ") - (t "-n "))) - (greppat (cond ((eq (oref tool searchtype) 'regexp) - (oref tool searchfor)) - (t - ;; Can't use the word boundaries: Grep - ;; doesn't always agree with the language - ;; syntax on those. - (format "\\(^\\|\\W\\)%s\\(\\W\\|$\\)" - (oref tool searchfor))))) + (t "-nw "))) + (searchfor (oref tool searchfor)) + (greppat (if (eq (oref tool searchtype) 'regexp) + searchfor + (semantic-symref-grep--quote-grep searchfor))) ;; Misc (b (get-buffer-create "*Semantic SymRef*")) (ans nil) diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el index 2e447bbc582..b1b36132b35 100644 --- a/lisp/cedet/semantic/symref/list.el +++ b/lisp/cedet/semantic/symref/list.el @@ -152,7 +152,7 @@ Display the references in `semantic-symref-results-mode'." (easy-menu-define semantic-symref-list-menu semantic-symref-results-mode-map - "Symref Mode Menu" + "Symref Mode Menu." semantic-symref-list-menu-entries) (defcustom semantic-symref-auto-expand-results nil diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el index 3aa1a62901c..4bdae58690a 100644 --- a/lisp/cedet/semantic/tag-ls.el +++ b/lisp/cedet/semantic/tag-ls.el @@ -130,7 +130,10 @@ are the same. Similar tags that have sub-tags such as arg lists or type members, are similar w/out checking the sub-list of tags. -Optional argument IGNORABLE-ATTRIBUTES are attributes to ignore while comparing similarity. + +Optional argument IGNORABLE-ATTRIBUTES are attributes to ignore while comparing +similarity. + By default, `semantic-tag-similar-ignorable-attributes' is referenced for attributes, and IGNORABLE-ATTRIBUTES will augment this list. @@ -191,11 +194,14 @@ See `semantic-tag-similar-p' for details." ;; will contain the info needed to determine the full name. (define-overloadable-function semantic-tag-full-package (tag &optional stream-or-buffer) "Return the fully qualified package name of TAG in a package hierarchy. -STREAM-OR-BUFFER can be anything convertible by `semantic-something-to-tag-table', -but must be a toplevel semantic tag stream that contains TAG. +STREAM-OR-BUFFER can be anything convertible by +`semantic-something-to-tag-table', but must be a toplevel +semantic tag stream that contains TAG. + A Package Hierarchy is defined in UML by the way classes and methods are organized on disk. Some languages use this concept such that a class can be accessed via it's fully qualified name, (such as Java.) + Other languages qualify names within a Namespace (such as C++) which result in a different package like structure. @@ -214,11 +220,14 @@ Return the name of the first tag of class `package' in STREAM." (define-overloadable-function semantic-tag-full-name (tag &optional stream-or-buffer) "Return the fully qualified name of TAG in the package hierarchy. -STREAM-OR-BUFFER can be anything convertible by `semantic-something-to-tag-table', -but must be a toplevel semantic tag stream that contains TAG. +STREAM-OR-BUFFER can be anything convertible by +`semantic-something-to-tag-table', but must be a toplevel +semantic tag stream that contains TAG. + A Package Hierarchy is defined in UML by the way classes and methods are organized on disk. Some languages use this concept such that a class can be accessed via it's fully qualified name, (such as Java.) + Other languages qualify names within a Namespace (such as C++) which result in a different package like structure. diff --git a/lisp/cedet/semantic/tag.el b/lisp/cedet/semantic/tag.el index b6386d71db0..a86ed020bbb 100644 --- a/lisp/cedet/semantic/tag.el +++ b/lisp/cedet/semantic/tag.el @@ -119,8 +119,7 @@ Statement that represents a file from which more tags can be found. Statement that declares this file's package name. @item code Code that has not name or binding to any other symbol, such as in a script. -@end table -" +@end table" (nth 1 tag)) (defsubst semantic-tag-attributes (tag) @@ -703,7 +702,7 @@ It is safe for FILTER to modify the input tag and return it." It is safe to modify ATTR, and return a permutation of that list. -FILTER takes TAG as an argument, and should returns a semantic-tag. +FILTER takes TAG as an argument, and should return a semantic-tag. It is safe for FILTER to modify the input tag and return it." (when (car attrs) (when (not (symbolp (car attrs))) (error "Bad Attribute List in tag")) @@ -716,7 +715,7 @@ It is safe for FILTER to modify the input tag and return it." It is safe to modify VALUE, and return a permutation of that list. -FILTER takes TAG as an argument, and should returns a semantic-tag. +FILTER takes TAG as an argument, and should return a semantic-tag. It is safe for FILTER to modify the input tag and return it." (cond ;; Another tag. @@ -735,7 +734,7 @@ It is safe for FILTER to modify the input tag and return it." It is safe to modify the TAGS list, and return a permutation of that list. -FILTER takes TAG as an argument, and should returns a semantic-tag. +FILTER takes TAG as an argument, and should return a semantic-tag. It is safe for FILTER to modify the input tag and return it." (when (car tags) (if (semantic-tag-p (car tags)) @@ -1309,12 +1308,12 @@ This function is overridable with the symbol `insert-foreign-tag'." ;;; Support log modes here (define-mode-local-override semantic-insert-foreign-tag log-edit-mode (foreign-tag) - "Insert foreign tags into log-edit mode." + "Insert foreign tags into `log-edit' mode." (insert (concat "(" (semantic-format-tag-name foreign-tag) "): "))) (define-mode-local-override semantic-insert-foreign-tag change-log-mode (foreign-tag) - "Insert foreign tags into log-edit mode." + "Insert foreign tags into `log-edit' mode." (insert (concat "(" (semantic-format-tag-name foreign-tag) "): "))) diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el index 106862837a1..5ce1108044a 100644 --- a/lisp/cedet/semantic/util-modes.el +++ b/lisp/cedet/semantic/util-modes.el @@ -565,7 +565,7 @@ to indicate a parse in progress." (easy-menu-define semantic-stickyfunc-popup-menu semantic-stickyfunc-mode-map - "Stickyfunc Menu" + "Stickyfunc Menu." '("Stickyfunc Mode" :visible (progn nil) [ "Copy Headerline Tag" senator-copy-tag :active (semantic-current-tag) @@ -837,7 +837,7 @@ Used by `semantic-highlight-func-mode'.") (easy-menu-define semantic-highlight-func-popup-menu semantic-highlight-func-mode-map - "Highlight-Func Menu" + "Highlight-Func Menu." '("Highlight-Func Mode" :visible (progn nil) [ "Copy Tag" senator-copy-tag :active (semantic-current-tag) diff --git a/lisp/cedet/semantic/wisent.el b/lisp/cedet/semantic/wisent.el index f5f381d4079..afcdd142822 100644 --- a/lisp/cedet/semantic/wisent.el +++ b/lisp/cedet/semantic/wisent.el @@ -66,7 +66,7 @@ Returned tokens must have the form: (TOKSYM VALUE START . END) where VALUE is the buffer substring between START and END positions." - (declare (debug (&define name stringp def-body))) + (declare (debug (&define name stringp def-body)) (indent 1)) `(defun ,name () ,doc (cond diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el index 9ac4ed9f518..2eeade66467 100644 --- a/lisp/cedet/semantic/wisent/python.el +++ b/lisp/cedet/semantic/wisent/python.el @@ -118,9 +118,9 @@ curly braces." ;; look-ahead assertions.) (when (and (= (- end start) 2) (looking-at "\"\\{3\\}\\|'\\{3\\}")) - (error "unterminated syntax")) + (error "Unterminated syntax")) (goto-char end)) - (error "unterminated syntax"))) + (error "Unterminated syntax"))) (defun wisent-python-forward-balanced-expression () "Move point to the end of the balanced expression at point. @@ -145,7 +145,7 @@ triple-quoted string syntax." ;; delimiter (backquote) characters, line continuation, and end ;; of comment characters (AKA newline characters in Python). ((zerop (skip-syntax-forward "-w_.$\\>")) - (error "can't figure out how to go forward from here")))) + (error "Can't figure out how to go forward from here")))) ;; Skip closing character. As a last resort this should raise an ;; error if we hit EOB before we find our closing character.. (forward-char 1))) @@ -555,7 +555,7 @@ SELF or the instance name \"self\" if SELF is nil." (rx-to-string `(seq string-start ,(or self "self") ".")) name) - (not (string-match "\\." (substring name 5))))))) + (not (string-search "." (substring name 5))))))) (defun semantic-python-docstring-p (tag) "Return non-nil, when TAG is a Python documentation string." |