Re: [PATCH 2/2] userdiff: support Java try keyword

2014-06-02 Thread Junio C Hamano
Sup Yut Sum  writes:

> try keyword is enhanced in Java 7, see try-with-resources Statement
> try (XX yy = new XX()) {
> } catch (Exception e){
> }

Sorry, but I do not see the connection between the proposed log
message and what the patch does.

The patch seems to tell me this:

We did not know 'try' was a keyword to begin a block for java,
whether that 'try' is a traditional 'try' or 'try' in
'try-with-resources'.  With this patch we start recognising
'try' as a keyword.

and nothing else, but the log message makes it sound as if the more
prevalent use of try-with-resources in Java 7 makes it for some
reason more important to recognise it as a keyword than it used to
be---or is that what you meant to say?

Puzzled...

> Signed-off-by: Sup Yut Sum 
> ---
>  userdiff.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/userdiff.c b/userdiff.c
> index 96eda6c..49e898b 100644
> --- a/userdiff.c
> +++ b/userdiff.c
> @@ -39,7 +39,7 @@ IPATTERN("fortran",
>  PATTERNS("html", "^[ \t]*(<[Hh][1-6][ \t].*>.*)$",
>"[^<>= \t]+"),
>  PATTERNS("java",
> -  "!^[ \t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)\n"
> +  "!^[ 
> \t]*(try|catch|do|for|if|instanceof|new|return|switch|throw|while)\n"
>"^[ \t]*(([A-Za-z_][A-Za-z_0-9]*[ \t]+)+[A-Za-z_][A-Za-z_0-9]*[ 
> \t]*\\([^;]*)$",
>/* -- */
>"[a-zA-Z_][a-zA-Z0-9_]*"
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 2/2] userdiff: support Java try keyword

2014-06-01 Thread Sup Yut Sum
try keyword is enhanced in Java 7, see try-with-resources Statement
try (XX yy = new XX()) {
} catch (Exception e){
}

Signed-off-by: Sup Yut Sum 
---
 userdiff.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/userdiff.c b/userdiff.c
index 96eda6c..49e898b 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -39,7 +39,7 @@ IPATTERN("fortran",
 PATTERNS("html", "^[ \t]*(<[Hh][1-6][ \t].*>.*)$",
 "[^<>= \t]+"),
 PATTERNS("java",
-"!^[ \t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)\n"
+"!^[ 
\t]*(try|catch|do|for|if|instanceof|new|return|switch|throw|while)\n"
 "^[ \t]*(([A-Za-z_][A-Za-z_0-9]*[ \t]+)+[A-Za-z_][A-Za-z_0-9]*[ 
\t]*\\([^;]*)$",
 /* -- */
 "[a-zA-Z_][a-zA-Z0-9_]*"
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html