[PATCH] srcpos: correct column numbers

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]



The start of a line is column 0, at least according to emacs.

Every character counts, so need to increment by 1 before adjusting for tab.

Signed-off-by: Julia Lawall <Julia.Lawall@xxxxxxx>
---
 srcpos.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpos.c b/srcpos.c
index 9d38459..e8fced9 100644
--- a/srcpos.c
+++ b/srcpos.c
@@ -154,7 +154,7 @@ void srcfile_push(const char *fname)
 	srcfile->prev = current_srcfile;

 	srcfile->lineno = 1;
-	srcfile->colno = 1;
+	srcfile->colno = 0;

 	current_srcfile = srcfile;
 }
@@ -223,8 +223,9 @@ void srcpos_update(struct srcpos *pos, const char *text, int len)
 	for (i = 0; i < len; i++)
 		if (text[i] == '\n') {
 			current_srcfile->lineno++;
-			current_srcfile->colno = 1;
+			current_srcfile->colno = 0;
 		} else if (text[i] == '\t') {
+			current_srcfile->colno++;
 			current_srcfile->colno =
 				ALIGN(current_srcfile->colno, TAB_SIZE);
 		} else {
-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe devicetree-compiler" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Device Tree]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]

  Powered by Linux