godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37033 from ThakeeNathees/python-like-str-escape

Browse Source 
python like string escape implemented
This commit is contained in:
Rémi Verschelde 2020-05-09 21:53:59 +02:00 committed by GitHub
commit f5371bc6b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/gdscript/gdscript_tokenizer.cpp
View File

@ -803,19 +803,16 @@ void GDScriptTokenizerText::_advance() {
switch (next) { switch (next) {
case 'a': res = 7; break; case 'a': res = '\a'; break;
case 'b': res = 8; break; case 'b': res = '\b'; break;
case 't': res = 9; break; case 't': res = '\t'; break;
case 'n': res = 10; break; case 'n': res = '\n'; break;
case 'v': res = 11; break; case 'v': res = '\v'; break;
case 'f': res = 12; break; case 'f': res = '\f'; break;
case 'r': res = 13; break; case 'r': res = '\r'; break;
case '\'': res = '\''; break; case '\'': res = '\''; break;
case '\"': res = '\"'; break; case '\"': res = '\"'; break;
case '\\': res = '\\'; break; case '\\': res = '\\'; break;
case '/':
res = '/';
break; //wtf
case 'u': { case 'u': {
// hex number // hex number
@ -847,6 +844,10 @@ void GDScriptTokenizerText::_advance() {
i += 3; i += 3;
} break; } break;
case '\n': {
line++;
column = 1;
} break;
default: { default: {
_make_error("Invalid escape sequence"); _make_error("Invalid escape sequence");
@ -854,7 +855,8 @@ void GDScriptTokenizerText::_advance() {
} break; } break;
} }
str += res; if (next != '\n')
str += res;
} else { } else {
if (CharType(GETCHAR(i)) == '\n') { if (CharType(GETCHAR(i)) == '\n') {