Merge pull request #6815 from RandomShaper/one-based-col-numbers-2

Adapt overlooked instances of zero-based column numbers
This commit is contained in:
George Marques 2016-10-13 13:51:23 -03:00 committed by GitHub
commit 6c0be2c017

View File

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