mirror of
https://github.com/godotengine/godot.git
synced 2024-11-24 13:12:42 +00:00
Merge pull request #98356 from dustdfg/gdscript_endif_readability_comments
Add some comments to `#endif's` where it helps readability
This commit is contained in:
commit
b5368d5e40
@ -2553,11 +2553,11 @@ void GDScriptLanguage::reload_all_scripts() {
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif // TOOLS_ENABLED
|
||||
}
|
||||
|
||||
reload_scripts(scripts, true);
|
||||
#endif
|
||||
#endif // DEBUG_ENABLED
|
||||
}
|
||||
|
||||
void GDScriptLanguage::reload_scripts(const Array &p_scripts, bool p_soft_reload) {
|
||||
@ -2627,7 +2627,7 @@ void GDScriptLanguage::reload_scripts(const Array &p_scripts, bool p_soft_reload
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif // TOOLS_ENABLED
|
||||
|
||||
for (const KeyValue<ObjectID, List<Pair<StringName, Variant>>> &F : scr->pending_reload_state) {
|
||||
map[F.key] = F.value; //pending to reload, use this one instead
|
||||
@ -2695,7 +2695,7 @@ void GDScriptLanguage::reload_scripts(const Array &p_scripts, bool p_soft_reload
|
||||
//if instance states were saved, set them!
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif // DEBUG_ENABLED
|
||||
}
|
||||
|
||||
void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_soft_reload) {
|
||||
|
@ -5871,7 +5871,7 @@ void GDScriptAnalyzer::is_shadowing(GDScriptParser::IdentifierNode *p_identifier
|
||||
parent = ClassDB::get_parent_class(parent);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif // DEBUG_ENABLED
|
||||
|
||||
GDScriptParser::DataType GDScriptAnalyzer::get_operation_type(Variant::Operator p_operation, const GDScriptParser::DataType &p_a, bool &r_valid, const GDScriptParser::Node *p_source) {
|
||||
// Unary version.
|
||||
|
@ -3534,13 +3534,13 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
||||
return OK;
|
||||
}
|
||||
|
||||
#else
|
||||
#else // !TOOLS_ENABLED
|
||||
|
||||
Error GDScriptLanguage::complete_code(const String &p_code, const String &p_path, Object *p_owner, List<ScriptLanguage::CodeCompletionOption> *r_options, bool &r_forced, String &r_call_hint) {
|
||||
return OK;
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif // TOOLS_ENABLED
|
||||
|
||||
//////// END COMPLETION //////////
|
||||
|
||||
@ -4125,4 +4125,4 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
||||
return ERR_CANT_RESOLVE;
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif // TOOLS_ENABLED
|
||||
|
@ -244,7 +244,7 @@ void GDScriptParser::apply_pending_warnings() {
|
||||
|
||||
pending_warnings.clear();
|
||||
}
|
||||
#endif
|
||||
#endif // DEBUG_ENABLED
|
||||
|
||||
void GDScriptParser::override_completion_context(const Node *p_for_node, CompletionType p_type, Node *p_node, int p_argument) {
|
||||
if (!for_completion) {
|
||||
|
@ -74,13 +74,13 @@
|
||||
return; \
|
||||
}
|
||||
|
||||
#else
|
||||
#else // !DEBUG_ENABLED
|
||||
|
||||
#define VALIDATE_ARG_COUNT(m_count)
|
||||
#define VALIDATE_ARG_INT(m_arg)
|
||||
#define VALIDATE_ARG_NUM(m_arg)
|
||||
|
||||
#endif
|
||||
#endif // DEBUG_ENABLED
|
||||
|
||||
struct GDScriptUtilityFunctionsDefinitions {
|
||||
#ifndef DISABLE_DEPRECATED
|
||||
|
@ -397,32 +397,36 @@ void (*type_init_function_table[])(Variant *) = {
|
||||
#define OPCODES_OUT \
|
||||
OPSOUT:
|
||||
#define OPCODE_SWITCH(m_test) goto *switch_table_ops[m_test];
|
||||
|
||||
#ifdef DEBUG_ENABLED
|
||||
#define DISPATCH_OPCODE \
|
||||
last_opcode = _code_ptr[ip]; \
|
||||
goto *switch_table_ops[last_opcode]
|
||||
#else
|
||||
#else // !DEBUG_ENABLED
|
||||
#define DISPATCH_OPCODE goto *switch_table_ops[_code_ptr[ip]]
|
||||
#endif
|
||||
#endif // DEBUG_ENABLED
|
||||
|
||||
#define OPCODE_BREAK goto OPSEXIT
|
||||
#define OPCODE_OUT goto OPSOUT
|
||||
#else
|
||||
#else // !(defined(__GNUC__) || defined(__clang__))
|
||||
#define OPCODES_TABLE
|
||||
#define OPCODE(m_op) case m_op:
|
||||
#define OPCODE_WHILE(m_test) while (m_test)
|
||||
#define OPCODES_END
|
||||
#define OPCODES_OUT
|
||||
#define DISPATCH_OPCODE continue
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#define OPCODE_SWITCH(m_test) \
|
||||
__assume(m_test <= OPCODE_END); \
|
||||
switch (m_test)
|
||||
#else
|
||||
#else // !_MSC_VER
|
||||
#define OPCODE_SWITCH(m_test) switch (m_test)
|
||||
#endif
|
||||
#endif // _MSC_VER
|
||||
|
||||
#define OPCODE_BREAK break
|
||||
#define OPCODE_OUT break
|
||||
#endif
|
||||
#endif // defined(__GNUC__) || defined(__clang__)
|
||||
|
||||
// Helpers for VariantInternal methods in macros.
|
||||
#define OP_GET_BOOL get_bool
|
||||
@ -663,7 +667,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
|
||||
OPCODE_BREAK; \
|
||||
}
|
||||
|
||||
#else
|
||||
#else // !DEBUG_ENABLED
|
||||
#define GD_ERR_BREAK(m_cond)
|
||||
#define CHECK_SPACE(m_space)
|
||||
|
||||
@ -676,7 +680,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
|
||||
OPCODE_BREAK; \
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif // DEBUG_ENABLED
|
||||
|
||||
#define LOAD_INSTRUCTION_ARGS \
|
||||
int instr_arg_count = _code_ptr[ip + 1]; \
|
||||
@ -1965,7 +1969,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
|
||||
err_text = _get_call_error("function '" + methodstr + (is_callable ? "" : "' in base '" + basestr) + "'", (const Variant **)argptrs, temp_ret, err);
|
||||
OPCODE_BREAK;
|
||||
}
|
||||
#endif
|
||||
#endif // DEBUG_ENABLED
|
||||
|
||||
ip += 3;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user