Make: fill end: fields for targets

Signed-off-by: Masatake YAMATO <[email protected]>

Author: masatake

Units/parser-make.r/make.multi-target.d/args.ctags

@@ -0,0 +1 @@
+--fields=+en

Units/parser-make.r/make.multi-target.d/expected.tags

@@ -1,4 +1,4 @@
-all	input.mak	/^all: foo bar$/;"	t
-bar	input.mak	/^foo bar: baz$/;"	t
-baz	input.mak	/^baz:$/;"	t
-foo	input.mak	/^foo bar: baz$/;"	t
+all	input.mak	/^all: foo bar$/;"	t	line:2	end:3
+bar	input.mak	/^foo bar: baz$/;"	t	line:4	end:6
+baz	input.mak	/^baz:$/;"	t	line:7	end:8
+foo	input.mak	/^foo bar: baz$/;"	t	line:4	end:6

parsers/make.c

@@ -19,6 +19,7 @@
 
 #include "entry.h"
 #include "kind.h"
+#include "numarray.h"
 #include "parse.h"
 #include "read.h"
 #include "routines.h"
@@ -124,14 +125,14 @@ static void makeSimpleMakeRefTag (const vString* const name, const int kind,
 	makeSimpleRefTag (name, kind, roleIndex);
 }
 
-static void newTarget (vString *const name)
+static int newTarget (vString *const name)
 {
 	/* Ignore GNU Make's "special targets". */
 	if  (isSpecialTarget (name))
 	{
-		return;
+		return CORK_NIL;
 	}
-	makeSimpleMakeTag (name, K_TARGET);
+	return makeSimpleMakeTag (name, K_TARGET);
 }
 
 static int newMacro (vString *const name, bool with_define_directive, bool appending)
@@ -210,13 +211,25 @@ static void readIdentifier (const int first, vString *const id)
 	ungetcToInputFile (c);
 }
 
+static void endTargets (intArray *targets, unsigned long lnum)
+{
+	for (unsigned int i = 0; i < intArrayCount (targets); i++)
+	{
+		int cork_index = intArrayItem (targets, i);
+		tagEntryInfo *e = getEntryInCorkQueue (cork_index);
+		if (e)
+			e->extensionFields.endLine = lnum;
+	}
+	intArrayClear (targets);
+}
+
 static void findMakeTags (void)
 {
 	stringList *identifiers = stringListNew ();
 	bool newline = true;
 	int  current_macro = CORK_NIL;
 	bool in_value  = false;
-	bool in_rule = false;
+	intArray *current_targets = intArrayNew ();
 	bool variable_possible = true;
 	bool appending = false;
 	int c;
@@ -230,21 +243,21 @@ static void findMakeTags (void)
 	{
 		if (newline)
 		{
-			if (in_rule)
+			if (!intArrayIsEmpty (current_targets))
 			{
 				if (c == '\t' || (c = skipToNonWhite (c)) == '#')
 				{
 					skipLine ();  /* skip rule or comment */
 					c = nextChar ();
 				}
 				else if (c != '\n')
-					in_rule = false;
+					endTargets (current_targets, getInputLineNumber () - 1);
 			}
 			else if (in_value)
 				in_value = false;
 
 			stringListClear (identifiers);
-			variable_possible = (bool)(!in_rule);
+			variable_possible = intArrayIsEmpty (current_targets);
 			newline = false;
 		}
 		if (c == '\n')
@@ -275,9 +288,12 @@ static void findMakeTags (void)
 			{
 				unsigned int i;
 				for (i = 0; i < stringListCount (identifiers); i++)
-					newTarget (stringListItem (identifiers, i));
+				{
+					int r = newTarget (stringListItem (identifiers, i));
+					if (r != CORK_NIL)
+						intArrayAdd (current_targets, r);
+				}
 				stringListClear (identifiers);
-				in_rule = true;
 			}
 		}
 		else if (variable_possible && c == '=' &&
@@ -286,7 +302,7 @@ static void findMakeTags (void)
 			newMacro (stringListItem (identifiers, 0), false, appending);
 
 			in_value = true;
-			in_rule = false;
+			endTargets (current_targets, getInputLineNumber () - 1);
 			appending = false;
 		}
 		else if (variable_possible && isIdentifier (c))
@@ -366,6 +382,9 @@ static void findMakeTags (void)
 			variable_possible = false;
 	}
 
+	endTargets (current_targets, getInputLineNumber ());
+
+	intArrayDelete (current_targets);
 	stringListDelete (identifiers);
 }