Fix scope issue when calling user function with global var

Author: benhoyt

goawk.go

@@ -44,7 +44,7 @@ import (
 )
 
 const (
-	version = "v1.1.4"
+	version = "v1.1.5"
 )
 
 func main() {

interp/interp_test.go

@@ -505,6 +505,11 @@ BEGIN { early() }
 		{`function f(x) { 0 in _; f(_) }  BEGIN { f() }  # !awk !gawk`, "", "",
 			`parse error at 1:25: can't pass array "_" as scalar param`, ""},
 		{`BEGIN { for (i=0; i<1001; i++) f(); print x }  function f() { x++ }`, "", "1001\n", "", ""},
+		{`
+function bar(y) { return y[1] }
+function foo() { return bar(x) }
+BEGIN { x[1] = 42; print foo() }
+`, "", "42\n", "", ""},
 
 		// Type checking / resolver tests
 		{`BEGIN { a[x]; a=42 }`, "", "", `parse error at 1:15: can't use array "a" as scalar`, "array"},

parser/resolve.go

@@ -156,12 +156,12 @@ func (p *parser) resolveUserCalls(prog *Program) {
 // type based on context, so mark the types for these as unknown.
 func (p *parser) processUserCallArg(funcName string, arg Expr, index int) {
 	if varExpr, ok := arg.(*VarExpr); ok {
-		ref := p.varTypes[p.funcName][varExpr.Name].ref
+		scope, varFuncName := p.getScope(varExpr.Name)
+		ref := p.varTypes[varFuncName][varExpr.Name].ref
 		if ref == varExpr {
 			// Only applies if this is the first reference to this
 			// variable (otherwise we know the type already)
-			scope := p.varTypes[p.funcName][varExpr.Name].scope
-			p.varTypes[p.funcName][varExpr.Name] = typeInfo{typeUnknown, ref, scope, 0, funcName, index}
+			p.varTypes[varFuncName][varExpr.Name] = typeInfo{typeUnknown, ref, scope, 0, funcName, index}
 		}
 		// Mark the last related varRef (the most recent one) as a
 		// call argument for later error handling