kiss-lang/tink_macro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix haxe3

Browse Source
This commit is contained in:
Kevin Leung
2020-12-22 17:15:28 +08:00
parent 007c73d58e
commit f46e49ce66
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tink/macro/Types.hx
View File

@@ -209,9 +209,9 @@ class Types {
} }
static public function deduceCommonType(types:Array<Type>):Outcome<Type, Error> { static public function deduceCommonType(types:Array<Type>):Outcome<Type, Error> {
var exprs = types.map(t ->{ var exprs = types.map(function(t) {
var ct = t.toComplex(); var ct = t.toComplex();
macro (null:$ct); return macro (null:$ct);
}); });
return switch (macro $a{exprs}).typeof() { return switch (macro $a{exprs}).typeof() {

9
tests/Types.hx
View File

@@ -67,10 +67,11 @@ class Types extends Base {
} }
function testDeduceCommonType() { function testDeduceCommonType() {
assertEquals('StdTypes.Float', tink.macro.Types.deduceCommonType([(macro:Float), (macro:Int)].map(ct -> ct.toType().sure())).sure().toComplex().toString()); function ct2t(ct:ComplexType) return ct.toType().sure();
assertEquals('Types.CommonI1', tink.macro.Types.deduceCommonType([(macro:Types.CommonA), (macro:Types.CommonB), (macro:Types.CommonC)].map(ct -> ct.toType().sure())).sure().toComplex().toString()); assertEquals('StdTypes.Float', tink.macro.Types.deduceCommonType([(macro:Float), (macro:Int)].map(ct2t)).sure().toComplex().toString());
assertEquals('Types.CommonI2', tink.macro.Types.deduceCommonType([(macro:Types.CommonB), (macro:Types.CommonC)].map(ct -> ct.toType().sure())).sure().toComplex().toString()); assertEquals('Types.CommonI1', tink.macro.Types.deduceCommonType([(macro:Types.CommonA), (macro:Types.CommonB), (macro:Types.CommonC)].map(ct2t)).sure().toComplex().toString());
// assertEquals('Types.CommonI3', tink.macro.Types.deduceCommonType([(macro:Types.CommonC)].map(ct -> ct.toType().sure())).sure().toComplex().toString()); assertEquals('Types.CommonI2', tink.macro.Types.deduceCommonType([(macro:Types.CommonB), (macro:Types.CommonC)].map(ct2t)).sure().toComplex().toString());
// assertEquals('Types.CommonI3', tink.macro.Types.deduceCommonType([(macro:Types.CommonC)].map(ct2t)).sure().toComplex().toString());
} }
} }
#end #end