reverse booleans

decoder.go

@@ -24,7 +24,7 @@ var (
 // Unmarshal accepts a byte slice as input and writes the
 // data to the value pointed to by v.
 func Unmarshal(bs []byte, v interface{}) error {
-	root, err := parse(bs, true)
+	root, err := parse(bs, false)
 	if err != nil {
 		return err
 	}
@@ -34,8 +34,8 @@ func Unmarshal(bs []byte, v interface{}) error {
 
 // Unmarshal accepts a byte slice as input and writes the
 // data to the value pointed to by v.
-func UnmarshalDontErrorOnDuplicates(bs []byte, v interface{}) error {
-	root, err := parse(bs, false)
+func UnmarshalErrorOnDuplicates(bs []byte, v interface{}) error {
+	root, err := parse(bs, true)
 	if err != nil {
 		return err
 	}
@@ -46,13 +46,13 @@ func UnmarshalDontErrorOnDuplicates(bs []byte, v interface{}) error {
 // Decode reads the given input and decodes it into the structure
 // given by `out`.
 func Decode(out interface{}, in string) error {
-	return decode(out, in, true)
+	return decode(out, in, false)
 }
 
 // Decode reads the given input and decodes it into the structure
 // given by `out`.
-func DecodeDontErrorOnDuplicates(out interface{}, in string) error {
-	return decode(out, in, false)
+func DecodeErrorOnDuplicates(out interface{}, in string) error {
+	return decode(out, in, true)
 }
 
 // Decode reads the given input and decodes it into the structure

decoder_test.go

@@ -37,8 +37,10 @@ func TestDecode_interface(t *testing.T) {
 		},
 		{
 			"basic_duplicates.hcl",
-			true,
-			nil,
+			false,
+			map[string]interface{}{
+				"foo": "${file(\"bing/bong.txt\")}",
+			},
 		},
 		{
 			"empty.hcl",
@@ -455,18 +457,16 @@ func TestDecode_interface(t *testing.T) {
 	}
 }
 
-func TestDecodeDontErrorOnDuplicates_interface(t *testing.T) {
+func TestDecodeErrorOnDuplicates_interface(t *testing.T) {
 	cases := []struct {
 		File string
 		Err  bool
 		Out  interface{}
 	}{
 		{
 			"basic_duplicates.hcl",
-			false,
-			map[string]interface{}{
-				"foo": "${file(\"bing/bong.txt\")}",
-			},
+			true,
+			nil,
 		},
 	}
 
@@ -478,7 +478,7 @@ func TestDecodeDontErrorOnDuplicates_interface(t *testing.T) {
 			}
 
 			var out interface{}
-			err = DecodeDontErrorOnDuplicates(&out, string(d))
+			err = DecodeErrorOnDuplicates(&out, string(d))
 			if (err != nil) != tc.Err {
 				t.Fatalf("Input: %s\n\nError: %s", tc.File, err)
 			}
@@ -488,7 +488,7 @@ func TestDecodeDontErrorOnDuplicates_interface(t *testing.T) {
 			}
 
 			var v interface{}
-			err = UnmarshalDontErrorOnDuplicates(d, &v)
+			err = UnmarshalErrorOnDuplicates(d, &v)
 			if (err != nil) != tc.Err {
 				t.Fatalf("Input: %s\n\nError: %s", tc.File, err)
 			}