internal/core/adt: rename CallContext.Expr

Rename it to Arg to be more consistent with
naming and to free up Expr for actually
getting the corresponding expression.

Signed-off-by: Marcel van Lohuizen <[email protected]>
Change-Id: If5b71be2ca364ecfb98ee221f5d989bb3f4e2241
Dispatch-Trailer: {"type":"trybot","CL":1217234,"patchset":4,"ref":"refs/changes/34/1217234/4","targetBranch":"master"}

Author: mpvl

internal/core/adt/call.go

@@ -69,13 +69,13 @@ func (c *CallContext) Args() []Value {
 	return c.args
 }
 
-// Expr returns the nth argument expression. The value is evaluated and any
+// Arg returns the nth argument expression. The value is evaluated and any
 // cycle information is accumulated in the context. This allows cycles in
 // arguments to be detected.
 //
 // This method of getting an argument should be used when the argument is used
 // as a schema and may contain cycles.
-func (c *CallContext) Expr(i int) Value {
+func (c *CallContext) Arg(i int) Value {
 	// If the call context represents a validator call, the argument will be
 	// offset by 1.
 	if c.isValidator {

internal/core/compile/builtin.go

@@ -118,7 +118,7 @@ var andBuiltin = &adt.Builtin{
 	Result: adt.IntKind,
 	RawFunc: func(call *adt.CallContext) adt.Value {
 		c := call.OpContext()
-		arg := call.Expr(0)
+		arg := call.Arg(0)
 
 		list := c.RawElems(arg)
 		if len(list) == 0 {

internal/pkg/context.go

@@ -56,7 +56,7 @@ func (c *CallCtxt) Do() bool {
 // However, this only makes sense if functions also use the same OpContext for
 // further evaluation. We should enforce as we port the old calls.
 func (c *CallCtxt) Schema(i int) Schema {
-	v := c.Expr(i)
+	v := c.Arg(i)
 	return value.Make(c.ctx, v)
 }