* \d+ - *, but note that the sequence + * + * + * , but note that the sequence * *
* (?e=#) @@ -260,8 +282,8 @@ class UnicodeLower extends UniValidator * small differences as well. I will either make my package conform or note them * as I become aware of them. *- * This package supports additional patterns not in perl5:
* * @author Steven R. Brandt * @version package com.stevesoft.pat, release 1.5.3 @@ -593,7 +615,7 @@ public class Regex extends RegRes implements FilenameFilter /** Essentially clones the Regex object */ public Regex(Regex r) { - super((RegRes) r); + super(r); dontMatchInQuotes = r.dontMatchInQuotes; esc = r.esc; ignoreCase = r.ignoreCase; @@ -625,9 +647,8 @@ public class Regex extends RegRes implements FilenameFilter * search or matchAt methods. * * @exception com.stevesoft.pat.RegSyntax - * is thrown if a syntax error is encountered in the - * pattern. For example, "x{3,1}" or "*a" are not valid - * patterns. + * is thrown if a syntax error is encountered in the pattern. For + * example, "x{3,1}" or "*a" are not valid patterns. * @see com.stevesoft.pat.Regex#search * @see com.stevesoft.pat.Regex#matchAt */ @@ -669,6 +690,7 @@ public class Regex extends RegRes implements FilenameFilter * patterns are equal as well as the most recent match. If a Regex is compare * with a RegRes, only the result of the most recent match is compared. */ + @Override public boolean equals(Object o) { if (o instanceof Regex) @@ -689,6 +711,7 @@ public class Regex extends RegRes implements FilenameFilter } /** A clone by any other name would smell as sweet. */ + @Override public Object clone() { return new Regex(this); @@ -775,7 +798,9 @@ public class Regex extends RegRes implements FilenameFilter { if (s == null) { - throw new NullPointerException("Null String Given to Regex.search"); + throw new NullPointerException( + MessageManager + .getString("exception.null_string_given_to_regex_search")); } return _search(s, 0, s.length()); } @@ -785,7 +810,8 @@ public class Regex extends RegRes implements FilenameFilter if (sl == null) { throw new NullPointerException( - "Null StringLike Given to Regex.search"); + MessageManager + .getString("exception.null_string_like_given_to_regex_search")); } return _search(sl, 0, sl.length()); } @@ -795,7 +821,8 @@ public class Regex extends RegRes implements FilenameFilter if (s == null) { throw new NullPointerException( - "Null String Given to Regex.reverseSearch"); + MessageManager + .getString("exception.null_string_given_to_regex_reverse_search")); } return _reverseSearch(s, 0, s.length()); } @@ -805,7 +832,8 @@ public class Regex extends RegRes implements FilenameFilter if (sl == null) { throw new NullPointerException( - "Null StringLike Given to Regex.reverseSearch"); + MessageManager + .getString("exception.null_string_like_given_to_regex_reverse_search")); } return _reverseSearch(sl, 0, sl.length()); } @@ -823,7 +851,8 @@ public class Regex extends RegRes implements FilenameFilter if (s == null) { throw new NullPointerException( - "Null String Given to Regex.searchFrom"); + MessageManager + .getString("exception.null_string_like_given_to_regex_search_from")); } return _search(s, start, s.length()); } @@ -833,7 +862,8 @@ public class Regex extends RegRes implements FilenameFilter if (s == null) { throw new NullPointerException( - "Null String Given to Regex.searchFrom"); + MessageManager + .getString("exception.null_string_like_given_to_regex_search_from")); } return _search(s, start, s.length()); } @@ -846,7 +876,8 @@ public class Regex extends RegRes implements FilenameFilter if (s == null) { throw new NullPointerException( - "Null String Given to Regex.searchRegion"); + MessageManager + .getString("exception.null_string_like_given_to_regex_search_region")); } return _search(s, start, end); } @@ -967,13 +998,13 @@ public class Regex extends RegRes implements FilenameFilter * if(skipper == null) { for(long i=start;i<=up;i++) { charsMatched_ = * thePattern.matchAt(s,i,pt); if(charsMatched_ >= 0) { matchFrom_ = * thePattern.mfrom; marks = pt.marks; gFlagto = matchFrom_+charsMatched_; - * return didMatch_=true; } } } else { pt.no_check = true; for(long i=start;i<=up;i++) { - * i = skipper.find(src,i,up); if(i<0) { charsMatched_ = matchFrom_ = -1; - * return didMatch_ = false; } charsMatched_ = thePattern.matchAt(s,i,pt); - * if(charsMatched_ >= 0) { matchFrom_ = thePattern.mfrom; marks = pt.marks; - * gFlagto = matchFrom_+charsMatched_; gFlags = s; return didMatch_=true; } - * else { i = s.adjustIndex(i); up = s.adjustEnd(i); } } } return - * didMatch_=false; } + * return didMatch_=true; } } } else { pt.no_check = true; for(long + * i=start;i<=up;i++) { i = skipper.find(src,i,up); if(i<0) { charsMatched_ = + * matchFrom_ = -1; return didMatch_ = false; } charsMatched_ = + * thePattern.matchAt(s,i,pt); if(charsMatched_ >= 0) { matchFrom_ = + * thePattern.mfrom; marks = pt.marks; gFlagto = matchFrom_+charsMatched_; + * gFlags = s; return didMatch_=true; } else { i = s.adjustIndex(i); up = + * s.adjustEnd(i); } } } return didMatch_=false; } */ boolean _reverseSearch(String s, int start, int end) @@ -1064,13 +1095,16 @@ public class Regex extends RegRes implements FilenameFilter { try { - return (Regex) getClass().newInstance(); + return getClass().getDeclaredConstructor().newInstance(); } catch (InstantiationException ie) { return null; } catch (IllegalAccessException iae) { return null; + } catch (ReflectiveOperationException roe) + { + return null; } } @@ -1101,8 +1135,8 @@ public class Regex extends RegRes implements FilenameFilter * the Pattern. * * @exception com.stevesoft.pat.RegSyntax - * is thrown when a nonsensensical pattern is supplied. For - * example, a pattern beginning with *. + * is thrown when a nonsensensical pattern is supplied. For + * example, a pattern beginning with *. */ protected void compile1(StrPos sp, Rthings mk) throws RegSyntax { @@ -1628,7 +1662,7 @@ public class Regex extends RegRes implements FilenameFilter { if (p instanceof Any && p.next == null) { - return (Pattern) new DotMulti(lo, hi); + return new DotMulti(lo, hi); } return RegOpt.safe4fm(p) ? (Pattern) new FastMulti(lo, hi, p) : (Pattern) new Multi(lo, hi, p); @@ -1788,6 +1822,7 @@ public class Regex extends RegRes implements FilenameFilter * representations. Also be prepared to see some strange output if your * characters are not printable. */ + @Override public String toString() { if (false && thePattern == null) @@ -1888,6 +1923,7 @@ public class Regex extends RegRes implements FilenameFilter * * @see com.stevesoft.pat.FileRegex */ + @Override public boolean accept(File dir, String s) { return search(s); @@ -1907,9 +1943,9 @@ public class Regex extends RegRes implements FilenameFilter * optimized() method. * + * This package supports additional patterns not in perl5:
+ *+ * - * + **
* (?@()) *Group @@ -275,8 +297,8 @@ class UnicodeLower extends UniValidator * "look behind." It fails if it attempts to move to a position before the * beginning of the string. "x(?<1)" is equivalent to "(?=x)". The number, 1 * in this example, is the number of characters to move backwards. - ** This method will attempt to rewrite your pattern in a way that makes it - * faster (not all patterns execute at the same speed). In general, "(?: ... )" - * will be faster than "( ... )" so if you don't need the backreference, you - * should group using the former pattern. + * faster (not all patterns execute at the same speed). In general, + * "(?: ... )" will be faster than "( ... )" so if you don't need the + * backreference, you should group using the former pattern. *
* It will also introduce new pattern elements that you can't get to * otherwise, for example if you have a large table of strings, i.e. the