gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-05 00:58:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #823 from grabiller/#821

Browse source 
Fix issue #821: GDScript now accepts single quoted as well as double quoted strings.
This commit is contained in:
Juan Linietsky 2014-10-27 22:44:53 -03:00
parent b42ced68e8 f1744c8c31
commit 9608d4255e
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/gdscript/gd_tokenizer.cpp
View file

@ -237,7 +237,9 @@ void GDTokenizerText::_advance() {
while (true) {
bool is_node_path=false;
bool is_node_path = false;
bool is_string = false;
bool is_string_alt = false;
switch(GETCHAR(0)) {
case 0:
@ -527,13 +529,17 @@ void GDTokenizerText::_advance() {
}
} break;
case '@':
if (CharType(GETCHAR(1))!='"') {
if( CharType(GETCHAR(1))!='"' && CharType(GETCHAR(1))!='\'' ) {
_make_error("Unexpected '@'");
return;
}
INCPOS(1);
is_node_path=true;
case '\'':
is_string_alt = true;
case '"': {
is_string = is_string_alt ? false : true;
int i=1;
String str;
@ -542,8 +548,10 @@ void GDTokenizerText::_advance() {
_make_error("Unterminated String");
return;
} else if (CharType(GETCHAR(i)=='"')) {
} else if( CharType(GETCHAR(i)=='"') && is_string ) {
break;
} else if( CharType(GETCHAR(i)=='\'') && is_string_alt ) {
break;
} else if (CharType(GETCHAR(i)=='\\')) {
//escaped characters...
i++;