PHP: Fix parsing of anonymous functions using the "use" keyword

http://www.php.net/manual/en/language.namespaces.php#104136
geany · Aug 8, 2013 · cc9e56e · cc9e56e
1 parent fb7bd34
commit cc9e56e
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/tagmanager/ctags/php.c b/tagmanager/ctags/php.c
@@ -1085,7 +1085,8 @@ static boolean parseTrait (tokenInfo *const token)
  *
  * if @name is not NULL, parses an anonymous function with name @name
  * 	$foo = function($foo, $bar) {}
- * 	$foo = function&($foo, $bar) {} */
+ * 	$foo = function&($foo, $bar) {}
+ * 	$foo = function($foo, $bar) use ($x, &$y) {} */
 static boolean parseFunction (tokenInfo *const token, const tokenInfo *name)
 {
 	boolean readNext = TRUE;
@@ -1176,8 +1177,33 @@ static boolean parseFunction (tokenInfo *const token, const tokenInfo *name)
 		makeFunctionTag (name, arglist, access, impl);
 		vStringDelete (arglist);
 
-		readToken (token); /* normally it's an open brace or a semicolon */
+		readToken (token); /* normally it's an open brace or "use" keyword */
 	}
+
+	/* skip use(...) */
+	if (token->type == TOKEN_KEYWORD && token->keyword == KEYWORD_use)
+	{
+		readToken (token);
+		if (token->type == TOKEN_OPEN_PAREN)
+		{
+			int depth = 1;
+
+			do
+			{
+				readToken (token);
+				switch (token->type)
+				{
+					case TOKEN_OPEN_PAREN:  depth++; break;
+					case TOKEN_CLOSE_PAREN: depth--; break;
+					default: break;
+				}
+			}
+			while (token->type != TOKEN_EOF && depth > 0);
+
+			readToken (token);
+		}
+	}
+
 	if (token->type == TOKEN_OPEN_CURLY)
 		enterScope (token, name->string, K_FUNCTION);
 	else

diff --git a/tests/ctags/anonymous_functions.php b/tests/ctags/anonymous_functions.php
@@ -22,3 +22,10 @@
   global $_g;
   return $_g;
 };
+
+$f = function&() use (&$_g) {
+
+  function f_sub() {}
+
+  return $_g;
+};
diff --git a/tests/ctags/anonymous_functions.php.tags b/tests/ctags/anonymous_functions.php.tags
@@ -5,3 +5,5 @@ b
 c�16�()�0
 d�16�()�0
 e�16�()�0
+f�16�()�0
+f_sub�16�()�f�0