HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PHP: fix parsing of functions returning a reference

Browse Source 
Fix parsing of functions declarations with a leading ampersand (&),
used to make the function return a reference:

	function &foo($arg1, $arg2) {
		/* ... */
	}
This commit is contained in:
Colomban Wendling 2013-04-09 19:41:50 +02:00
parent d283eb243c
commit bdb98f0132
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tagmanager/ctags/php.c
View File

@ -199,7 +199,8 @@ typedef enum eTokenType {
TOKEN_EQUAL_SIGN,
TOKEN_OPEN_SQUARE,
TOKEN_CLOSE_SQUARE,
TOKEN_VARIABLE
TOKEN_VARIABLE,
TOKEN_AMPERSAND
} tokenType;
typedef struct {
@ -567,6 +568,7 @@ getNextChar:
case '}': token->type = TOKEN_CLOSE_CURLY; break;
case '[': token->type = TOKEN_OPEN_SQUARE; break;
case ']': token->type = TOKEN_CLOSE_SQUARE; break;
case '&': token->type = TOKEN_AMPERSAND; break;
case '=':
{
@ -740,6 +742,9 @@ static boolean parseClassOrIface (tokenInfo *const token, phpKind kind)
return readNext;
}
/* parse a function
* function myfunc($foo, $bar) {}
* function &myfunc($foo, $bar) {} */
static boolean parseFunction (tokenInfo *const token)
{
boolean readNext = TRUE;
@ -748,6 +753,9 @@ static boolean parseFunction (tokenInfo *const token)
tokenInfo *name;
readToken (token);
/* skip a possible leading ampersand (return by reference) */
if (token->type == TOKEN_AMPERSAND)
readToken (token);
if (token->type != TOKEN_IDENTIFIER)
return FALSE;