main,refactor: don't access lineNumber member of tag entries directrl…

…y when setting

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

main/entry.c

@@ -1559,6 +1559,14 @@ static int queueTagEntry (const tagEntryInfo *const tag)
 	return corkIndex;
 }
 
+extern void updateTagLine (tagEntryInfo *tag, unsigned long lineNumber,
+						   MIOPos filePosition)
+{
+	tag->lineNumber = lineNumber;
+	tag->filePosition = filePosition;
+	tag->boundaryInfo = getNestedInputBoundaryInfo (lineNumber);
+}
+
 extern void setTagEndLine(tagEntryInfo *tag, unsigned long endLine)
 {
 	if (endLine != 0 && endLine < tag->lineNumber)
@@ -1910,9 +1918,8 @@ extern int makeQualifiedTagEntry (const tagEntryInfo *const e)
 extern void setTagPositionFromTag (tagEntryInfo *const dst,
 								   const tagEntryInfo *const src)
 {
-		dst->lineNumber = src->lineNumber;
-		dst->boundaryInfo = src->boundaryInfo;
-		dst->filePosition = src->filePosition;
+	updateTagLine (dst, src->lineNumber, src->filePosition);
+	dst->boundaryInfo = src->boundaryInfo;
 }
 
 static void initTagEntryFull (tagEntryInfo *const e, const char *const name,

main/entry.h

@@ -69,7 +69,8 @@ struct sTagEntryInfo {
 											* Set in the cork queue; don't touch this.*/
 	unsigned int boundaryInfo: 2; /* info about nested input stream */
 
-	unsigned long lineNumber;     /* line number of tag */
+	unsigned long lineNumber;     /* line number of tag;
+									 use updateTagLine() for updating this member. */
 	const char* pattern;	      /* pattern for locating input line
 				       * (may be NULL if not present) *//*  */
 	MIOPos      filePosition;     /* file position of line containing tag */
@@ -241,6 +242,7 @@ int           anyKindsEntryInScopeRecursive (int corkIndex,
 											 const int * kinds, int count,
 											 bool onlyDefinitionTag);
 
+extern void    updateTagLine(tagEntryInfo *tag, unsigned long lineNumber, MIOPos filePosition);
 extern void    setTagEndLine (tagEntryInfo *tag, unsigned long endLine);
 extern void    setTagEndLineToCorkEntry (int corkIndex, unsigned long endLine);
 

main/field.c

@@ -1889,10 +1889,7 @@ static EsObject* setFieldValueForLineCommon (tagEntryInfo *tag, const fieldDefin
 	if (fdef->ftype == FIELD_END_LINE)
 		setTagEndLine(tag, (unsigned long)l);
 	else
-	{
-		tag->lineNumber = l;
-		tag->filePosition = getInputFilePositionForLine (l);
-	}
+		updateTagLine (tag, l, getInputFilePositionForLine (l));
 
 	return es_false;
 }

main/lregex.c

@@ -409,10 +409,7 @@ static void initRegexTag (tagEntryInfo *e,
 	e->extensionFields.scopeIndex = scopeIndex;
 	markTagAsPlaceholder(e, placeholder);
 	if (line)
-	{
-		e->lineNumber = line;
-		e->filePosition = *pos;
-	}
+		updateTagLine(e, line, *pos);
 
 	if (xtag_type != XTAG_UNKNOWN)
 		markTagExtraBit (e, xtag_type);

main/lxpath.c

@@ -52,8 +52,8 @@ static void simpleXpathMakeTag (xmlNode *node,
 		goto out;
 
 
-	tag.lineNumber = XML_GET_LINE (node);
-	tag.filePosition = getInputFilePositionForLine (tag.lineNumber);
+	unsigned long lineNumber = XML_GET_LINE (node);
+	updateTagLine(&tag, lineNumber, getInputFilePositionForLine (lineNumber));
 
 	path = (char *)xmlGetNodePath (node);
 	tag.extensionFields.xpath = path;

parsers/ada.c

@@ -1499,8 +1499,8 @@ static adaTokenInfo *adaParseVariables (adaTokenInfo *parent, adaKind kind)
 
 					/* now set the proper line and file position counts for this
 					 * new token */
-					token->tag.lineNumber = lineNum + filePosIndex;
-					token->tag.filePosition = filePos[filePosIndex];
+					updateTagLine (&token->tag, lineNum + filePosIndex,
+								   filePos[filePosIndex]);
 				}
 				tokenStart = -1;
 			}
@@ -1526,8 +1526,8 @@ static adaTokenInfo *adaParseVariables (adaTokenInfo *parent, adaKind kind)
 
 			/* now set the proper line and file position counts for this
 			 * new token */
-			token->tag.lineNumber = lineNum + filePosIndex;
-			token->tag.filePosition = filePos[filePosIndex];
+			updateTagLine (&token->tag, lineNum + filePosIndex,
+						   filePos[filePosIndex]);
 		}
 	}
 
@@ -1931,8 +1931,7 @@ static adaTokenInfo *adaParse (adaParseMode mode, adaTokenInfo *parent)
 				token = newAdaToken (NULL, 0, ADA_KIND_ANONYMOUS, false, parent);
 
 				/* save the correct starting line */
-				token->tag.lineNumber = matchLineNum;
-				token->tag.filePosition = matchFilePos;
+				updateTagLine (&token->tag, matchLineNum, matchFilePos);
 
 				adaParse (ADA_DECLARATIONS, token);
 			}
