Call top level function even if there are no TLAs (match cpp semantics) (#169)

* Call top level function even if there are no TLAs (match cpp semantics)

ast/ast.go

@@ -444,6 +444,9 @@ const (
 	ObjectFieldExpr                        // '['expr1']':[:[:]] expr2
 	ObjectFieldStr                         // expr1:[:[:]] expr2
 	ObjectLocal                            // local id = expr2
+	ObjectNullID                           // null id
+	ObjectNullExpr                         // null '['expr1']'
+	ObjectNullStr                          // null expr1
 )
 
 type ObjectFieldHide int

interpreter.go

@@ -942,22 +942,20 @@ func evaluateAux(i *interpreter, node ast.Node, tla vmExtMap) (value, *TraceElem
 	if err != nil {
 		return nil, nil, err
 	}
-	if len(tla) != 0 {
-		// If it's not a function, ignore TLA
-		if f, ok := result.(*valueFunction); ok {
-			toplevelArgMap := prepareExtVars(i, tla, "top-level-arg")
-			args := callArguments{}
-			for argName, pv := range toplevelArgMap {
-				args.named = append(args.named, namedCallArgument{name: ast.Identifier(argName), pv: pv})
-			}
-			funcLoc := ast.MakeLocationRangeMessage("Top-level function")
-			funcTrace := &TraceElement{
-				loc: &funcLoc,
-			}
-			result, err = f.call(args).getValue(i, funcTrace)
-			if err != nil {
-				return nil, nil, err
-			}
+	// If it's not a function, ignore TLA
+	if f, ok := result.(*valueFunction); ok {
+		toplevelArgMap := prepareExtVars(i, tla, "top-level-arg")
+		args := callArguments{}
+		for argName, pv := range toplevelArgMap {
+			args.named = append(args.named, namedCallArgument{name: ast.Identifier(argName), pv: pv})
+		}
+		funcLoc := ast.MakeLocationRangeMessage("Top-level function")
+		funcTrace := &TraceElement{
+			loc: &funcLoc,
+		}
+		result, err = f.call(args).getValue(i, funcTrace)
+		if err != nil {
+			return nil, nil, err
 		}
 	}
 	manifestationLoc := ast.MakeLocationRangeMessage("During manifestation")

testdata/function_manifested.jsonnet

@@ -0,0 +1,3 @@
+{
+    f(x): 3,
+}

testdata/function_no_params.golden

@@ -0,0 +1 @@
+42

testdata/function_too_many_params.golden

@@ -0,0 +1,5 @@
+RUNTIME ERROR: Missing argument: x
+-------------------------------------------------
+	Top-level function	
+
+

testdata/function_too_many_params.jsonnet

@@ -0,0 +1 @@
+function(x) 3