awk: Fix handling of functions with empty body

ammend b79a0fef99627c457548e804fcd6e162b116cbe8 to properly
handle functions defined in another scope.

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

diff --git a/editors/awk.c b/editors/awk.c
index a2e20215bf7d7e4346ccea1599d98771cb6a959e..77784dfc166e1a447d9429bc7f3fed3b34335219 100644 (file)
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -2662,7 +2662,7 @@ static var *evaluate(node *op, var *res)
                        const char *sv_progname;
 
                        /* The body might be empty, still has to eval the args */
-                       if (!op->r.n->info)
+                       if (!op->r.n->info && !op->r.f->body.first)
                                syntax_error(EMSG_UNDEF_FUNC);
 
                        vbeg = v = nvalloc(op->r.f->nargs + 1);

diff --git a/testsuite/awk.tests b/testsuite/awk.tests
index 160f460a5fdf89891e09bd6e0b51dd57d0c19d5d..6af6072b8bf2ebe08747d02f95936282e579a050 100755 (executable)
--- a/testsuite/awk.tests
+++ b/testsuite/awk.tests
@@ -44,6 +44,34 @@ testing "awk handles empty function f(arg){}" \
        "L1\n\nL2\n\n" \
        "" ""
 
+prg='
+function outer_fun() {
+  return 1
+}
+END {
+  i=1
+  print "L" i "\n"
+  i += outer_fun()
+  print "L" i "\n"
+}'
+testing "awk properly handles function from other scope" \
+       "awk '$prg'" \
+       "L1\n\nL2\n\n" \
+       "" ""
+
+prg='
+END {
+  i=1
+  print "L" i "\n"
+  i + trigger_error_fun()
+  print "L" i "\n"
+}'
+testing "awk properly handles undefined function" \
+       "awk '$prg' 2>&1" \
+       "L1\n\nawk: cmd. line:5: Call to undefined function\n" \
+       "" ""
+
+
 optional DESKTOP
 testing "awk hex const 1" "awk '{ print or(0xffffffff,1) }'" "4294967295\n" "" "\n"
 testing "awk hex const 2" "awk '{ print or(0x80000000,1) }'" "2147483649\n" "" "\n"