[geany/geany] f791e9: ctags: Rename Geany-specific tagEntryInfo::arglist to upstream's ::signature

[Jiří Techet]

Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Thu, 28 Jul 2016 19:06:59 UTC
Commit:      f791e91e1884a76754d88b7cd92fff4df3383947
             https://github.com/geany/geany/commit/f791e91e1884a76754d88b7cd92fff4df3383947

Log Message:
-----------
ctags: Rename Geany-specific tagEntryInfo::arglist to upstream's ::signature

Based on patch from Colomban Wendling.


Modified Paths:
--------------
    ctags/main/entry.h
    ctags/main/get.c
    ctags/parsers/c.c
    ctags/parsers/go.c
    ctags/parsers/jscript.c
    ctags/parsers/pascal.c
    ctags/parsers/php.c
    ctags/parsers/powershell.c
    ctags/parsers/python.c
    ctags/parsers/rust.c
    src/tagmanager/tm_source_file.c

Modified: ctags/main/entry.h
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -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;


Modified: ctags/main/get.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -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);
 	}
 }
 


Modified: ctags/parsers/c.c
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -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);
 	}
 }
 


Modified: ctags/parsers/go.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -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;
 


Modified: ctags/parsers/jscript.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -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);


Modified: ctags/parsers/pascal.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -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


Modified: ctags/parsers/php.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -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);
 	}


Modified: ctags/parsers/powershell.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -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);
 	}


Modified: ctags/parsers/python.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -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)
 	{


Modified: ctags/parsers/rust.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -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)
 	{


Modified: src/tagmanager/tm_source_file.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -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]);



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).