Various parser updates to make them compatible with latest ctags main

geany · Nov 18, 2020 · 353ceff · 353ceff
1 parent 28fa776
commit 353ceff
Show file tree

Hide file tree

Showing 17 changed files with 1,186 additions and 15 deletions.
diff --git a/ctags/parsers/c.c b/ctags/parsers/c.c
@@ -1224,7 +1224,7 @@ static void addOtherFields (tagEntryInfo* const tag, const tagType type,
 		if (((TOKEN_NAME == st->firstToken->type) || isDataTypeKeyword(st->firstToken))
 			&& (0 != strcmp(vStringValue(st->firstToken->name), tag->name)))
 		{
-			tag->extensionFields.varType = getVarType(st, nameToken);
+			tag->extensionFields.typeRef[1] = getVarType(st, nameToken);
 		}
 	}
 }
@@ -1726,7 +1726,7 @@ static void analyzeIdentifier (tokenInfo *const token)
 	bool parensToo = false;
 
 	if (isInputLanguage (Lang_java)  ||
-		! isIgnoreToken (name, &parensToo, &replacement))
+		! cppIsIgnoreToken (name, &parensToo, &replacement))
 	{
 		if (replacement != NULL)
 			token->keyword = analyzeKeyword (replacement);

diff --git a/ctags/parsers/erlang.c b/ctags/parsers/erlang.c
@@ -18,6 +18,7 @@
 #include "entry.h"
 #include "options.h"
 #include "read.h"
+#include "parse.h"
 #include "routines.h"
 #include "vstring.h"
 

diff --git a/ctags/parsers/go.c b/ctags/parsers/go.c
@@ -10,7 +10,7 @@
 #include "entry.h"
 #include "keyword.h"
 #include "read.h"
-#include "main.h"
+#include "parse.h"
 #include "routines.h"
 #include "vstring.h"
 #include "options.h"
@@ -531,7 +531,7 @@ static void makeTag (tokenInfo *const token, const goKind kind,
 	if (argList)
 		e.extensionFields.signature = argList;
 	if (varType)
-		e.extensionFields.varType = varType;
+		e.extensionFields.typeRef[1] = varType;
 
 	if (parent_kind != GOTAG_UNDEFINED && parent_token != NULL)
 	{

diff --git a/ctags/parsers/haxe.c b/ctags/parsers/haxe.c
@@ -17,7 +17,6 @@
 #include <stdio.h>
 #endif
 #include <string.h>
-#include "main.h"
 #include "entry.h"
 #include "keyword.h"
 #include "parse.h"