Merge pull request #29 from VerbalExpressions/or_without_capt

fix - don't create additional capture when use OR

Author: pathikrit

src/main/java/ru/lanwen/verbalregex/VerbalExpression.java

@@ -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(), ")");

src/test/java/ru/lanwen/verbalregex/BasicFunctionalityUnitTest.java

@@ -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"));
     }
 
 
@@ -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

src/test/java/ru/lanwen/verbalregex/NegativeCasesTest.java

@@ -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

src/test/java/ru/lanwen/verbalregex/RealWorldUnitTest.java

@@ -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")