go/ferret
1
0
Fork 0
mirror of https://github.com/MontFerret/ferret.git synced 2025-11-27 22:08:15 +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

11
pkg/stdlib/strings/concat.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"
)
// Concat concatenates one or more instances of Read, or an Array.
@@ -21,7 +22,7 @@ func Concat(_ context.Context, args ...core.Value) (core.Value, error) {
res := values.EmptyString
if argsCount == 1 && args[0].Type() == core.ArrayType {
if argsCount == 1 && args[0].Type() == types.Array {
arr := args[0].(*values.Array)
arr.ForEach(func(value core.Value, _ int) bool {
@@ -53,15 +54,15 @@ func ConcatWithSeparator(_ context.Context, args ...core.Value) (core.Value, err
separator := args[0]
if separator.Type() != core.StringType {
if separator.Type() != types.String {
separator = values.NewString(separator.String())
}
res := values.EmptyString
for idx, arg := range args[1:] {
if arg.Type() != core.ArrayType {
if arg.Type() != core.NoneType {
if arg.Type() != types.Array {
if arg.Type() != types.None {
if idx > 0 {
res = res.Concat(separator)
}
@@ -72,7 +73,7 @@ func ConcatWithSeparator(_ context.Context, args ...core.Value) (core.Value, err
arr := arg.(*values.Array)
arr.ForEach(func(value core.Value, idx int) bool {
if value.Type() != core.NoneType {
if value.Type() != types.None {
if idx > 0 {
res = res.Concat(separator)
}