From: Johannes Sixt <j6t@kdbg.org>
To: Boxuan Li <liboxuan@connect.hku.hk>
Cc: git@vger.kernel.org, avarab@gmail.com, philipoakley@iee.org,
gitster@pobox.com
Subject: Re: [PATCH v5] userdiff: add Octave
Date: Mon, 20 May 2019 21:26:01 +0200 [thread overview]
Message-ID: <3b7a22e8-0310-3738-0476-b6d73f187331@kdbg.org> (raw)
In-Reply-To: <20190518034623.87702-1-liboxuan@connect.hku.hk>
Am 18.05.19 um 05:46 schrieb Boxuan Li:
> Octave pattern is almost the same as matlab, except
> that '%%%' and '##' can also be used to begin code sections,
> in addition to '%%' that is understood by both. Octave
> pattern is merged into Matlab pattern. Test cases for
> the hunk header patterns of matlab and octave under
> t/t4018 are added.
Thank you! This patch looks good. With or without the grammar and style
fixes below:
Acked-by: Johannes Sixt <j6t@kdbg.org>
Junio will very likely appreciate if you resend with these fixes applied.
>
> Signed-off-by: Boxuan Li <liboxuan@connect.hku.hk>
> ---
> v1: use matlab pattern for octave
> v2: add a new octave pattern
> v3: fix indentation problem of v2
> v4: improve doc and commit message
> v5: merge octave pattern into matlab and add test cases
> ---
> diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
> index 4fb20cd0e9..e657a6b7b7 100644
> --- a/Documentation/gitattributes.txt
> +++ b/Documentation/gitattributes.txt
> @@ -819,7 +819,7 @@ patterns are available:
>
> - `java` suitable for source code in the Java language.
>
> -- `matlab` suitable for source code in the MATLAB language.
> +- `matlab` suitable for source code in the MATLAB and Octave language.
s/language/languages/
>
> - `objc` suitable for source code in the Objective-C language.
>
> diff --git a/userdiff.c b/userdiff.c
> index 3a78fbf504..bcae006abe 100644
> --- a/userdiff.c
> +++ b/userdiff.c
> @@ -58,7 +58,10 @@ PATTERNS("java",
> "|[-+*/<>%&^|=!]="
> "|--|\\+\\+|<<=?|>>>?=?|&&|\\|\\|"),
> PATTERNS("matlab",
> - "^[[:space:]]*((classdef|function)[[:space:]].*)$|^%%[[:space:]].*$",
> + /* Octave pattern is mostly the same as matlab, except that '%%%' and
> + * '##' can also be used to begin code sections, in addition to '%%'
> + * that is understood by both. */
/*
* We write multi-line
* comments like this.
*/
> + "^[[:space:]]*((classdef|function)[[:space:]].*)$|^(%%%?|##)[[:space:]].*$",
> "[a-zA-Z_][a-zA-Z0-9_]*|[-+0-9.e]+|[=~<>]=|\\.[*/\\^']|\\|\\||&&"),
> PATTERNS("objc",
> /* Negate C statements that can look like functions */
>
-- Hannes
next prev parent reply other threads:[~2019-05-20 19:26 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-10 0:47 [PATCH] doc/gitattributes: add Octave Boxuan Li
2019-05-10 23:09 ` Philip Oakley
2019-05-10 23:26 ` Ævar Arnfjörð Bjarmason
2019-05-11 2:36 ` LI, BO XUAN
2019-05-11 4:08 ` [PATCH v2] userdiff.c & doc/gitattributes.txt: " Boxuan Li
2019-05-11 4:13 ` [PATCH v3] " Boxuan Li
2019-05-15 5:35 ` Junio C Hamano
2019-05-15 5:57 ` Johannes Sixt
2019-05-15 6:15 ` LI, BO XUAN
2019-05-15 17:46 ` Johannes Sixt
2019-05-16 9:19 ` Junio C Hamano
2019-05-16 19:20 ` Johannes Sixt
2019-05-16 23:33 ` Junio C Hamano
2019-05-17 12:19 ` LI, BO XUAN
2019-05-17 19:47 ` Johannes Sixt
2019-05-15 5:55 ` [PATCH v4] " Boxuan Li
2019-05-18 3:46 ` [PATCH v5] userdiff: " Boxuan Li
2019-05-20 19:26 ` Johannes Sixt [this message]
2019-05-21 14:57 ` [PATCH v6] " Boxuan Li
2019-05-28 16:37 ` [PATCH v5] " Junio C Hamano
2019-05-28 20:26 ` Johannes Sixt
2019-05-29 16:15 ` [PATCH] userdiff: fix grammar and style issues Boxuan Li
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=3b7a22e8-0310-3738-0476-b6d73f187331@kdbg.org \
--to=j6t@kdbg.org \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=liboxuan@connect.hku.hk \
--cc=philipoakley@iee.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.
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).