From: Andrei Rybak <rybak.a.v@gmail.com>
To: Tassilo Horn <tsdh@gnu.org>, git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Paolo Bonzini <pbonzini@redhat.com>,
Johannes Sixt <j6t@kdbg.org>
Subject: [PATCH v2 0/3] userdiff: Java updates
Date: Sat, 4 Feb 2023 14:43:26 +0100 [thread overview]
Message-ID: <20230204134329.251451-1-rybak.a.v@gmail.com> (raw)
In-Reply-To: <877cwxvl3a.fsf@gnu.org>
On 04/02/2023 10:22, Tassilo Horn wrote:
> Thanks for including me being the last contributor to java userdiff.
> The patches look good from my POV and are safe-guarded with tests, so
> I'm all for it.
Thank you for review!
I've realized that I've been writing modifiers "abstract" and "sealed" in a
technically correct, but not the conventional order. Here's a reroll with the
order of modifiers following the style of original authors of
https://openjdk.org/jeps/409. It doesn't matter for the purposes of the test,
but it will be less annoying to any future readers :-)
Range diff since v1:
1: c300745a58 = 1: c300745a58 userdiff: support Java type parameters
2: a0e622a0f8 = 2: a0e622a0f8 userdiff: support Java record types
3: a53fca4d49 ! 3: b9c6a5dffd userdiff: support Java sealed classes
@@ Commit message
## t/t4018/java-non-sealed (new) ##
@@
-+public sealed abstract class SealedClass {
++public abstract sealed class SealedClass {
+ public static non-sealed class RIGHT extends SealedClass {
+ static int ONE;
+ static int TWO;
@@ t/t4018/java-non-sealed (new)
## t/t4018/java-sealed (new) ##
@@
-+public sealed abstract class Sealed { // RIGHT
++public abstract sealed class Sealed { // RIGHT
+ static int ONE;
+ static int TWO;
+ static int THREE;
@@ t/t4018/java-sealed (new)
## t/t4018/java-sealed-permits (new) ##
@@
-+public sealed abstract class RIGHT permits PermittedA, PermittedB {
++public abstract sealed class RIGHT permits PermittedA, PermittedB {
+ static int ONE;
+ static int TWO;
+ static int THREE;
@@ t/t4018/java-sealed-permits (new)
## t/t4018/java-sealed-type-parameters (new) ##
@@
-+public sealed abstract class RIGHT<A, B> {
++public abstract sealed class RIGHT<A, B> {
+ static int ONE;
+ static int TWO;
+ static int THREE;
@@ t/t4018/java-sealed-type-parameters (new)
## t/t4018/java-sealed-type-parameters-implements-permits (new) ##
@@
-+public sealed abstract class RIGHT<A, B> implements List<A> permits PermittedA, PermittedB {
++public abstract sealed class RIGHT<A, B> implements List<A> permits PermittedA, PermittedB {
+ static int ONE;
+ static int TWO;
+ static int THREE;
@@ t/t4018/java-sealed-type-parameters-implements-permits (new)
## t/t4018/java-sealed-type-parameters-permits (new) ##
@@
-+public sealed abstract class RIGHT<A, B> permits PermittedA, PermittedB {
++public abstract sealed class RIGHT<A, B> permits PermittedA, PermittedB {
+ static int ONE;
+ static int TWO;
+ static int THREE;
Andrei Rybak (3):
userdiff: support Java type parameters
userdiff: support Java record types
userdiff: support Java sealed classes
t/t4018/java-class-type-parameters | 6 ++++++
t/t4018/java-class-type-parameters-implements | 6 ++++++
t/t4018/java-interface-type-parameters | 6 ++++++
t/t4018/java-interface-type-parameters-extends | 6 ++++++
t/t4018/java-non-sealed | 8 ++++++++
t/t4018/java-record | 6 ++++++
t/t4018/java-record-type-parameters | 6 ++++++
t/t4018/java-sealed | 7 +++++++
t/t4018/java-sealed-permits | 6 ++++++
t/t4018/java-sealed-type-parameters | 6 ++++++
t/t4018/java-sealed-type-parameters-implements-permits | 6 ++++++
t/t4018/java-sealed-type-parameters-permits | 6 ++++++
userdiff.c | 2 +-
13 files changed, 76 insertions(+), 1 deletion(-)
create mode 100644 t/t4018/java-class-type-parameters
create mode 100644 t/t4018/java-class-type-parameters-implements
create mode 100644 t/t4018/java-interface-type-parameters
create mode 100644 t/t4018/java-interface-type-parameters-extends
create mode 100644 t/t4018/java-non-sealed
create mode 100644 t/t4018/java-record
create mode 100644 t/t4018/java-record-type-parameters
create mode 100644 t/t4018/java-sealed
create mode 100644 t/t4018/java-sealed-permits
create mode 100644 t/t4018/java-sealed-type-parameters
create mode 100644 t/t4018/java-sealed-type-parameters-implements-permits
create mode 100644 t/t4018/java-sealed-type-parameters-permits
--
2.39.1
next prev parent reply other threads:[~2023-02-04 13:43 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-03 23:23 [PATCH v1 0/3] userdiff: Java updates Andrei Rybak
2023-02-03 23:23 ` [PATCH v1 1/3] userdiff: support Java type parameters Andrei Rybak
2023-02-03 23:23 ` [PATCH v1 2/3] userdiff: support Java record types Andrei Rybak
2023-02-03 23:23 ` [PATCH v1 3/3] userdiff: support Java sealed classes Andrei Rybak
2023-02-04 9:22 ` [PATCH v1 0/3] userdiff: Java updates Tassilo Horn
2023-02-04 13:43 ` Andrei Rybak [this message]
2023-02-04 13:43 ` [PATCH v2 1/3] userdiff: support Java type parameters Andrei Rybak
2023-02-04 13:43 ` [PATCH v2 2/3] userdiff: support Java record types Andrei Rybak
2023-02-04 13:43 ` [PATCH v2 3/3] userdiff: support Java sealed classes Andrei Rybak
2023-02-05 10:09 ` [PATCH v2 0/3] userdiff: Java updates Johannes Sixt
2023-02-05 19:27 ` Andrei Rybak
2023-02-05 21:33 ` Johannes Sixt
2023-02-07 23:42 ` [PATCH v3 " Andrei Rybak
2023-02-07 23:42 ` [PATCH v3 1/3] userdiff: support Java type parameters Andrei Rybak
2023-02-08 0:04 ` Andrei Rybak
2023-02-07 23:42 ` [PATCH v3 2/3] userdiff: support Java record types Andrei Rybak
2023-02-07 23:42 ` [PATCH v3 3/3] userdiff: support Java sealed classes Andrei Rybak
2023-02-08 20:51 ` [PATCH v3 0/3] userdiff: Java updates Johannes Sixt
2023-02-08 20:55 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230204134329.251451-1-rybak.a.v@gmail.com \
--to=rybak.a.v@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=pbonzini@redhat.com \
--cc=peff@peff.net \
--cc=tsdh@gnu.org \
/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.
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 NNTP newsgroup(s).