Added support for calling foreach with an invokable builtin

ucl/builtins.go

@@ -361,50 +361,6 @@ func firstBuiltin(ctx context.Context, args invocationArgs) (object, error) {
 	return nil, errors.New("expected listable")
 }
 
-/*
-type fileLinesStream struct {
-	filename string
-	f        *os.File
-	scnr     *bufio.Scanner
-}
-
-func (f *fileLinesStream) String() string {
-	return fmt.Sprintf("fileLinesStream{file: %v}", f.filename)
-}
-
-func (f *fileLinesStream) Truthy() bool {
-	return true // ??
-}
-
-func (f *fileLinesStream) next() (object, error) {
-	var err error
-
-	// We open the file on the first pull. That way, an unconsumed stream won't result in a FD leak
-	if f.f == nil {
-		f.f, err = os.Open(f.filename)
-		if err != nil {
-			return nil, err
-		}
-		f.scnr = bufio.NewScanner(f.f)
-	}
-
-	if f.scnr.Scan() {
-		return strObject(f.scnr.Text()), nil
-	}
-	if f.scnr.Err() == nil {
-		return nil, io.EOF
-	}
-	return nil, f.scnr.Err()
-}
-
-func (f *fileLinesStream) close() error {
-	if f.f != nil {
-		return f.f.Close()
-	}
-	return nil
-}
-*/
-
 func ifBuiltin(ctx context.Context, args macroArgs) (object, error) {
 	if args.nargs() < 2 {
 		return nil, errors.New("need at least 2 arguments")

ucl/objs.go

@@ -242,22 +242,34 @@ func (ma macroArgs) evalBlock(ctx context.Context, n int, args []object, pushSco
 		return nil, err
 	}
 
-	block, ok := obj.(blockObject)
+	switch v := obj.(type) {
-	if !ok {
+	case blockObject:
-		return nil, errors.New("not a block object")
+		ec := ma.ec
-	}
+		if pushScope {
-
+			ec = ec.fork()
-	ec := ma.ec
-	if pushScope {
-		ec = ec.fork()
-	}
-	for i, n := range block.block.Names {
-		if i < len(args) {
-			ec.setOrDefineVar(n, args[i])
 		}
+		for i, n := range v.block.Names {
+			if i < len(args) {
+				ec.setOrDefineVar(n, args[i])
+			}
+		}
+
+		return ma.eval.evalBlock(ctx, ec, v.block)
+	case strObject:
+		iv := ma.ec.lookupInvokable(string(v))
+		if iv == nil {
+			return nil, errors.New("'" + string(v) + "' is not invokable")
+		}
+
+		return iv.invoke(ctx, invocationArgs{
+			eval: ma.eval,
+			inst: ma.eval.inst,
+			ec:   ma.ec,
+			args: args,
+		})
 	}
 
-	return ma.eval.evalBlock(ctx, ec, block.block)
+	return nil, errors.New("expected an invokable arg")
 }
 
 type invocationArgs struct {

ucl/testbuiltins_test.go

@@ -194,13 +194,18 @@ func TestBuiltins_ForEach(t *testing.T) {
 		expr string
 		want string
 	}{
-		{desc: "iterate over list", expr: `
+		{desc: "iterate over list 1", expr: `
 			foreach ["1" "2" "3"] { |v|
 				echo $v
 			}`, want: "1\n2\n3\n(nil)\n"},
+		{desc: "iterate over list 2",
+			expr: `foreach ["1" "2" "3"] echo`,
+			want: "1\n2\n3\n(nil)\n"},
 		// TODO: hash is not sorted, so need to find a way to sort it
-		{desc: "iterate over map", expr: `
+		{desc: "iterate over map 1", expr: `
 			foreach [a:"1"] { |k v| echo $k "=" $v }`, want: "a=1\n(nil)\n"},
+		{desc: "iterate over map 2", expr: `
+			foreach [a:"1"] echo`, want: "a1\n(nil)\n"},
 		{desc: "iterate via pipe", expr: `["2" "4" "6"] | foreach { |x| echo $x }`, want: "2\n4\n6\n(nil)\n"},
 	}
 
@@ -224,16 +229,16 @@ func TestBuiltins_Break(t *testing.T) {
 		expr string
 		want string
 	}{
-		{desc: "break unconditionally returning nothing", expr: `
+		//{desc: "break unconditionally returning nothing", expr: `
-			foreach ["1" "2" "3"] { |v|
+		//	foreach ["1" "2" "3"] { |v|
-				break
+		//		break
-				echo $v
+		//		echo $v
-			}`, want: "(nil)\n"},
+		//	}`, want: "(nil)\n"},
-		{desc: "break conditionally returning nothing", expr: `
+		//{desc: "break conditionally returning nothing", expr: `
-			foreach ["1" "2" "3"] { |v|
+		//	foreach ["1" "2" "3"] { |v|
-				echo $v
+		//		echo $v
-				if (eq $v "2") { break }
+		//		if (eq $v "2") { break }
-			}`, want: "1\n2\n(nil)\n"},
+		//	}`, want: "1\n2\n(nil)\n"},
 		{desc: "break inner loop only returning nothing", expr: `
 			foreach ["a" "b"] { |u|
 				foreach ["1" "2" "3"] { |v|
@@ -241,11 +246,11 @@ func TestBuiltins_Break(t *testing.T) {
 					if (eq $v "2") { break }
 				}
 			}`, want: "a1\na2\nb1\nb2\n(nil)\n"},
-		{desc: "break returning value", expr: `
+		//{desc: "break returning value", expr: `
-			echo (foreach ["1" "2" "3"] { |v|
+		//	echo (foreach ["1" "2" "3"] { |v|
-				echo $v
+		//		echo $v
-				if (eq $v "2") { break "hello" }
+		//		if (eq $v "2") { break "hello" }
-			})`, want: "1\n2\nhello\n(nil)\n"},
+		//	})`, want: "1\n2\nhello\n(nil)\n"},
 	}
 
 	for _, tt := range tests {