Merge pull request #288 from asmundak/master

Fix the bug in buildPropertyMap in the previous commit.

proptools/unpack.go

@@ -136,23 +136,22 @@ func (ctx *unpackContext) buildPropertyMap(prefix string, properties []*parser.P
 		}
 
 		ctx.propertyMap[name] = &packedProperty{property, false}
-		if structProperty, ok := property.Value.(*parser.Map); ok {
-			ctx.buildPropertyMap(name, structProperty.Properties)
-		}
-
+		switch propValue := property.Value.Eval().(type) {
+		case *parser.Map:
+			ctx.buildPropertyMap(name, propValue.Properties)
+		case *parser.List:
 			// If it is a list, unroll it unless its elements are of primitive type
 			// (no further mapping will be needed in that case, so we avoid cluttering
 			// the map).
-		listExpr, ok := property.Value.Eval().(*parser.List)
-		if !ok || len(listExpr.Values) == 0 {
+			if len(propValue.Values) == 0 {
 				continue
 			}
-		if t := listExpr.Values[0].Eval().Type(); t == parser.StringType || t == parser.Int64Type || t == parser.BoolType {
+			if t := propValue.Values[0].Type(); t == parser.StringType || t == parser.Int64Type || t == parser.BoolType {
 				continue
 			}
 
-		itemProperties := make([]*parser.Property, len(listExpr.Values), len(listExpr.Values))
-		for i, expr := range listExpr.Values {
+			itemProperties := make([]*parser.Property, len(propValue.Values), len(propValue.Values))
+			for i, expr := range propValue.Values {
 				itemProperties[i] = &parser.Property{
 					Name:     property.Name + "[" + strconv.Itoa(i) + "]",
 					NamePos:  property.NamePos,
@@ -164,6 +163,7 @@ func (ctx *unpackContext) buildPropertyMap(prefix string, properties []*parser.P
 				return false
 			}
 		}
+	}
 
 	return len(ctx.errs) == nOldErrors
 }

proptools/unpack_test.go

@@ -496,10 +496,12 @@ var validUnpackTestCases = []struct {
 			list = ["abc"]
 			string = "def"
 			list_with_variable = [string]
+			struct_value = { name: "foo" }
 			m {
 				s: string,
 				list: list,
 				list2: list_with_variable,
+				structattr: struct_value,
 			}
 		`,
 		output: []interface{}{
@@ -507,10 +509,18 @@ var validUnpackTestCases = []struct {
 				S          string
 				List       []string
 				List2      []string
+				Structattr struct {
+					Name string
+				}
 			}{
 				S:     "def",
 				List:  []string{"abc"},
 				List2: []string{"def"},
+				Structattr: struct {
+					Name string
+				}{
+					Name: "foo",
+				},
 			},
 		},
 	},