Adapt overlooked instances of zero-based column numbers

(cherry picked from commit 1b3dcac281)
This commit is contained in:
Pedro J. Estébanez 2016-10-13 12:57:14 +02:00 committed by Rémi Verschelde
parent a418304def
commit 2261c65f19

View file

@ -277,7 +277,7 @@ void GDTokenizerText::_advance() {
case '\n': { case '\n': {
line++; line++;
INCPOS(1); INCPOS(1);
column=0; column=1;
int i=0; int i=0;
while(GETCHAR(i)==' ' || GETCHAR(i)=='\t') { while(GETCHAR(i)==' ' || GETCHAR(i)=='\t') {
i++; i++;
@ -298,7 +298,7 @@ void GDTokenizerText::_advance() {
} }
} }
INCPOS(1); INCPOS(1);
column=0; column=1;
line++; line++;
int i=0; int i=0;
while(GETCHAR(i)==' ' || GETCHAR(i)=='\t') { while(GETCHAR(i)==' ' || GETCHAR(i)=='\t') {
@ -330,7 +330,7 @@ void GDTokenizerText::_advance() {
break; break;
} else if (_code[pos]=='\n') { } else if (_code[pos]=='\n') {
new_line++; new_line++;
new_col=0; new_col=1;
} else { } else {
new_col++; new_col++;
} }
@ -353,7 +353,7 @@ void GDTokenizerText::_advance() {
} }
} }
INCPOS(1); INCPOS(1);
column=0; column=1;
line++; line++;
continue; continue;
@ -649,7 +649,7 @@ void GDTokenizerText::_advance() {
} else { } else {
if (CharType(GETCHAR(i))=='\n') { if (CharType(GETCHAR(i))=='\n') {
line++; line++;
column=0; column=1;
} }
str+=CharType(GETCHAR(i)); str+=CharType(GETCHAR(i));