Merge pull request #3931 from masatake/make--adjust-endline

 Make: fix wrong end fields for targets having macros on the same line

Author: masatake

Units/parser-make.r/same-line.d/args.ctags

@@ -0,0 +1,2 @@
+--sort=no
+--fields=+ne

Units/parser-make.r/same-line.d/expected.tags

@@ -0,0 +1,2 @@
+target	input.mak	/^target: macro = 1$/;"	t	line:2	end:2
+macro	input.mak	/^target: macro = 1$/;"	m	line:2

Units/parser-make.r/same-line.d/input.mak

@@ -0,0 +1,2 @@
+#
+target: macro = 1

main/entry.c

@@ -1625,7 +1625,7 @@ extern void setTagEndLine(tagEntryInfo *tag, unsigned long endLine)
 	{
 		error (WARNING,
 			   "given end line (%lu) for the tag (%s) in the file (%s) is smaller than its start line: %lu",
-			   tag->lineNumber,
+			   endLine,
 			   tag->name,
 			   tag->inputFileName,
 			   tag->lineNumber);

parsers/make.c

@@ -221,6 +221,20 @@ static void endTargets (intArray *targets, unsigned long lnum)
 	intArrayClear (targets);
 }
 
+static bool isTheLastTargetOnTheSameLine (intArray *current_targets,
+										  unsigned long line)
+{
+	if (!intArrayIsEmpty (current_targets))
+	{
+		int r = intArrayLast (current_targets);
+		tagEntryInfo *e = getEntryInCorkQueue (r);
+		if (e && e->lineNumber == line)
+			return true;
+	}
+
+	return false;
+}
+
 static void findMakeTags (void)
 {
 	stringList *identifiers = stringListNew ();
@@ -300,7 +314,10 @@ static void findMakeTags (void)
 			newMacro (stringListItem (identifiers, 0), false, appending);
 
 			in_value = true;
-			endTargets (current_targets, getInputLineNumber () - 1);
+			unsigned long curline = getInputLineNumber ();
+			unsigned long adj = isTheLastTargetOnTheSameLine (current_targets,
+															  curline)? 0: 1;
+			endTargets (current_targets, curline - adj);
 			appending = false;
 		}
 		else if (variable_possible && isIdentifier (c))