[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/phps-mode 7161184 041/405: Handles stacked states bette
From: |
Stefan Monnier |
Subject: |
[elpa] externals/phps-mode 7161184 041/405: Handles stacked states better |
Date: |
Sat, 13 Jul 2019 09:59:39 -0400 (EDT) |
branch: externals/phps-mode
commit 7161184dfe6e001481649e7b689c50db113177dd
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>
Handles stacked states better
---
phps-lexer.el | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/phps-lexer.el b/phps-lexer.el
index 8fb5694..2a2c9d1 100644
--- a/phps-lexer.el
+++ b/phps-lexer.el
@@ -169,17 +169,11 @@
)
;; _yy_push_state
-(defun phps-mode/yy_push_state (state)
- "Add STATE to stack and then begin state."
- (let ((old-state (car phps-mode/state_stack)))
- (when (not old-state)
- (setq old-state phps-mode/STATE))
- (if (not phps-mode/state_stack)
- (setq phps-mode/state_stack (list old-state))
- (push old-state phps-mode/state_stack))
- ;; (message "Added state %s to stack" old-state)
- )
- (phps-mode/BEGIN state))
+(defun phps-mode/yy_push_state (new-state)
+ "Add NEW-STATE to stack and then begin state."
+ (push phps-mode/STATE phps-mode/state_stack)
+ ;; (message "Added state %s to stack" old-state)
+ (phps-mode/BEGIN new-state))
(defun phps-mode/yy_pop_state ()
"Pop current state from stack."
- [elpa] externals/phps-mode 9d3f644 032/405: Separated indentation tests for lexer tests, (continued)
- [elpa] externals/phps-mode 9d3f644 032/405: Separated indentation tests for lexer tests, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode d839f8a 029/405: More work on indentation support, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode efcefde 035/405: Added support for closing parenthesis and braces, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 1b891ea 031/405: More work on indentation and related tests, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode c6e5255 038/405: Merge branch 'master' of https://github.com/cjohansson/emacs-phps-mode, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 3837d9c 001/405: My initial commit, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 6776468 037/405: Started worked with adding references to tokens from point meta information, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode feb5724 039/405: Various debug work, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode e36d477 045/405: token-number from point now is the same format as (nth), Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode b437374 040/405: Fixed bug in parsing of object parameters inside double quoted string, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 7161184 041/405: Handles stacked states better,
Stefan Monnier <=
- [elpa] externals/phps-mode c625217 042/405: Added flag for PSR-2 white-space settings, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode b629c4b 050/405: Updated comments and TODOs, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 4b4a375 043/405: Using lexical bindings for all files, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode c040358 046/405: Point lexer token information makes more sense, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 94492c4 048/405: Added changes tracking to functions from lexer, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode be46d9c 044/405: Added lexer autoload to functions, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode a259292 047/405: Changed indentation function to work solely on tokens, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 4098f46 049/405: Started with incremental lexer, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode da1d1de 051/405: Temporary lexer after change until other work is ready, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 990d3dd 054/405: Added test for indentation of multiple-line doc comment, Stefan Monnier, 2019/07/13