mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gdscript/gd_tokenizer.cpp
View File

@ -282,7 +282,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++;
@ -303,7 +303,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') {
@ -335,7 +335,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++;
} }
@ -358,7 +358,7 @@ void GDTokenizerText::_advance() {
} }
} }
INCPOS(1); INCPOS(1);
column=0; column=1;
line++; line++;
continue; continue;
@ -654,7 +654,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));