[geany/geany] 0ec359: Remove makeSimpleScopedTag() and fix scope for conf filetype

[Jiří Techet]

Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Sat, 06 Aug 2016 20:01:05 UTC
Commit:      0ec3590e199eb9f4576eacaffc7785dca2e5f847
             https://github.com/geany/geany/commit/0ec3590e199eb9f4576eacaffc7785dca2e5f847

Log Message:
-----------
Remove makeSimpleScopedTag() and fix scope for conf filetype


Modified Paths:
--------------
    ctags/main/parse.c
    ctags/main/parse.h
    ctags/parsers/conf.c
    ctags/parsers/haxe.c

Modified: ctags/main/parse.c
18 lines changed, 0 insertions(+), 18 deletions(-)
===================================================================
@@ -68,24 +68,6 @@ extern void makeSimpleTag (const vString* const name,
 }
 
 
-extern void makeSimpleScopedTag (const vString* const name,
-								 kindOption* const kinds, const int kind,
-								 const char* scopeKind, const char *scopeName,
-								 const char *laccess)
-{
-	if (name != NULL  &&  vStringLength (name) > 0)
-	{
-		tagEntryInfo e;
-		initTagEntry (&e, vStringValue (name), &(kinds [kind]));
-
-		e.extensionFields.scopeKind = &(kinds [kind]);
-		e.extensionFields.scopeName = scopeName;
-		e.extensionFields.access = laccess;
-
-		makeTagEntry (&e);
-	}
-}
-
 /*
 *   parserDescription mapping management
 */


Modified: ctags/main/parse.h
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -111,7 +111,6 @@ extern void processLegacyKindOption (const char *const parameter);
 
 /* Language processing and parsing */
 extern void makeSimpleTag (const vString* const name, kindOption* const kinds, const int kind);
-extern void makeSimpleScopedTag (const vString* const name, kindOption* const kinds, const int kind, const char* scope, const char* scope2, const char *access);
 
 extern parserDefinition* parserNew (const char* name);
 extern parserDefinition* parserNewFull (const char* name, char fileKind);


Modified: ctags/parsers/conf.c
12 lines changed, 8 insertions(+), 4 deletions(-)
===================================================================
@@ -91,11 +91,15 @@ static void findConfTags (void)
 					++cp;
 				if (*cp == '=')
 				{
+					tagEntryInfo e;
+					initTagEntry (&e, vStringValue (name), &(ConfKinds [K_KEY]));
+
 					if (vStringLength (scope) > 0)
-						makeSimpleScopedTag (name, ConfKinds, K_KEY,
-							"section", vStringValue(scope), NULL);
-					else
-						makeSimpleTag (name, ConfKinds, K_KEY);
+					{
+						e.extensionFields.scopeKind = &(ConfKinds [K_SECTION]);
+						e.extensionFields.scopeName = vStringValue(scope);
+					}
+					makeTagEntry (&e);
 				}
 				vStringClear (name);
 			}


Modified: ctags/parsers/haxe.c
10 lines changed, 0 insertions(+), 10 deletions(-)
===================================================================
@@ -92,11 +92,6 @@ static void findHxTags (void)
 			}
 			vStringTerminate (name);
 			makeSimpleTag (name, HxKinds, HXTAG_VARIABLE);
-			/*
-			 makeSimpleScopedTag(name, HxKinds,
-						HXTAG_VARIABLE,vStringValue(clsName),
-						strdup(vStringValue(scope2)),strdup(vStringValue(laccess)));
-			 */
 
 			vStringClear (name);
 		}
@@ -116,11 +111,6 @@ static void findHxTags (void)
 			}
 			vStringTerminate (name);
 			makeSimpleTag (name, HxKinds, HXTAG_METHODS);
-			/*
-			makeSimpleScopedTag(name, HxKinds, HXTAG_METHODS,
-				strdup(vStringValue(clsName)),strdup(vStringValue(scope2)),strdup(vStringValue(laccess)));
-
-			*/
 
 			vStringClear (name);
 		}



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