[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/swift-mode 2b17f71 183/496: Improve grammar and lexer to s
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/swift-mode 2b17f71 183/496: Improve grammar and lexer to support access modifier in class definitions |
Date: |
Sun, 29 Aug 2021 11:33:32 -0400 (EDT) |
branch: elpa/swift-mode
commit 2b17f714eb86eb4535784313f924649e4c00236e
Author: ap4y <lod@pisem.net>
Commit: ap4y <lod@pisem.net>
Improve grammar and lexer to support access modifier in class definitions
---
swift-mode.el | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/swift-mode.el b/swift-mode.el
index 95d16c8..c61ca5c 100644
--- a/swift-mode.el
+++ b/swift-mode.el
@@ -99,7 +99,7 @@
(top-level-st
("import" type)
(decl)
- ("class" class-decl-exp "{" class-level-sts "}"))
+ ("ACCESSMOD" "class" class-decl-exp "{" class-level-sts "}"))
(class-level-sts (class-level-st) (class-level-st ";" class-level-st))
(class-level-st
@@ -195,6 +195,9 @@
(rx (? (or "class" "mutating" "override" "static" "unowned" "weak"))
(* space) "func"))
+(defvar swift-smie--access-modifier-regexp
+ (regexp-opt '("private" "public" "internal")))
+
(defun swift-smie--implicit-semi-p ()
(save-excursion
(not (or (memq (char-before) '(?\{ ?\[ ?, ?. ?\? ?\:))
@@ -225,6 +228,9 @@
((looking-at swift-smie--decl-specifier-regexp)
(goto-char (match-end 0)) "DECSPEC")
+ ((looking-at swift-smie--access-modifier-regexp)
+ (goto-char (match-end 0)) "ACCESSMOD")
+
(t (let ((tok (smie-default-forward-token)))
(cond
((equal tok "case")
@@ -259,6 +265,9 @@
((looking-back swift-smie--decl-specifier-regexp (- (point) 8) t)
(goto-char (match-beginning 0)) "DECSPEC")
+ ((looking-back swift-smie--access-modifier-regexp (- (point) 8) t)
+ (goto-char (match-beginning 0)) "ACCESSMOD")
+
(t (let ((tok (smie-default-backward-token)))
(cond
((equal tok "case")
- [nongnu] elpa/swift-mode adb3c13 039/496: Restore Emacs 24.1 requirement, (continued)
- [nongnu] elpa/swift-mode adb3c13 039/496: Restore Emacs 24.1 requirement, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode ab5e170 044/496: Add a few links, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode a44a755 052/496: Add docstrings for internal indent commands, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 62276c3 061/496: Indent cases in enums, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode e168b34 128/496: Don't use implicit semicolon for multi-line dot expressions, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode ee83a1d 137/496: Rename swift-indent-multiline-dot-offset to swift-indent-multiline-statement-offset, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode fca914a 165/496: Merge pull request #63 from ckruse/updated_syntax, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 8db040e 166/496: fix: underscores are word characters (Word constituents), ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 2a21e1b 177/496: Add ternary operator smie grammar, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 641681a 182/496: Fix small typo in comment string, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 2b17f71 183/496: Improve grammar and lexer to support access modifier in class definitions,
ELPA Syncer <=
- [nongnu] elpa/swift-mode cac2884 185/496: Add lists to the "type" grammar, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode adfe341 190/496: Add grammar for the protocol definitions, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 20134ed 193/496: Use postive lookahead for declaration specifier lexer rule, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode c2c3c01 199/496: Improve support for optional types, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode d6483e1 207/496: Add ?? to the lexer rule for operators, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 9e6c538 210/496: Correct DECSPEC regex and lexer rule, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 2c67d92 213/496: Fix indentation of the closure arguments inside parentheses, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 5a858c7 218/496: Improve indentation of the array and dictionary expressions, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 195d040 227/496: Merge pull request #76 from ap4y/batch_smie_fixes, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode dbf48a1 232/496: Merge pull request #90 from nathankot/flycheck-framework-search-paths, ELPA Syncer, 2021/08/29