Revert "Simplify extractVars, fixes edge cases. (gorilla#185)"

This reverts commit 0b13a92.

Author: ldez

mux_test.go

@@ -135,12 +135,12 @@ func TestHost(t *testing.T) {
 		},
 		{
 			title:        "Host route with pattern, additional capturing group, match",
-			route:        new(Route).Host("aaa.{v1:[a-z]{2}(?:b|c)}.ccc"),
+			route:        new(Route).Host("aaa.{v1:[a-z]{2}(b|c)}.ccc"),
 			request:      newRequest("GET", "http://aaa.bbb.ccc/111/222/333"),
 			vars:         map[string]string{"v1": "bbb"},
 			host:         "aaa.bbb.ccc",
 			path:         "",
-			hostTemplate: `aaa.{v1:[a-z]{2}(?:b|c)}.ccc`,
+			hostTemplate: `aaa.{v1:[a-z]{2}(b|c)}.ccc`,
 			shouldMatch:  true,
 		},
 		{
@@ -185,12 +185,12 @@ func TestHost(t *testing.T) {
 		},
 		{
 			title:        "Host route with hyphenated name and pattern, additional capturing group, match",
-			route:        new(Route).Host("aaa.{v-1:[a-z]{2}(?:b|c)}.ccc"),
+			route:        new(Route).Host("aaa.{v-1:[a-z]{2}(b|c)}.ccc"),
 			request:      newRequest("GET", "http://aaa.bbb.ccc/111/222/333"),
 			vars:         map[string]string{"v-1": "bbb"},
 			host:         "aaa.bbb.ccc",
 			path:         "",
-			hostTemplate: `aaa.{v-1:[a-z]{2}(?:b|c)}.ccc`,
+			hostTemplate: `aaa.{v-1:[a-z]{2}(b|c)}.ccc`,
 			shouldMatch:  true,
 		},
 		{
@@ -328,17 +328,6 @@ func TestPath(t *testing.T) {
 			pathRegexp:   `^/(?P<v0>[0-9]{3})/(?P<v1>[0-9]{3})/(?P<v2>[0-9]{3})$`,
 			shouldMatch:  false,
 		},
-		{
-			title:        "Path route with multiple patterns with pipe, match",
-			route:        new(Route).Path("/{category:a|(?:b/c)}/{product}/{id:[0-9]+}"),
-			request:      newRequest("GET", "http://localhost/a/product_name/1"),
-			vars:         map[string]string{"category": "a", "product": "product_name", "id": "1"},
-			host:         "",
-			path:         "/a/product_name/1",
-			pathTemplate: `/{category:a|(?:b/c)}/{product}/{id:[0-9]+}`,
-			pathRegexp:   `^/(?P<v0>a|(?:b/c))/(?P<v1>[^/]+)/(?P<v2>[0-9]+)$`,
-			shouldMatch:  true,
-		},
 		{
 			title:        "Path route with hyphenated name and pattern, match",
 			route:        new(Route).Path("/111/{v-1:[0-9]{3}}/333"),
@@ -361,17 +350,6 @@ func TestPath(t *testing.T) {
 			pathRegexp:   `^/(?P<v0>[0-9]{3})/(?P<v1>[0-9]{3})/(?P<v2>[0-9]{3})$`,
 			shouldMatch:  true,
 		},
-		{
-			title:        "Path route with multiple hyphenated names and patterns with pipe, match",
-			route:        new(Route).Path("/{product-category:a|(?:b/c)}/{product-name}/{product-id:[0-9]+}"),
-			request:      newRequest("GET", "http://localhost/a/product_name/1"),
-			vars:         map[string]string{"product-category": "a", "product-name": "product_name", "product-id": "1"},
-			host:         "",
-			path:         "/a/product_name/1",
-			pathTemplate: `/{product-category:a|(?:b/c)}/{product-name}/{product-id:[0-9]+}`,
-			pathRegexp:   `^/(?P<v0>a|(?:b/c))/(?P<v1>[^/]+)/(?P<v2>[0-9]+)$`,
-			shouldMatch:  true,
-		},
 		{
 			title:        "Path route with multiple hyphenated names and patterns with pipe and case insensitive, match",
 			route:        new(Route).Path("/{type:(?i:daily|mini|variety)}-{date:\\d{4,4}-\\d{2,2}-\\d{2,2}}"),
@@ -383,17 +361,6 @@ func TestPath(t *testing.T) {
 			pathRegexp:   `^/(?P<v0>(?i:daily|mini|variety))-(?P<v1>\d{4,4}-\d{2,2}-\d{2,2})$`,
 			shouldMatch:  true,
 		},
-		{
-			title:        "Path route with empty match right after other match",
-			route:        new(Route).Path(`/{v1:[0-9]*}{v2:[a-z]*}/{v3:[0-9]*}`),
-			request:      newRequest("GET", "http://localhost/111/222"),
-			vars:         map[string]string{"v1": "111", "v2": "", "v3": "222"},
-			host:         "",
-			path:         "/111/222",
-			pathTemplate: `/{v1:[0-9]*}{v2:[a-z]*}/{v3:[0-9]*}`,
-			pathRegexp:   `^/(?P<v0>[0-9]*)(?P<v1>[a-z]*)/(?P<v2>[0-9]*)$`,
-			shouldMatch:  true,
-		},
 		{
 			title:        "Path route with single pattern with pipe, match",
 			route:        new(Route).Path("/{category:a|b/c}"),

regexp.go

@@ -313,7 +313,14 @@ func getHost(r *http.Request) string {
 }
 
 func extractVars(input string, matches []int, names []string, output map[string]string) {
-	for i, name := range names {
-		output[name] = input[matches[2*i+2]:matches[2*i+3]]
+	matchesCount := 0
+	prevEnd := -1
+	for i := 2; i < len(matches) && matchesCount < len(names); i += 2 {
+		if prevEnd < matches[i+1] {
+			value := input[matches[i]:matches[i+1]]
+			output[names[matchesCount]] = value
+			prevEnd = matches[i+1]
+			matchesCount++
+		}
 	}
 }