branch: externals/phps-mode commit 9e24e2121ddcc54839ba178e2139eb4baf84360b Author: Christian Johansson <christ...@cvj.se> Commit: Christian Johansson <christ...@cvj.se>
Started new lexer --- phps-mode-lexer-generator.el | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/phps-mode-lexer-generator.el b/phps-mode-lexer-generator.el index fdba516223..fb7a39541e 100644 --- a/phps-mode-lexer-generator.el +++ b/phps-mode-lexer-generator.el @@ -476,14 +476,6 @@ (lambda() (phps-mode-lexer--yy-pop-state) (phps-mode-lexer--return-token-with-str 'T_STRING 0))) - (phps-mode-lexer-generator--add-rule - phps-mode-lexer-generator--table - 'ST_LOOKING_FOR_PROPERTY - (lambda() (looking-at phps-mode-lexer--any-char)) - (lambda() (phps-mode-lexer--yyless 0) - (phps-mode-lexer--yy-pop-state) - (phps-mode-lexer--restart))) - (phps-mode-lexer-generator--add-rule phps-mode-lexer-generator--table 'ST_IN_SCRIPTING @@ -735,6 +727,24 @@ (lambda() (looking-at "protected")) (lambda() (phps-mode-lexer--return-token-with-indent 'T_PROTECTED))) + (phps-mode-lexer-generator--add-rule + phps-mode-lexer-generator--table + 'ST_IN_SCRIPTING + (lambda() (looking-at "public(set)")) + (lambda() (phps-mode-lexer--return-token-with-indent 'T_PUBLIC_SET))) + + (phps-mode-lexer-generator--add-rule + phps-mode-lexer-generator--table + 'ST_IN_SCRIPTING + (lambda() (looking-at "protected(set)")) + (lambda() (phps-mode-lexer--return-token-with-indent 'T_PROTECTED_SET))) + + (phps-mode-lexer-generator--add-rule + phps-mode-lexer-generator--table + 'ST_IN_SCRIPTING + (lambda() (looking-at "private(set)")) + (lambda() (phps-mode-lexer--return-token-with-indent 'T_PRIVATE_SET))) + (phps-mode-lexer-generator--add-rule phps-mode-lexer-generator--table 'ST_IN_SCRIPTING @@ -957,6 +967,8 @@ (lambda() (looking-at ">>")) (lambda() (phps-mode-lexer--return-token 'T_SR))) + ;; TODO WAS HERE + (phps-mode-lexer-generator--add-rule phps-mode-lexer-generator--table 'ST_IN_SCRIPTING