mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-18 18:05:07 +00:00
Code Issues Releases Activity

Move functions from semantic.el to analyze.el to avoid warnings

Browse Source 
* lisp/cedet/semantic.el (semantic-analyze-completion-at-point-function)
(semantic-analyze-notc-completion-at-point-function)
(semantic-analyze-nolongprefix-completion-at-point-function): Add
autoloads for the moved functions.

* lisp/cedet/semantic/analyze.el
(semantic-analyze-completion-at-point-function)
(semantic-analyze-notc-completion-at-point-function)
(semantic-analyze-nolongprefix-completion-at-point-function): Move
here from semantic.el to avoid getting compilation warnings about
unknown slot `bounds'.
This commit is contained in:
Lars Ingebrigtsen 2019-06-14 15:15:09 +02:00
parent c213422fd3
commit 595e12c2da
2 changed files with 62 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
lisp/cedet/semantic.el
View File

@ -1168,57 +1168,6 @@ Semantic mode.
;; re-activated.
(setq semantic-new-buffer-fcn-was-run nil)))
;;; Completion At Point functions
(defun semantic-analyze-completion-at-point-function ()
"Return possible analysis completions at point.
The completions provided are via `semantic-analyze-possible-completions'.
This function can be used by `completion-at-point-functions'."
(when (semantic-active-p)
(let* ((ctxt (semantic-analyze-current-context))
(possible (semantic-analyze-possible-completions ctxt)))
;; The return from this is either:
;; nil - not applicable here.
;; A list: (START END COLLECTION . PROPS)
(when possible
(list (car (oref ctxt bounds))
(cdr (oref ctxt bounds))
possible))
)))
(defun semantic-analyze-notc-completion-at-point-function ()
"Return possible analysis completions at point.
The completions provided are via `semantic-analyze-possible-completions',
but with the `no-tc' option passed in, which means constraints based
on what is being assigned to are ignored.
This function can be used by `completion-at-point-functions'."
(when (semantic-active-p)
(let* ((ctxt (semantic-analyze-current-context))
(possible (semantic-analyze-possible-completions ctxt 'no-tc)))
(when possible
(list (car (oref ctxt bounds))
(cdr (oref ctxt bounds))
possible))
)))
(defun semantic-analyze-nolongprefix-completion-at-point-function ()
"Return possible analysis completions at point.
The completions provided are via `semantic-analyze-possible-completions',
but with the `no-tc' and `no-longprefix' option passed in, which means
constraints resulting in a long multi-symbol dereference are ignored.
This function can be used by `completion-at-point-functions'."
(when (semantic-active-p)
(let* ((ctxt (semantic-analyze-current-context))
(possible (semantic-analyze-possible-completions
ctxt 'no-tc 'no-longprefix)))
(when possible
(list (car (oref ctxt bounds))
(cdr (oref ctxt bounds))
possible))
)))
;;; Autoload some functions that are not in semantic/loaddefs
(autoload 'global-semantic-idle-completions-mode "semantic/idle"
@ -1259,6 +1208,16 @@ Call `semantic-symref-hits-in-region' to identify local references." t nil)
(autoload 'srecode-template-setup-parser "srecode/srecode-template"
"Set up buffer for parsing SRecode template files." t nil)
(autoload 'semantic-analyze-completion-at-point-function "semantic/analyze"
"Return possible analysis completions at point.")
(autoload 'semantic-analyze-notc-completion-at-point-function "semantic/analyze"
"Return possible analysis completions at point.")
(autoload 'semantic-analyze-nolongprefix-completion-at-point-function
"semantic/analyze"
"Return possible analysis completions at point.")
(provide 'semantic)
;; Semantic-util is a part of the semantic API. Include it last

52
lisp/cedet/semantic/analyze.el
View File

@ -819,6 +819,58 @@ CONTEXT's content is described in `semantic-analyze-current-context'."
(get-buffer-window "*Semantic Context Analysis*"))
)
;;; Completion At Point functions
(defun semantic-analyze-completion-at-point-function ()
"Return possible analysis completions at point.
The completions provided are via `semantic-analyze-possible-completions'.
This function can be used by `completion-at-point-functions'."
(when (semantic-active-p)
(let* ((ctxt (semantic-analyze-current-context))
(possible (semantic-analyze-possible-completions ctxt)))
;; The return from this is either:
;; nil - not applicable here.
;; A list: (START END COLLECTION . PROPS)
(when possible
(list (car (oref ctxt bounds))
(cdr (oref ctxt bounds))
possible))
)))
(defun semantic-analyze-notc-completion-at-point-function ()
"Return possible analysis completions at point.
The completions provided are via `semantic-analyze-possible-completions',
but with the `no-tc' option passed in, which means constraints based
on what is being assigned to are ignored.
This function can be used by `completion-at-point-functions'."
(when (semantic-active-p)
(let* ((ctxt (semantic-analyze-current-context))
(possible (semantic-analyze-possible-completions ctxt 'no-tc)))
(when possible
(list (car (oref ctxt bounds))
(cdr (oref ctxt bounds))
possible))
)))
(defun semantic-analyze-nolongprefix-completion-at-point-function ()
"Return possible analysis completions at point.
The completions provided are via `semantic-analyze-possible-completions',
but with the `no-tc' and `no-longprefix' option passed in, which means
constraints resulting in a long multi-symbol dereference are ignored.
This function can be used by `completion-at-point-functions'."
(when (semantic-active-p)
(let* ((ctxt (semantic-analyze-current-context))
(possible (semantic-analyze-possible-completions
ctxt 'no-tc 'no-longprefix)))
(when possible
(list (car (oref ctxt bounds))
(cdr (oref ctxt bounds))
possible))
)))
(provide 'semantic/analyze)
;; Local variables: