Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8316704: Regex-free parsing of Formatter and FormatProcessor specifiers #15776

Closed
wants to merge 41 commits into from
+293 −38
Closed

8316704: Regex-free parsing of Formatter and FormatProcessor specifiers #15776

Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
131eddf
optimization for String::format
wenshao Sep 16, 2023
77d0d5a
remove print fast-path changes
wenshao Sep 17, 2023
32f9990
parse fast-path support more pattern
wenshao Sep 17, 2023
0607e08
parse fast-path support more pattern and add benchmark case
wenshao Sep 18, 2023
dbcebaa
bug fix
wenshao Sep 18, 2023
d78149f
parse fast-path support more pattern
wenshao Sep 18, 2023
7692a1c
remove unused comment
wenshao Sep 18, 2023
17ab583
parse fast-path support more specifiers
wenshao Sep 18, 2023
c28ab59
fix specifiers support '%<s'
wenshao Sep 19, 2023
0ccc6a6
fix specifiers duplicate flags not throw error
wenshao Sep 19, 2023
4d6d1e8
drop the regex code entirely and write a custom parser
wenshao Sep 20, 2023
a71031e
bug fix
wenshao Sep 20, 2023
3cebe97
bug fix for '%T' not throw error
wenshao Sep 20, 2023
f303f29
refactor
wenshao Sep 20, 2023
b3ca246
refactor & bug fix
wenshao Sep 20, 2023
59c2983
shared between Formatter and FormatProcessor
wenshao Sep 21, 2023
2042751
restore StringFormat
wenshao Sep 24, 2023
eef0ca6
add decimal benchmark
wenshao Sep 24, 2023
2153a22
Merge remote-tracking branch 'upstream/master' into optim_for_string_…
wenshao Sep 24, 2023
9f229b0
import BigDecimal
wenshao Sep 24, 2023
0d977b2
refactor and cache single conversion FormatSpecifier
wenshao Sep 24, 2023
7b831ab
Revert "refactor and cache single conversion FormatSpecifier"
wenshao Sep 24, 2023
155d004
fix logic error
wenshao Sep 24, 2023
f85b9d4
remove unused code
wenshao Sep 25, 2023
6be4d46
remove unused code
wenshao Sep 25, 2023
ba4660a
refactor for review & remove comment
wenshao Sep 25, 2023
eafac65
code format
wenshao Sep 27, 2023
8a6fe0e
fix : the exception thrown when the input does not include conversion…
wenshao Sep 27, 2023
3ff5121
Refactor according to rgiulietti's suggestion and add testcases
wenshao Sep 27, 2023
b19dc51
Fix from @rgiulietti review
wenshao Sep 28, 2023
ad7f3bd
Improve the readability of parseArgument, suggestion from @rgiulietti
wenshao Sep 28, 2023
7b3ce95
Improve the readability, suggestion from @rgiulietti
wenshao Oct 5, 2023
7a1cd11
add copyright info
wenshao Oct 5, 2023
134f2b2
move testcase from BasicInt to Basic-X
wenshao Oct 9, 2023
bce554a
move testcases to Basic.java
wenshao Oct 9, 2023
fd5a5f2
fix from @rgiulietti 's review
wenshao Oct 18, 2023
d8d3ef4
fix FormatterBuilder testcase handle lineSeparator on windows
wenshao Oct 18, 2023
abb9022
add document
wenshao Oct 20, 2023
289a024
fix from @rgiulietti 's review
wenshao Oct 20, 2023
9618d61
Merge remote-tracking branch 'upstream/master' into optim_for_string_…
wenshao Dec 21, 2023
a5f1a4f
Merge remote-tracking branch 'upstream/master' into optim_for_string_…
wenshao Jan 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/java.base/share/classes/java/util/FormatProcessor.java
View file
Original file line number Diff line number Diff line change
@@ -248,7 +248,6 @@ private static boolean findFormat(String fragment, boolean needed) {
}

if (off > 0) {
// if (!group.equals("%%") && !group.equals("%n")) {
if (i + off == max && needed) {
return true;
}
34 changes: 8 additions & 26 deletions src/java.base/share/classes/java/util/Formatter.java
View file
Original file line number Diff line number Diff line change
@@ -2890,14 +2890,9 @@ int parse() {
// %(\d+\$)?([-#+ 0,(\<]*)?(\d+)?(\.\d+)?([tT])?([a-zA-Z%])
int precisionSize = 0;

parseArgument();

if (widthSize == 0) {
if (flagSize == 0) {
parseFlag();
}
parseWidth();
}
parseArgument();
parseFlag();
parseWidth();

if (c == '.' && off + 1 < max) {
// (\.\d+)?
@@ -2935,7 +2930,7 @@ int parse() {

private void parseArgument() {
// (\d+\$)?
for (int size = 0; off < max; ++off, c = s.charAt(off), size++) {
for (int size = 0; off < max; c = s.charAt(++off), size++) {
if (!isDigit(c)) {
if (size > 0) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would put the first iteration outside of this loop and have a loop which doesn't need to check for it

if (c == '$') {
@@ -2945,21 +2940,8 @@ private void parseArgument() {
c = s.charAt(off);
}
} else {
if (first == '0') {
boolean nextFlag = off < max && Flags.isFlag(s.charAt(off));
if (!nextFlag) {
flagSize = 1;
off = start + 1;
if (off < max) {
c = s.charAt(off);
}
} else {
off = start;
c = first;
}
} else {
widthSize = size;
}
off = start;
c = first;
}
}
break;
@@ -2969,7 +2951,7 @@ private void parseArgument() {

private void parseFlag() {
// ([-#+ 0,(\<]*)?
for (int size = 0; off < max; ++off, c = s.charAt(off), size++) {
for (int size = 0; off < max; c = s.charAt(++off), size++) {
if (!Flags.isFlag(c)) {
flagSize = size;
break;
@@ -2979,7 +2961,7 @@ private void parseFlag() {

private void parseWidth() {
// (\d+)?
for (int size = 0; off < max; ++off, c = s.charAt(off), size++) {
for (int size = 0; off < max; c = s.charAt(++off), size++) {
if (!isDigit(c)) {
widthSize = size;
break;