Skip to content

Update to address override issue #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
peteshand wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update to address override issue #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 63 additions & 22 deletions SampleProject/Haxe/src/UEMetadata.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ class UEMetadata {

// Stores the metadata default parameter configurations
static var metadataDefaults: { uprop: Array<String>, ufunc: Array<String> };

// cache class inheritance fields
static var fieldMap = new Map<String, Array<String>>();

// This function is called in the compile.hxml
public static function init(packageName: String) {
Expand Down Expand Up @@ -189,29 +192,42 @@ class UEMetadata {
final moduleIsType = moduleTPath.name == cls.name;
final complexType = TPath({ pack: moduleTPath.pack, name: moduleTPath.name, sub: moduleIsType ? null : cls.name, params: null });

// Add toPtr function to convert to Ptr class
extraFields.push({
name: "toPtr",
pos: nopos,
kind: FFun({
args: [],
ret: macro : cpp.Star<$complexType>,
expr: macro return untyped __cpp__("this")
}),
access: [APublic, AInline, AExtern]
});
// This is probably not the best approach, as with large codebases it has the potential to slow down compile times
var parentFields:Array<String> = getParentFieldNames(cls, false);

// only add field if not already defined in the parent class
if (parentFields.indexOf("toPtr") == -1) {
// Add toPtr function to convert to Ptr class
extraFields.push({
name: "toPtr",
pos: nopos,
kind: FFun({
args: [],
ret: macro:cpp.Star<$complexType>,
expr: macro return untyped __cpp__("this")
}),
access: [APublic, AInline, AExtern]
});

fieldMap.get(cls.name).push("toPtr");
}

// Add toVal function to override Haxe's normal behavior for passing values
extraFields.push({
name: "toVal",
pos: nopos,
kind: FFun({
args: [],
ret: macro : $complexType,
expr: macro return untyped __cpp__("(*this)")
}),
access: [APublic, AInline, AExtern]
});
// only add field if not already defined in the parent class
if (parentFields.indexOf("toVal") == -1) {
// Add toVal function to override Haxe's normal behavior for passing values
extraFields.push({
name: "toVal",
pos: nopos,
kind: FFun({
args: [],
ret: macro:$complexType,
expr: macro return untyped __cpp__("(*this)")
}),
access: [APublic, AInline, AExtern]
});

fieldMap.get(cls.name).push("toVal");
}

// Let's add our extra fields to the final list of fields
for(extra in extraFields) {
Expand Down Expand Up @@ -492,6 +508,31 @@ class UEMetadata {

return checkExternSuperClassesForMethod(superCls, fieldName);
}

static function getParentFieldNames(classType:ClassType, addfields:Bool = true):Array<String> {
var fieldNames:Array<String> = fieldMap.get(classType.name);
if (fieldNames == null) {
fieldNames = [];

if (classType.superClass != null) {
var parentCls = classType.superClass.t.get();
if (parentCls != null) {
fieldNames = getParentFieldNames(parentCls, true);
}
}

if (addfields) {
var classFields = classType.fields.get();
for (classField in classFields) {
fieldNames.push(classField.name);
}
}

fieldMap.set(classType.name, fieldNames);
}

return fieldNames.concat([]);
}
}

#end