diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-09 21:53:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-09 21:53:59 +0200 |
| commit | f5371bc6b87a79f2510aa2f5a41204d7d224d2c5 (patch) | |
| tree | 9fa9ab7693194df74503e113d36abf2550bd29f3 /modules/gdscript/gdscript_tokenizer.cpp | |
| parent | c04cdc2bf1b02248c880b17deb2f340cdf89134f (diff) | |
| parent | f6cee4a1215e455f2b1e54ec4e099c7ff12ca475 (diff) | |
| download | redot-engine-f5371bc6b87a79f2510aa2f5a41204d7d224d2c5.tar.gz | |
Merge pull request #37033 from ThakeeNathees/python-like-str-escape
python like string escape implemented
Diffstat (limited to 'modules/gdscript/gdscript_tokenizer.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_tokenizer.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/modules/gdscript/gdscript_tokenizer.cpp b/modules/gdscript/gdscript_tokenizer.cpp index d42ca52731..76f42ead5f 100644 --- a/modules/gdscript/gdscript_tokenizer.cpp +++ b/modules/gdscript/gdscript_tokenizer.cpp @@ -803,19 +803,16 @@ void GDScriptTokenizerText::_advance() { switch (next) { - case 'a': res = 7; break; - case 'b': res = 8; break; - case 't': res = 9; break; - case 'n': res = 10; break; - case 'v': res = 11; break; - case 'f': res = 12; break; - case 'r': res = 13; break; + case 'a': res = '\a'; break; + case 'b': res = '\b'; break; + case 't': res = '\t'; break; + case 'n': res = '\n'; break; + case 'v': res = '\v'; break; + case 'f': res = '\f'; break; + case 'r': res = '\r'; break; case '\'': res = '\''; break; case '\"': res = '\"'; break; case '\\': res = '\\'; break; - case '/': - res = '/'; - break; //wtf case 'u': { // hex number @@ -847,6 +844,10 @@ void GDScriptTokenizerText::_advance() { i += 3; } break; + case '\n': { + line++; + column = 1; + } break; default: { _make_error("Invalid escape sequence"); @@ -854,7 +855,8 @@ void GDScriptTokenizerText::_advance() { } break; } - str += res; + if (next != '\n') + str += res; } else { if (CharType(GETCHAR(i)) == '\n') { |