[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/phps-mode f79cf4f 081/405: Started on function for movi
From: |
Stefan Monnier |
Subject: |
[elpa] externals/phps-mode f79cf4f 081/405: Started on function for moving lexer states |
Date: |
Sat, 13 Jul 2019 09:59:47 -0400 (EDT) |
branch: externals/phps-mode
commit f79cf4f5f6fab10f56a291c896f6df3f1a335fda
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>
Started on function for moving lexer states
---
phps-lexer.el | 17 +++++++++++++++--
phps-test-lexer.el | 16 ++++++++--------
2 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/phps-lexer.el b/phps-lexer.el
index d96bf2b..18ee244 100644
--- a/phps-lexer.el
+++ b/phps-lexer.el
@@ -1278,8 +1278,21 @@ ANY_CHAR'
(interactive)
(setq phps-mode/lexer-tokens (semantic-lex-buffer)))
-(defun phps-mode/move-lexer-tokens (old-tokens start diff)
- "Move lexer OLD-TOKENS positions after (or equal to) START with DIFF points."
+(defun phps-mode/move-lexer-states (start diff)
+ "Move lexer states after (or equal to) START with modification DIFF."
+ (setq phps-mode/lexer-states (phps-mode/get-moved-lexer-states
phps-mode/lexer-states start diff)))
+
+(defun phps-mode/get-moved-lexer-states (states start diff)
+ "Return moved lexer STATES after (or equal to) START with modification DIFF."
+ ;; TODO Implement this
+ )
+
+(defun phps-mode/lexer-move-lexer-tokens (start diff)
+ "Update tokens with moved lexer tokens after or equal to START with
modification DIFF."
+ (setq phps-mode/lexer-tokens (phps-mode/get-moved-lexer-tokens
phps-mode/lexer-tokens start diff)))
+
+(defun phps-mode/get-moved-lexer-tokens (old-tokens start diff)
+ "Return moved lexer OLD-TOKENS positions after (or equal to) START with DIFF
points."
(let ((new-tokens '()))
(when old-tokens
diff --git a/phps-test-lexer.el b/phps-test-lexer.el
index 8ef15d5..e2401d5 100644
--- a/phps-test-lexer.el
+++ b/phps-test-lexer.el
@@ -269,28 +269,28 @@
)
-(defun phps-mode/test-move-lexer-tokens ()
- "Run test for move lexer tokens."
+(defun phps-mode/test-get-moved-lexer-tokens ()
+ "Run test for get moved lexer tokens."
(should (equal
'((T_OPEN_TAG 1 . 7) (T_START_HEREDOC 7 . 16) (T_ERROR 21 . 60))
- (phps-mode/move-lexer-tokens '((T_OPEN_TAG 1 . 7) (T_START_HEREDOC
7 . 16) (T_ERROR 16 . 55)) 8 5)))
+ (phps-mode/get-moved-lexer-tokens '((T_OPEN_TAG 1 . 7)
(T_START_HEREDOC 7 . 16) (T_ERROR 16 . 55)) 8 5)))
(should (equal
'((T_OPEN_TAG 1 . 7) (T_START_HEREDOC 7 . 16) (T_ERROR 11 . 50))
- (phps-mode/move-lexer-tokens '((T_OPEN_TAG 1 . 7) (T_START_HEREDOC
7 . 16) (T_ERROR 16 . 55)) 8 -5)))
+ (phps-mode/get-moved-lexer-tokens '((T_OPEN_TAG 1 . 7)
(T_START_HEREDOC 7 . 16) (T_ERROR 16 . 55)) 8 -5)))
(should (equal
'((T_OPEN_TAG 1 . 7) (T_START_HEREDOC 8 . 17) (T_ERROR 17 . 56))
- (phps-mode/move-lexer-tokens '((T_OPEN_TAG 1 . 7) (T_START_HEREDOC
7 . 16) (T_ERROR 16 . 55)) 7 1)))
+ (phps-mode/get-moved-lexer-tokens '((T_OPEN_TAG 1 . 7)
(T_START_HEREDOC 7 . 16) (T_ERROR 16 . 55)) 7 1)))
(should (equal
'((T_OPEN_TAG 1 . 7) (T_START_HEREDOC 7 . 16) (T_ERROR 16 . 55))
- (phps-mode/move-lexer-tokens '((T_OPEN_TAG 1 . 7) (T_START_HEREDOC
7 . 16) (T_ERROR 16 . 55)) 20 1)))
+ (phps-mode/get-moved-lexer-tokens '((T_OPEN_TAG 1 . 7)
(T_START_HEREDOC 7 . 16) (T_ERROR 16 . 55)) 20 1)))
(should (equal
'((T_OPEN_TAG 2 . 8) (T_START_HEREDOC 8 . 17) (T_ERROR 17 . 56))
- (phps-mode/move-lexer-tokens '((T_OPEN_TAG 1 . 7) (T_START_HEREDOC
7 . 16) (T_ERROR 16 . 55)) -20 1)))
+ (phps-mode/get-moved-lexer-tokens '((T_OPEN_TAG 1 . 7)
(T_START_HEREDOC 7 . 16) (T_ERROR 16 . 55)) -20 1)))
)
@@ -303,7 +303,7 @@
(phps-mode/test-lexer--complex-tokens)
(phps-mode/test-lexer--namespaces)
(phps-mode/test-lexer--errors)
- (phps-mode/test-move-lexer-tokens)
+ (phps-mode/test-get-moved-lexer-tokens)
;; (message "\n-- Ran all tests for lexer. --")
)
- [elpa] externals/phps-mode 90d059c 064/405: Fixed bug in incremental lexer logic, (continued)
- [elpa] externals/phps-mode 90d059c 064/405: Fixed bug in incremental lexer logic, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 1be9270 068/405: Updated README, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode e57f1e1 075/405: Skipping indentation if it's already correct, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode c57fb5b 073/405: Improved indentation of trailing opening brace, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 5e30a65 076/405: Added TODO items, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 94d4814 078/405: Added test for moving lexer tokens, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode a59ef7b 079/405: More unit tests for moving lexer token positions, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 287d934 077/405: Updated comments are made un-tested function for moving token positions, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode b3821a1 080/405: Updated TODOs, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode f4cd90e 072/405: Updated readme and makefile for running all tests, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode f79cf4f 081/405: Started on function for moving lexer states,
Stefan Monnier <=
- [elpa] externals/phps-mode e340279 082/405: Added unit tests for moving lexer-state positions, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 89b12ab 084/405: Added autoloads and fixed bug with assigning variable, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode a10cc79 085/405: Debugging a indentation case, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode e30ac0c 083/405: Started implementation of moving lexer and state position when, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 8c919ac 087/405: Added failing indentation test, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 69ced0d 090/405: Added another unit test for failed indentation, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode f2f41a3 088/405: Handles indentation case with } else if (...) {, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 59ba835 086/405: Fixed issue with wrong indentation at trailing opening brace, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 434c3dc 089/405: Added more failing tests, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 61abf7e 091/405: Added todo item, Stefan Monnier, 2019/07/13