[PATCH] srcpos: drop special handling of tab

[PATCH] srcpos: drop special handling of tab

[Julia Lawall]

Align column number with those reported by gcc.  Thus, do not make a tab
count as 8 spaces.

Signed-off-by: Julia Lawall <Julia.Lawall-L2FTfq7BK8M@public.gmane.org>
---

This replaces the patch about correcting column numbers.  That one should
be dropped.  This one, with the starting column as column 1 and no
expansion of tabs, follows the strategy of gcc.

julia

 srcpos.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/srcpos.c b/srcpos.c
index 9d38459..cb6ed0e 100644
--- a/srcpos.c
+++ b/srcpos.c
@@ -209,8 +209,6 @@ struct srcpos srcpos_empty = {
 	.file = NULL,
 };

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

Re: [PATCH] srcpos: drop special handling of tab

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1416 bytes --]

On Mon, Jan 22, 2018 at 09:08:45AM +0100, Julia Lawall wrote:
> Align column number with those reported by gcc.  Thus, do not make a tab
> count as 8 spaces.
> 
> Signed-off-by: Julia Lawall <Julia.Lawall-L2FTfq7BK8M@public.gmane.org>
> ---
> 
> This replaces the patch about correcting column numbers.  That one should
> be dropped.  This one, with the starting column as column 1 and no
> expansion of tabs, follows the strategy of gcc.

Applied, thanks.

> 
> julia
> 
>  srcpos.c | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/srcpos.c b/srcpos.c
> index 9d38459..cb6ed0e 100644
> --- a/srcpos.c
> +++ b/srcpos.c
> @@ -209,8 +209,6 @@ struct srcpos srcpos_empty = {
>  	.file = NULL,
>  };
> 
> -#define TAB_SIZE      8
> -
>  void srcpos_update(struct srcpos *pos, const char *text, int len)
>  {
>  	int i;
> @@ -224,9 +222,6 @@ void srcpos_update(struct srcpos *pos, const char *text, int len)
>  		if (text[i] == '\n') {
>  			current_srcfile->lineno++;
>  			current_srcfile->colno = 1;
> -		} else if (text[i] == '\t') {
> -			current_srcfile->colno =
> -				ALIGN(current_srcfile->colno, TAB_SIZE);
>  		} else {
>  			current_srcfile->colno++;
>  		}

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]