From 39114178a0952e9f5efee08e23d73d70f3d8d3db Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Sun, 15 Jan 2017 20:00:04 +0100 Subject: Style: Prevent clang-format on JS code --- platform/javascript/javascript_eval.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'platform/javascript/javascript_eval.cpp') diff --git a/platform/javascript/javascript_eval.cpp b/platform/javascript/javascript_eval.cpp index 7bbe0ae99..a79e5473c 100644 --- a/platform/javascript/javascript_eval.cpp +++ b/platform/javascript/javascript_eval.cpp @@ -41,6 +41,7 @@ JavaScript *JavaScript::get_singleton() { Variant JavaScript::eval(const String& p_code, bool p_use_global_exec_context) { union { int i; double d; char* s; } js_data[4]; + /* clang-format off */ Variant::Type return_type = static_cast(EM_ASM_INT({ var eval_ret; @@ -49,8 +50,7 @@ Variant JavaScript::eval(const String& p_code, bool p_use_global_exec_context) { // indirect eval call grants global execution context var global_eval = eval; eval_ret = global_eval(UTF8ToString($2)); - } - else { + } else { eval_ret = eval(UTF8ToString($2)); } } catch (e) { @@ -125,6 +125,7 @@ Variant JavaScript::eval(const String& p_code, bool p_use_global_exec_context) { return 0; // NIL }, js_data, sizeof *js_data, p_code.utf8().get_data(), p_use_global_exec_context)); + /* clang-format on */ switch(return_type) { case Variant::BOOL: @@ -136,7 +137,9 @@ Variant JavaScript::eval(const String& p_code, bool p_use_global_exec_context) { case Variant::STRING: { String str = String::utf8(js_data->s); + /* clang-format off */ EM_ASM_({ _free($0); }, js_data->s); + /* clang-format on */ return str; } case Variant::VECTOR2: -- cgit v1.2.3-70-g09d2