@@ -1947,8 +1946,7 @@ static adaTokenInfo *adaParse (adaParseMode mode, adaTokenInfo *parent)
 				token = newAdaToken (NULL, 0, ADA_KIND_ANONYMOUS, false, parent);
 
 				/* save the correct starting line */
-				token->tag.lineNumber = matchLineNum;
-				token->tag.filePosition = matchFilePos;
+				updateTagLine (&token->tag, matchLineNum, matchFilePos);
 
 				adaParse (ADA_CODE, token);
 			}
@@ -2029,8 +2027,7 @@ static adaTokenInfo *adaParse (adaParseMode mode, adaTokenInfo *parent)
 									 ADA_KIND_ANONYMOUS, false, parent);
 
 				/* save the correct starting line */
-				token->tag.lineNumber = matchLineNum;
-				token->tag.filePosition = matchFilePos;
+				updateTagLine (&token->tag, matchLineNum, matchFilePos);
 
 				/* parse the loop body */
 				skipWhiteSpace ();

parsers/asciidoc.c

@@ -103,8 +103,8 @@ static int makeAsciidocTag (const vString* const name, const int kind, const boo
 			if (e.lineNumber > 1)
 			{
 				unsigned long lineNumber = e.lineNumber - 1;
-				e.lineNumber = lineNumber;
-				e.filePosition = getInputFilePositionForLine(lineNumber);
+				updateTagLine (&e, lineNumber,
+							   getInputFilePositionForLine(lineNumber));
 			}
 		}
 

parsers/bibtex.c

@@ -175,8 +175,7 @@ static void makeBibTag (tokenInfo *const token, bibKind kind)
 		tagEntryInfo e;
 		initTagEntry (&e, name, kind);
 
-		e.lineNumber   = token->lineNumber;
-		e.filePosition = token->filePosition;
+		updateTagLine (&e, token->lineNumber, token->filePosition);
 
 		makeTagEntry (&e);
 	}

parsers/c-based.c

@@ -1239,8 +1239,7 @@ static int makeTag (const tokenInfo *const token,
 		else
 			initRefTagEntry (&e, vStringValue (token->name), kind, role);
 
-		e.lineNumber	= token->lineNumber;
-		e.filePosition	= token->filePosition;
+		updateTagLine (&e, token->lineNumber,  token->filePosition);
 		e.isFileScope	= isFileScope;
 		if (e.isFileScope)
 			markTagExtraBit (&e, XTAG_FILE_SCOPE);

parsers/c.c

@@ -1480,8 +1480,7 @@ static int makeTag (const tokenInfo *const token,
 		else
 			initRefTagEntry (&e, vStringValue (token->name), kind, role);
 
-		e.lineNumber	= token->lineNumber;
-		e.filePosition	= token->filePosition;
+		updateTagLine (&e, token->lineNumber, token->filePosition);
 		e.isFileScope	= isFileScope;
 		if (e.isFileScope)
 			markTagExtraBit (&e, XTAG_FILE_SCOPE);

parsers/cobol.c

@@ -242,8 +242,7 @@ static void initCOBOLRefTagEntry (tagEntryInfo *e, const char *name,
 								  const cobolKind kind, const int role)
 {
 	initRefTagEntry (e, name, kind, role);
-	e->lineNumber = CblInputState.lineNumber;
-	e->filePosition = CblInputState.filePosition;
+	updateTagLine (e, CblInputState.lineNumber, CblInputState.filePosition);
 }
 
 static void initCOBOLTagEntry (tagEntryInfo *e, const char *name, const cobolKind kind)

parsers/cpreprocessor.c

@@ -980,8 +980,7 @@ static int directiveDefine (const int c, bool undef)
 				tagEntryInfo *e = getEntryInCorkQueue (r);
 				if (e)
 				{
-					e->lineNumber = lineNumber;
-					e->filePosition = filePosition;
+					updateTagLine (e, lineNumber, filePosition);
 					patchScopeFieldOfParameters (param_start, param_end, r);
 				}
 			}

parsers/css.c

@@ -227,8 +227,7 @@ static void findCssTags (void)
 				tagEntryInfo e;
 				initTagEntry (&e, vStringValue (selector), kind);
 
-				e.lineNumber	= lineNumber;
-				e.filePosition	= filePosition;
+				updateTagLine (&e, lineNumber, filePosition);
 
 				makeTagEntry (&e);
 			}

