Fix conversions accidentally missed

Author: idodeclare

src/org/opensolaris/opengrok/analysis/perl/PerlLexHelper.java

@@ -29,6 +29,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.opensolaris.opengrok.analysis.Resettable;
+import org.opensolaris.opengrok.util.StringUtils;
 import org.opensolaris.opengrok.web.HtmlConsts;
 
 /**
@@ -300,10 +301,10 @@ public void setState(String ltpostop, boolean nointerp) {
         int state;
         boolean nolink = false;
 
-        // "no link" for {FNameChar} or {URIChar}, which covers everything in
-        // the rule for "string links" below
-        if (ltpostop.matches("^[a-zA-Z0-9_]") ||
-            ltpostop.matches("^[\\?\\#\\+%&:/\\.@_;=\\$,\\-!~\\*\\\\]")) {
+        // "no link" for values in the rules for "string links" if `ltpostop'
+        // is file- or URI-like.
+        if (StringUtils.startsWithFnameChars(ltpostop) ||
+            StringUtils.startsWithURIChars(ltpostop)) {
             nolink = true;
         }
 

src/org/opensolaris/opengrok/analysis/perl/PerlProductions.lexh

@@ -26,10 +26,7 @@
  * Regex productions shared between PerlXref and PerlSymbolTokenizer
  */
 
-WhspChar      = [ \t\f]
-WhiteSpace    = {WhspChar}+
 MaybeWhsp     = {WhspChar}*
