Merge pull request #27 from Pungyeon/support_array_of_maps

supporting array of maps

pkg/json/parser.go

@@ -142,8 +142,14 @@ func (p *parser) decodeArray(arr reflect.Value) error {
 			return nil
 		case token.OpenCurly:
 			arr.Set(grow(arr, i))
-			if err := p.decodeObject(arr.Index(i), tags); err != nil {
-				return err
+			if arr.Index(i).Kind() == reflect.Map {
+				if err := p.decodeMap(arr.Index(i)); err != nil {
+					return err
+				}
+			} else {
+				if err := p.decodeObject(arr.Index(i), tags); err != nil {
+					return err
+				}
 			}
 			i++
 			if p.current().Type == token.ClosingBrace {
@@ -260,8 +266,9 @@ func (p *parser) parseArray(sliceType reflect.Type) (reflect.Value, error) {
 		case token.ClosingBrace:
 			return arr.Slice(0, i), nil
 		case token.OpenCurly:
-			if err := p.parseStructure(val); err != nil {
-				return val, nil
+			val, err := p.parseMap(val.Type())
+			if err != nil {
+				return val, err
 			}
 			arr = insertAt(arr, i, val)
 			i++
@@ -332,12 +339,6 @@ func (p *parser) parseStructure(vo reflect.Value) error {
 			}
 			tags.Set(tag) // TODO : Make sure to not set this, if the token is a NullToken
 			obj.Set(val)
-			// TODO : This is currently 10+ allocations per op :/
-			if req, ok := obj.Interface().(required.Required); ok {
-				if err := req.IsValueValid(); err != nil {
-					return err
-				}
-			}
 		}
 		if p.eof() || p.current().Type == token.ClosingCurly {
 			p.next()

pkg/json/parser_test.go

@@ -533,3 +533,31 @@ func TestCustomMarshaler(t *testing.T) {
 		t.Fatal(d.Value)
 	}
 }
+
+func TestMapArray(t *testing.T) {
+	type MA struct {
+		Array []map[string]int
+	}
+
+	var ma MA
+	if err := Parse(LexString(t, `{ "array": [{ "name": 3 }]`), &ma); err != nil {
+		t.Fatal(err)
+	}
+	if ma.Array[0]["name"] != 3 {
+		t.Fatal(ma)
+	}
+}
+
+func TestMapArrayInterface(t *testing.T) {
+	type MA struct {
+		Array []map[string]int
+	}
+
+	var ma interface{}
+	if err := Parse(LexString(t, `{ "array": [{ "name": 3 }]`), &ma); err != nil {
+		t.Fatal(err)
+	}
+	if ma.(map[string]interface{})["array"].([]interface{})[0].(map[string]interface{})["name"].(int) != 3 {
+		t.Fatal(ma)
+	}
+}