Skip to content

Haxe 4.3 support #286

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

Draft
sandorfehervari wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Haxe 4.3 support #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0a953c
Dirty way of making Enums Haxe 4.3 compatible. The abstract type cann…
sandorfehervari Apr 29, 2024
d9948ef
Revert "Dirty way of making Enums Haxe 4.3 compatible. The abstract t…
sandorfehervari May 8, 2024
aaaa516
Fixing abstract enum generation in haxe 4 with @:runtimeValue annotation
sandorfehervari May 9, 2024
9586ed2
Fixed compiler warnings
sandorfehervari May 9, 2024
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
4 changes: 2 additions & 2 deletions spaghetti-gradle-example/app/src/main/haxe/prezi/test/client/Client.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ class Client {
});
trace("TestStuff.doSomething(): " + testStuff.doSomething("pre", "text", "pos"));

if (untyped __js__("typeof(document)") != "undefined") {
var canvas = untyped __js__("document.getElementById('canvas')");
if (js.Syntax.code("typeof(document)") != "undefined") {
var canvas = js.Syntax.code("document.getElementById('canvas')");
testStuff.drawSomething(canvas);
}

Expand Down
2 changes: 1 addition & 1 deletion spaghetti-haxe-support/src/integTest/module/src/spaghetti/test/TestModule.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ class TestModule {
}

public static function getExternalDependencyVersion(): String {
return untyped __js__('libWithVersion.version');
return js.Syntax.code('libWithVersion.version');
}
}
2 changes: 1 addition & 1 deletion ...src/main/groovy/com/prezi/spaghetti/haxe/access/HaxeModuleAccessorGeneratorVisitor.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class HaxeModuleAccessorGeneratorVisitor extends AbstractHaxeGeneratorVisitor {
return \
"""@:final class ${node.alias} {

static var __module:Dynamic = untyped __js__('${GeneratorUtils.createModuleAccessor(node.name, format)}');
static var __module:Dynamic = js.Syntax.code('${GeneratorUtils.createModuleAccessor(node.name, format)}');

${node.methods*.accept(new MethodVisitor(node)).join("")}
}
Expand Down
8 changes: 5 additions & 3 deletions ...port/src/main/groovy/com/prezi/spaghetti/haxe/impl/HaxeModuleProxyGeneratorVisitor.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ class HaxeModuleProxyGeneratorVisitor extends AbstractHaxeGeneratorVisitor {
String visitModuleNode(ModuleNode node) {
return \
"""@:final class __${node.alias}Proxy {
public function new() {}
public var ${node.alias}: __${node.alias}Proxy;
public function new() {
${node.alias} = this;
}
${
node.methods*.accept(new MethodVisitor(node)).join("") +
node.accept(new QualifiedConstVisitor(node)) +
node.accept(new QualifiedEnumVisitor(node)) +
"\tpublic var ${node.alias} = this;\n"
node.accept(new QualifiedEnumVisitor(node))
}}
"""
}
Expand Down
2 changes: 1 addition & 1 deletion ...ain/groovy/com/prezi/spaghetti/haxe/type/consts/HaxeDependentConstGeneratorVisitor.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ${node.entries*.accept(new ConstEntryVisitor(node.name)).join("")}
String value = HaxeUtils.toPrimitiveString(node.value)
// TODO [knuton] Enable after migratory period
// String moduleAccessor = GeneratorUtils.createModuleAccessor(foreignModuleName, format)
// String value = "untyped __js__('${moduleAccessor}[\"${constName}\"][\"${node.name}\"]')"
// String value = "js.Syntax.code('${moduleAccessor}[\"${constName}\"][\"${node.name}\"]')"
return "\tpublic static inline var ${node.name}:${type} = ${value};\n"
}
}
Expand Down
2 changes: 1 addition & 1 deletion .../main/groovy/com/prezi/spaghetti/haxe/type/enums/HaxeDependentEnumGeneratorVisitor.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class HaxeDependentEnumGeneratorVisitor extends HaxeEnumGeneratorVisitor {
return new HaxeEnumGeneratorVisitor.EnumValueVisitor(enumName) {
@Override
String generateValueExpression(EnumValueNode node) {
return "untyped __js__('${GeneratorUtils.createModuleAccessor(foreignModuleName, format)}[\"${enumName}\"][\"${node.name}\"]')"
return "js.Syntax.code('${GeneratorUtils.createModuleAccessor(foreignModuleName, format)}[\"${enumName}\"][\"${node.name}\"]')"
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions ...pport/src/main/groovy/com/prezi/spaghetti/haxe/type/enums/HaxeEnumGeneratorVisitor.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ class HaxeEnumGeneratorVisitor extends StringModuleVisitorBase {
def enumName = node.name

return \
"""abstract ${enumName}(Int) {
"""
@:runtimeValue
enum abstract ${enumName}(Int) {
${node.values*.accept(createEnumValueVisitor(node.name)).join("\n")}

static var _values = {
#if js
var thisValue = ${enumName};
${node.values.collect { entry -> "untyped __js__(\"thisValue[thisValue.${entry.name}] = '${entry.name}'\");" }.join("\n\t\t")}
${node.values.collect { entry -> "js.Syntax.code(\"thisValue[thisValue.${entry.name}] = '${entry.name}'\");" }.join("\n\t\t")}
#end
[${node.values.collect { entry -> "Std.string(${entry.name}) => ${entry.name}" }.join(", ")}];
}
Expand Down
2 changes: 1 addition & 1 deletion ...test/groovy/com/prezi/spaghetti/haxe/access/HaxeModuleAccessorGeneratorVisitorTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module com.example.test {
expect:
result == """@:final class TestModule {

static var __module:Dynamic = untyped __js__('Spaghetti["dependencies"]["com.example.test"]["module"]');
static var __module:Dynamic = js.Syntax.code('Spaghetti["dependencies"]["com.example.test"]["module"]');

/**
* Initializes module.
Expand Down
18 changes: 9 additions & 9 deletions ...t/src/test/groovy/com/prezi/spaghetti/haxe/type/enums/HaxeEnumGeneratorVisitorTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@ class HaxeEnumGeneratorVisitorTest extends EnumGeneratorSpecification {

expect:
result == expectedWith(
"untyped __js__('Spaghetti[\"dependencies\"][\"test\"][\"MyEnum\"][\"ALMA\"]')",
"untyped __js__('Spaghetti[\"dependencies\"][\"test\"][\"MyEnum\"][\"BELA\"]')",
"untyped __js__('Spaghetti[\"dependencies\"][\"test\"][\"MyEnum\"][\"GEZA\"]')")
"js.Syntax.code('Spaghetti[\"dependencies\"][\"test\"][\"MyEnum\"][\"ALMA\"]')",
"js.Syntax.code('Spaghetti[\"dependencies\"][\"test\"][\"MyEnum\"][\"BELA\"]')",
"js.Syntax.code('Spaghetti[\"dependencies\"][\"test\"][\"MyEnum\"][\"GEZA\"]')")
}

def "generate dependent definition for wrapperless format"() {
def result = parseAndVisitEnum(definition, new HaxeDependentEnumGeneratorVisitor("test", ModuleFormat.Wrapperless))

expect:
result == expectedWith(
"untyped __js__('Spaghetti[\"dependencies\"][\"test\"][\"module\"][\"MyEnum\"][\"ALMA\"]')",
"untyped __js__('Spaghetti[\"dependencies\"][\"test\"][\"module\"][\"MyEnum\"][\"BELA\"]')",
"untyped __js__('Spaghetti[\"dependencies\"][\"test\"][\"module\"][\"MyEnum\"][\"GEZA\"]')")
"js.Syntax.code('Spaghetti[\"dependencies\"][\"test\"][\"module\"][\"MyEnum\"][\"ALMA\"]')",
"js.Syntax.code('Spaghetti[\"dependencies\"][\"test\"][\"module\"][\"MyEnum\"][\"BELA\"]')",
"js.Syntax.code('Spaghetti[\"dependencies\"][\"test\"][\"module\"][\"MyEnum\"][\"GEZA\"]')")
}

private static String expectedWith(String first, String second, String third) {
Expand All @@ -56,9 +56,9 @@ class HaxeEnumGeneratorVisitorTest extends EnumGeneratorSpecification {
static var _values = {
#if js
var thisValue = MyEnum;
untyped __js__("thisValue[thisValue.ALMA] = 'ALMA'");
untyped __js__("thisValue[thisValue.BELA] = 'BELA'");
untyped __js__("thisValue[thisValue.GEZA] = 'GEZA'");
js.Syntax.code("thisValue[thisValue.ALMA] = 'ALMA'");
js.Syntax.code("thisValue[thisValue.BELA] = 'BELA'");
js.Syntax.code("thisValue[thisValue.GEZA] = 'GEZA'");
#end
[Std.string(ALMA) => ALMA, Std.string(BELA) => BELA, Std.string(GEZA) => GEZA];
}
Expand Down