commit 7a9ce25d4d11e9720636abab5d55d3320272a51e Author: toby cabot Date: Thu Dec 24 11:00:54 2009 -0500 clean up warnings caused by deprecated semantic functions diff --git a/jde/lisp/jde-java-grammar.el b/jde/lisp/jde-java-grammar.el index 9ed212f..b4a24d1 100644 --- a/jde/lisp/jde-java-grammar.el +++ b/jde/lisp/jde-java-grammar.el @@ -48,10 +48,6 @@ Should be run when Semantic is ready to parse, that is, via ((boundp 'global-semantic-idle-scheduler-mode) (or global-semantic-idle-scheduler-mode (semantic-idle-scheduler-mode 1))) - ;; Since Semantic 1.4beta12 - ((boundp 'global-semantic-auto-parse-mode) - (or global-semantic-auto-parse-mode - (semantic-auto-parse-mode 1))) (t ;; Default to JDE's auto-parse (make-local-hook 'semantic-change-hooks) @@ -88,4 +84,4 @@ Should be run when Semantic is ready to parse, that is, via (provide 'jde-java-grammar) -;; End of jde-java-grammar.el \ No newline at end of file +;; End of jde-java-grammar.el diff --git a/jde/lisp/jde-parse.el b/jde/lisp/jde-parse.el index 679ee5c..69141a1 100644 --- a/jde/lisp/jde-parse.el +++ b/jde/lisp/jde-parse.el @@ -119,7 +119,7 @@ match `jde-auto-parse-max-buffer-size' threshold." ;; in some versions of XEmacs. Hence the following ;; guard. (if (eq major-mode 'jde-mode) - (semantic-bovinate-toplevel t))) + (semantic-fetch-tags))) (defsubst jde-parse-should-auto-parse-buffer-p () "Return non-nil if the JDE should automatically reparse the buffer." @@ -181,7 +181,7 @@ replaced by that range. See also `semantic-change-hooks'." (let* ((top-level-classes (semantic-find-nonterminal-by-token 'type - (semantic-bovinate-toplevel))) + (semantic-fetch-tags))) (top-level-class-count (length top-level-classes))) (or (> top-level-class-count 1) @@ -220,7 +220,7 @@ See also `semantic-after-toplevel-cache-change-hook'." "Hook run after Semantic updated the token cache. TOKENS is the list of updated tokens. See also `semantic-after-partial-cache-change-hook'." - (jde-parse-update-after-parse (semantic-bovinate-toplevel))) + (jde-parse-update-after-parse (semantic-fetch-tags))) (defun jde-parse-get-top-of-class (&optional class-regexp no-move-point) @@ -243,7 +243,7 @@ moved also." (if (null class-name) (error "point is not in a class definition")) (setq class-regexp (regexp-quote class-name))))) - (let* ((tokens (semantic-bovinate-toplevel t)) + (let* ((tokens (semantic-fetch-tags)) (classes (semantic-find-nonterminal-by-token 'type tokens)) class-parts pos) @@ -296,7 +296,7 @@ MODIFIERS creteria as an exact match or subset. This defaults to `subset'." (if (null member-name-regexp) (setq member-name-regexp ".*")) - (let* ((tokens (semantic-bovinate-toplevel)) + (let* ((tokens (semantic-fetch-tags)) (classes (semantic-find-nonterminal-by-token 'type tokens)) cmp-fn vars var-parts var-name var-modifiers i) @@ -914,7 +914,7 @@ in a method; otherwise, nil." (cons method-start method-end))))))))) (let* ((pos (if position position (point))) - (tokens (semantic-bovinate-toplevel)) + (tokens (semantic-fetch-tags)) (classes (semantic-find-nonterminal-by-token 'type tokens))) (catch 'found (loop for class in classes @@ -1026,7 +1026,7 @@ in a method; otherwise, nil." (cons class-name method-name) (cons method-start method-end)))))))) - (let* ((tokens (semantic-bovinate-toplevel)) + (let* ((tokens (semantic-fetch-tags)) (classes (semantic-find-nonterminal-by-token 'type tokens))) (loop for class in classes do (add-methods class))))) @@ -1497,7 +1497,7 @@ For example: It uses the semantic parser table to find the 'package' and 'import' statements. It implicitly adds the java.lang.* package. See also `jde-split-import-token'." - (let* ((tokens (semantic-bovinate-toplevel t)) + (let* ((tokens (semantic-fetch-tags)) (packages (semantic-find-nonterminal-by-token 'package tokens)) (imports (semantic-find-nonterminal-by-token 'include tokens)) lst) diff --git a/jde/lisp/jde-wiz.el b/jde/lisp/jde-wiz.el index dd67343..de4f6e9 100644 --- a/jde/lisp/jde-wiz.el +++ b/jde/lisp/jde-wiz.el @@ -716,7 +716,7 @@ the tokens of `class-name', returns nil if no token are found" temp-parts inner-classes) (if (not parts) (while tokens - (setq temp-parts (semantic-token-type-parts (car tokens))) + (setq temp-parts (semantic-tag-type-members (car tokens))) (setq inner-classes (semantic-find-nonterminal-by-token 'type temp-parts)) (setq parts (jde-wiz-get-class-parts class-name inner-classes)) (if parts @@ -731,9 +731,9 @@ return otherwise" (let (parts current-class) (while tokens (setq current-class (car tokens)) - (if (string= class-name (semantic-token-name current-class)) + (if (string= class-name (semantic-tag-name current-class)) (progn - (setq parts (semantic-token-type-parts current-class)) + (setq parts (semantic-tag-type-members current-class)) (setq tokens nil))) (setq tokens (cdr tokens))) parts)) @@ -774,7 +774,7 @@ defined in the current buffer." (class (jde-parse-get-class-at-point));;class name (classes (split-string class "\\.")) (class-name (nth (- (length classes) 1) classes)) - (tokens (semantic-bovinate-toplevel t));;buffer tokens + (tokens (semantic-fetch-tags));;buffer tokens (type (semantic-find-nonterminal-by-token 'type tokens));;class tokens (parts (jde-wiz-get-class-parts class-name type)) (variables (semantic-find-nonterminal-by-token 'variable parts));;declared variables @@ -799,10 +799,10 @@ defined in the current buffer." (while non-public-variables (setq var (car non-public-variables)) - (setq name (semantic-token-name var));;variable name - (setq type (semantic-token-type var));;variable type i.e. boolean - (setq staticp (member "static" (semantic-token-variable-modifiers var)));;is it static - (setq finalp (member "final" (semantic-token-variable-modifiers var)));;is it final + (setq name (semantic-tag-name var));;variable name + (setq type (semantic-tag-type var));;variable type i.e. boolean + (setq staticp (member "static" (semantic-tag-modifiers var)));;is it static + (setq finalp (member "final" (semantic-tag-modifiers var)));;is it final (setq report @@ -812,10 +812,10 @@ defined in the current buffer." "%-60.60s" (concat type " " name " " - (and (semantic-token-variable-modifiers var) + (and (semantic-tag-modifiers var) ;; only if some modifiers are present ;; print them - (format "%s" (semantic-token-variable-modifiers var))))))) + (format "%s" (semantic-tag-modifiers var))))))) (setq report (concat report "\t")) @@ -948,7 +948,7 @@ defined in the current buffer." (let (token name filtered-methods) (while tokens (setq token (car tokens)) - (setq name (semantic-token-name token)) + (setq name (semantic-tag-name token)) (if (or (string-match "^get" name) (string-match "^set" name) (string-match "^is" name)) @@ -962,7 +962,7 @@ protected modifiers" (let (token modifiers filtered-tokens) (while tokens (setq token (car tokens)) - (setq modifiers (semantic-token-variable-modifiers token)) + (setq modifiers (semantic-tag-modifiers token)) (if (not (member "public" modifiers)) (setq filtered-tokens (append filtered-tokens (list token)))) (setq tokens (cdr tokens))) @@ -1160,7 +1160,7 @@ If `jde-wiz-tostring-postfix' is defined, it is appended to the string. " class-name (semantic-find-nonterminal-by-token 'type - (semantic-bovinate-toplevel t) + (semantic-fetch-tags) )))) (method (concat @@ -1179,7 +1179,7 @@ If `jde-wiz-tostring-postfix' is defined, it is appended to the string. " (setq variables (jde-wiz-filter-variables-by-typemodifier variables)) (if jde-wiz-tostring-sort-variables - (setq variables (semantic-sort-tokens-by-name-increasing variables))) + (setq variables (semantic-sort-tags-by-name-increasing variables))) ;; Remove static members. (unless jde-wiz-tostring-static-members @@ -1192,7 +1192,7 @@ If `jde-wiz-tostring-postfix' is defined, it is appended to the string. " (let ((staticp (member "static" - (semantic-token-variable-modifiers var)))) + (semantic-tag-modifiers var)))) (unless staticp var))) variables)))) @@ -1202,8 +1202,8 @@ If `jde-wiz-tostring-postfix' is defined, it is appended to the string. " (while variables (let* ((var (car variables)) - (name (semantic-token-name var)) ;;variable name - (type (semantic-token-type var))) ;;variable type i.e. boolean + (name (semantic-tag-name var)) ;;variable name + (type (semantic-tag-type var))) ;;variable type i.e. boolean (setq method diff --git a/jde/lisp/jde-xref.el b/jde/lisp/jde-xref.el index 904fdbb..e6e353b 100644 --- a/jde/lisp/jde-xref.el +++ b/jde/lisp/jde-xref.el @@ -376,9 +376,9 @@ circumstance we just create tiny hashes to conserve memory." called-package-caller-hash))))))))) (defun jde-xref-class-and-token-to-signature (class token) - (let ((ttype (semantic-token-type token)) - (tclass (semantic-token-token token)) - (tname (semantic-token-name token))) + (let ((ttype (semantic-tag-type token)) + (tclass (semantic-tag-class token)) + (tname (semantic-tag-name token))) (list tclass class (if (equal tname (jde-parse-get-unqualified-name class)) @@ -391,8 +391,8 @@ circumstance we just create tiny hashes to conserve memory." (if (eq tclass 'function) (mapcar (lambda (arg) (jde-parse-get-unqualified-name - (semantic-token-type arg))) - (semantic-token-function-args token)) + (semantic-tag-type arg))) + (semantic-tag-function-arguments token)) (list (jde-parse-get-unqualified-name ttype)))))) (defun jde-xref-get-current-class () @@ -401,12 +401,12 @@ circumstance we just create tiny hashes to conserve memory." (defun jde-xref-get-current-signature () (unless (member - (semantic-token-token (semantic-current-nonterminal)) + (semantic-tag-class (semantic-current-tag)) '(function variable)) (error "The cursor must be in a function or class variable to get the callers")) (jde-xref-class-and-token-to-signature (jde-xref-get-current-class) - (semantic-current-nonterminal))) + (semantic-current-tag))) ;;;###autoload (defun jde-xref-first-caller (strict) @@ -630,9 +630,9 @@ and show it" (defun jde-xref-get-class-variables (class-token) (mapcan (lambda (token) - (when (eq (semantic-token-token token) 'variable) + (when (eq (semantic-tag-class token) 'variable) (list token))) - (semantic-nonterminal-children class-token))) + (semantic-tag-children-compatibility class-token))) ;;;###autoload (defun jde-xref-list-uncalled-functions (strict) @@ -651,7 +651,7 @@ while. If it does, you might want to consider increasing (jde-xref-load-subclasses-table-if-necessary) (save-excursion (flet ((get-unused-string (token) - (goto-char (semantic-token-start token)) + (goto-char (semantic-tag-start token)) (unless (jde-xref-get-callers (jde-xref-class-and-token-to-signature (jde-xref-get-current-class) token) strict) @@ -666,7 +666,7 @@ while. If it does, you might want to consider increasing (unreferenced-variables (mapcan 'get-unused-string (mapcan 'jde-xref-get-class-variables - (semantic-find-nonterminal-by-type "class" + (semantic-brute-find-tag-by-type "class" (current-buffer) t)))) (outbuf (get-buffer-create "Unreferenced Methods and Members"))) @@ -720,8 +720,8 @@ call list of all files modified in emacs" (mapcar (lambda (class-token) (concat (jde-parse-get-package-name) (when (jde-parse-get-package-name) ".") - (semantic-token-name class-token))) - (semantic-find-nonterminal-by-type + (semantic-tag-name class-token))) + (semantic-brute-find-tag-by-type "class" (current-buffer) t)))))) ;;;###autoload