From f791e91e1884a76754d88b7cd92fff4df3383947 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ji=C5=99=C3=AD=20Techet?= Date: Thu, 28 Jul 2016 21:06:59 +0200 Subject: [PATCH] ctags: Rename Geany-specific tagEntryInfo::arglist to upstream's ::signature Based on patch from Colomban Wendling. --- ctags/main/entry.h | 2 +- ctags/main/get.c | 4 ++-- ctags/parsers/c.c | 6 +++--- ctags/parsers/go.c | 2 +- ctags/parsers/jscript.c | 2 +- ctags/parsers/pascal.c | 2 +- ctags/parsers/php.c | 2 +- ctags/parsers/powershell.c | 2 +- ctags/parsers/python.c | 2 +- ctags/parsers/rust.c | 2 +- src/tagmanager/tm_source_file.c | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ctags/main/entry.h b/ctags/main/entry.h index 5f116d748..32febba85 100644 --- a/ctags/main/entry.h +++ b/ctags/main/entry.h @@ -69,7 +69,7 @@ typedef struct sTagEntryInfo { const char* implementation; const char* inheritance; const char* scope [2]; /* value and key */ - const char *arglist; /* Argument list for functions and macros with arguments */ + const char *signature; /* Argument list for functions and macros with arguments */ const char *varType; } extensionFields; /* list of extension fields*/ } tagEntryInfo; diff --git a/ctags/main/get.c b/ctags/main/get.c index e6983308c..859a0ef94 100644 --- a/ctags/main/get.c +++ b/ctags/main/get.c @@ -317,12 +317,12 @@ static void makeDefineTag (const char *const name, boolean parameterized) e.kind = 'd'; if (parameterized) { - e.extensionFields.arglist = getArglistFromFilePos(getInputFilePosition() + e.extensionFields.signature = getArglistFromFilePos(getInputFilePosition() , e.name); } makeTagEntry (&e); if (parameterized) - free((char *) e.extensionFields.arglist); + free((char *) e.extensionFields.signature); } } diff --git a/ctags/parsers/c.c b/ctags/parsers/c.c index fc4af97d5..cf577494a 100644 --- a/ctags/parsers/c.c +++ b/ctags/parsers/c.c @@ -1241,7 +1241,7 @@ static void addOtherFields (tagEntryInfo* const tag, const tagType type, if ((TRUE == st->gotArgs) && (TRUE == Option.extensionFields.argList) && ((TAG_FUNCTION == type) || (TAG_METHOD == type) || (TAG_PROTOTYPE == type))) { - tag->extensionFields.arglist = getArglistFromFilePos( + tag->extensionFields.signature = getArglistFromFilePos( tag->filePosition, tag->name); } break; @@ -1486,8 +1486,8 @@ static void makeTag (const tokenInfo *const token, if (NULL != TagEntryFunction) makeExtraTagEntry (type, &e, scope); vStringDelete (scope); - if (NULL != e.extensionFields.arglist) - free((char *) e.extensionFields.arglist); + if (NULL != e.extensionFields.signature) + free((char *) e.extensionFields.signature); } } diff --git a/ctags/parsers/go.c b/ctags/parsers/go.c index 3c2ddd512..6b1a88d61 100644 --- a/ctags/parsers/go.c +++ b/ctags/parsers/go.c @@ -543,7 +543,7 @@ static void makeTag (tokenInfo *const token, const goKind kind, e.kindName = GoKinds [kind].name; e.kind = GoKinds [kind].letter; if (argList) - e.extensionFields.arglist = argList; + e.extensionFields.signature = argList; if (varType) e.extensionFields.varType = varType; diff --git a/ctags/parsers/jscript.c b/ctags/parsers/jscript.c index e8629ecf7..c345fac33 100644 --- a/ctags/parsers/jscript.c +++ b/ctags/parsers/jscript.c @@ -274,7 +274,7 @@ static void makeJsTag (tokenInfo *const token, const jsKind kind, vString *const if (c < 0x20 /* below space */ || c == 0x7F /* DEL */) signature->buffer[i] = ' '; } - e.extensionFields.arglist = vStringValue(signature); + e.extensionFields.signature = vStringValue(signature); } makeTagEntry (&e); diff --git a/ctags/parsers/pascal.c b/ctags/parsers/pascal.c index 2c76ce937..253c54b91 100644 --- a/ctags/parsers/pascal.c +++ b/ctags/parsers/pascal.c @@ -47,7 +47,7 @@ static void createPascalTag (tagEntryInfo* const tag, tag->kindName = PascalKinds [kind].name; tag->kind = PascalKinds [kind].letter; - tag->extensionFields.arglist = arglist; + tag->extensionFields.signature = arglist; tag->extensionFields.varType = vartype; } else diff --git a/ctags/parsers/php.c b/ctags/parsers/php.c index b8fc3ae0a..abe876892 100644 --- a/ctags/parsers/php.c +++ b/ctags/parsers/php.c @@ -381,7 +381,7 @@ static void makeFunctionTag (const tokenInfo *const token, if (impl != IMPL_UNDEFINED) e.extensionFields.implementation = implToString (impl); if (arglist) - e.extensionFields.arglist = vStringValue (arglist); + e.extensionFields.signature = vStringValue (arglist); makeTagEntry (&e); } diff --git a/ctags/parsers/powershell.c b/ctags/parsers/powershell.c index ece45ec9f..c7752ae9b 100644 --- a/ctags/parsers/powershell.c +++ b/ctags/parsers/powershell.c @@ -139,7 +139,7 @@ static void makeFunctionTag (const tokenInfo *const token, const vString *const initPowerShellEntry (&e, token, K_FUNCTION, access); if (arglist) - e.extensionFields.arglist = vStringValue (arglist); + e.extensionFields.signature = vStringValue (arglist); makeTagEntry (&e); } diff --git a/ctags/parsers/python.c b/ctags/parsers/python.c index 0c3ce4ad7..5d164de2e 100644 --- a/ctags/parsers/python.c +++ b/ctags/parsers/python.c @@ -114,7 +114,7 @@ static void makeFunctionTag (vString *const function, tag.kindName = PythonKinds[K_FUNCTION].name; tag.kind = PythonKinds[K_FUNCTION].letter; - tag.extensionFields.arglist = arglist; + tag.extensionFields.signature = arglist; if (vStringLength (parent) > 0) { diff --git a/ctags/parsers/rust.c b/ctags/parsers/rust.c index 508c3b34f..0158773a2 100644 --- a/ctags/parsers/rust.c +++ b/ctags/parsers/rust.c @@ -447,7 +447,7 @@ static void addTag (vString* ident, const char* type, const char* arg_list, int tag.kindName = rustKinds[kind].name; tag.kind = rustKinds[kind].letter; - tag.extensionFields.arglist = arg_list; + tag.extensionFields.signature = arg_list; tag.extensionFields.varType = type; if (parent_kind != K_NONE) { diff --git a/src/tagmanager/tm_source_file.c b/src/tagmanager/tm_source_file.c index b46ef4e6b..3f27e765c 100644 --- a/src/tagmanager/tm_source_file.c +++ b/src/tagmanager/tm_source_file.c @@ -188,8 +188,8 @@ static gboolean init_tag(TMTag *tag, TMSourceFile *file, const tagEntryInfo *tag tag->local = tag_entry->isFileScope; tag->pointerOrder = 0; /* backward compatibility (use var_type instead) */ tag->line = tag_entry->lineNumber; - if (NULL != tag_entry->extensionFields.arglist) - tag->arglist = g_strdup(tag_entry->extensionFields.arglist); + if (NULL != tag_entry->extensionFields.signature) + tag->arglist = g_strdup(tag_entry->extensionFields.signature); if ((NULL != tag_entry->extensionFields.scope[1]) && (0 != tag_entry->extensionFields.scope[1][0])) tag->scope = g_strdup(tag_entry->extensionFields.scope[1]); -- 2.11.4.GIT