operator: record the base position on matchloc objects

Signed-off-by: Masatake YAMATO <[email protected]>
universal-ctags · Dec 12, 2022 · 6c8ce10 · 6c8ce10
1 parent 1a9f953
commit 6c8ce10
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/main/lregex.c b/main/lregex.c
@@ -3539,17 +3539,18 @@ static matchLoc *make_mloc (scriptWindow *window, int group, bool start)
 	matchLoc *mloc = xMalloc (1, matchLoc);
 	if (window->patbuf->regptype == REG_PARSER_SINGLE_LINE)
 	{
+		mloc->base  = 0;
 		mloc->delta = 0;
 		mloc->line = getInputLineNumber ();
 		mloc->pos = getInputFilePosition ();
 	}
 	else
 	{
+		mloc->base  = window->line - window->start;
 		mloc->delta = (start
 					   ? window->pmatch [group].rm_so
 					   : window->pmatch [group].rm_eo);
-		off_t offset = (window->line + mloc->delta) - window->start;
-		mloc->line = getInputLineNumberForFileOffset (offset);
+		mloc->line = getInputLineNumberForFileOffset (mloc->base + mloc->delta);
 		mloc->pos  = getInputFilePositionForLine (mloc->line);
 	}
 	return mloc;

diff --git a/main/script_p.h b/main/script_p.h
@@ -52,7 +52,11 @@ extern void      optscriptHelp          (OptVM *vm, FILE *fp, EsObject *procdocs
 extern xtagType optscriptGetXtagType (const EsObject *extra);
 
 typedef struct {
-	unsigned long delta;		/* for _advanceto operator */
+	unsigned long base;			/* useless when the parser type is
+								 * REG_PARSER_SINGLE_LINE.
+								 * base + delta is the file offset. */
+	unsigned long delta;		/* for _advanceto operator, relateive from
+								 * the base. */
 	unsigned long line;
 	MIOPos pos;
 } matchLoc;