Skip to content

fix - don't create additional capture when use OR #29

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

Merged
merged 1 commit into from
Jul 16, 2014
Merged

fix - don't create additional capture when use OR #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/java/ru/lanwen/verbalregex/VerbalExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ public Builder atLeast(final int from) {
* @return this builder
*/
public Builder or(final String pValue) {
this.prefixes.append("(");
this.prefixes.append("(?:");

int opened = countOccurrencesOf(this.prefixes.toString(), "(");
int closed = countOccurrencesOf(this.suffixes.toString(), ")");
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/ru/lanwen/verbalregex/BasicFunctionalityUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,9 +348,9 @@ public void testOrWithCapture() {
assertThat("Starts with abc or def", testRegex, matchesTo("abczzz"));
assertThat("Doesn't start with abc or def", testRegex, not(matchesExactly("xyzabcefg")));

assertThat(testRegex.getText("xxxabcdefzzz", 1), equalTo("abcdef"));
assertThat(testRegex.getText("xxxdefzzz", 2), equalTo("null"));
assertThat(testRegex.getText("xxxabcdefzzz", 2), equalTo("abcnull"));
assertThat(testRegex.getText("xxxabcdefzzz", 1), equalTo("abcnull"));
assertThat(testRegex.getText("xxxdefzzz", 1), equalTo("null"));
assertThat(testRegex.getText("xxxabcdefzzz", 1), equalTo("abcnull"));
}


Expand All @@ -367,8 +367,8 @@ public void testOrWithClosedCapture() {
assertThat("Doesn't start with abc or def", testRegex, not(matchesExactly("xyzabcefg")));

assertThat(testRegex.getText("xxxabcdefzzz", 1), equalTo("abcnull"));
assertThat(testRegex.getText("xxxdefzzz", 2), equalTo("null"));
assertThat(testRegex.getText("xxxabcdefzzz", 2), equalTo("abcnull"));
assertThat(testRegex.getText("xxxdefzzz", 1), equalTo("null"));
assertThat(testRegex.getText("xxxabcdefzzz", 1), equalTo("abcnull"));
}

@Test
Expand Down
4 changes: 1 addition & 3 deletions src/test/java/ru/lanwen/verbalregex/NegativeCasesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@ public void orAfterCaptureProduceEmptyGroup() throws Exception {
assertThat(regex.toString(), containsString("()|"));

assertThat("regex dont matches string abcd", regex.getText("abcd", 0), equalTo("a"));
assertThat("regex dont extract a by first group", regex.getText("abcd", 1), equalTo("a"));
assertThat("second group should produce empty string", regex.getText("abcd", 2), equalTo(""));

assertThat("regex dont extract a by first group", regex.getText("abcd", 1), equalTo(""));
}

@Test
Expand Down
5 changes: 5 additions & 0 deletions src/test/java/ru/lanwen/verbalregex/RealWorldUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ public void complexPatternWithMultiplyCaptures() throws Exception {
*/
}

@Test
public void unusualRegex() throws Exception {
assertThat(regex().add("[A-Z0-1!-|]").build().toString(), equalTo("[A-Z0-1!-|]"));

}

@Test
@Ignore("Planned in 1.3")
Expand Down