go/ferret
1
0
Fork 0
mirror of https://github.com/MontFerret/ferret.git synced 2025-07-13 01:20:35 +02:00
Code Issues Releases Activity

New type system (#232)

Browse Source 
* New type system

* Fixed dot notation for HTML elements
This commit is contained in:
Tim Voronov
2019-02-13 12:31:18 -05:00
committed by GitHub
parent b3bcbda3b9
commit 1af8b37a0f
185 changed files with 1379 additions and 820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/stdlib/objects/merge.go
View File

@ -5,6 +5,7 @@ import (
"github.com/MontFerret/ferret/pkg/runtime/core"
"github.com/MontFerret/ferret/pkg/runtime/values"
"github.com/MontFerret/ferret/pkg/runtime/values/types"
)
// Merge merge the given objects into a single object.
@ -19,11 +20,11 @@ func Merge(_ context.Context, args ...core.Value) (core.Value, error) {
objs := values.NewArrayWith(args...)
if len(args) == 1 && args[0].Type() == core.ArrayType {
if len(args) == 1 && args[0].Type().Equals(types.Array) {
objs = args[0].(*values.Array)
}
err = validateArrayOf(core.ObjectType, objs)
err = validateArrayOf(types.Object, objs)
if err != nil {
return values.None, err
@ -38,10 +39,14 @@ func mergeArray(arr *values.Array) *values.Object {
arr.ForEach(func(arrValue core.Value, arrIdx int) bool {
obj = arrValue.(*values.Object)
obj.ForEach(func(objValue core.Value, objKey string) bool {
if values.IsCloneable(objValue) {
objValue = objValue.(core.Cloneable).Clone()
cloneable, ok := objValue.(core.Cloneable)
if ok {
objValue = cloneable.Clone()
}
merged.Set(values.NewString(objKey), objValue)
return true
})
return true