@@ -2,8 +2,8 @@ package dsl
2
2
3
3
import (
4
4
"encoding/json"
5
- "fmt"
6
5
6
+ "github.com/pkg/errors"
7
7
"github.com/vim-volt/volt/dsl/ops"
8
8
"github.com/vim-volt/volt/dsl/types"
9
9
)
@@ -30,30 +30,31 @@ func deparse(value types.Value) (interface{}, error) {
30
30
case types.Number :
31
31
return val .Value (), nil
32
32
case types.Object :
33
- m := make (map [string ]interface {}, len (val .Value ()))
33
+ result := make (map [string ]interface {}, len (val .Value ()))
34
34
for k , o := range val .Value () {
35
35
v , err := deparse (o )
36
36
if err != nil {
37
37
return nil , err
38
38
}
39
- m [k ] = v
39
+ result [k ] = v
40
40
}
41
- return m , nil
41
+ return result , nil
42
42
case types.Expr :
43
- a := make ([]interface {}, 0 , len (val .Args ())+ 1 )
43
+ args := val .Args ()
44
+ result := make ([]interface {}, 0 , len (args )+ 1 )
44
45
// Do not include "@" in array literal
45
46
if val .Op ().String () != ops .ArrayOp .String () {
46
- a = append (a , types . NewString ( val .Op ().String () ))
47
+ result = append (result , val .Op ().String ())
47
48
}
48
- for i := range a {
49
- v , err := deparse (val . Args () [i ])
49
+ for i := range args {
50
+ v , err := deparse (args [i ])
50
51
if err != nil {
51
52
return nil , err
52
53
}
53
- a = append (a , v )
54
+ result = append (result , v )
54
55
}
55
- return a , nil
56
+ return result , nil
56
57
default :
57
- return nil , fmt .Errorf ("unknown value was given '%+v'" , val )
58
+ return nil , errors .Errorf ("unknown value was given '%+v'" , val )
58
59
}
59
60
}
0 commit comments