branch: externals/phps-mode
commit 2ec6f6d61dc7a21f1e3e970e1ea6d59e8116bb32
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
Fixed some compilation warnings
---
phps-mode-lexer.el | 7 +++----
phps-mode-test-functions.el | 1 +
phps-mode-test-lexer.el | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/phps-mode-lexer.el b/phps-mode-lexer.el
index 95e171a..c5b75e5 100644
--- a/phps-mode-lexer.el
+++ b/phps-mode-lexer.el
@@ -1317,8 +1317,7 @@
(end (match-end 0))
(_data (buffer-substring-no-properties start end))
(doc-com (looking-at-p (concat "/\\*\\*"
phps-mode-lexer-WHITESPACE))))
- (let ((string-start (search-forward "*/" nil t))
- position)
+ (let ((string-start (search-forward "*/" nil t)))
(if string-start
(if doc-com
(phps-mode-lexer-RETURN_TOKEN 'T_DOC_COMMENT start
(match-end 0))
@@ -1691,11 +1690,11 @@
(catch 'stop-iteration
(dolist (token tokens)
(let ((start (car (cdr token)))
- (end (cdr (cdr token))))
+ (_end (cdr (cdr token))))
(if (< start previous-token-end)
(progn
;; NOTE Does following line make any difference?
- ;; (semantic-lex-push-token (semantic-lex-token token
start end))
+ ;; (semantic-lex-push-token (semantic-lex-token token
start _end))
(push token old-tokens))
(throw 'stop-iteration nil)))))
(setq old-tokens (nreverse old-tokens))
diff --git a/phps-mode-test-functions.el b/phps-mode-test-functions.el
index 2240251..8ec1b0b 100644
--- a/phps-mode-test-functions.el
+++ b/phps-mode-test-functions.el
@@ -33,6 +33,7 @@
(autoload 'phps-mode-functions-verbose "phps-mode-functions")
(autoload 'phps-mode-functions-indent-line "phps-mode-functions")
(autoload 'phps-mode-functions-get-lines-indent "phps-mode-functions")
+(autoload 'phps-mode-functions-get-imenu "phps-mode-functions")
(autoload 'phps-mode-test-hash-to-list "phps-mode-test")
(autoload 'should "ert")
diff --git a/phps-mode-test-lexer.el b/phps-mode-test-lexer.el
index 364ab75..bc34a72 100644
--- a/phps-mode-test-lexer.el
+++ b/phps-mode-test-lexer.el
@@ -78,7 +78,7 @@
(phps-mode-test-with-buffer
"<?php echo $var = array('');"
"Simple PHP via array declaration"
- (should (equal phps-mode-lexer-tokens
+ (should (equal (phps-mode-lexer-get-tokens)
'((T_OPEN_TAG 1 . 7) (T_ECHO 7 . 11) (T_VARIABLE 12 . 16)
("=" 17 . 18) (T_ARRAY 19 . 24) ("(" 24 . 25) (T_CONSTANT_ENCAPSED_STRING 25 .
27) (")" 27 . 28) (";" 28 . 29)))))
(phps-mode-test-with-buffer
