jflack/emacs-matlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Unconditional require of semanticdb-matlab.

Browse source 
(semantic-matlab-function-tags): Better parsing of doc strings.
Return flag for builtin functions.
(semantic-matlab-sort-raw-tags): Include new :builtin attribute.
This commit is contained in:
davenar 2008-08-31 17:49:08 +00:00
parent 55f4e6051a
commit 6ae665a59b
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
semantic-matlab.el
View file

@ -36,10 +36,7 @@
(require 'semantic)
(require 'semantic-format)
(require 'matlab)
(condition-case nil
;; This will eventually become available.
(require 'semanticdb-matlab)
(error nil))
(require 'semanticdb-matlab)
;;; Code:
(defvar semantic-matlab-system-paths-include '("toolbox/matlab/funfun" "toolbox/matlab/general")
@ -91,14 +88,14 @@ START=END=0 and no arguments or return values."
(goto-char (point-min))
(if (and (string-match (format "^%s" semantic-matlab-root-directory)
(buffer-file-name))
(looking-at "%\\([A-Z]+\\) \\(.*\\)"))
(looking-at "%\\([A-Z0-9_]+\\)\\s-+\\(.*\\)\\s-*$"))
;; This is a builtin function, ie there's no function line.
;; Hence we must use function name from the doc string.
;; FIXME
;; How can we get function arguments/return vals for builtin func's?
(setq taglist
(cons (list 0 0 nil (downcase (match-string-no-properties 1))
nil (match-string-no-properties 2)
nil (match-string-no-properties 2) t
)
taglist))
;; this is a either not builtin or a user function
@ -115,9 +112,22 @@ START=END=0 and no arguments or return values."
doc (save-excursion
(forward-line)
(beginning-of-line)
(if (looking-at "%[A-Z]+ \\(.*\\)")
(match-string-no-properties 1)
nil))
;; snarf doc string
(cond
;; Mathworks standard
((looking-at "%[A-Z0-9_]+\\s-+\\(.*\\)\\s-*$")
(match-string-no-properties 1))
;; lookfor string
((looking-at "%\\s-+\\(.*\\)\\s-*$")
(match-string-no-properties 1))
;; otherwise simply snarf first line of
;; comments under function declaration
(t
(re-search-forward "[^[:blank:][:cntrl:]]" nil t)
(backward-char)
(if (looking-at "%\\s-+\\(.*\\)")
(match-string-no-properties 1)
nil))))
end (save-excursion
(goto-char start)
(if matlab-functions-have-end
@ -134,6 +144,7 @@ START=END=0 and no arguments or return values."
fn
(split-string arg "[(), \n\t.]+" t)
doc
nil
)
taglist))))
(nreverse taglist))))
@ -187,6 +198,7 @@ Return list is:
(name (nth 3 tag))
(args (nth 4 tag))
(doc (nth 5 tag))
(builtin (nth 6 tag))
(parts (semantic-matlab-sort-raw-tags (cdr tag-list) end))
(chil (car parts)))
(setq rest (car (cdr parts)))
@ -195,7 +207,8 @@ Return list is:
(semantic-tag-new-function name nil args
:return ret
:subfunctions chil
:documentation doc)
:documentation doc
:builtin builtin)
(list start end))
newlist))
(setq tag-list rest)))