summaryrefslogtreecommitdiff
path: root/java/util/regex/Matcher.java
Commit message (Collapse)AuthorAgeFilesLines
* Implement Matcher.usePattern(Pattern).Andrew John Hughes2012-04-031-1/+23
| | | | | | | | | 2012-03-22 Andrew John Hughes <ahughes@redhat.com> * java/util/regex/Matcher.java: (usePattern(Pattern)): Implemented. Signed-off-by: Andrew John Hughes <ahughes@redhat.com>
* Add Matcher.quoteReplacement API methodPekka Enberg2011-04-251-0/+23
| | | | | | | 2011-04-25 Pekka Enberg <penberg@kernel.org> * java/util/regex/Matcher.java: (quoteReplacement): Implement missing Java 1.5 API method.
* Fix Matcher.find() infinite loop bugPekka Enberg2011-03-021-0/+6
| | | | | | | | | | | | | | | | | | This patch fixes a problem in Match.find() where the following piece of code would enter an infinite loop: System.out.println("hello, world".split("\uFFFF"); The root cause is that Matcher.find() returns true for the following snippet: Pattern p = Pattern.compile("\uFFFF"); Matcher m = p.matcher("hello, world"); System.out.println(m.find()); 2011-03-02 Pekka Enberg <penberg@kernel.org> * java/util/regex/Matcher: (find): Make sure match is within input data limits.
* Correctly spot EOF in java.util.Scanner#hasNextLine().Andrew John Hughes2009-07-071-1/+2
| | | | | | | | | | | | | 2009-07-07 Andrew John Hughes <ahughes@redhat.com> PR classpath/40630 * java/util/Scanner.java: (myCoreNext(boolean, Pattern)): Set tmp2 to null if the string is empty (i.e. we are at the end of the file). * java/util/regex/Matcher.java: (toMatchResult()): Check that match is non-null before attempting to clone it.
* Whitespace cleanup.Andrew John Hughes2009-07-071-59/+59
| | | | | | | | 2009-07-07 Andrew John Hughes <ahughes@redhat.com> * java/util/Scanner.java, * java/util/regex/Matcher.java: Replace tab characters with spaces.
* Reset the append position when resetting a Matcher instance.Andrew John Hughes2008-08-211-0/+1
| | | | | | | | | 2008-08-23 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/util/regex/Matcher.java: (reset()): Reset append position so we don't try and append to the end of the old input.
* Implement java.util.regex.Matcher#toMatchResult()Andrew John Hughes2008-08-161-1/+17
| | | | | | | 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/util/regex/Matcher.java: (toMatchResult()): Implemented.
* 2008-05-11 Andrew John Hughes <gnu_andrew@member.fsf.org>Andrew John Hughes2008-05-121-7/+259
| | | | | | | | | | | | | | | | | | | | | | | * java/util/regex/Matcher.java: (regionStart): New variable. (regionEnd): Likewise. (transparentBounds): Likewise. (anchoringBounds): Likewise. (Matcher()): Initialise new variables. (find()): Alter to use new settings. (find(int)): Likewise. (lookingAt()): Likewise. (matches()): Likewise. (reset()): Reset region. (reset(CharSequence)): Documented. (toString()): Include new variables. (region(int,int)): Implemented. (regionStart()): Likewise. (regionEnd()): Likewise. (hasTransparentBounds()): Likewise. (useTransparentBounds(boolean)): Likewise. (hasAnchoringBounds()): Likewise. (useAnchoringBounds(boolean)): Likewise.
* 2008-03-16 Andrew John Hughes <gnu_andrew@member.fsf.org>Andrew John Hughes2008-03-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | PR classpath/21869 * java/security/AlgorithmParameterGenerator.java, * java/security/AlgorithmParameters.java, * java/security/KeyFactory.java, * java/security/KeyPairGenerator.java, * java/security/MessageDigest.java, * java/security/SecureRandom.java, * java/security/Signature.java, * java/security/cert/CertPathBuilder.java, * java/security/cert/CertPathValidator.java, * java/security/cert/CertStore.java, * java/text/SimpleDateFormat.java, * java/util/AbstractMap.java, * java/util/Arrays.java, * java/util/Calendar.java, * java/util/Date.java, * java/util/Formatter.java, * java/util/Hashtable.java, * java/util/Properties.java, * java/util/TreeMap.java, * java/util/regex/Matcher.java: Use CPStringBuilder in preference to StringBuilder.
* 2006-11-06 Ito Kazumitsu <kaz@maczuka.gcd.org>Ito Kazumitsu2006-11-061-0/+1
| | | | | Fixes bug #29703 * java/util/regex/Matcher.java(reset): Reset inputCharIndexed.
* 2006-08-20 Ito Kazumitsu <kaz@maczuka.gcd.org>Ito Kazumitsu2006-08-201-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #28412 * gnu/java/util/regex/CharIndexed.java(move1, setHitEnd, hitEnd): New methods. * gnu/java/util/regex/CharIndexedCharSequence.java, gnu/java/util/regex/CharIndexedInputStream.java: Implemented the new methods above. * gnu/java/util/regex/RE.java(REG_FIX_STARTING_POSITION): New flag, (match): call the new method setHitEnd of the input, (getMatchImpl): Handle the new flag REG_FIX_STARTING_POSITION, Some optimization commented out, Use CharIndexed#move1 instead of move. * gnu/java/util/regex/REMatch.java: Made some debugging methods public. * gnu/java/util/regex/REToken.java(match): The method body has been moved to an internal private method, (matchFake): New method, (setHitEnd): New method. * gnu/java/util/regex/RETokenChar.java(matchThis): Call setHitEnd if the match is not complete, (matchOneString): Count the number of characters which matched the pattern. * gnu/java/util/regex/RETokenEnd.java(fake): New field, (setFake): New method, (match): Call super.match or super.matchFake. * gnu/java/util/regex/RETokenEndSub.java(setHitEnd): New method. * gnu/java/util/regex/RETokenOneOf.java(match): call the new method setHitEnd of the input, * gnu/java/util/regex/RETokenRepeated.java(match): Likewise. * java/util/regex/Matcher.java(lookingAt, match): Use the new flag RE.REG_FIX_STARTING_POSITION, (hitEnd, toString): New methods.
* 2006-06-07 Roman Kennke <kennke@aicas.com>Roman Kennke2006-06-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR 27902 * gnu/regexp/BacktrackStack.java * gnu/regexp/CharIndexed.java * gnu/regexp/CharIndexedCharArray.java * gnu/regexp/CharIndexedCharSequence.java * gnu/regexp/CharIndexedInputStream.java * gnu/regexp/CharIndexedString.java * gnu/regexp/CharIndexedStringBuffer.java * gnu/regexp/RE.java * gnu/regexp/REException.java * gnu/regexp/REFilterInputStream.java * gnu/regexp/REMatch.java * gnu/regexp/REMatchEnumeration.java * gnu/regexp/RESyntax.java * gnu/regexp/REToken.java * gnu/regexp/RETokenAny.java * gnu/regexp/RETokenBackRef.java * gnu/regexp/RETokenChar.java * gnu/regexp/RETokenEnd.java * gnu/regexp/RETokenEndOfPreviousMatch.java * gnu/regexp/RETokenEndSub.java * gnu/regexp/RETokenIndependent.java * gnu/regexp/RETokenLookAhead.java * gnu/regexp/RETokenLookBehind.java * gnu/regexp/RETokenNamedProperty.java * gnu/regexp/RETokenOneOf.java * gnu/regexp/RETokenPOSIX.java * gnu/regexp/RETokenRange.java * gnu/regexp/RETokenRepeated.java * gnu/regexp/RETokenStart.java * gnu/regexp/RETokenWordBoundary.java * gnu/regexp/UncheckedRE.java * gnu/java/util/regex/BacktrackStack.java * gnu/java/util/regex/CharIndexed.java * gnu/java/util/regex/CharIndexedCharArray.java * gnu/java/util/regex/CharIndexedCharSequence.java * gnu/java/util/regex/CharIndexedInputStream.java * gnu/java/util/regex/CharIndexedString.java * gnu/java/util/regex/CharIndexedStringBuffer.java * gnu/java/util/regex/RE.java * gnu/java/util/regex/REException.java * gnu/java/util/regex/REFilterInputStream.java * gnu/java/util/regex/REMatch.java * gnu/java/util/regex/REMatchEnumeration.java * gnu/java/util/regex/RESyntax.java * gnu/java/util/regex/REToken.java * gnu/java/util/regex/RETokenAny.java * gnu/java/util/regex/RETokenBackRef.java * gnu/java/util/regex/RETokenChar.java * gnu/java/util/regex/RETokenEnd.java * gnu/java/util/regex/RETokenEndOfPreviousMatch.java * gnu/java/util/regex/RETokenEndSub.java * gnu/java/util/regex/RETokenIndependent.java * gnu/java/util/regex/RETokenLookAhead.java * gnu/java/util/regex/RETokenLookBehind.java * gnu/java/util/regex/RETokenNamedProperty.java * gnu/java/util/regex/RETokenOneOf.java * gnu/java/util/regex/RETokenPOSIX.java * gnu/java/util/regex/RETokenRange.java * gnu/java/util/regex/RETokenRepeated.java * gnu/java/util/regex/RETokenStart.java * gnu/java/util/regex/RETokenWordBoundary.java * gnu/java/util/regex/UncheckedRE.java Moved gnu.regexp classes to gnu.java.util.regex package. * java/util/regex/Matcher.java * java/util/regex/Pattern.java Adjusted import statements for new package name for gnu regexp.
* 2006-04-04 Ito Kazumitsu <kaz@maczuka.gcd.org>Ito Kazumitsu2006-04-041-4/+10
| | | | | | | | | | | | | | | * gnu/regexp/CharIndexed.java(setAnchor): New method. * gnu/regexp/CharIndexedInputStream.java(setAnchor): New method. * gnu/regexp/CharIndexedCharSequence.java: New file. * gnu/regexp/CharIndexedCharArray.java: Rewritten as an extention of gnu.regexp.CharIndexedCharSequence. * gnu/regexp/CharIndexedString.java: Likewise. * gnu/regexp/CharIndexedStringBuffer.java: Likewise. * gnu/regexp/RE.java(makeCharIndexed): Make a new CharIndexed using CharIndexedCharSequence. Use setAnchor when the input object is already a CharIndexed. * java/util/regex/Matcher.java(inputCharIndexed): New field to be used as a parameter of the RE#getMatch.
* 2006-03-28 Ito Kazumitsu <kaz@maczuka.gcd.org>Ito Kazumitsu2006-03-281-10/+4
| | | | * java/util/regex/Matcher.java: Reverted.
* 2006-03-26 Ito Kazumitsu <kaz@maczuka.gcd.org>Ito Kazumitsu2006-03-261-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | * gnu/regexp/CharIndexed.java(setLastMatch, getLastMatch, getAnchor): New methods. * gnu/regexp/CharIndexedCharArray.java(setLastMatch, getLastMatch, getAnchor): New methods. * gnu/regexp/CharIndexedInputStream.java(setLastMatch, getLastMatch, getAnchor): New methods. * gnu/regexp/CharIndexedString.java(setLastMatch, getLastMatch, getAnchor): New methods. * gnu/regexp/CharIndexedStringBuffer.java(setLastMatch, getLastMatch, getAnchor): New methods. * gnu/regexp/REMatch.java(start1): New field. * gnu/regexp/RE.java(initialize): Added support for \z and \G, (match): set the starting position to start1[] instead of start[], (getMatchImpl): Set the found REMatch to the input, (makeCharIndexed): Made public. * gnu/regexp/RETokenEndOfPreviousMatch.java: New file. * gnu/regexp/RETokenEndSub.java(matchThis, findMatch): set the value of start[] copying from start1[]. * gnu/regexp/RETokenLookBehind.java(matchThis): Added the settings of offset. * java/util/regex/Matcher.java(inputCharIndexed): New field to be used as a parameter of the RE#getMatch.
* 2006-02-09 Ito Kazumitsu <kaz@maczuka.gcd.org>Ito Kazumitsu2006-02-091-3/+6
| | | | | | | | | | | | Fixes bug #26112 * gnu/regexp/RE.java(REG_REPLACE_USE_BACKSLASHESCAPE): New execution flag which enables backslash escape in a replacement. (getReplacement): New public static method. (substituteImpl),(substituteAllImpl): Use getReplacement. * gnu/regexp/REMatch.java(substituteInto): Replace $n even if n>=10. * java/util/regex/Matcher.java(appendReplacement) Use RE#getReplacement. (replaceFirst),(replaceAll): Use RE.REG_REPLACE_USE_BACKSLASHESCAPE.
* 2006-02-06 Ito Kazumitsu <kaz@maczuka.gcd.org>Ito Kazumitsu2006-02-061-4/+10
| | | | | * java/util/regex/Matcher.java(matches): set RE.REG_TRY_ENTIRE_MATCH as an execution flag of getMatch.
* * java/util/regex/PatternSyntaxException.java: Added @since.Tom Tromey2006-01-241-1/+1
| | | | | * java/util/regex/Matcher.java (Matcher): Implements MatchResult. * java/util/regex/MatchResult.java: New file.
* * java/util/regex/Matcher.java (matches): Javadoc fix.Tom Tromey2005-09-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (start): Likewise. * java/lang/reflect/Proxy.java (equals): Javadoc fix. * java/io/ObjectInputStream.java (inputGetObjectStreamClasses): Javadoc fix. * java/util/zip/ZipFile.java (getEntry): Javadoc fix. * java/util/logging/XMLFormatter.java (getHead): Javadoc fix. * java/util/logging/LogManager.java (getLevelProperty): Javadoc fix. * java/util/logging/Handler.java (getEncoding): Javadoc fix. (setFilter): Likewise. * java/util/logging/FileHandler.java: Organized imports. * java/util/jar/Manifest.java (Manifest): Javadoc fix. * java/util/TreeMap.java (putFromObjStream): Javadoc fix. * java/util/SimpleTimeZone.java (isBefore): Javadoc fix. * java/util/ResourceBundle.java (tryBundle): Javadoc fix. * java/util/Random.java (seed): Javadoc fix. * java/util/Collections.java (SynchronizedSortedSet): Javadoc fix. (SingletonMap): Likewise. (addAll): Javadoc fix. * java/lang/reflect/UndeclaredThrowableException.java: Javadoc fix. * java/lang/reflect/Member.java (DECLARED, PUBLIC): Javadoc fix. * java/lang/ref/WeakReference.java: Javadoc fix. * java/lang/ref/Reference.java: Javadoc fix. (Reference): Likewise. * java/lang/Thread.java (setContextClassLoader): Javadoc fix. (getContextClassLoader): Likewise. (stop): Likewise. * java/lang/System.java (runFinalizersOnExit): Javadoc fix. * java/lang/String.java (upperExpand): Javadoc fix. * java/lang/StrictMath.java: Javadoc fixes. * java/lang/SecurityManager.java: Added imports for javadoc. (currentClassLoader): Javadoc fix. (classLoaderDepth): Likewise. (currentLoadedClass): Likewise. (checkRead): Likewise. (checkWrite): Likewise. (checkAccess): Likewise. * java/lang/RuntimePermission.java: Added import for javadoc. * java/lang/Readable.java (read): Added import for javadoc.
* * all files: Update for new FSF address.Mark Wielaard2005-07-021-2/+2
|
* Reported by Timo Lindfors <timo.lindfors@iki.fi>Mark Wielaard2005-02-061-2/+11
| | | | | | java/util/regex/Matcher.java (lookingAt): Set position when match found. (matches): Implemented through lookingAt().
* 2004-11-15 Jeroen Frijters <jeroen@frijters.net>Jeroen Frijters2004-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * java/lang/StackTraceElement.java: Made final. * java/nio/channels/Channels.java: Added private constructor. * java/rmi/Naming.java: Added private constructor. * java/rmi/registry/LocateRegistry.java: Added private constructor. * java/rmi/server/RMIClassLoader.java: Added private constructor. * java/security/KeyPairGeneratorSpi.java (clone): Made protected and simplified implementation. * java/text/DateFormat.java (allFields): Made package accessible. * java/text/DecimalFormat.java (formatInternal): Made private. * java/text/Format.java (formatInternal): Made private. * java/util/logging/Handler.java: Made constructor protected. * java/util/regex/Matcher.java: Made final. * java/util/regex/Pattern.java: Made final. * java/util/zip/InflaterHuffmanTree.java: Made package. * javax/crypto/CipherInputStream.java (mark): Corrected mark parameter type (from long to int). * javax/crypto/ExemptionMechanism.java (finalize): Added. * javax/crypto/Mac.java (getMacLength): Made final. (clone): Made final. * javax/imageio/ImageIO.java: Added private constructor. * javax/imageio/stream/ImageInputStreamImpl.java (checkClosed): Made final. * javax/net/ssl/SSLPermission.java: Made final. * javax/print/DocFlavor.java (hostEncoding): Added work-around to prevent the field from being a compile time constant. * javax/print/attribute/AttributeSetUtilities.java: Added private constructor. (UnmodifiableDocAttributeSet): Made private. (UnmodifiablePrintJobAttributeSet): Made private. (UnmodifiablePrintRequestAttributeSet): Made private. (UnmodifiablePrintServiceAttributeSet): Made private. (SynchronizedAttributeSet): Made private. (SynchronizedDocAttributeSet): Made private. (SynchronizedPrintJobAttributeSet): Made private. (SynchronizedPrintRequestAttributeSet): Made private. (SynchronizedPrintServiceAttributeSet): Made private. * javax/security/auth/PrivateCredentialPermission.java: Made final.
* Cleaned up imports in java/util/regex/Dalibor Topic2004-04-211-1/+0
| | | | | | | | 2004-04-21 Dalibor Topic <robilad@kaffe.org> * java/util/regex/Matcher.java, java/util/regex/Pattern.java: Cleaned up imports.
* * configure.ac: Add gnu/regexp/Makefile andMark Wielaard2004-03-071-22/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resource/gnu/regexp/Makefile * gnu/Makefile.am (SUBDIRS): Add regexp. * gnu/regexp/Makefile.am: New file. * gnu/regexp/CharIndexed.java: Imported. * gnu/regexp/CharIndexedCharArray.java: Likewise. * gnu/regexp/CharIndexedInputStream.java: Likewise. * gnu/regexp/CharIndexedString.java: Likewise. * gnu/regexp/CharIndexedStringBuffer.java: Likewise. * gnu/regexp/RE.java: Likewise. * gnu/regexp/REException.java: Likewise. * gnu/regexp/REFilterInputStream.java: Likewise. * gnu/regexp/REMatch.java: Likewise. * gnu/regexp/REMatchEnumeration.java: Likewise. * gnu/regexp/RESyntax.java: Likewise. * gnu/regexp/REToken.java: Likewise. * gnu/regexp/RETokenAny.java: Likewise. * gnu/regexp/RETokenBackRef.java: Likewise. * gnu/regexp/RETokenChar.java: Likewise. * gnu/regexp/RETokenEnd.java: Likewise. * gnu/regexp/RETokenEndSub.java: Likewise. * gnu/regexp/RETokenOneOf.java: Likewise. * gnu/regexp/RETokenPOSIX.java: Likewise. * gnu/regexp/RETokenRange.java: Likewise. * gnu/regexp/RETokenRepeated.java: Likewise. * gnu/regexp/RETokenStart.java: Likewise. * gnu/regexp/RETokenWordBoundary.java: Likewise. * gnu/regexp/UncheckedRE.java: Likewise. * java/util/regex/Matcher.java: Add gnu.regexp wrappers. * java/util/regex/Pattern.java: Likewise. * resource/gnu/Makefile.am (SUBDIRS): Add regexp. * resource/gnu/regexp/Makefile.am: New file. * resource/gnu/regexp/MessagesBundle.properties: Imported. * resource/gnu/regexp/MessagesBundle_fr.properties: Likewise.
* 2003-04-30 Michael Koch <konqueror@gmx.de>Michael Koch2003-04-301-5/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * java/util/regex/Matcher.java (pattern): New member variable. (appendReplacement): New method. (appendTail): New method. (end): New method. (find): New method. (group): New method. (replaceFirst): Added documentation. (replaceAll): Added documentation. (groupCount): New method. (lookingAt): New method. (matches): New method. (reset): New method. (start): New method. * java/util/regex/Pattern.java (serialVersionUID): New constant. (CANON_EQ): New constant. (CASE_INSENSITIVE): New constant. (COMMENTS): New constant. (DOTALL): New constant. (MULTILINE): New constant. (UNICODE_CASE): New constant. (UNIX_LINES): New constant. (regex): New member variable. (flags): New member variable. (Pattern): New method. (compile): Documentation added. (flags): New method. (matches): Documentation added. (matcher): Documentation added. (split): Documentation added. (pattern): New method.
* Add copyright notices.Mark Wielaard2002-04-301-0/+37
|
* 2002-03-08 Eric Blake <ebb9@email.byu.edu>Eric Blake2002-03-091-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * java/util/regex/Pattern.java (split): Add missing stubs. * java/util/regex/Matcher.java (replace*): Ditto. * doc/unicode/SpecialCasing-2.txt: New file from unicode.org. * scripts/unicode-muncher.pl: Add special casing rules for multi-character uppercase expansions. * gnu/java/lang/CharData.java: Regenerate. * java/util/WeakHashMap.java: Improve Javadoc. * java/lang/CharSequence.java: Ditto. * java/lang/Character.java (getDirectionality): Update to new CharData format. (direction, readChar): Change visibility. (toString): One less method call. * java/lang/String.java: General code cleanup, optimizations, and better exception matching to Sun's implementation. (internTable, intern): Switch to use weak references. (String(StringBuffer), String(char[], int)): Implement array sharing when the array comes from a trusted source. (matches, replace*, split): New methods, that call unimplemented stubs in java.util.regex. (toUpperCase, toLowerCase): Correctly implement one-to-many case conversions, and special casing based on locale. (upperExpand, upperSpecial, upperCaseExpansion, upperCaseIndex): New tables and methods, to implement toUpperCase. * java/lang/StringBuffer.java: General code cleanup, optimizations, and better exception matching. (substring): Use array sharing. (append(StringBuffer), indexOf, lastIndexOf): Avoid object creation. (regionMatches): New method, used by indexOf.
* added stub classes for java.util.regex (new dependency from String)John Leuner2002-03-081-0/+6
View Lorry Controller Status