Merge remote-tracking branch 'origin/topic/bbannier/ipv6'

grammar.js

@@ -438,16 +438,8 @@ module.exports = grammar({
     file: ($) => /[^ \t\r\n]+/,
     pattern: ($) => /\/((\\\/)?[^\r\n\/]?)*\/i?/,
 
-    // https://stackoverflow.com/questions/53497/regular-expression-that-matches-valid-ipv6-addresses
-    //
-    // This is technically more narrow than Zeek's own IPv6 regex in a few
-    // specific cases (IPv6-embedded v4 comes to mind, where Zeek accepts
-    // technically invalid strings). Might want to move to Zeek's regex, for
-    // consistency.
-    //
-    ipv6: ($) =>
-      /(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))/,
-    ipv4: ($) => /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/,
+    ipv4: (_) => /([0-9]+\.*){4}/,
+    ipv6: (_) => /\[([0-9a-fA-F]?:*)+(:+([0-9]+\.*){4})?\]/,
 
     port: ($) => /[0-9]+\/(tcp|udp|icmp|unknown)/,