Merge branch 'master' into testing

This commit is contained in:
Ne_Eo
2024-08-13 13:34:56 +02:00
2 changed files with 15 additions and 2 deletions
+2
View File
@@ -1,2 +1,4 @@
/hscript.swf
/release.zip
tests/bin/*
+13 -2
View File
@@ -144,12 +144,16 @@ class ClassExtendMacro {
//trace(getModuleName(cl));
var hasNew = false;
for(_field in [fields.copy(), superFields.copy()])
for(f in _field) {
if (f == null)
continue;
if (f.name == "new")
if (f.name == "new") {
hasNew = true;
continue;
}
if (f.name.startsWith(FUNC_PREFIX))
continue;
if (f.access.contains(ADynamic) || f.access.contains(AStatic) || f.access.contains(AExtern) || f.access.contains(AInline))
@@ -257,6 +261,13 @@ class ClassExtendMacro {
}
}
var totalFields = definedFields.length;
if(totalFields == 0 && !hasNew) {
//Sys.println(cl.pack.join(".") + "." + cl.name + ", " + totalFields);
return fields;
}
shadowClass.kind = TDClass({
pack: cl.pack.copy(),
name: cl.name
@@ -423,7 +434,7 @@ class ClassExtendMacro {
__custom__variables.set(name, val);
return val;
}
return super.hset(this, name);
return super.hset(name, val);
}
} else {
macro {