From: Vadim Zeitlin <vz-git@zeitlins.org>
To: git@vger.kernel.org
Subject: Re: [PATCH] Avoid false positives in label detection in cpp diff hunk header regex.
Date: Fri, 22 Mar 2013 17:27:41 +0000 (UTC) [thread overview]
Message-ID: <loom.20130322T182517-342@post.gmane.org> (raw)
In-Reply-To: 7vehf78olw.fsf@alter.siamese.dyndns.org
Junio C Hamano <gitster <at> pobox.com> writes:
>
> Vadim Zeitlin <vz-git <at> zeitlins.org> writes:
...
> > diff --git a/userdiff.c b/userdiff.c
> > index ea43a03..9415586 100644
> > --- a/userdiff.c
> > +++ b/userdiff.c
> > @@ -125,7 +125,7 @@ PATTERNS("tex",
> > "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
> > "\\\\[a-zA-Z@]+|\\\\.|[a-zA-Z0-9\x80-\xff]+"),
> > 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]*:([^:]|$)"
This works too, of course. I didn't know why did the original regex
contain ".*$" part so I decided to keep it but your version is indeed
how I would have written it myself if I were doing it from scratch.
Should I resubmit an updated patch or could you please just apply
your version?
TIA!
VZ
next prev parent reply other threads:[~2013-03-22 17:28 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 [this message]
2013-03-22 21:55 ` Johannes Sixt
2013-03-22 22:32 ` Junio C Hamano
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=loom.20130322T182517-342@post.gmane.org \
--to=vz-git@zeitlins.org \
--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.
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).