* [PATCH] userdiff: match Pascal class methods
@ 2011-01-11 8:53 Alexey Shumkin
2011-01-11 19:13 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Alexey Shumkin @ 2011-01-11 8:53 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
Class declarations were already covered by the second pattern, but class methods have the 'class' keyword in front too. Account for it.
Signed-off-by: Alexey Shumkin <zapped@mail.ru>
Acked-by: Thomas Rast <trast@student.ethz.ch>
---
userdiff.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/userdiff.c b/userdiff.c
index f9e05b5..259a382 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -52,7 +52,7 @@ PATTERNS("objc",
"|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"
"|[^[:space:]]|[\x80-\xff]+"),
PATTERNS("pascal",
- "^((procedure|function|constructor|destructor|interface|"
+ "^(((class[ \t]+)?(procedure|function)|constructor|destructor|interface|"
"implementation|initialization|finalization)[ \t]*.*)$"
"\n"
"^(.*=[ \t]*(class|record).*)$",
--
1.7.3.4.3.g3f811
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] userdiff: match Pascal class methods
2011-01-11 8:53 [PATCH] userdiff: match Pascal class methods Alexey Shumkin
@ 2011-01-11 19:13 ` Junio C Hamano
2011-01-11 19:50 ` Re[2]: " Алексей Шумкин
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2011-01-11 19:13 UTC (permalink / raw)
To: Alexey Shumkin; +Cc: git
Alexey Shumkin <zapped@mail.ru> writes:
> Class declarations were already covered by the second pattern, but class methods have the 'class' keyword in front too. Account for it.
Too long a line (which I could re-wrap locally but I'd rather not be in
the business of doing that for everybody).
> PATTERNS("pascal",
> - "^((procedure|function|constructor|destructor|interface|"
> + "^(((class[ \t]+)?(procedure|function)|constructor|destructor|interface|"
> "implementation|initialization|finalization)[ \t]*.*)$"
Earlier we took "^procedure frotz", "^function frotz", etc. and now we
also take "^class procedure frotz", "^class function frotz", but not
"^class constructor frotz"---am I reading the patterns correctly?
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re[2]: [PATCH] userdiff: match Pascal class methods
2011-01-11 19:13 ` Junio C Hamano
@ 2011-01-11 19:50 ` Алексей Шумкин
0 siblings, 0 replies; 3+ messages in thread
From: Алексей Шумкин @ 2011-01-11 19:50 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
JCH> Alexey Shumkin <zapped@mail.ru> writes:
>> Class declarations were already covered by the second pattern, but class methods have the 'class' keyword in front too. Account for it.
JCH> Too long a line (which I could re-wrap locally but I'd rather not be in
JCH> the business of doing that for everybody).
Ooh, I'm sorry
>> PATTERNS("pascal",
>> - "^((procedure|function|constructor|destructor|interface|"
>> + "^(((class[ \t]+)?(procedure|function)|constructor|destructor|interface|"
>> "implementation|initialization|finalization)[ \t]*.*)$"
JCH> Earlier we took "^procedure frotz", "^function frotz", etc. and now we
JCH> also take "^class procedure frotz", "^class function frotz", but not
JCH> "^class constructor frotz"---am I reading the patterns correctly?
Yes, you're reading correctly. 'class' keyword might precede only
'procedure' or 'function' keyword but not the other ones
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-01-11 19:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-11 8:53 [PATCH] userdiff: match Pascal class methods Alexey Shumkin
2011-01-11 19:13 ` Junio C Hamano
2011-01-11 19:50 ` Re[2]: " Алексей Шумкин
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.