You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/12/22 23:53:07 UTC
svn commit: r489793 - in /harmony/enhanced/classlib/trunk/modules/regex/src:
main/java/java/util/regex/
test/java/org/apache/harmony/tests/java/util/regex/
Author: tellison
Date: Fri Dec 22 14:53:06 2006
New Revision: 489793
URL: http://svn.apache.org/viewvc?view=rev&rev=489793
Log:
Apply patch HARMONY-2754 ([Classlib][regex] Wrong words in regex module)
Modified:
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractCharClass.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractSet.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AtomicJointSet.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/BackReferencedSingleSet.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CharClass.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CompositeRangeSet.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DecomposedCharSet.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DotQuantifierSet.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EmptySet.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/GroupQuantifierSet.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Lexer.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MatchResultImpl.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Pattern.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PosAltGroupQuantifierSet.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PosPlusGroupQuantifierSet.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Quantifier.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/SequenceSet.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UCIRangeSet.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UCISequenceSet.java
harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/WordBoundary.java
harmony/enhanced/classlib/trunk/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractCharClass.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractCharClass.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractCharClass.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractCharClass.java Fri Dec 22 14:53:06 2006
@@ -306,7 +306,7 @@
static class LazyGraph extends LazyAlnum {
protected AbstractCharClass computeValue() {
- /* plus punctiation */
+ /* plus punctuation */
return ((CharClass) super.computeValue()).add(0x21, 0x40).add(0x5B,
0x60).add(0x7B, 0x7E);
}
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractSet.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AbstractSet.java Fri Dec 22 14:53:06 2006
@@ -62,7 +62,7 @@
}
/**
- * Checks if this node matches in given position and requrcively call
+ * Checks if this node matches in given position and recursively call
* next node matches on positive self match. Returns positive integer if
* entire match succeed, negative otherwise
* @param stringIndex - string index to start from;
@@ -183,11 +183,11 @@
/**
* Returns true if the given node intersects with this one,
* false otherwise.
- * This method is bieng used for quantifiers construction,
+ * This method is being used for quantifiers construction,
* lets consider the following regular expression (a|b)*ccc.
*
* (a|b) does not intersects with "ccc" and thus can be quantified
- * greedly (w/o kickbacks), like *+ instead of *.
+ * greedily (w/o kickbacks), like *+ instead of *.
*
* @param set - usually previous node
*
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AtomicJointSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AtomicJointSet.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AtomicJointSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/AtomicJointSet.java Fri Dec 22 14:53:06 2006
@@ -25,7 +25,7 @@
/**
* This class represent atomic group (?>X), once X matches,
- * this match become unchangable till the end of the match.
+ * this match become unchangeable till the end of the match.
*
* @author Nikolay A. Kuznetsov
* @version $Revision: 1.4.2.2 $
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/BackReferencedSingleSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/BackReferencedSingleSet.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/BackReferencedSingleSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/BackReferencedSingleSet.java Fri Dec 22 14:53:06 2006
@@ -43,7 +43,7 @@
*
* To fix this problem we replace backreferenced groups with instances of
* this class, which will use matches instead of find; this will affect
- * perfomance, but ensure correctness of the match.
+ * performance, but ensure correctness of the match.
*/
public BackReferencedSingleSet(AbstractSet child, FSet fSet) {
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CharClass.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CharClass.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CharClass.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CharClass.java Fri Dec 22 14:53:06 2006
@@ -65,7 +65,7 @@
/*
* We can use this method safely even if nonBitSet != null
- * due to specific of range constrcutions in regular expressions.
+ * due to specific of range constructions in regular expressions.
*/
public CharClass add(int ch) {
if (ci) {
@@ -103,7 +103,7 @@
}
/*
- * The difference between add(AbstarctCharClass) and union(AbstractCharClass)
+ * The difference between add(AbstractCharClass) and union(AbstractCharClass)
* is that add() is used for constructions like "[^abc\\d]"
* (this pattern doesn't match "1")
* while union is used for constructions like "[^abc[\\d]]"
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CompositeRangeSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CompositeRangeSet.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CompositeRangeSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/CompositeRangeSet.java Fri Dec 22 14:53:06 2006
@@ -86,7 +86,7 @@
* characters into two ranges: the first consisting of these surrogate
* characters and the second consisting of all others characters
* from the parent range.
- * This class represents the parent range splitted in such a manner.
+ * This class represents the parent range split in such a manner.
*/
class CompositeRangeSet extends JointSet {
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DecomposedCharSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DecomposedCharSet.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DecomposedCharSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DecomposedCharSet.java Fri Dec 22 14:53:06 2006
@@ -214,7 +214,7 @@
*
* @param strIndex - index to read codepoint at
* @param testString - input
- * @param matchResult - auxilary object
+ * @param matchResult - auxiliary object
* @return codepoint at given strIndex at testString and
*/
public int codePointAt(int strIndex, CharSequence testString,
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DotQuantifierSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DotQuantifierSet.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DotQuantifierSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/DotQuantifierSet.java Fri Dec 22 14:53:06 2006
@@ -66,11 +66,11 @@
// we don't skip line terminators here, but return zero match instead
// //
- // 2. find first occurance of the searched pattern
+ // 2. find first occurrence of the searched pattern
// //
int res = next.find(stringIndex, testString, matchResult);
- // 3. Check if we have other occurances till the end of line
+ // 3. Check if we have other occurrences till the end of line
// (because .* is greedy and we need last one)
// //
if (res >= 0) {
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EmptySet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EmptySet.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EmptySet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/EmptySet.java Fri Dec 22 14:53:06 2006
@@ -22,7 +22,7 @@
package java.util.regex;
/**
- * Valid constatnt zero character match.
+ * Valid constant zero character match.
*
* @author Nikolay A. Kuznetsov
* @version $Revision: 1.4.2.2 $
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/GroupQuantifierSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/GroupQuantifierSet.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/GroupQuantifierSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/GroupQuantifierSet.java Fri Dec 22 14:53:06 2006
@@ -22,7 +22,7 @@
package java.util.regex;
/**
- * Default quantifier over groups, in fact this type of quantifiier is
+ * Default quantifier over groups, in fact this type of quantifier is
* generally used for constructions we cant identify number of characters they
* consume.
*
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Lexer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Lexer.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Lexer.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Lexer.java Fri Dec 22 14:53:06 2006
@@ -493,7 +493,7 @@
/**
* Moves pointer one position right; save current character to lookBack;
- * lookAhead to current one and finaly read one more to lookAhead;
+ * lookAhead to current one and finally read one more to lookAhead;
*/
private void movePointer() {
// swap pointers
@@ -505,7 +505,7 @@
boolean reread;
do {
reread = false;
- // read next character analize it and construct token:
+ // read next character analyze it and construct token:
// //
lookAhead = (index < pattern.length) ? nextCodePoint() : 0;
@@ -762,7 +762,7 @@
*/
if (lookAhead >= 256) {
- //Erase auxiliaury bit
+ //Erase auxiliary bit
lookAhead = (lookAhead & 0xff);
flags = lookAhead;
lookAhead = lookAhead << 16;
@@ -1264,7 +1264,7 @@
if (Character.isHighSurrogate(high)) {
- //low and high char may be delimetered by spaces
+ //low and high char may be delimited by spaces
int lowExpectedIndex = prevNW + 1;
if (lowExpectedIndex < pattern.length) {
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MatchResultImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MatchResultImpl.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MatchResultImpl.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/MatchResultImpl.java Fri Dec 22 14:53:06 2006
@@ -26,7 +26,7 @@
import org.apache.harmony.regex.internal.nls.Messages;
/**
- * Match result implementaion
+ * Match result implementation
* Note: probably it might make sense to combine this class with Matcher.
*
* @author Nikolay A. Kuznetsov
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Pattern.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Pattern.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Pattern.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Pattern.java Fri Dec 22 14:53:06 2006
@@ -220,7 +220,7 @@
* than ASCII, then the UNICODE_CASE must also be set to enable Unicode case
* detection.
* <dt><code>UNICODE_CASE</code> (0x0040)
- * <dd>Enables Unicode case folding if used in conjuntion with the
+ * <dd>Enables Unicode case folding if used in conjunction with the
* <code>CASE_INSENSITIVE</code> flag. If <code>CASE_INSENSITIVE</code>
* is not set, then this flag has no effect.
* <dt><code>COMMENTS</code> (0x0004)
@@ -242,7 +242,7 @@
* <dd>Enables the DOT (".") character in regular expressions to match line
* terminators. By default, line terminators are not matched by DOT.
* <dt><code>CANON_EQ</code> (0x0080)
- * <dd>Enables matching of character sequences which are cacnonically
+ * <dd>Enables matching of character sequences which are canonically
* equivalent according to the Unicode standard. Canonical equivalence is
* described here: http://www.unicode.org/reports/tr15/. By default,
* canonical equivalence is not detected while matching.
@@ -1007,7 +1007,7 @@
}
/**
- * proceess [...] ranges
+ * process [...] ranges
*/
private CharClass processRangeExpression(boolean alt) {
CharClass res = new CharClass(alt, hasFlag(Pattern.CASE_INSENSITIVE),
@@ -1335,7 +1335,7 @@
}
/**
- * Dismiss public costructor.
+ * Dismiss public constructor.
*
*/
private Pattern() {
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PosAltGroupQuantifierSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PosAltGroupQuantifierSet.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PosAltGroupQuantifierSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PosAltGroupQuantifierSet.java Fri Dec 22 14:53:06 2006
@@ -23,7 +23,7 @@
/**
* Possessive quantifier over group, see java.util.regex.GroupQuantifierSet
- * for more dertails.
+ * for more details.
*
* @author Nikolay A. Kuznetsov
* @version $Revision: 1.7.2.2 $
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PosPlusGroupQuantifierSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PosPlusGroupQuantifierSet.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PosPlusGroupQuantifierSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/PosPlusGroupQuantifierSet.java Fri Dec 22 14:53:06 2006
@@ -22,7 +22,7 @@
package java.util.regex;
/**
- * Posessive + quantifier node over groups.
+ * Possessive + quantifier node over groups.
*
* @author Nikolay A. Kuznetsov
* @version $Revision: 1.7.2.2 $
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Quantifier.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Quantifier.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Quantifier.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/Quantifier.java Fri Dec 22 14:53:06 2006
@@ -23,7 +23,7 @@
/**
* Represents RE quantifier; contains two fields responsible for min and max
- * number of repetitions. Negative value for maximum bumber of repetition
+ * number of repetitions. Negative value for maximum number of repetition
* represents infinity(i.e. +,*)
*
* @author Nikolay A. Kuznetsov
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/SequenceSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/SequenceSet.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/SequenceSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/SequenceSet.java Fri Dec 22 14:53:06 2006
@@ -22,9 +22,9 @@
package java.util.regex;
/**
- * This class represents nodes constructed with character sequenses. For
+ * This class represents nodes constructed with character sequences. For
* example, lets consider regular expression: ".*word.*". During regular
- * expression compilation phase character sequense w-o-r-d, will be represented
+ * expression compilation phase character sequence w-o-r-d, will be represented
* with single node for the entire word.
*
* During the match phase, Moyer-Moore algorithm will be used for fast
@@ -99,7 +99,7 @@
}
public String getName() {
- return "secuence: " + string; //$NON-NLS-1$
+ return "sequence: " + string; //$NON-NLS-1$
}
public boolean first(AbstractSet set) {
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UCIRangeSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UCIRangeSet.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UCIRangeSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UCIRangeSet.java Fri Dec 22 14:53:06 2006
@@ -23,7 +23,7 @@
/**
* Represents node accepting single character from the given char class. Note,
- * this class contains normalaized characters fo unicode case, asci case is
+ * this class contains normalized characters fo unicode case, asci case is
* supported through adding both symbols to the range.
*
* @author Nikolay A. Kuznetsov
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UCISequenceSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UCISequenceSet.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UCISequenceSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/UCISequenceSet.java Fri Dec 22 14:53:06 2006
@@ -54,6 +54,6 @@
}
public String getName() {
- return "UCI secuence: " + string; //$NON-NLS-1$
+ return "UCI sequence: " + string; //$NON-NLS-1$
}
}
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/WordBoundary.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/WordBoundary.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/WordBoundary.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/main/java/java/util/regex/WordBoundary.java Fri Dec 22 14:53:06 2006
@@ -23,7 +23,7 @@
/**
* Represents word boundary, checks current character and previous one if
- * differet types returns true;
+ * different types returns true;
*
* @author Nikolay A. Kuznetsov
* @version $Revision: 1.3.2.2 $
Modified: harmony/enhanced/classlib/trunk/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java?view=diff&rev=489793&r1=489792&r2=489793
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java Fri Dec 22 14:53:06 2006
@@ -330,21 +330,21 @@
String pattern = "b)a";
try {
Pattern.compile(pattern);
- fail("Expected a PatternSyntacException when compiling pattern: " + pattern);
+ fail("Expected a PatternSyntaxException when compiling pattern: " + pattern);
} catch (PatternSyntaxException e) {
// pass
}
pattern = "bcde)a";
try {
Pattern.compile(pattern);
- fail("Expected a PatternSyntacException when compiling pattern: " + pattern);
+ fail("Expected a PatternSyntaxException when compiling pattern: " + pattern);
} catch (PatternSyntaxException e) {
// pass
}
pattern = "bbg())a";
try {
Pattern pat = Pattern.compile(pattern);
- fail("Expected a PatternSyntacException when compiling pattern: " + pattern);
+ fail("Expected a PatternSyntaxException when compiling pattern: " + pattern);
} catch (PatternSyntaxException e) {
// pass
}
@@ -352,7 +352,7 @@
pattern = "cdb(?i))a";
try {
Pattern pat = Pattern.compile(pattern);
- fail("Expected a PatternSyntacException when compiling pattern: " + pattern);
+ fail("Expected a PatternSyntaxException when compiling pattern: " + pattern);
} catch (PatternSyntaxException e) {
// pass
}
@@ -793,7 +793,7 @@
pat = Pattern.compile("(?>aa|a)aabb");
assertFalse(pat.matcher("aaabb").matches());
- // quantifiers over look aheads
+ // quantifiers over look ahead
pat = Pattern.compile(".*(?<=abc)*\\.log$");
assertTrue(pat.matcher("cde.log").matches());
pat = Pattern.compile(".*(?<=abc)+\\.log$");