Skip to content

Commit 4d77f86

Browse files
committed
fix: fix bug that operator name is not deparsed
1 parent 9ae163f commit 4d77f86

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

dsl/deparse.go

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package dsl
22

33
import (
44
"encoding/json"
5-
"fmt"
65

6+
"github.com/pkg/errors"
77
"github.com/vim-volt/volt/dsl/ops"
88
"github.com/vim-volt/volt/dsl/types"
99
)
@@ -30,30 +30,31 @@ func deparse(value types.Value) (interface{}, error) {
3030
case types.Number:
3131
return val.Value(), nil
3232
case types.Object:
33-
m := make(map[string]interface{}, len(val.Value()))
33+
result := make(map[string]interface{}, len(val.Value()))
3434
for k, o := range val.Value() {
3535
v, err := deparse(o)
3636
if err != nil {
3737
return nil, err
3838
}
39-
m[k] = v
39+
result[k] = v
4040
}
41-
return m, nil
41+
return result, nil
4242
case types.Expr:
43-
a := make([]interface{}, 0, len(val.Args())+1)
43+
args := val.Args()
44+
result := make([]interface{}, 0, len(args)+1)
4445
// Do not include "@" in array literal
4546
if val.Op().String() != ops.ArrayOp.String() {
46-
a = append(a, types.NewString(val.Op().String()))
47+
result = append(result, val.Op().String())
4748
}
48-
for i := range a {
49-
v, err := deparse(val.Args()[i])
49+
for i := range args {
50+
v, err := deparse(args[i])
5051
if err != nil {
5152
return nil, err
5253
}
53-
a = append(a, v)
54+
result = append(result, v)
5455
}
55-
return a, nil
56+
return result, nil
5657
default:
57-
return nil, fmt.Errorf("unknown value was given '%+v'", val)
58+
return nil, errors.Errorf("unknown value was given '%+v'", val)
5859
}
5960
}

0 commit comments

Comments
 (0)