[geany/geany] 2161b7: Change isHeaderFile() to isInputHeaderFile()

[Jiří Techet]

Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Sun, 07 Aug 2016 16:22:49 UTC
Commit:      2161b73864973cc63a85526158cea35f59e849a8
             https://github.com/geany/geany/commit/2161b73864973cc63a85526158cea35f59e849a8

Log Message:
-----------
Change isHeaderFile() to isInputHeaderFile()


Modified Paths:
--------------
    ctags/main/lcpp.c
    ctags/main/read.c
    ctags/main/read.h
    ctags/parsers/c.c

Modified: ctags/main/lcpp.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -307,7 +307,7 @@ static boolean popConditional (void)
 
 static void makeDefineTag (const char *const name, boolean parameterized)
 {
-	const boolean isFileScope = (boolean) (! isHeaderFile ());
+	const boolean isFileScope = (boolean) (! isInputHeaderFile ());
 
 	if (includingDefineTags () &&
 		(! isFileScope  ||  Option.include.fileScope))


Modified: ctags/main/read.c
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -92,6 +92,7 @@ static void setSourceFileParameters (vString *const fileName, const langType lan
 		TagFile.max.file = vStringLength (fileName);
 
 	File.source.isHeader = isIncludeFile (vStringValue (fileName));
+	File.input.isHeader = File.source.isHeader;
 	if (language != -1)
 		File.source.language = language;
 	else


Modified: ctags/main/read.h
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -34,7 +34,7 @@
 #define getSourceLanguageName() getLanguageName (File.source.language)
 #define getSourceLineNumber()   File.source.lineNumber
 #define isInputLanguage(lang)    (boolean)((lang) == File.input.language)
-#define isHeaderFile()      File.source.isHeader
+#define isInputHeaderFile()      File.input.isHeader
 
 /*
 *   DATA DECLARATIONS


Modified: ctags/parsers/c.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1436,7 +1436,7 @@ static void makeTag (const tokenInfo *const token,
 #endif
 	/*  Nothing is really of file scope when it appears in a header file.
 	 */
-	isFileScope = (boolean) (isFileScope && ! isHeaderFile ());
+	isFileScope = (boolean) (isFileScope && ! isInputHeaderFile ());
 
 	if (isType (token, TOKEN_NAME)  &&  vStringLength (token->name) > 0  /* &&
 		includeTag (type, isFileScope) */)



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