git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "LI, BO XUAN" <liboxuan@connect.hku.hk>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] doc/gitattributes: add Octave
Date: Sat, 11 May 2019 10:36:00 +0800	[thread overview]
Message-ID: <CALM0=-mTLakSBW67vqHNX84p=uw990QDbpeUfh1HKq9N0CiiLA@mail.gmail.com> (raw)
In-Reply-To: <87woixx556.fsf@evledraar.gmail.com>

On Sat, May 11, 2019 at 7:26 AM Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
>
>
> On Fri, May 10 2019, Boxuan Li wrote:
>
> > `matlab` pattern is also suitable for source code
> > in the GNU Octave language.
> >
> > Signed-off-by: Boxuan Li <liboxuan@connect.hku.hk>
> > ---
> >  Documentation/gitattributes.txt | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
> > index 4fb20cd0e9..1b28381bda 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/Octave language.
> >
> >  - `objc` suitable for source code in the Objective-C language.
>
> I've never used either, but browsing our patterns I see:
>
>          "^[[:space:]]*((classdef|function)[[:space:]].*)$|^%%[[:space:]].*$",
>
> I.e. that last bit matches ^%%, and then here:
> https://en.wikibooks.org/wiki/MATLAB_Programming/Differences_between_Octave_and_MATLAB
>
>     MATLAB uses the percent sign '%' to begin a comment. Octave uses
>     both the hash symbol # and the percent sign % interchangeably.
>
> So here we have the "function" pattern matching a comment, right? (this
> doesn't have any tests) and we'd want to add "#" to Octave, but not
> MATLAB.

Thanks, that's a great catch! Actually, '%%' is used to start a code
section in Matlab
(https://www.mathworks.com/help/matlab/matlab_prog/run-sections-of-programs.html),
while Octave uses both '%%' and '##'
(https://octave.org/doc/interpreter/Sections.html).

>
> I see both tend to use the ".m" extension. Anyway, isn't it better to
> add an "octave" pattern, and document that they're mostly the same

I agree. I'll send an updated patch soon.

> (although it looks like we can add #-comments, to future-proof
> ourselves?

  reply	other threads:[~2019-05-11  2:36 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 [this message]
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
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='CALM0=-mTLakSBW67vqHNX84p=uw990QDbpeUfh1HKq9N0CiiLA@mail.gmail.com' \
    --to=liboxuan@connect.hku.hk \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.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).