From: Junio C Hamano <gitster@pobox.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Vadim Zeitlin <vz-git@zeitlins.org>, git@vger.kernel.org
Subject: Re: [PATCH] Avoid false positives in label detection in cpp diff hunk header regex.
Date: Fri, 22 Mar 2013 15:32:21 -0700 [thread overview]
Message-ID: <7vhak35ami.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <514CD34F.70107@kdbg.org> (Johannes Sixt's message of "Fri, 22 Mar 2013 22:55:27 +0100")
Johannes Sixt <j6t@kdbg.org> writes:
> Am 22.03.2013 16:02, schrieb Junio C Hamano:
>> Vadim Zeitlin <vz-git@zeitlins.org> writes:
>>
>>> A C++ method start such as
>>>
>>> void
>>> foo::bar()
>>>
>>> wasn't recognized by cpp diff driver as it mistakenly included "foo::bar" as a
>>> label. However the colon in a label can't be followed by another colon, so
>>> recognize this case specially to correctly detect C++ methods using this style.
>
> Much appreciated!
>
>>> PATTERNS("cpp",
>>> /* Jump targets or access declarations */
>>> - "!^[ \t]*[A-Za-z_][A-Za-z_0-9]*:.*$\n"
>>> + "!^[ \t]*[A-Za-z_][A-Za-z_0-9]*:([^:].*$|$)\n"
>>
>> Hmm. Wouldn't "find a word (possibly after indentation), colon and
>> then either a non-colon or end of line" be sufficient and simpler?
>> iow, something like...
>>
>> "!^[ \t]*[A-Za-z_][A-Za-z_0-9]*:([^:]|$)"
>
> Yes, indeed. We don't need to match more than necessary in a negative
> pattern. The \n must still remain, though.
... because \n is not for matching against the text, but merely to
separate the regular expressions, right?
I also wonder if
label :
should also be caught, or is it too weird format to be worth
supporting?
next prev parent reply other threads:[~2013-03-22 22:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-22 13:43 [PATCH] Avoid false positives in label detection in cpp diff hunk header regex Vadim Zeitlin
2013-03-22 15:02 ` Junio C Hamano
2013-03-22 17:27 ` Vadim Zeitlin
2013-03-22 21:55 ` Johannes Sixt
2013-03-22 22:32 ` Junio C Hamano [this message]
2013-03-22 23:11 ` Johannes Sixt
2013-03-23 0:38 ` Vadim Zeitlin
2013-03-23 8:31 ` Andreas Schwab
2013-03-23 9:48 ` Vadim Zeitlin
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=7vhak35ami.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=vz-git@zeitlins.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).