From: Visuwesh <visuweshm@gmail.com>
To: Lars Ingebrigtsen <larsi@gnus.org>
Cc: 55764@debbugs.gnu.org, Stefan Monnier <monnier@iro.umontreal.ca>
Subject: bug#55764: 29.0.50; sh-mode: Support mksh's alternate case brace syntax
Date: Thu, 02 Jun 2022 19:31:18 +0530 [thread overview]
Message-ID: <87k09zp3kh.fsf@gmail.com> (raw)
In-Reply-To: <87o7zbw5dz.fsf@gnus.org> (Lars Ingebrigtsen's message of "Thu, 02 Jun 2022 15:40:08 +0200")
[-- Attachment #1: Type: text/plain, Size: 1044 bytes --]
[வியாழன் ஜூன் 02, 2022] Lars Ingebrigtsen wrote:
> Visuwesh <visuweshm@gmail.com> writes:
>
>> mksh and OpenBSD's ksh support an alternative case syntax for historical
>> reasons [1],
>>
>> case $i {
>> *pattern) do ;;
>> *pattern2) do2 ;;
>> }
>>
>> Currently, sh-mode cannot handle this and the easy way out of writing a
>> semicolon after $i is out since,
>>
>> % case "foo"; { *o) echo 1;; }
>> /bin/mksh: syntax error: unexpected ';'
>>
>> I came with the attached patch after a bit of trial and error but I'm
>> not sure if it is the right way to do it.
>
> I think that might make sense, but perhaps Stefan has some comments here
> (added to the CCs).
To no one's surprise, the patch is not the right approach. IIUC, when I
use braces, *pattern) thingies are not recognised as "case-)" anymore so
sh-indent-for-case-label does not get applied. I tried a bit more but I
only got it to respect the first line but still it is definitely not the
right approach,
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: mksh-braces.patch --]
[-- Type: text/x-diff, Size: 1511 bytes --]
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 4d2554c087..96ff8e8627 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1971,9 +1971,9 @@ sh-smie-sh-rules
(sh-var-value 'sh-indent-for-case-label)))
(`(:before . ,(or "(" "{" "[" "while" "if" "for" "case"))
(cond
- ((and (equal token "{") (smie-rule-parent-p "for"))
+ ((and (equal token "{") (smie-rule-parent-p "for" "case"))
(let ((data (smie-backward-sexp "in")))
- (when (equal (nth 2 data) "for")
+ (when (member (nth 2 data) '("for" "case"))
`(column . ,(smie-indent-virtual)))))
((not (smie-rule-prev-p "&&" "||" "|"))
(when (smie-rule-hanging-p)
@@ -2021,10 +2021,13 @@ sh-smie-sh-rules
('(:after . "in") (sh-var-value 'sh-indent-for-case-label))
;; sh-indent-for-continuation: Line continuations are handled differently.
(`(:after . ,(or "(" "{" "["))
- (if (not (looking-at ".[ \t]*[^\n \t#]"))
- (sh-var-value 'sh-indent-after-open)
- (goto-char (1- (match-end 0)))
- `(column . ,(current-column))))
+ (cond
+ ((smie-rule-parent-p "case")
+ (sh-var-value 'sh-indent-for-case-label))
+ ((not (looking-at ".[ \t]*[^\n \t#]"))
+ (sh-var-value 'sh-indent-after-open))
+ (t (goto-char (1- (match-end 0)))
+ `(column . ,(current-column)))))
;; sh-indent-after-function: we don't handle it differently.
))
next prev parent reply other threads:[~2022-06-02 14:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-02 13:33 bug#55764: 29.0.50; sh-mode: Support mksh's alternate case brace syntax Visuwesh
2022-06-02 13:40 ` Lars Ingebrigtsen
2022-06-02 14:01 ` Visuwesh [this message]
2023-10-01 2:30 ` Stefan Kangas
2023-10-01 3:37 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-01-10 22:24 ` Stefan Kangas
2024-01-12 3:13 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87k09zp3kh.fsf@gmail.com \
--to=visuweshm@gmail.com \
--cc=55764@debbugs.gnu.org \
--cc=larsi@gnus.org \
--cc=monnier@iro.umontreal.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).