Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33 from maxim-sheronov/fix_binding_generation_for_enums 

Fix bindings generation for enums
pull/36/head
Thomas Herzog 2017-09-15 08:46:04 +02:00 committed by GitHub
parent cb5b80d421 8939c663d9
commit e32d7bb1b9
2 changed files with 108 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
binding_generator.py
View File

@ -44,7 +44,9 @@ def is_reference_type(t):
return False
def make_gdnative_type(t):
if is_class_type(t):
if is_enum(t):
return remove_enum_prefix(t) + " "
elif is_class_type(t):
if is_reference_type(t):
return "Ref<" + strip_name(t) + "> "
else:
@ -72,6 +74,24 @@ def generate_class_header(used_classes, c):
source.append("#include <CoreTypes.hpp>")
source.append("#include <Ref.hpp>")
class_name = strip_name(c["name"])
included = []
for used_class in used_classes:
if is_enum(used_class) and is_nested_type(used_class):
used_class_name = remove_enum_prefix(extract_nested_type(used_class))
if used_class_name not in included:
included.append(used_class_name)
source.append("#include <" + used_class_name + ".hpp>")
elif is_enum(used_class) and is_nested_type(used_class) and not is_nested_type(used_class, class_name):
used_class_name = remove_enum_prefix(used_class)
if used_class_name not in included:
included.append(used_class_name)
source.append("#include <" + used_class_name + ".hpp>")
source.append("")
if c["base_class"] != "":
source.append("#include <" + strip_name(c["base_class"]) + ".hpp>")
@ -82,14 +102,17 @@ def generate_class_header(used_classes, c):
for used_type in used_classes:
source.append("class " + strip_name(used_type) + ";")
if is_enum(used_type) or is_nested_type(used_type, class_name):
continue
else:
source.append("class " + strip_name(used_type) + ";")
source.append("")
# generate the class definition here
source.append("class " + strip_name(c["name"]) + ("" if c["base_class"] == "" else (" : public " + strip_name(c["base_class"])) ) + " {")
source.append("class " + class_name + ("" if c["base_class"] == "" else (" : public " + strip_name(c["base_class"])) ) + " {")
source.append("public:")
source.append("")
@ -97,10 +120,21 @@ def generate_class_header(used_classes, c):
# ___get_class_name
source.append("\tstatic inline char *___get_class_name() { return (char *) \"" + strip_name(c["name"]) + "\"; }")
source.append("\t// constants")
enum_values = []
source.append("\n\t// enums")
for enum in c["enums"]:
source.append("\tenum " + strip_name(enum["name"]) + " {")
for value in enum["values"]:
source.append("\t\t" + remove_nested_type_prefix(value) + " = " + str(enum["values"][value]) + ",")
enum_values.append(value)
source.append("\t};")
source.append("\n\t// constants")
for name in c["constants"]:
source.append("\tconst static int " + name + " = " + str(c["constants"][name]) + ";")
if name not in enum_values:
source.append("\tconst static int " + name + " = " + str(c["constants"][name]) + ";")
if c["instanciable"]:
@ -108,7 +142,6 @@ def generate_class_header(used_classes, c):
source.append("\tstatic void operator delete(void *);")
source.append("")
source.append("\n\t// methods")
for method in c["methods"]:
@ -201,8 +234,9 @@ def generate_class_header(used_classes, c):
def generate_class_implementation(icalls, used_classes, c):
class_name = strip_name(c["name"])
source = []
source.append("#include <" + strip_name(c["name"]) + ".hpp>")
source.append("#include <" + class_name + ".hpp>")
source.append("")
source.append("")
@ -218,7 +252,10 @@ def generate_class_implementation(icalls, used_classes, c):
source.append("")
for used_class in used_classes:
source.append("#include <" + strip_name(used_class) + ".hpp>")
if is_enum(used_class):
continue
else:
source.append("#include <" + strip_name(used_class) + ".hpp>")
source.append("")
source.append("")
@ -298,7 +335,9 @@ def generate_class_implementation(icalls, used_classes, c):
if method["return_type"] != "void":
if is_class_type(method["return_type"]):
if is_reference_type(method["return_type"]):
if is_enum(method["return_type"]):
return_statement += "return (" + remove_enum_prefix(method["return_type"]) + ") "
elif is_reference_type(method["return_type"]):
return_statement += "return Ref<" + strip_name(method["return_type"]) + ">::__internal_constructor(";
else:
return_statement += "return " + ("(" + strip_name(method["return_type"]) + " *) " if is_class_type(method["return_type"]) else "")
@ -306,6 +345,8 @@ def generate_class_implementation(icalls, used_classes, c):
return_statement += "return "
def get_icall_type_name(name):
if is_enum(name):
return "int"
if is_class_type(name):
return "Object"
return name
@ -606,6 +647,20 @@ def strip_name(name):
return name[1:]
return name
def extract_nested_type(nested_type):
return strip_name(nested_type[:nested_type.find("::")])
def remove_nested_type_prefix(name):
return name if name.find("::") == -1 else strip_name(name[name.find("::") + 2:])
def remove_enum_prefix(name):
return strip_name(name[name.find("enum.") + 5:])
def is_nested_type(name, type = ""):
return name.find(type + "::") != -1
def is_enum(name):
return name.find("enum.") == 0
def is_class_type(name):
return not is_core_type(name) and not is_primitive(name)

40
include/core/Variant.hpp
View File

@ -74,6 +74,46 @@ public:
};
enum Operator {
//comparation
OP_EQUAL,
OP_NOT_EQUAL,
OP_LESS,
OP_LESS_EQUAL,
OP_GREATER,
OP_GREATER_EQUAL,
//mathematic
OP_ADD,
OP_SUBSTRACT,
OP_MULTIPLY,
OP_DIVIDE,
OP_NEGATE,
OP_POSITIVE,
OP_MODULE,
OP_STRING_CONCAT,
//bitwise
OP_SHIFT_LEFT,
OP_SHIFT_RIGHT,
OP_BIT_AND,
OP_BIT_OR,
OP_BIT_XOR,
OP_BIT_NEGATE,
//logic
OP_AND,
OP_OR,
OP_XOR,
OP_NOT,
//containment
OP_IN,
OP_MAX
};
Variant();
Variant(const Variant& v);