Skip to content

Check ints for the end of string before seperator #4

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

Open
b0d0nne11 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Check ints for the end of string before seperator #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec05731
Check ints for the end of string before seperator
b0d0nne11 Mar 18, 2015
1db90db
Add a test case for int matches at the end of urls
b0d0nne11 Mar 18, 2015
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
10 changes: 5 additions & 5 deletions trie.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,11 @@ func (s *intMatcher) match(iter *charIter) bool {
c, sep, ok := iter.next()
count++

// if it's the end of the string, it's a match
if !ok {
return true
}

// if the current character is not a number:
// - it's either a separator that means it's a match
// - it's some other character that means it's not a match
Expand All @@ -391,11 +396,6 @@ func (s *intMatcher) match(iter *charIter) bool {
return false
}
}

// if it's the end of the string, it's a match
if !ok {
return true
}
}
}

Expand Down
6 changes: 6 additions & 0 deletions trie_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,12 @@ func (s *TrieSuite) TestMergeAndMatchCases(c *C) {
"http://google.com/v42/domains/domain1",
"/v<int:version>/domains/<string:name>",
},
// Int matcher at the end of the Trie
{
[]string{"/v<int:version>/domains/<int:name>"},
"http://google.com/v42/domains/1",
"/v<int:version>/domains/<int:name>",
},
// Int matcher, no match
{
[]string{"/v<int:version>/domains/<string:name>", "/<string:version>/domains/<string:name>"},
Expand Down