Enter/Exit location for a map in general

mitchellh · Jun 11, 2014 · 0052d08 · 0052d08
1 parent 67a182b
commit 0052d08
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/reflectwalk.go b/reflectwalk.go
@@ -12,6 +12,7 @@ type Location uint
 
 const (
 	None Location = iota
+	Map
 	MapKey
 	MapValue
 	SliceElem
@@ -115,6 +116,11 @@ func walk(v reflect.Value, w interface{}) error {
 }
 
 func walkMap(v reflect.Value, w interface{}) error {
+	ew, ewok := w.(EnterExitWalker)
+	if ewok {
+		ew.Enter(Map)
+	}
+
 	for _, k := range v.MapKeys() {
 		kv := v.MapIndex(k)
 
@@ -147,6 +153,10 @@ func walkMap(v reflect.Value, w interface{}) error {
 		}
 	}
 
+	if ewok {
+		ew.Exit(Map)
+	}
+
 	return nil
 }
 

diff --git a/reflectwalk_test.go b/reflectwalk_test.go
@@ -188,10 +188,12 @@ func TestWalk_EnterExit(t *testing.T) {
 		StructField,
 		StructField,
 		StructField,
+		Map,
 		MapKey,
 		MapKey,
 		MapValue,
 		MapValue,
+		Map,
 		StructField,
 		WalkLoc,
 	}