-EOL = \r|\n|\r\n
 Identifier = [a-zA-Z_] [a-zA-Z0-9_]*
 Sigils = ("$" | "@" | "%" | "&" | "*")
 WxSigils = [[\W]--[\$\@\%\&\*\"\'\`\#\r\n]]
@@ -63,14 +60,9 @@ SPIdentifier4 = "${^" ( "]" | "[" | [A-Z\^_?\\] ) [a-zA-Z0-9_]* "}"
 // mistaken for an SPIdentifier2
 ProtoAttr = "(" ( [\\]? {Sigils} | ";" | {WhiteSpace} )* ")"
 
-// see also: PerlLexHelper.setState() which mirrors this regex
-URIChar = [\?\#\+\%\&\:\/\.\@\_\;\=\$\,\-\!\~\*\\]
-
-FNameChar = [a-zA-Z0-9_\-\.]
 FileExt = ("pl"|"perl"|"pm"|"conf"|"txt"|"htm"|"html"|"xml"|"ini"|"diff"|"patch"|
            "PL"|"PERL"|"PM"|"CONF"|"TXT"|"HTM"|"HTML"|"XML"|"INI"|"DIFF"|"PATCH")
 File = [a-zA-Z]{FNameChar}* "." {FileExt}
-Path = "/"? [a-zA-Z]{FNameChar}* ("/" [a-zA-Z]{FNameChar}*[a-zA-Z0-9])+
 
 Number = (0[xX][0-9a-fA-F]+|[0-9]+\.[0-9]+|[0-9][0-9_]*)([eE][+-]?[0-9]+)?
 
@@ -189,7 +181,7 @@ Mpunc2IN = ([!=]"~" | [\:\?\=\+\-\<\>] | "=="|"!="|"<="|">="|"<=>"|"=>")
     }
  }
 
- "<" ({File}|{Path}) ">"    {
+ "<" ({File} | {FPath}) ">"    {
     maybeIntraState();
     if (takeAllContent()) {
         takeNonword("<");
@@ -515,7 +507,7 @@ Mpunc2IN = ([!=]"~" | [\:\?\=\+\-\<\>] | "=="|"!="|"<="|">="|"<=>"|"=>")
 
 // "string links" and "comment links"
 <SCOMMENT, POD, FMT, QUO, QUOxN, HERE, HERExN, HEREin, HEREinxN> {
-    {Path}    {
+    {FPath}    {
         if (takeAllContent()) {
             take(Util.breadcrumbPath(getUrlPrefix() + "path=",yytext(),'/'));
         }
@@ -533,7 +525,7 @@ Mpunc2IN = ([!=]"~" | [\:\?\=\+\-\<\>] | "=="|"!="|"<="|">="|"<=>"|"=>")
         }
     }
 
-    ("http" | "https" | "ftp" ) "://" ({FNameChar}|{URIChar})+[a-zA-Z0-9/]    {
+    {BrowseableURI}    {
         if (takeAllContent()) {
             appendLink(yytext());
         }

src/org/opensolaris/opengrok/analysis/perl/PerlSymbolTokenizer.lex

@@ -136,4 +136,7 @@ import org.opensolaris.opengrok.web.Util;
     protected void writeEMailAddress(String s) { /* noop */ }
 %}
 
+%include Common.lexh
+%include CommonURI.lexh
+%include CommonPath.lexh
 %include PerlProductions.lexh

src/org/opensolaris/opengrok/analysis/perl/PerlXref.lex

@@ -134,4 +134,7 @@ import org.opensolaris.opengrok.web.Util;
     protected String getUrlPrefix() { return urlPrefix; }
 %}
 
+%include Common.lexh
+%include CommonURI.lexh
+%include CommonPath.lexh
 %include PerlProductions.lexh

src/org/opensolaris/opengrok/analysis/ruby/RubyLexHelper.java

@@ -29,6 +29,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.opensolaris.opengrok.analysis.Resettable;
+import org.opensolaris.opengrok.util.StringUtils;
 import org.opensolaris.opengrok.web.HtmlConsts;
 
 /**
@@ -247,10 +248,10 @@ public void setState(String postop, boolean nointerp) {
         int state;
         boolean nolink = false;
 
-        // "no link" for {FNameChar} or {URIChar}, which covers everything in
-        // the rule for "string links" below
-        if (postop.matches("^[a-zA-Z0-9_]") ||
-            postop.matches("^[\\?\\#\\+%&:/\\.@_;=\\$,\\-!~\\*\\\\]")) {
+        // "no link" for values in the rules for "string links" if `postop'
+        // is file- or URI-like.
+        if (StringUtils.startsWithFnameChars(postop) ||
+            StringUtils.startsWithURIChars(postop)) {
             nolink = true;
         }
 

src/org/opensolaris/opengrok/analysis/ruby/RubyProductions.lexh

@@ -26,10 +26,7 @@
  * Regex productions shared between RubyXref and RubySymbolTokenizer
  */
 
-WhspChar      = [ \t\f]
-WhiteSpace    = {WhspChar}+
 MaybeWhsp     = {WhspChar}*
-EOL = \r|\n|\r\n
 
 /*
  * globals_rdoc: Pre-defined variables
@@ -161,14 +158,9 @@ Character_literal_esc = [\\] ([MC][\-][^\s] | "u{" [0-9]+ "}" |
 
 WxSigils = [[\W]--[\$\@\"\'\`\#\r\n]]
 
-// see also: RubyLexHelper.setState() which mirrors this regex
-URIChar = [\?\#\+\%\&\:\/\.\@\_\;\=\$\,\-\!\~\*\\]
-
-FNameChar = [a-zA-Z0-9_\-\.]
 FileExt = ([Rr][Bb] | [Rr][Uu][Bb][Yy] | [Dd][Ii][Ff][Ff] |
     [Pp][Aa][Tt][Cc][Hh])
 File = [a-zA-Z]{FNameChar}* "." {FileExt}
-Path = "/"? [a-zA-Z]{FNameChar}* ("/" [a-zA-Z]{FNameChar}*[a-zA-Z0-9])+
 
 POD_begin = "=begin"
 POD_end = "=end"
@@ -494,7 +486,7 @@ Here_EOF3 = [\`][^\r\n\`]*[\`]
 
 // "string links" and "comment links"
 <SCOMMENT, POD, QUO, QUOxN, HERE, HERExN, HEREin, HEREinxN> {
-    {Path}    {
+    {FPath}    {
         if (takeAllContent()) {
             take(Util.breadcrumbPath(getUrlPrefix() + "path=",yytext(),'/'));
         }
@@ -512,7 +504,7 @@ Here_EOF3 = [\`][^\r\n\`]*[\`]
         }
     }
 
-    ("http" | "https" | "ftp" ) "://" ({FNameChar}|{URIChar})+[a-zA-Z0-9/]    {
+    {BrowseableURI}    {
         if (takeAllContent()) {
             appendLink(yytext());
         }

src/org/opensolaris/opengrok/analysis/ruby/RubySymbolTokenizer.lex

@@ -151,4 +151,7 @@ import org.opensolaris.opengrok.web.Util;
     protected void writeEMailAddress(String s) { /* noop */ }
 %}
 
+%include Common.lexh
+%include CommonURI.lexh
+%include CommonPath.lexh
 %include RubyProductions.lexh

src/org/opensolaris/opengrok/analysis/ruby/RubyXref.lex

@@ -145,4 +145,7 @@ import org.opensolaris.opengrok.web.Util;
     protected String getUrlPrefix() { return urlPrefix; }
 %}
 
+%include Common.lexh
+%include CommonURI.lexh
+%include CommonPath.lexh
 %include RubyProductions.lexh