feedback

compiler/semantic/analyzer.go

@@ -55,16 +55,6 @@ type opDecl struct {
 	scope *Scope // parent scope of op declaration.
 }
 
-func (a *analyzer) appendOpPath(op *dag.UserOp) error {
-	a.opPath = append(a.opPath, op)
-	for i := len(a.opPath) - 2; i >= 0; i-- {
-		if a.opPath[i] == op {
-			return opCycleError(a.opPath)
-		}
-	}
-	return nil
-}
-
 type opCycleError []*dag.UserOp
 
 func (e opCycleError) Error() string {

compiler/semantic/op.go

@@ -1091,11 +1091,10 @@ func (a *analyzer) maybeConvertUserOp(call *ast.Call, seq dag.Seq) (dag.Op, erro
 	if a.opDecl != nil {
 		a.opDecl.deps = append(a.opDecl.deps, op)
 	} else {
-		// appendOpPath will return an error if the opDecl is already in the
-		// path, which means we have a cycle.
-		if err := a.appendOpPath(op); err != nil {
-			return nil, err
+		if slices.Contains(a.opPath, op) {
+			return nil, opCycleError(append(a.opPath, op))
 		}
+		a.opPath = append(a.opPath, op)
 		decl := a.opDeclMap[op]
 		oldscope := a.scope
 		a.scope = NewScope(decl.scope)
@@ -1112,7 +1111,6 @@ func (a *analyzer) maybeConvertUserOp(call *ast.Call, seq dag.Seq) (dag.Op, erro
 			return nil, err
 		}
 	}
-	// Else we need to
 	return &dag.UserOpCall{
 		Kind:  "UserOpCall",
 		Name:  call.Name,

runtime/op/ztests/user-nested.yaml

@@ -8,11 +8,11 @@ zed: |
   op add4(x): (
     add2(x) | add2(x)
   )
-  add4(x)
+  add4(y)
 
-input: '{x:1} {x:2} {x:3}'
+input: '{y:1} {y:2} {y:3}'
 
 output: |
-  {x:5}
-  {x:6}
-  {x:7}
+  {y:5}
+  {y:6}
+  {y:7}

runtime/op/ztests/user-no-params.yaml

@@ -0,0 +1,10 @@
+zed: |
+  op noparams(): (
+    yield "hello"
+  )
+  noparams()
+
+input: "null"
+
+output: |
+  "hello"