[geany/geany] e76a35: Minor tweak to D "!" template parameter list parsing code

[Matthew Brush]

Branch:      refs/heads/master
Author:      Matthew Brush <matt at geany.org>
Committer:   Matthew Brush <matt at geany.org>
Date:        Sat, 04 Aug 2012 02:07:58
Commit:      e76a35c2715bfc015af6c965a972bc3eaec35460
             https://github.com/geany/geany/commit/e76a35c2715bfc015af6c965a972bc3eaec35460

Log Message:
-----------
Minor tweak to D "!" template parameter list parsing code

Note:
Indentation left as is so that the diff is readable, next commit contains
the indentation fix.


Modified Paths:
--------------
    tagmanager/ctags/c.c

Modified: tagmanager/ctags/c.c
13 files changed, 5 insertions(+), 8 deletions(-)
===================================================================
@@ -2363,13 +2363,6 @@ static int parseParens (statementInfo *const st, parenInfo *const info)
 	{
 		int c = skipToNonWhite ();
 
-		if (isLanguage(Lang_d) && c == '!')
-		{	/* template instantiation */
-			info->isNameCandidate = FALSE;
-			info->isKnrParamList = FALSE;
-		}
-		else
-		{
 			switch (c)
 			{
 				case '&':
@@ -2481,6 +2474,11 @@ static int parseParens (statementInfo *const st, parenInfo *const info)
 							info->isNameCandidate = FALSE;
 						}
 					}
+					else if (isLanguage(Lang_d) && c == '!')
+					{ /* D template instantiation */
+						info->isNameCandidate = FALSE;
+						info->isKnrParamList = FALSE;
+					}
 					else
 					{
 						info->isParamList     = FALSE;
@@ -2491,7 +2489,6 @@ static int parseParens (statementInfo *const st, parenInfo *const info)
 					break;
 				}
 			}
-		}
 		firstChar = FALSE;
 	} while (! info->nestedArgs  &&  depth > 0  &&
 			 (info->isKnrParamList  ||  info->isNameCandidate));


@@ Diff output truncated at 100000 characters. @@


--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).