X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fcom%2Fstevesoft%2Fpat%2FRegex.java;h=c00ddad01e60e9c9b6c78bdbe8b2c0e3b32a2da9;hb=86e844061a6202e657f2a6886c5ce0057952995a;hp=04bb0daea5b381b984e9bb2aeda42d0070a8d526;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git diff --git a/src/com/stevesoft/pat/Regex.java b/src/com/stevesoft/pat/Regex.java index 04bb0da..c00ddad 100755 --- a/src/com/stevesoft/pat/Regex.java +++ b/src/com/stevesoft/pat/Regex.java @@ -7,10 +7,14 @@ // package com.stevesoft.pat; -import java.io.*; -import java.util.*; +import jalview.util.MessageManager; -import com.stevesoft.pat.wrap.*; +import java.io.File; +import java.io.FilenameFilter; +import java.util.BitSet; +import java.util.Hashtable; + +import com.stevesoft.pat.wrap.StringWrap; /** Matches a Unicode punctuation character. */ class UnicodePunct extends UniValidator @@ -250,7 +254,9 @@ class UnicodeLower extends UniValidator * *
* \d+ - *, but note that the sequence + * + * + * , but note that the sequence * *
* (?e=#) @@ -260,8 +266,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 @@ -625,9 +631,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 */ @@ -775,7 +780,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 +792,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 +803,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 +814,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 +833,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 +844,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 +858,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 +980,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) @@ -1101,8 +1114,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 { @@ -1907,9 +1920,9 @@ public class Regex extends RegRes implements FilenameFilter * optimized() method. * + * This package supports additional patterns not in perl5:
+ *+ * - * + **
* (?@()) *Group @@ -275,8 +281,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