From: Johannes Sixt <j6t@kdbg.org>
To: Jaydeep P Das <jaydeepjd.8914@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v6] userdiff: add builtin diff driver for kotlin language.
Date: Fri, 11 Mar 2022 21:07:06 +0100 [thread overview]
Message-ID: <16543315-8515-a4d7-d75b-e7fe9731a7cf@kdbg.org> (raw)
In-Reply-To: <20220311072716.674808-1-jaydeepjd.8914@gmail.com>
Am 11.03.22 um 08:27 schrieb Jaydeep P Das:
> The xfuncname pattern finds func/class declarations
> in diffs to display as a hunk header. The word_regex
> pattern finds individual tokens in Kotlin code to generate
> appropriate diffs.
>
> This patch adds xfuncname regex and word_regex for Kotlin
> language.
>
> Signed-off-by: Jaydeep P Das <jaydeepjd.8914@gmail.com>
> ---
Thank you. At first, I thought this round is it, but then I noticed this
line:
> +<RED>0xFF_EC_DE_5E 0b100_000 1<RESET><GREEN>0xFF_E1_DE_5E 0b100_100 2<RESET>00_000
Notice how the change from 100_000 to 200_000 breaks out the first digit
into its own token.
> diff --git a/userdiff.c b/userdiff.c
> index 8578cb0d12..c416c9b426 100644
> --- a/userdiff.c
> +++ b/userdiff.c
> @@ -168,6 +168,18 @@ PATTERNS("java",
> "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
> "|[-+*/<>%&^|=!]="
> "|--|\\+\\+|<<=?|>>>?=?|&&|\\|\\|"),
> +PATTERNS("kotlin",
> + "^[ \t]*(([a-z]+[ \t]+)*(fun|class|interface)[ \t]+.*)$",
> + /* -- */
> + "[a-zA-Z_][a-zA-Z0-9_]*"
> + /* hexadecimal and binary numbers */
> + "|0[xXbB][0-9a-fA-F_]+[lLuU]*"
> + /* integers and floats */
> + "|[0-9][0-9_]*([.][0-9_]*)([Ee][-+]?[0-9]+)?[fFlLuU]*"
This line matches a non-empty digit sequence of any length, and I
thought the longest match would win. Why is that not the case here?
Frankly, I'm scratching my head over it. Any ideas?
> + /* floating point numbers beginning with decimal point */
> + "|[.][0-9][0-9_]*([Ee][-+]?[0-9]+)?[fFlLuU]?"
> + /* unary and binary operators */
> + "|[-+*/<>%&^|=!]==?|--|\\+\\+|<<=|>>=|&&|\\|\\||->|\\.\\*|!!|[?:.][.:]"),
> PATTERNS("markdown",
> "^ {0,3}#{1,6}[ \t].*",
> /* -- */
-- Hannes
next prev parent reply other threads:[~2022-03-11 20:07 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-01 7:02 [GSoC][PATCH] userdiff: Add diff driver for Kotlin lang and tests Jaydeep P Das
2022-03-01 7:02 ` [PATCH] " Jaydeep P Das
2022-03-01 9:32 ` Junio C Hamano
2022-03-01 9:37 ` Ævar Arnfjörð Bjarmason
2022-03-01 10:27 ` jaydeepjd.8914
2022-03-01 15:54 ` [PATCH] userdiff: add builtin diff driver for Kotlin language Jaydeep P Das
2022-03-01 17:17 ` Junio C Hamano
2022-03-01 18:09 ` jaydeepjd.8914
2022-03-01 19:59 ` Johannes Sixt
2022-03-01 19:47 ` Johannes Sixt
2022-03-02 6:45 ` [GSoC][PATCHv2] userdiff: add builtin driver for kotlin language Jaydeep P Das
2022-03-02 6:45 ` [PATCH] " Jaydeep P Das
2022-03-02 8:00 ` Johannes Sixt
2022-03-02 9:09 ` jaydeepjd.8914
2022-03-02 9:28 ` jaydeepjd.8914
2022-03-02 14:26 ` [GSoC][PATCHv3] " Jaydeep P Das
2022-03-02 14:26 ` [PATCH] " Jaydeep P Das
2022-03-02 20:18 ` Johannes Sixt
2022-03-03 11:41 ` Jaydeep Das
2022-03-03 16:54 ` Ævar Arnfjörð Bjarmason
2022-03-03 19:47 ` Junio C Hamano
2022-03-03 20:04 ` Johannes Sixt
2022-03-04 12:28 ` Jaydeep Das
2022-03-04 13:59 ` Johannes Sixt
2022-03-03 18:15 ` [PATCH] userdiff: add builtin diff driver for Kotlin language Jaydeep P Das
2022-03-04 2:44 ` Junio C Hamano
2022-03-04 5:16 ` jaydeepjd.8914
2022-03-04 7:25 ` Johannes Sixt
2022-03-05 9:40 ` [PATCH v4] " Jaydeep P Das
2022-03-05 14:17 ` Johannes Sixt
2022-03-05 19:18 ` jaydeepjd.8914
2022-03-05 22:17 ` Johannes Sixt
2022-03-06 11:15 ` [PATCH v5] userdiff: add builtin diff driver for kotlin language Jaydeep P Das
2022-03-07 7:07 ` Johannes Sixt
2022-03-08 16:54 ` jaydeepjd.8914
2022-03-08 18:32 ` Johannes Sixt
2022-03-10 10:52 ` jaydeepjd.8914
2022-03-10 16:29 ` Jaydeep Das
2022-03-10 19:11 ` Johannes Sixt
2022-03-11 7:27 ` [PATCH v6] " Jaydeep P Das
2022-03-11 20:07 ` Johannes Sixt [this message]
2022-03-12 4:36 ` jaydeepjd.8914
2022-03-12 8:36 ` Johannes Sixt
2022-03-12 4:48 ` [PATCH v7] " Jaydeep P Das
2022-03-12 8:59 ` Johannes Sixt
2022-03-13 17:02 ` jaydeepjd.8914
2022-03-13 17:09 ` jaydeepjd.8914
2022-03-13 21:36 ` Johannes Sixt
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=16543315-8515-a4d7-d75b-e7fe9731a7cf@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=jaydeepjd.8914@gmail.com \
/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://80x24.org/mirrors/git.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).