branch: externals/phps-mode
commit 529042eede02325856876b239d12f9bb2b40dc65
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
More work on renaming
---
.travis.yml | 29 +++++++++++++++++++++++++++++
phps-mode-automation-header.wy | 4 ++--
phps-mode-functions.el | 20 ++++++++++----------
phps-mode-lexer.el | 2 +-
phps-mode-test-functions.el | 22 +++++++++++-----------
phps-mode.el | 2 +-
6 files changed, 54 insertions(+), 25 deletions(-)
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..97cac42
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,29 @@
+language: emacs-lisp
+sudo: required
+env:
+ matrix:
+ - EMACS_VERSION=emacs-24.4-bin
+ - EMACS_VERSION=emacs-24.5-bin
+ - EMACS_VERSION=emacs-snapshot
+
+before_install:
+ # Use the ubuntu emacs teams regularly updated snapshot packages.
+ - if [ "$EMACS_VERSION" = 'emacs-snapshot' ]; then
+ sudo add-apt-repository -y ppa:ubuntu-elisp/ppa &&
+ sudo apt-get update -qq &&
+ sudo apt-get install -qq $EMACS_VERSION &&
+ sudo apt-get install -qq emacs-snapshot-el emacs-snapshot-nox;
+ fi
+
+ # Use emacs version manager for all other versions.
+ - sudo mkdir /usr/local/evm
+ - sudo chown travis:travis /usr/local/evm
+ - export PATH="/home/travis/.evm/bin:$PATH"
+ - curl -fsSkL https://raw.github.com/cjohansson/phps-mode/master/go | bash
+ - evm install $EMACS_VERSION --use || true
+
+script:
+ # Make sure the exact emacs version can be found in the build output.
+ - emacs -Q --batch --eval '(message (emacs-version))'
+ - make tests
+
diff --git a/phps-mode-automation-header.wy b/phps-mode-automation-header.wy
index 1772711..86f574e 100644
--- a/phps-mode-automation-header.wy
+++ b/phps-mode-automation-header.wy
@@ -38,8 +38,8 @@
;;; Code:
-%package phps-mode/tags
-%provide phps-mode/phps-wy
+%package phps-mode-tags
+%provide phps-mode-phps-wy
%languagemode phps-mode
diff --git a/phps-mode-functions.el b/phps-mode-functions.el
index bf4e77a..cea1ff5 100644
--- a/phps-mode-functions.el
+++ b/phps-mode-functions.el
@@ -66,14 +66,14 @@
;; When bracket count at start is larger than bracket count at end
(when (and
- (boundp 'phps-mode/lexer-tokens)
+ (boundp 'phps-mode-lexer-tokens)
start-token-number
end-token-number)
(let ((token-number start-token-number)
(valid-tokens t)
(last-token-is-opening-curly-bracket nil)
(first-token-is-closing-curly-bracket nil)
- (tokens phps-mode/lexer-tokens)
+ (tokens phps-mode-lexer-tokens)
(is-first-line-token t))
;; (message "token start %s, token end %s" start-token-number
end-token-number)
;; (message "First token %s, last token %s" (car (nth
start-token-number tokens)) (car (nth end-token-number tokens)))
@@ -164,10 +164,10 @@
;; (message "Moving tokens and states %s, %s to %s"
indent-diff current-indentation indent-sum)
;; ;; Set point of change if it's not set or if it's larger
than current point
- ;; (when (or (not phps-mode/buffer-changes--start)
- ;; (< line-start phps-mode/buffer-changes--start))
- ;; ;; (message "Setting changes start from %s to %s"
phps-mode/buffer-changes--start start)
- ;; (setq phps-mode/buffer-changes--start line-start))
+ ;; (when (or (not phps-mode-functions-buffer-changes-start)
+ ;; (< line-start
phps-mode-functions-buffer-changes-start))
+ ;; ;; (message "Setting changes start from %s to %s"
phps-mode-functions-buffer-changes-start start)
+ ;; (setq phps-mode-functions-buffer-changes-start
line-start))
;; (phps-mode-lexer-run-incremental)
@@ -179,22 +179,22 @@
(when (string= major-mode "phps-mode")
(when (and (not phps-mode-functions-buffer-changes-start)
(boundp 'phps-mode-idle-interval))
- ;; (run-with-idle-timer phps-mode/idle-interval nil
#'phps-mode-lexer-run)
+ ;; (run-with-idle-timer phps-mode-idle-interval nil
#'phps-mode-lexer-run)
;; TODO Maybe use incremental lexer once it's working
(run-with-idle-timer phps-mode-idle-interval nil
#'phps-mode-lexer-run-incremental)
)
(when (or (not phps-mode-functions-buffer-changes-start)
(< start phps-mode-functions-buffer-changes-start))
- ;; (message "Setting start of changes from %s to %s"
phps-mode/buffer-changes--start start)
+ ;; (message "Setting start of changes from %s to %s"
phps-mode-functions-buffer-changes-start start)
(setq phps-mode-functions-buffer-changes-start start))
- ;; (message "phps-mode/after-change-functions %s %s %s" start stop length)
+ ;; (message "phps-mode-functions-after-change %s %s %s" start stop length)
))
;; TODO This function needs to keep track of alternative syntax for control
structures
(defun phps-mode-functions-get-point-data ()
"Return information about point in tokens."
- ;; (message "Point: %s in %s" (point) phps-mode/lexer-tokens)
+ ;; (message "Point: %s in %s" (point) phps-mode-lexer-tokens)
(when (boundp 'phps-mode-lexer-tokens)
(save-excursion
(beginning-of-line)
diff --git a/phps-mode-lexer.el b/phps-mode-lexer.el
index a221c83..8b0079a 100644
--- a/phps-mode-lexer.el
+++ b/phps-mode-lexer.el
@@ -1324,7 +1324,7 @@ ANY_CHAR'
new-tokens))
-(defun phps-mode-lexer-run-incremental-lex ()
+(defun phps-mode-lexer-run-incremental ()
"Run incremental lexer based on `phps-mode-lexer-buffer-changes--start'."
(when (and (boundp 'phps-mode-lexer-buffer-changes--start)
phps-mode-lexer-buffer-changes--start
diff --git a/phps-mode-test-functions.el b/phps-mode-test-functions.el
index 844edd8..7677cf3 100644
--- a/phps-mode-test-functions.el
+++ b/phps-mode-test-functions.el
@@ -78,7 +78,7 @@
(phps-mode-test-with-buffer
"<?php\n$variable = array(\n 'random2'\n );\n$variable = true;\n"
(goto-char 43)
- ;; (message "Tokens %s point %s" phps-mode/lexer-tokens (point))
+ ;; (message "Tokens %s point %s" phps-mode-lexer-tokens (point))
(phps-mode-functions-indent-line)
(let ((buffer-contents (buffer-substring-no-properties (point-min)
(point-max))))
(should (equal buffer-contents "<?php\n$variable = array(\n
'random2'\n);\n$variable = true;\n"))))
@@ -87,7 +87,7 @@
"<?php\n/**\n* My first line\n* My second line\n**/\n"
(goto-char 20)
(phps-mode-functions-indent-line)
- ;; (message "Tokens %s point %s" phps-mode/lexer-tokens (point))
+ ;; (message "Tokens %s point %s" phps-mode-lexer-tokens (point))
(let ((buffer-contents (buffer-substring-no-properties (point-min)
(point-max))))
(should (equal buffer-contents "<?php\n/**\n * My first line\n* My
second line\n**/\n"))))
@@ -95,7 +95,7 @@
"<?php\n/**\n* My first line\n* My second line\n**/\n"
(goto-char 9)
(phps-mode-functions-indent-line)
- ;; (message "Tokens %s point %s" phps-mode/lexer-tokens (point))
+ ;; (message "Tokens %s point %s" phps-mode-lexer-tokens (point))
(let ((buffer-contents (buffer-substring-no-properties (point-min)
(point-max))))
(should (equal buffer-contents "<?php\n/**\n* My first line\n* My second
line\n**/\n"))))
@@ -103,7 +103,7 @@
"<?php\n/**\n* My first line\n* My second line\n**/\n"
(goto-char 46)
(phps-mode-functions-indent-line)
- ;; (message "Tokens %s point %s" phps-mode/lexer-tokens (point))
+ ;; (message "Tokens %s point %s" phps-mode-lexer-tokens (point))
(let ((buffer-contents (buffer-substring-no-properties (point-min)
(point-max))))
(should (equal buffer-contents "<?php\n/**\n* My first line\n* My second
line\n **/\n"))))
@@ -111,7 +111,7 @@
"<?php\n$variable = array(\n'random4');\n$variable = true;\n"
(goto-char 29)
(phps-mode-functions-indent-line)
- ;; (message "Tokens %s point %s" phps-mode/lexer-tokens (point))
+ ;; (message "Tokens %s point %s" phps-mode-lexer-tokens (point))
(let ((buffer-contents (buffer-substring-no-properties (point-min)
(point-max))))
(should (equal buffer-contents "<?php\n$variable = array(\n
'random4');\n$variable = true;\n"))))
@@ -119,7 +119,7 @@
"<?php\nadd_filter(\n\"views_{$screen->id}\",'__return_empty_array'\n);"
(goto-char 25)
(phps-mode-functions-indent-line)
- ;; (message "Tokens %s point %s" phps-mode/lexer-tokens (point))
+ ;; (message "Tokens %s point %s" phps-mode-lexer-tokens (point))
(let ((buffer-contents (buffer-substring-no-properties (point-min)
(point-max))))
(should (equal buffer-contents "<?php\nadd_filter(\n
\"views_{$screen->id}\",'__return_empty_array'\n);"))))
@@ -127,7 +127,7 @@
"<?php\nif (random_expression(\ntrue\n)) {\nsome_logic_here();\n}"
(goto-char 36)
(phps-mode-functions-indent-line)
- ;; (message "Tokens %s point %s" phps-mode/lexer-tokens (point))
+ ;; (message "Tokens %s point %s" phps-mode-lexer-tokens (point))
(let ((buffer-contents (buffer-substring-no-properties (point-min)
(point-max))))
(should (equal buffer-contents "<?php\nif (random_expression(\ntrue\n))
{\nsome_logic_here();\n}"))))
@@ -135,7 +135,7 @@
"<?php\nif (empty(\n$this->var\n) && !empty($this->var)\n) {\n$this->var =
'abc123';\n}\n"
(goto-char 54)
(phps-mode-functions-indent-line)
- ;; (message "Tokens %s point %s" phps-mode/lexer-tokens (point))
+ ;; (message "Tokens %s point %s" phps-mode-lexer-tokens (point))
(let ((buffer-contents (buffer-substring-no-properties (point-min)
(point-max))))
(should (equal buffer-contents "<?php\nif (empty(\n$this->var\n) &&
!empty($this->var)\n) {\n$this->var = 'abc123';\n}\n"))))
@@ -143,7 +143,7 @@
"<?php\nif (myFirstCondition()) {\n $this->var = 'abc123';\n } else
{\n $this->var = 'def456';\n}\n"
(goto-char 68)
(phps-mode-functions-indent-line)
- ;; (message "Tokens %s point %s" phps-mode/lexer-tokens (point))
+ ;; (message "Tokens %s point %s" phps-mode-lexer-tokens (point))
(let ((buffer-contents (buffer-substring-no-properties (point-min)
(point-max))))
(should (equal buffer-contents "<?php\nif (myFirstCondition()) {\n
$this->var = 'abc123';\n} else {\n $this->var = 'def456';\n}\n"))))
@@ -151,7 +151,7 @@
"<?php\nif (myFirstCondition()) {\n $this->var = 'abc123';\n } else
if (mySeconCondition()) {\n $this->var = 'def456';\n}\n"
(goto-char 68)
(phps-mode-functions-indent-line)
- ;; (message "Tokens %s point %s" phps-mode/lexer-tokens (point))
+ ;; (message "Tokens %s point %s" phps-mode-lexer-tokens (point))
(let ((buffer-contents (buffer-substring-no-properties (point-min)
(point-max))))
(should (equal buffer-contents "<?php\nif (myFirstCondition()) {\n
$this->var = 'abc123';\n} else if (mySeconCondition()) {\n $this->var =
'def456';\n}\n"))))
@@ -167,7 +167,7 @@
"<?php\nif (myRandomCondition()):\necho 'Something here';\n else:\n
echo 'Something else here';\nendif;\n"
(goto-char 60)
(phps-mode-functions-indent-line)
- ;; (message "Tokens %s" phps-mode/lexer-tokens)
+ ;; (message "Tokens %s" phps-mode-lexer-tokens)
(let ((buffer-contents (buffer-substring-no-properties (point-min)
(point-max))))
(should (equal buffer-contents "<?php\nif (myRandomCondition()):\necho
'Something here';\nelse:\n echo 'Something else here';\nendif;\n"))))
diff --git a/phps-mode.el b/phps-mode.el
index d6ba0c2..f1f6370 100644
--- a/phps-mode.el
+++ b/phps-mode.el
@@ -90,7 +90,7 @@
(phps-mode-lexer-init)
;; Wisent LALR parser
- ;; (phps-mode/tags-init)
+ ;; (phps-mode-tags-init)
(run-hooks 'phps-mode-hook)
(semantic-new-buffer-fcn))
