diff options
| author | Anton Yabchinskiy <arn@bestmx.ru> | 2015-02-20 13:41:37 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy <arn@bestmx.ru> | 2015-02-20 13:41:37 +0300 |
| commit | 19a99afa81354ed69e1c07b6050aeb438e4ee2cb (patch) | |
| tree | ff1bd5e8aa7179af55975952d2f5885c7abb09a2 /modules/gdscript/gd_tokenizer.cpp | |
| parent | 2735deb0cf1301a9fd1e6d008b7db3d028563aa7 (diff) | |
| parent | 31e076d16affca682e956c966c0a8f9218a2b192 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'modules/gdscript/gd_tokenizer.cpp')
| -rw-r--r-- | modules/gdscript/gd_tokenizer.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/gdscript/gd_tokenizer.cpp b/modules/gdscript/gd_tokenizer.cpp index 6f968f2080..1979577a17 100644 --- a/modules/gdscript/gd_tokenizer.cpp +++ b/modules/gdscript/gd_tokenizer.cpp @@ -538,9 +538,12 @@ void GDTokenizerText::_advance() { is_node_path=true; case '\'': - string_mode=STRING_SINGLE_QUOTE; case '"': { - + + if (GETCHAR(0)=='\'') + string_mode=STRING_SINGLE_QUOTE; + + int i=1; if (string_mode==STRING_DOUBLE_QUOTE && GETCHAR(i)=='"' && GETCHAR(i+1)=='"') { i+=2; |