Update to haxe 4.3.0 (#15)

Fix recursive implicit cast errors from 4.3.0 Update libraries for 4.3.0
skial · Apr 21, 2023 · b91299e · b91299e
1 parent b7b7163
commit b91299e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/.haxerc b/.haxerc
@@ -1,4 +1,4 @@
 {
-  "version": "4.2.1",
+  "version": "4.3.0",
   "resolveLibs": "scoped"
 }
diff --git a/build.hxml b/build.hxml
@@ -9,8 +9,10 @@
 #-debug
 
 -D eval-stack
+-D eval-pretty-print
 -D analyzer-optimize
 -D resolve-verbose
+-D messages-log-format=pretty
 
 -main Entry
 

diff --git a/haxe_libraries/tink_core.hxml b/haxe_libraries/tink_core.hxml
@@ -1,3 +1,3 @@
--D tink_core=1.22.0
-# @install: lix --silent download "gh://github.com/haxetink/tink_core#fa752b88f6757c18da92998aeab5523fe4f28853" into tink_core/1.22.0/github/fa752b88f6757c18da92998aeab5523fe4f28853
--cp ${HAXE_LIBCACHE}/tink_core/1.22.0/github/fa752b88f6757c18da92998aeab5523fe4f28853/src
+# @install: lix --silent download "haxelib:/tink_core#2.1.1" into tink_core/2.1.1/haxelib
+-cp ${HAXE_LIBCACHE}/tink_core/2.1.1/haxelib/src
+-D tink_core=2.1.1
diff --git a/src/be/types/ResolveProperty.hx b/src/be/types/ResolveProperty.hx
@@ -25,14 +25,18 @@ using StringTools;
 
         switch type {
             case TAbstract(_.get() => {name:"ResolveProperty" }, _): 
-                return expr;
+                if (debug) {
+                    trace('already resolved');
+                }
+                return macro $e{expr}.get();
 
             case x:
                 if (debug) trace( x );
         }
 
         var task = Resolver.determineTask( expr, type, Context.getExpectedType() );
-        var result:Expr = macro @:pos(expr.pos) be.types.ResolveProperty.seal($e{Resolver.handleTask(task)});
+        var e = Resolver.handleTask(task);
+        var result:Expr = macro @:pos(expr.pos) be.types.ResolveProperty.seal($e);
 
         if (debug) {
             trace( result.toString() );