diff options
| author | Carl Olsson | 2015-02-22 07:38:06 +1000 |
|---|---|---|
| committer | Carl Olsson | 2015-02-22 07:38:06 +1000 |
| commit | 41686d5fdd0d72f167894f976d19b177789f1f63 (patch) | |
| tree | b8ebdbd9846f54241d23f99304df29dcc6ac4dcf /modules/gdscript/gd_tokenizer.cpp | |
| parent | 402db5bd79bf889fca33b89cb083feb24effc614 (diff) | |
| parent | 1d7337ba10ad593f0786d3e356cf0b05aa9be2b4 (diff) | |
| download | godot-41686d5fdd0d72f167894f976d19b177789f1f63.tar.gz godot-41686d5fdd0d72f167894f976d19b177789f1f63.tar.zst godot-41686d5fdd0d72f167894f976d19b177789f1f63.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot into snapping2
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 6f968f208..1979577a1 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; |