diff options
| author | George Marques <george@gmarqu.es> | 2016-10-13 13:51:23 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-13 13:51:23 -0300 |
| commit | 6c0be2c017e605c2106823e80e5aaa78fc68aba5 (patch) | |
| tree | da6f9cdbe1d4af38c17cd6a590e2ec51c21ea186 | |
| parent | 98ad32c1677575e9c31876d132c90423539aa3d3 (diff) | |
| parent | 1b3dcac28145bfc6cc1bf2327852209155f59082 (diff) | |
Merge pull request #6815 from RandomShaper/one-based-col-numbers-2
Adapt overlooked instances of zero-based column numbers
| -rw-r--r-- | modules/gdscript/gd_tokenizer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/gdscript/gd_tokenizer.cpp b/modules/gdscript/gd_tokenizer.cpp index 383a092d96..39c4530d96 100644 --- a/modules/gdscript/gd_tokenizer.cpp +++ b/modules/gdscript/gd_tokenizer.cpp @@ -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)); |