mutex

compile.go

@@ -1,24 +1,20 @@
 package pathmatch
 
-
 import (
 	"strings"
 )
 
-
 const (
 	defaultFieldTagName = "match"
 	wildcardBit = "{}"
 )
 
-
 var (
 	errMissingEndingRightBraceToMatchBeginningLeftBrace = newPatternSyntaxError(`Missing ending "}" (to match beginning "{").`)
 	errSlashInsideOfBraces     = newPatternSyntaxError(`"/" inside of "{...}".`)
 	errLeftBraceInsideOfBraces = newPatternSyntaxError(`"{" inside of "{...}".`)
 )
 
-
 // Compile takes an uncompiled pattern, in the form of a Go string (ex: "/users/{userId}/vehicles/{vehicleId}"),
 // and returns a compiled pattern.
 //
@@ -66,7 +62,10 @@ func CompileTo(target *Pattern, uncompiledPattern string) error {
 		return errNilTarget
 	}
 
-	newPattern(target, defaultFieldTagName)
+	target.mutex.Lock()
+	defer target.mutex.Unlock()
+
+	target.init(defaultFieldTagName)
 
 	s := uncompiledPattern
 	for {

errors.go

@@ -5,5 +5,6 @@ import (
 )
 
 var (
+	errNilReceiver = errors.New("pathmatch: Nil Receiver")
 	errNilTarget   = errors.New("pathmatch: Nil Target")
 )

pattern.go

@@ -1,7 +1,7 @@
 package pathmatch
 
 import (
-	"bytes"
+	"sync"
 )
 
 // Pattern represents a compiled pattern. It is what is returned
@@ -31,46 +31,20 @@ import (
 //		fmt.Println("Did not match.")
 //	}
 type Pattern struct {
+	mutex sync.RWMutex
 	bits              []string
 	names             []string
 	namesSet map[string]struct{}
 	fieldTagName        string
 }
 
-func newPattern(target *Pattern, fieldTagName string) error {
+func (pattern *Pattern) MatchNames() []string {
-	if nil == target {
+	if nil == pattern {
-		return errNilTarget
+		return nil
 	}
 
-	bits     := []string{}
+	pattern.mutex.RLock()
-	names    := []string{}
+	defer pattern.mutex.RUnlock()
-	namesSet := map[string]struct{}{}
-
-	target.bits         = bits
-	target.names        = names
-	target.namesSet     = namesSet
-	target.fieldTagName = fieldTagName
-
-	return nil
-}
-
-func (pattern *Pattern) MatchNames() []string {
 
 	return pattern.names
 }
-
-func (pattern *Pattern) Glob() string {
-//@TODO: This shouldn't be executed every time!
-
-	var buffer bytes.Buffer
-
-	for _, bit := range pattern.bits {
-		if wildcardBit == bit {
-			buffer.WriteRune('*')
-		} else {
-			buffer.WriteString(bit)
-		}
-	}
-
-	return buffer.String()
-}

pattern_find.go

@@ -13,6 +13,12 @@ var (
 )
 
 func (pattern *Pattern) Find(path string, args ...interface{}) (bool, error) {
+	if nil == pattern {
+		return false, errNilReceiver
+	}
+
+	pattern.mutex.RLock()
+	defer pattern.mutex.RUnlock()
 
 	s := path
 

pattern_glob.go

@@ -0,0 +1,28 @@
+package pathmatch
+
+import (
+	"bytes"
+)
+
+func (pattern *Pattern) Glob() string {
+	if nil == pattern {
+		return ""
+	}
+
+	pattern.mutex.RLock()
+	defer pattern.mutex.RUnlock()
+
+//@TODO: This shouldn't be executed every time!
+
+	var buffer bytes.Buffer
+
+	for _, bit := range pattern.bits {
+		if wildcardBit == bit {
+			buffer.WriteRune('*')
+		} else {
+			buffer.WriteString(bit)
+		}
+	}
+
+	return buffer.String()
+}

pattern_init.go

@@ -0,0 +1,16 @@
+package pathmatch
+
+func (receiver *Pattern) init(fieldTagName string) {
+	if nil == receiver {
+		return
+	}
+
+	bits     := []string{}
+	names    := []string{}
+	namesSet := map[string]struct{}{}
+
+	receiver.bits         = bits
+	receiver.names        = names
+	receiver.namesSet     = namesSet
+	receiver.fieldTagName = fieldTagName
+}

pattern_load.go

@@ -15,6 +15,12 @@ var (
 
 
 func (pattern *Pattern) FindAndLoad(path string, strct interface{}) (bool, error) {
+	if nil == pattern {
+		return false, errNilReceiver
+	}
+
+	pattern.mutex.RLock()
+	defer pattern.mutex.RUnlock()
 
 //@TODO: Is it a good idea to be dynamically creating this?
 //@TODO: Also, can the struct fields be put in here directly instead?