seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix C# glue generation for enums with negative values

Browse Source
This commit is contained in:
RedworkDE
2023-05-12 21:53:42 +02:00
parent 964a5353db
commit 45659ce2d9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/mono/editor/bindings_generator.cpp
View File

@ -128,7 +128,7 @@ void BindingsGenerator::TypeInterface::postsetup_enum_type(BindingsGenerator::Ty
{ {
// The expected types for parameters and return value in ptrcall are 'int64_t' or 'uint64_t'. // The expected types for parameters and return value in ptrcall are 'int64_t' or 'uint64_t'.
r_enum_itype.c_in = "%5%0 %1_in = %1;\n"; r_enum_itype.c_in = "%5%0 %1_in = %1;\n";
r_enum_itype.c_out = "%5return (%0)%1;\n"; r_enum_itype.c_out = "%5return (%0)(%1);\n";
r_enum_itype.c_type = "long"; r_enum_itype.c_type = "long";
r_enum_itype.c_arg_in = "&%s_in"; r_enum_itype.c_arg_in = "&%s_in";
} }
@ -1893,7 +1893,7 @@ Error BindingsGenerator::_generate_cs_property(const BindingsGenerator::TypeInte
// Assume the index parameter is an enum // Assume the index parameter is an enum
const TypeInterface *idx_arg_type = _get_type_or_null(idx_arg.type); const TypeInterface *idx_arg_type = _get_type_or_null(idx_arg.type);
CRASH_COND(idx_arg_type == nullptr); CRASH_COND(idx_arg_type == nullptr);
p_output.append("(" + idx_arg_type->proxy_name + ")" + itos(p_iprop.index)); p_output.append("(" + idx_arg_type->proxy_name + ")(" + itos(p_iprop.index) + ")");
} else { } else {
p_output.append(itos(p_iprop.index)); p_output.append(itos(p_iprop.index));
} }
@ -1911,7 +1911,7 @@ Error BindingsGenerator::_generate_cs_property(const BindingsGenerator::TypeInte
// Assume the index parameter is an enum // Assume the index parameter is an enum
const TypeInterface *idx_arg_type = _get_type_or_null(idx_arg.type); const TypeInterface *idx_arg_type = _get_type_or_null(idx_arg.type);
CRASH_COND(idx_arg_type == nullptr); CRASH_COND(idx_arg_type == nullptr);
p_output.append("(" + idx_arg_type->proxy_name + ")" + itos(p_iprop.index) + ", "); p_output.append("(" + idx_arg_type->proxy_name + ")(" + itos(p_iprop.index) + "), ");
} else { } else {
p_output.append(itos(p_iprop.index) + ", "); p_output.append(itos(p_iprop.index) + ", ");
} }
@ -3286,7 +3286,7 @@ bool BindingsGenerator::_arg_default_value_from_variant(const Variant &p_val, Ar
break; break;
case Variant::INT: case Variant::INT:
if (r_iarg.type.cname != name_cache.type_int) { if (r_iarg.type.cname != name_cache.type_int) {
r_iarg.default_argument = "(%s)" + r_iarg.default_argument; r_iarg.default_argument = "(%s)(" + r_iarg.default_argument + ")";
} }
break; break;
case Variant::FLOAT: case Variant::FLOAT:
@ -3508,7 +3508,7 @@ void BindingsGenerator::_populate_builtin_type_interfaces() {
itype = TypeInterface::create_value_type(String(m_name)); \ itype = TypeInterface::create_value_type(String(m_name)); \
if (itype.name != "long" && itype.name != "ulong") { \ if (itype.name != "long" && itype.name != "ulong") { \
itype.c_in = "%5%0 %1_in = %1;\n"; \ itype.c_in = "%5%0 %1_in = %1;\n"; \
itype.c_out = "%5return (%0)%1;\n"; \ itype.c_out = "%5return (%0)(%1);\n"; \
itype.c_type = "long"; \ itype.c_type = "long"; \
itype.c_arg_in = "&%s_in"; \ itype.c_arg_in = "&%s_in"; \
} else { \ } else { \