t4018: convert java pattern test to the new infrastructure

diff --git a/userdiff.c b/userdiff.c
index ea43a0306f1a017f719e0d6b7c1de8b063760184..8830417e3be09ea47453bfc1a7567d3028f274f9 100644 (file)
--- a/userdiff.c
+++ b/userdiff.c
@@ -15,13 +15,13 @@ static int drivers_alloc;
          word_regex "|[^[:space:]]|[\xc0-\xff][\x80-\xbf]+" }
 static struct userdiff_driver builtin_drivers[] = {
 IPATTERN("ada",
-        "!^(.*[ \t])?(is new|renames|is separate)([ \t].*)?$\n"
+        "!^(.*[ \t])?(is[ \t]+new|renames|is[ \t]+separate)([ \t].*)?$\n"
         "!^[ \t]*with[ \t].*$\n"
         "^[ \t]*((procedure|function)[ \t]+.*)$\n"
         "^[ \t]*((package|protected|task)[ \t]+.*)$",
         /* -- */
         "[a-zA-Z][a-zA-Z0-9_]*"
-        "|[0-9][-+0-9#_.eE]"
+        "|[-+]?[0-9][0-9#_.aAbBcCdDeEfF]*([eE][+-]?[0-9_]+)?"
         "|=>|\\.\\.|\\*\\*|:=|/=|>=|<=|<<|>>|<>"),
 IPATTERN("fortran",
         "!^([C*]|[ \t]*!)\n"
@@ -132,8 +132,8 @@ PATTERNS("cpp",
         "^((struct|class|enum)[^;]*)$",
         /* -- */
         "[a-zA-Z_][a-zA-Z0-9_]*"
-        "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
-        "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"),
+        "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lLuU]*"
+        "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*"),
 PATTERNS("csharp",
         /* Keywords */
         "!^[ \t]*(do|while|for|if|else|instanceof|new|return|switch|case|throw|catch|using)\n"