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

Rewrote squeeze to avoid commons-lang dependency #1992

Merged
merged 8 commits into from
Jul 17, 2024
Merged

Rewrote squeeze to avoid commons-lang dependency #1992

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2dc75e6
Rewrote squeeze to avoid commons-lang dependency
DavyLandman Jul 2, 2024
90d5afe
Rewrote squeeze in rascal
DavyLandman Jul 2, 2024
f71a9bc
Made rewrite more precise
DavyLandman Jul 2, 2024
7853970
Implemented squeeze in java
DavyLandman Jul 16, 2024
97131ac
Added more tests for squeeze
DavyLandman Jul 16, 2024
274e623
Merge remote-tracking branch 'origin/main' into chore/remove-commons-…
DavyLandman Jul 16, 2024
0b39033
Cleaned up test
DavyLandman Jul 16, 2024
47c7ac9
Support space in charset
DavyLandman Jul 16, 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
3 changes: 1 addition & 2 deletions src/org/rascalmpl/library/String.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,8 +524,7 @@ public str squeeze(str src, str charSet) {
return src;
}
return visit(src) {
case /<c:.><c>+/ => c
when /[<charSet>]/ := c
case /<c:[<charSet>]><c>+/ => c
DavyLandman marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/org/rascalmpl/library/lang/rascal/tests/basic/Strings1.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ test bool tstSplit(str S1, str S2) = areOverlapping(S1,S2) || isEmpty(S1) || isE
test bool tstSqueeze1(str S) = /<c:[a-zA-Z]><c>/ !:= squeeze(S, "a-zA-Z");
test bool tstSqueeze2(str S) = squeeze(S, "") == S;
test bool tstSqueeze3(str S) {
if (/<c:[a-z]><c>/ := S) {
if (/<c:[a-zA-Z]><c>/ := S) {
return /<c><c>/ := squeeze(S, "0-9");
}
return true;
Expand Down
Loading