summaryrefslogtreecommitdiffstats
path: root/regex
Commit message (Collapse)AuthorAgeFilesLines
* Fix build by turning a comment into a doc comment. Clarify logic.Elliott Hughes2010-04-091-10/+8
| | | | | | | | | | | | | | Now I see what jessewilson was trying to say earlier; rewrite the post-loop code to say what I guess it was aiming at, which is avoiding an add followed by a remove in the not completely uncommon case where limit == 0 and the regular expression is a terminator rather than a true separator ('\n', say). (Normally the regular expression is a true separator so there will be no trailing empty string even though limit is 0: "a,b,c".split(","), for example.) Also, String.isEmpty is our fasest way of recognizing the empty string; certainly better than equals(""). Change-Id: I82f4ec49fa58efc178e342cf55d4dfbbdad01c75
* Make String.split 10x faster.Elliott Hughes2010-04-093-52/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Almost all uses of String.split in the Android codebase use trivial single literal character separators. This patch optimizes that case to avoid the use of regular expressions entirely. The 10x speedup isn't the whole story, because the speedup is really proportional to the number of separators in the input. 10x is easily achievable, but the speedup could be arbitrarily high. Before: benchmark us logarithmic runtime PatternSplitComma 84.8 XXXXXXXXXXXXXX|||||||||||||| PatternSplitLiteralDot 85.0 XXXXXXXXXXXXXX|||||||||||||| StringSplitComma 166.3 XXXXXXXXXXXXXXXXXXXXXXXXXXXX| StringSplitHard 173.6 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX StringSplitLiteralDot 167.7 XXXXXXXXXXXXXXXXXXXXXXXXXXXX| After: benchmark us logarithmic runtime PatternSplitComma 18.9 XXX||||||||||||||||||||| PatternSplitLiteralDot 19.0 XXX||||||||||||||||||||| StringSplitComma 18.8 XXX||||||||||||||||||||| StringSplitHard 174.2 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX StringSplitLiteralDot 18.8 XXX||||||||||||||||||||| (The benchmarks starting "Pattern" use a precompiled Pattern for performance. Those starting "String" use String.split and would traditional entail a temporary Pattern. As you can see, creating Patterns is very expensive for us, and each one throws a finalizer spanner in the GC works too. The new fast path avoids all this. I'll commit the benchmark -- along with all the others I've ever used -- to http://code.google.com/p/dalvik this afternoon.) Tests? We actually pass _more_ tests after this patch, because the increase in performance means we don't hit timeouts. Change-Id: I404298e21a78d72cf5ce6ea675844bf251e3825b
* Remove all remaining "@since Android" tags.Elliott Hughes2010-03-222-6/+2
| | | | | | | I've fixed a few typos, and removed a few of the more egregiously nonsensical or incorrect comments that were nearby. Change-Id: I35851baebd532f949cc269f4738a26eeb9b6e697
* Resync a load of tests with upstream, make our build faster.Elliott Hughes2010-02-194-20/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | I started off with a mission to remove uses of dalvik.annotation.* (stuff like @TestTargetNew and other useless junk that just makes it harder to stay in sync with upstream). I wrote a script to go through tests showing me the diff between what we have and what upstream has, thinking that in cases where upstream has also added tests, I may as well pull them in at the same time... ...but I didn't realize how close we were to having dx fill its 1.5GiB heap. After trying various alternatives, I decided to bite the bullet and break core-tests up into one .jar per module. This adds parallelism back into this, the slowest part of our build. (I can do even better, but I'll do that in a separate patch, preferably after we've merged recent changes from master.) Only a couple of dependencies were problematic: the worthless TestSuiteFactory which already contained a comment suggesting we get rid of it, and the fact that some tests -- most notably the concurrent ones -- also contained main methods that started the JUnit tty-based TestRunner. (In the long run, we want to be running the harmony tests directly from a pristine "svn co" of upstream, using DalvikRunner. But this will be a big help in the meantime, and starts the work of getting our current copy of the tests into a state where we can start to extract any meaningful changes/additions we've made.)
* resolved conflicts for merge of 4923840c to masterScott Main2009-12-211-1/+1
|\
| * doc change: fix a broken link in class summaryScott Main2009-12-211-1/+1
| |
* | Update regex to Harmony r802921.Jesse Wilson2009-09-144-663/+567
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notable changes: - Reordered methods to be consistent with Harmony. Although our implementations are significantly different, this will make it easier to track Javadoc and signature changes. - Some unchecked exceptions removed from method signatures - Changed StringBuffer use to StringBuilder - Changed PatternSyntaxException description field to 'desc' for serialization compatibility. commit deba65caf92e9c5b77b29bcf9dcb26d637af90cb Merge: b239d4a 457c6cc Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 12 09:23:58 2009 -0700 Merge branch 'regex_802921' into regex_dalvik Conflicts: libcore/regex/.classpath libcore/regex/.settings/org.eclipse.jdt.core.prefs libcore/regex/build.xml libcore/regex/src/main/java/java/util/regex/AbstractCharClass.java libcore/regex/src/main/java/java/util/regex/AbstractSet.java libcore/regex/src/main/java/java/util/regex/CIDecomposedCharSet.java libcore/regex/src/main/java/java/util/regex/CharClass.java libcore/regex/src/main/java/java/util/regex/DecomposedCharSet.java libcore/regex/src/main/java/java/util/regex/IntArrHash.java libcore/regex/src/main/java/java/util/regex/JointSet.java libcore/regex/src/main/java/java/util/regex/Lexer.java libcore/regex/src/main/java/java/util/regex/MatchResult.java libcore/regex/src/main/java/java/util/regex/Matcher.java libcore/regex/src/main/java/java/util/regex/Pattern.java libcore/regex/src/main/java/java/util/regex/PatternSyntaxException.java libcore/regex/src/main/java/java/util/regex/SequenceSet.java libcore/regex/src/main/java/java/util/regex/UCIDecomposedCharSet.java libcore/regex/src/main/java/java/util/regex/UCISequenceSet.java libcore/regex/src/main/java/org/apache/harmony/regex/internal/nls/messages.properties libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Matcher2Test.java libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/MatcherTest.java libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/ModeTest.java libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Pattern2Test.java libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternErrorTest.java libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternSyntaxExceptionTest.java libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/ReplaceTest.java libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/SplitTest.java commit b239d4a17905f9e0b609eeaa12de9dfba433c44a Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 12 08:37:21 2009 -0700 Dalvik Regex commit 457c6cca0629f20b118cd128353439763e40fe9e Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 12 08:36:40 2009 -0700 Regex 802921 commit 51f4e67d71a8f92d8efa073fab32c540f6015594 Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 12 08:34:57 2009 -0700 Regex 527399
* | am 5ca29e14: Merge change 22629 into eclairElliott Hughes2009-09-022-29/+86
|\ \ | |/ | | | | | | | | | | Merge commit '5ca29e142032b6559824e4f7d526bbc037b90c93' into eclair-plus-aosp * commit '5ca29e142032b6559824e4f7d526bbc037b90c93': Fix "whatever".split(".") behavior.
| * Fix "whatever".split(".") behavior.Elliott Hughes2009-08-252-29/+86
| | | | | | | | | | | | | | | | Two special cases in Pattern.split's behavior had been incorrectly combined into one. Separate the two cases, and add tests. I've run the tests against Java 1.5 and 1.6 too. Bug: 1957900
| * AI 146535: am: CL 146128 am: CL 146126 Fixes from the review of 'Bringing ↵Urs Grob2009-04-162-62/+76
| | | | | | | | | | | | | | | | | | | | RegEx down to zero broken tests.' Original author: ursg Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146535
| * AI 144835: am: CL 144832 am: CL 144828 Bringing RegEx down to zero broken tests.Jorg Pleumann2009-04-072-28/+160
| | | | | | | | | | | | | | | | Original author: jorgp Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144835
* | Fix broken link in docstring. issue 1194Joe LaPenna2009-07-231-1/+1
| |
* | AI 146126: Fixes from the review of 'Bringing RegEx down to zero broken tests.'Urs Grob2009-04-142-62/+76
| | | | | | | | | | | | BUG=1285921 Automated import of CL 146126
* | AI 144828: Bringing RegEx down to zero broken tests.Jorg Pleumann2009-04-072-28/+160
|/ | | | | | BUG=1285921 Automated import of CL 144828
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0320-0/+9086
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0320-9086/+0
|
* auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-101-10/+0
|
* auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-0913-1402/+1625
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-1712-360/+399
|
* Initial ContributionThe Android Open Source Project2008-10-2119-0/+8834
generated by cgit v1.1 at 2025-03-21 18:19:07 +0000