]> Sergey Matveev's repositories - path-extractor.git/commitdiff
Shouldn't match + nor ^
authorEdgar HIPP <hipp.edg@gmail.com>
Sun, 30 Aug 2015 15:07:09 +0000 (17:07 +0200)
committerEdgar HIPP <hipp.edg@gmail.com>
Sun, 30 Aug 2015 15:07:09 +0000 (17:07 +0200)
extractor.go
pe_test.go

index 8e80d2c1378494bb1e05a8edb945e478573814fe..f64fe5fb1a5a0beb0b365c175050779d17137a80 100644 (file)
@@ -9,7 +9,7 @@ type MatchOptions struct {
 }
 
 func pathExtractor(input string) [][][]byte {
-       surroundRegex := "[^]()!#[ \\t:'\"\\\\]*"
+       surroundRegex := "[^]\\^\\+()!#[ \\t:'\"\\\\]*"
        r := regexp.MustCompile("(" + surroundRegex + "[\\./]" + surroundRegex + ")")
        temp := [][][]byte{}
        temp = r.FindAllSubmatch([]byte(input), -1)
index a2c563aabcc068f417ef299cdc5688a4f269b8f3..28f87f7afb3ddfb231e751b018861b1234057654 100644 (file)
@@ -13,6 +13,16 @@ func TestEverything(t *testing.T) {
                t.Errorf("Matches sentence", output)
        }
 
+       output = GetAllMatches("s/+//", MatchOptions{})
+       if len(output) != 0 {
+               t.Errorf("Doesn't match substitute", output)
+       }
+
+       output = GetAllMatches("s/^//", MatchOptions{})
+       if len(output) != 0 {
+               t.Errorf("Doesn't match substitute", output)
+       }
+
        output = GetAllMatches("/usr/bin/env\\", MatchOptions{})
        if len(output) != 1 {
                t.Errorf("Doesn't match escaped", output)