git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v6] userdiff: add builtin diff driver for kotlin language.

From
jaydeepjd.8914@gmail.com <jaydeepjd.8914@gmail.com>
Date
Mar 12, 2022, 04:36 UTC
Message-ID
<62e13889-315a-1a42-f37b-390702c0aa9d@gmail.com>
In-Reply-To
<16543315-8515-a4d7-d75b-e7fe9731a7cf@kdbg.org>
On 3/12/22 1:37 AM, Johannes Sixt <j6t@kdbg.org> wrote:
Show 19 quoted lines
> 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.
Wow. I completely missed it.
Show 20 quoted lines
> > 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?

Yes. The capture group ([.][0-9_]*) should occur once or zero times. So this `([.][0-9_]*)?` will fix it.

Previous: Johannes SixtNext: Johannes Sixt
Message 42 of 48 in “userdiff: Add diff driver for Kotlin lang and tests”
  1. Jaydeep P DasMar 1, 2022
  2. userdiff: Add diff driver for Kotlin lang and testsJaydeep P Das, Mar 1, 2022
  3. Junio C HamanoMar 1, 2022
  4. Ævar Arnfjörð BjarmasonMar 1, 2022
  5. jaydeepjd.8914@gmail.comMar 1, 2022
  6. userdiff: add builtin diff driver for Kotlin language.Jaydeep P Das, Mar 1, 2022
  7. Junio C HamanoMar 1, 2022
  8. jaydeepjd.8914@gmail.comMar 1, 2022
  9. Johannes SixtMar 1, 2022
  10. Johannes SixtMar 1, 2022
  11. [GSoC][PATCHv2] userdiff: add builtin driver for kotlin languageJaydeep P Das, Mar 2, 2022
  12. userdiff: add builtin driver for kotlin languageJaydeep P Das, Mar 2, 2022
  13. Johannes SixtMar 2, 2022
  14. jaydeepjd.8914@gmail.comMar 2, 2022
  15. jaydeepjd.8914@gmail.comMar 2, 2022
  16. [GSoC][PATCHv3] userdiff: add builtin driver for kotlin languageJaydeep P Das, Mar 2, 2022
  17. userdiff: add builtin driver for kotlin languageJaydeep P Das, Mar 2, 2022
  18. Johannes SixtMar 2, 2022
  19. Jaydeep DasMar 3, 2022
  20. Ævar Arnfjörð BjarmasonMar 3, 2022
  21. Junio C HamanoMar 3, 2022
  22. Johannes SixtMar 3, 2022
  23. Jaydeep DasMar 4, 2022
  24. Johannes SixtMar 4, 2022
  25. userdiff: add builtin diff driver for Kotlin language.Jaydeep P Das, Mar 3, 2022
  26. Junio C HamanoMar 4, 2022
  27. jaydeepjd.8914@gmail.comMar 4, 2022
  28. Johannes SixtMar 4, 2022
  29. userdiff: add builtin diff driver for Kotlin language.Jaydeep P Das, Mar 5, 2022
  30. Johannes SixtMar 5, 2022
  31. jaydeepjd.8914@gmail.comMar 5, 2022
  32. Johannes SixtMar 5, 2022
  33. userdiff: add builtin diff driver for kotlin language.Jaydeep P Das, Mar 6, 2022
  34. Johannes SixtMar 7, 2022
  35. jaydeepjd.8914@gmail.comMar 8, 2022
  36. Johannes SixtMar 8, 2022
  37. jaydeepjd.8914@gmail.comMar 10, 2022
  38. Jaydeep DasMar 10, 2022
  39. Johannes SixtMar 10, 2022
  40. userdiff: add builtin diff driver for kotlin language.Jaydeep P Das, Mar 11, 2022
  41. Johannes SixtMar 11, 2022
  42. jaydeepjd.8914@gmail.comMar 12, 2022
  43. Johannes SixtMar 12, 2022
  44. userdiff: add builtin diff driver for kotlin language.Jaydeep P Das, Mar 12, 2022
  45. Johannes SixtMar 12, 2022
  46. jaydeepjd.8914@gmail.comMar 13, 2022
  47. jaydeepjd.8914@gmail.comMar 13, 2022
  48. Johannes SixtMar 13, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.