Merge pull request #3521 from masatake/sh--array-alike-function

Sh: distinguish a function definition from an array initialization

Author: masatake

Units/parser-sh.r/array-alike-function.d/args.ctags

@@ -0,0 +1 @@
+--sort=no

Units/parser-sh.r/array-alike-function.d/expected.tags

@@ -0,0 +1,4 @@
+func	input.bash	/^func() {$/;"	f
+func1=	input.bash	/^function func1=$/;"	f
+func2=	input.bash	/^function func2= {$/;"	f
+func3=	input.bash	/^func3=() {$/;"	f

Units/parser-sh.r/array-alike-function.d/input.bash

@@ -0,0 +1,23 @@
+#!/bin/bash
+func() {
+    :
+}
+funcs=()
+
+function func1=
+{
+    :
+}
+
+function func2= {
+    :
+}
+
+func3=() {
+    :
+}
+
+notfunc=()
+{
+    :
+}

parsers/sh.c

@@ -661,7 +661,22 @@ static void findShTagsCommon (size_t (* keyword_handler) (int,
 					++cp;
 				if (*cp == ')')
 				{
-					found_kind = K_FUNCTION;
+					/* A function definiton can look like an array initialization:
+					 *
+					 *   ... f=()
+					 *
+					 * We use followng heuristics to distinguish a function definition
+					 * from an array initialization:
+					 *
+					 *   preceding "function" keyword: function f=()
+					 *   followed by '{': f=() {
+					 *
+					 */
+					if (! ((vStringLast(name) == '=')
+						   /* Have we found "function" yet? */
+						   && (found_kind != K_FUNCTION)
+						   && (strchr ((char *)(cp + 1), '{') == NULL)))
+						found_kind = K_FUNCTION;
 					++cp;
 				}
 			}