branch: externals/phps-mode
commit f3766dbca70274368f02eb323d182ef33d9e8bf0
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
Fixed byte-compilation in lexer and integration-tests
---
Makefile | 2 +-
phps-mode-lexer.el | 6 ++++++
phps-mode-test-integration.el | 3 ++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 9c03266..a14ed07 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ ifdef emacs
endif
EMACS_CMD := $(EMACS) -Q -batch -L .
-EL := phps-mode-flymake.el phps-mode-font-lock.el phps-mode-functions.el
phps-mode-map.el phps-mode-semantic.el phps-mode-syntax-table.el
phps-mode-test-functions.el phps-mode-test-lexer.el phps-mode-test-parser.el
phps-mode.el
+EL := phps-mode-flymake.el phps-mode-font-lock.el phps-mode-functions.el
phps-mode-lexer.el phps-mode-map.el phps-mode-semantic.el
phps-mode-syntax-table.el phps-mode-test.el phps-mode-test-functions.el
phps-mode-test-integration.el phps-mode-test-lexer.el phps-mode-test-parser.el
phps-mode.el
ELC := $(EL:.el=.elc)
.PHONY: clean
diff --git a/phps-mode-lexer.el b/phps-mode-lexer.el
index c5b75e5..aad3679 100644
--- a/phps-mode-lexer.el
+++ b/phps-mode-lexer.el
@@ -47,6 +47,12 @@
(autoload 'semantic-lex-push-token "semantic/lex")
(autoload 'define-lex-analyzer "semantic/lex")
+;; Fix for byte-compilation warnings
+(defvar phps-mode-lexer-lex)
+(defvar semantic-lex-default-action)
+(defvar phps-mode-lexer-lex-analyzer)
+
+
;; Define the lexer for this grammar
;; Make sure `semantic-lex-syntax-modifications' is correct since lexer is
dependent on Emacs syntax-table
diff --git a/phps-mode-test-integration.el b/phps-mode-test-integration.el
index a6fc0cc..a103f74 100644
--- a/phps-mode-test-integration.el
+++ b/phps-mode-test-integration.el
@@ -34,8 +34,9 @@
(autoload 'phps-mode-functions-get-lines-indent "phps-mode-functions")
(autoload 'phps-mode-functions-get-imenu "phps-mode-functions")
(autoload 'phps-mode-functions-get-buffer-changes-start "phps-mode-functions")
-(autoload 'phps-mode-test-hash-to-list "phps-mode-test")
(autoload 'phps-mode-lexer-get-tokens "phps-mode-lexer")
+(autoload 'phps-mode-lexer-run-incremental "phps-mode-lexer")
+(autoload 'phps-mode-test-hash-to-list "phps-mode-test")
(autoload 'should "ert")
(defun phps-mode-test-integration-incremental ()