parsers/cxx/cxx_qtmoc.c

@@ -89,8 +89,7 @@ static void qtMocMakeTagForProperty (CXXToken * pToken, const char *pszType)
 	initTagEntry(&tag,
 				 vStringValue(pToken->pszWord),
 				 K_PROPERTY);
-	tag.lineNumber = pToken->iLineNumber;
-	tag.filePosition = pToken->oFilePosition;
+	updateTagLine (&tag, pToken->iLineNumber, pToken->oFilePosition);
 	tag.isFileScope = false;
 
 	if(!cxxScopeIsGlobal())

parsers/cxx/cxx_tag.c

@@ -315,8 +315,7 @@ tagEntryInfo * cxxTagBegin(unsigned int uKind,CXXToken * pToken)
 			uKind
 		);
 
-	g_oCXXTag.lineNumber = pToken->iLineNumber;
-	g_oCXXTag.filePosition = pToken->oFilePosition;
+	updateTagLine (&g_oCXXTag, pToken->iLineNumber, pToken->oFilePosition);
 	g_oCXXTag.isFileScope = false;
 
 	if(!cxxScopeIsGlobal())

parsers/dtd.c

@@ -291,8 +291,7 @@ static int makeDtdTagMaybe (tagEntryInfo *const e, tokenInfo *const token,
 	initRefTagEntry (e, tokenString (token),
 					 kind,
 					 role);
-	e->lineNumber = token->lineNumber;
-	e->filePosition = token->filePosition;
+	updateTagLine (e, token->lineNumber, token->filePosition);
 	e->extensionFields.scopeIndex = DTD (token)->scopeIndex;
 
 	return makeTagEntry (e);

parsers/flex.c

@@ -327,8 +327,7 @@ static void makeConstTag (tokenInfo *const token, const flexKind kind)
 
 		initRefTagEntry (&e, name, kind, role);
 
-		e.lineNumber   = token->lineNumber;
-		e.filePosition = token->filePosition;
+		updateTagLine (&e, token->lineNumber, token->filePosition);
 
 		if ( vStringLength(token->scope) > 0 )
 		{

parsers/fortran.c

@@ -622,8 +622,7 @@ static void makeFortranTag (tokenInfo *const token, tagType tag)
 		if (token->anonymous)
 			markTagExtraBit (&e, XTAG_ANONYMOUS);
 
-		e.lineNumber	= token->lineNumber;
-		e.filePosition	= token->filePosition;
+		updateTagLine (&e, token->lineNumber, token->filePosition);
 		e.isFileScope	= isFileScope (token->tag);
 		if (e.isFileScope)
 			markTagExtraBit (&e, XTAG_FILE_SCOPE);

parsers/gdscript.c

@@ -210,9 +210,7 @@ static void initGDScriptEntry (tagEntryInfo *const e, const tokenInfo *const tok
 	NestingLevel *nl;
 
 	initTagEntry (e, vStringValue (token->string), kind);
-
-	e->lineNumber	= token->lineNumber;
-	e->filePosition	= token->filePosition;
+	updateTagLine (e, token->lineNumber, token->filePosition);
 
 	nl = nestingLevelsGetCurrent (GDScriptNestingLevels);
 	if (nl)
@@ -322,9 +320,7 @@ static int makeSimpleGDScriptRefTag (const tokenInfo *const token,
 
 		initRefTagEntry (&e, vStringValue (token->string),
 						 kind, roleIndex);
-
-		e.lineNumber	= token->lineNumber;
-		e.filePosition	= token->filePosition;
+		updateTagLine (&e, token->lineNumber, token->filePosition);
 
 		if (xtag != XTAG_UNKNOWN)
 			markTagExtraBit (&e, xtag);

parsers/go.c

@@ -693,8 +693,7 @@ static int makeTagFull (tokenInfo *const token, const goKind kind,
 
 	initRefTagEntry (&e, name, kind, role);
 
-	e.lineNumber = token->lineNumber;
-	e.filePosition = token->filePosition;
+	updateTagLine (&e, token->lineNumber, token->filePosition);
 	if (argList)
 		e.extensionFields.signature = argList;
 	if (typeref)

parsers/jscript.c

@@ -470,8 +470,7 @@ static int makeJsRefTagsForNameChain (char *name_chain, const tokenInfo *token,
 		}
 
 		initRefTagEntry (&e, name, kind, role);
-		e.lineNumber = token->lineNumber;
-		e.filePosition = token->filePosition;
+		updateTagLine (&e, token->lineNumber, token->filePosition);
 		e.extensionFields.scopeIndex = scope;
 
 		index = makeTagEntry (&e);
@@ -525,8 +524,7 @@ static int makeJsTagCommon (const tokenInfo *const token, const jsKind kind,
 
 	tagEntryInfo e;
 	initTagEntry (&e, name, kind);
-	e.lineNumber   = token->lineNumber;
-	e.filePosition = token->filePosition;
+	updateTagLine (&e, token->lineNumber, token->filePosition);
 	e.extensionFields.scopeIndex = scope;
 
 #ifdef DO_TRACING

parsers/json.c

@@ -128,8 +128,7 @@ static void makeJsonTag (tokenInfo *const token, const jsonKind kind)
 
 	initTagEntry (&e, vStringValue (token->string), kind);
 
-	e.lineNumber	= token->lineNumber;
-	e.filePosition	= token->filePosition;
+	updateTagLine (&e, token->lineNumber, token->filePosition);
 
 	if (vStringLength (token->scope) > 0)
 	{

parsers/julia.c

@@ -874,8 +874,7 @@ static void addTag (vString* ident, const char* type, const char* arg_list, int
     tagEntryInfo tag;
     initTagEntry(&tag, vStringValue(ident), kind);
 
-    tag.lineNumber = line;
-    tag.filePosition = pos;
+    updateTagLine(&tag, line, pos);
     tag.sourceFileName = getInputFileName();
 
     tag.extensionFields.signature = arg_list;
@@ -896,8 +895,7 @@ static void addReferenceTag (vString* ident, int kind, int role, unsigned long l
     }
     tagEntryInfo tag;
     initRefTagEntry(&tag, vStringValue(ident), kind, role);
-    tag.lineNumber = line;
-    tag.filePosition = pos;
+    updateTagLine(&tag, line, pos);
     if (parent_kind != K_NONE)
     {
         tag.extensionFields.scopeKindIndex = parent_kind;

parsers/ldscript.c

@@ -200,8 +200,7 @@ static int makeLdScriptTagMaybe (tagEntryInfo *const e, tokenInfo *const token,
 	initRefTagEntry (e, tokenString (token),
 					 kind,
 					 role);
-	e->lineNumber = token->lineNumber;
-	e->filePosition = token->filePosition;
+	updateTagLine (e, token->lineNumber, token->filePosition);
 	e->extensionFields.scopeIndex = LDSCRIPT (token)->scopeIndex;
 
 	/* TODO: implement file: field. */

parsers/markdown.c

@@ -117,8 +117,7 @@ static int makeMarkdownTag (const vString* const name, const int kind, const boo
 			if (e.lineNumber > 1)
 			{
 				unsigned long lineNumber = e.lineNumber - 1;
-				e.lineNumber = lineNumber;
-				e.filePosition = getInputFilePositionForLine (lineNumber);
+				updateTagLine (&e, lineNumber, getInputFilePositionForLine (lineNumber));
 			}
 		}
 

parsers/maven2.c

@@ -78,8 +78,9 @@ static void makeTagForProperties (xmlNode *node,
 
 	str = node->name;
 	initTagEntry (&tag, (char *)str, K_PROPERTY);
-	tag.lineNumber = xmlGetLineNo (node);
-	tag.filePosition = getInputFilePositionForLine (tag.lineNumber);
+
+	unsigned long lineNumber = xmlGetLineNo (node);
+	updateTagLine (&tag, lineNumber, getInputFilePositionForLine (lineNumber));
 
 	makeTagEntry (&tag);
 }

parsers/ocaml.c

@@ -898,8 +898,7 @@ static void prepareTag (tagEntryInfo * tag, vString const *name, int kind)
 	/* Ripped out of read.h initTagEntry, because of line number
 	 * shenanigans.
 	 * Ugh. Lookahead is harder than I expected. */
-	tag->lineNumber = ocaLineNumber;
-	tag->filePosition = ocaFilePosition;
+	updateTagLine(tag, ocaLineNumber, ocaFilePosition);
 
 	parentIndex = getLastNamedIndex ();
 	if (parentIndex >= 0)

parsers/perl-moose.c

@@ -279,8 +279,7 @@ static void enterMoose (struct mooseSubparser *moose, bool role)
 
 	tagEntryInfo moose_e;
 	initTagEntry (&moose_e, perl_e->name, role? K_ROLE: K_CLASS);
-	moose_e.lineNumber = perl_e->lineNumber;
-	moose_e.filePosition = perl_e->filePosition;
+	updateTagLine(&moose_e, perl_e->lineNumber, perl_e->filePosition);
 	moose->classCork = makeTagEntry (&moose_e);
 	vStringClear (moose->supersOrRoles);