summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2016-11-06 12:07:02 +0100
committerGitHub <noreply@github.com>2016-11-06 12:07:02 +0100
commit57cc953cffc1fa7d8a1e0b44436b4ed8090dfd50 (patch)
tree54e57c09d7bc2d604fd47785a2b84573bc7ca640
parent415f5a7cfe1d60b68af4b969bb81cc7490d960c2 (diff)
parent074bcb2a7bb770414713b9672dd6c609556b2d3d (diff)
Merge pull request #7028 from bojidar-bg/gdscript-multiline-comment-fixup
Make GDScript parser ignore floating strings in class definition
-rw-r--r--modules/gdscript/gd_parser.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp
index 434f918355..131b9a0853 100644
--- a/modules/gdscript/gd_parser.cpp
+++ b/modules/gdscript/gd_parser.cpp
@@ -3375,7 +3375,16 @@ void GDParser::_parse_class(ClassNode *p_class) {
} break;
-
+
+ case GDTokenizer::TK_CONSTANT: {
+ if(tokenizer->get_token_constant().get_type() == Variant::STRING) {
+ tokenizer->advance();
+ // Ignore
+ } else {
+ _set_error(String()+"Unexpected constant of type: "+Variant::get_type_name(tokenizer->get_token_constant().get_type()));
+ return;
+ }
+ } break;
default: {