CXX: More complete support for $ in C/C++ identifiers

Merge pull request #1971 from pskocik/master More complete support for $ in C/C++ identifiers
universal-ctags · Jan 11, 2019 · a20bb99 · a20bb99 · masatake · Jan 12, 2019
2 parents b60a7b9 + 8228c5f
commit a20bb99
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/parsers/cpreprocessor.c b/parsers/cpreprocessor.c
@@ -1565,15 +1565,15 @@ static void saveMacro(const char * macro)
 		return;
 	}
 
-	if(!(isalpha(*c) || (*c == '_')))
+	if(!(isalpha(*c) || (*c == '_' || (*c == '$') )))
 	{
 		CXX_DEBUG_LEAVE_TEXT("Macro does not start with an alphanumeric character");
 		return; // must be a sequence of letters and digits
 	}
 
 	const char * identifierBegin = c;
 
-	while(*c && (isalnum(*c) || (*c == '_')))
+	while(*c && (isalnum(*c) || (*c == '_') || (*c == '$') ))
 		c++;
 
 	const char * identifierEnd = c;

diff --git a/parsers/cxx/cxx_parser_tokenizer.c b/parsers/cxx/cxx_parser_tokenizer.c
@@ -286,7 +286,7 @@ static CXXCharTypeData g_aCharTable[128] =
 	},
 	// 036 (0x24) '$'
 	{
-		0,
+		CXXCharTypeStartOfIdentifier | CXXCharTypePartOfIdentifier,
 		0,
 		0
 	},