Partial workaround for https://github.com/benmerckx/genes/issues/6

This reverts commit 00640d8328.

.haxerc

@@ -1 +1,4 @@
-{"version":"3.4.4","resolveLibs":"scoped"}
+{
+  "version": "e552bdc",
+  "resolveLibs": "scoped"
+}

.travis.yml

@@ -1,28 +1,41 @@
 sudo: required
-dist: trusty
+dist: xenial
 
-language: haxe
+stages:
-haxe:
+  - test
-- 3.2.1
+  - deploy
-- development
 
-matrix:
+language: node_js
-  allow_failures:
+node_js: 8
-  - haxe: development
 
-install:
+os:
-- haxelib install travix
+  - linux
-- haxelib run travix install
+  # - osx
-- haxelib install hx3compat
-
-script:
-- haxelib run travix node -lib hx3compat
 
 env:
-  secure: T4SCtY5qmEsK1ARWPevJmqLm23tv4CobLrbPOQV3FsoQno7FCP1S/+9GmuoJKzeTjWMzdTeDsp8TVwZ6AyGjvhl2nZNjhU+QTsir4tfbYYRyvsz/QK6pveFbPQVv7OsnnaB4wbZtqGZ8mzFeQf7Ol4tsNe7iUFJb/iVc+4/lUxo=
+  - HAXE_VERSION=3.4.7
+  - HAXE_VERSION=edge
+  
+install:
+  - npm i -g lix@15.5.4
+  - lix install haxe $HAXE_VERSION
+  - lix download
 
-deploy:
+script:
-  provider: script
+  - lix run travix node -lib hx3compat
-  script: haxe && haxelib run travix release
+
-  on:
+jobs:
-    tags: true
+  include:
+    # - stage: test # should uncomment this when there is no matrix above (e.g. only one os, one env, etc)
+    - stage: deploy
+      language: haxe
+      haxe: "3.4.7"
+      os: linux
+      install: skip
+      script: skip
+      env:
+        secure: T4SCtY5qmEsK1ARWPevJmqLm23tv4CobLrbPOQV3FsoQno7FCP1S/+9GmuoJKzeTjWMzdTeDsp8TVwZ6AyGjvhl2nZNjhU+QTsir4tfbYYRyvsz/QK6pveFbPQVv7OsnnaB4wbZtqGZ8mzFeQf7Ol4tsNe7iUFJb/iVc+4/lUxo=
+      after_success:
+        - haxelib install travix
+        - haxelib run travix install
+        - haxelib run travix release

.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-    "haxe.displayConfigurations": [
-        ["tests.hxml"]
-    ]
-}

dev.hxml

@@ -0,0 +1,6 @@
+tests.hxml
+-lib travix
+-lib tink_macro
+-lib hx3compat
+-js whatever.js
+--no-output

haxe_libraries/hx3compat.hxml

@@ -0,0 +1,3 @@
+-D hx3compat=1.0.0
+# @install: lix --silent download "haxelib:/hx3compat#1.0.0" into hx3compat/1.0.0/haxelib
+-cp ${HAXE_LIBCACHE}/hx3compat/1.0.0/haxelib/std

haxe_libraries/tink_cli.hxml

@@ -0,0 +1,8 @@
+-D tink_cli=0.3.1
+# @install: lix --silent download "haxelib:/tink_cli#0.3.1" into tink_cli/0.3.1/haxelib
+-lib tink_io
+-lib tink_stringly
+-lib tink_macro
+-cp ${HAXE_LIBCACHE}/tink_cli/0.3.1/haxelib/src
+# Make sure docs are generated
+-D use-rtti-doc

haxe_libraries/tink_core.hxml

@@ -1,3 +1,3 @@
-# @install: lix --silent download "haxelib:tink_core#1.16.1" into tink_core/1.16.1/haxelib
+-D tink_core=1.24.0
--D tink_core=1.16.1
+# @install: lix --silent download "haxelib:/tink_core#1.24.0" into tink_core/1.24.0/haxelib
--cp ${HAXESHIM_LIBCACHE}/tink_core/1.16.1/haxelib/src
+-cp ${HAXE_LIBCACHE}/tink_core/1.24.0/haxelib/src

haxe_libraries/tink_io.hxml

@@ -0,0 +1,5 @@
+-D tink_io=0.5.0
+# @install: lix --silent download "haxelib:/tink_io#0.5.0" into tink_io/0.5.0/haxelib
+-lib tink_streams
+-lib tink_core
+-cp ${HAXE_LIBCACHE}/tink_io/0.5.0/haxelib/src

haxe_libraries/tink_streams.hxml

@@ -0,0 +1,4 @@
+-D tink_streams=0.2.1
+# @install: lix --silent download "haxelib:/tink_streams#0.2.1" into tink_streams/0.2.1/haxelib
+-lib tink_core
+-cp ${HAXE_LIBCACHE}/tink_streams/0.2.1/haxelib/src

haxe_libraries/tink_stringly.hxml

@@ -0,0 +1,4 @@
+-D tink_stringly=0.2.0
+# @install: lix --silent download "haxelib:/tink_stringly#0.2.0" into tink_stringly/0.2.0/haxelib
+-lib tink_core
+-cp ${HAXE_LIBCACHE}/tink_stringly/0.2.0/haxelib/src

haxe_libraries/travix.hxml

@@ -1,4 +1,6 @@
-# @run: haxelib run-dir travix ${HAXESHIM_LIBCACHE}/travix/0.10.3/haxelib
+-D travix=0.12.2
-# @install: lix --silent download "haxelib:travix#0.10.3" into travix/0.10.3/haxelib
+# @install: lix --silent download "gh://github.com/back2dos/travix#7da3bf96717b52bf3c7e5d2273bf927a8cd7aeb5" into travix/0.12.2/github/7da3bf96717b52bf3c7e5d2273bf927a8cd7aeb5
--D travix=0.10.3
+# @post-install: cd ${HAXE_LIBCACHE}/travix/0.12.2/github/7da3bf96717b52bf3c7e5d2273bf927a8cd7aeb5 && haxe -cp src --run travix.PostDownload
--cp ${HAXESHIM_LIBCACHE}/travix/0.10.3/haxelib/src
+# @run: haxelib run-dir travix ${HAXE_LIBCACHE}/travix/0.12.2/github/7da3bf96717b52bf3c7e5d2273bf927a8cd7aeb5
+-lib tink_cli
+-cp ${HAXE_LIBCACHE}/travix/0.12.2/github/7da3bf96717b52bf3c7e5d2273bf927a8cd7aeb5/src

haxelib.json

@@ -1,20 +1,20 @@
 {
 	"name": "tink_macro",
-	"description": "The macro toolkit ;)",
+	"license": "MIT",
-	"classPath": "src",
-	"dependencies": {
-		"tink_core": ""
-	},
-	"url": "http://haxetink.org/tink_macro",
-	"contributors": [
-		"back2dos"
-	],
-	"version": "0.16.4",
-	"releasenote": "Helper for short identifiers.",
 	"tags": [
 		"tink",
 		"macro",
 		"utility"
 	],
-	"license": "MIT"
+	"classPath": "src",
+	"description": "The macro toolkit ;)",
+	"contributors": [
+		"back2dos"
+	],
+	"releasenote": "Compat with haxe 4 rc4 onward.",
+	"version": "0.18.0",
+	"url": "http://haxetink.org/tink_macro",
+	"dependencies": {
+		"tink_core": ""
+	}
 }

src/tink/MacroApi.hx

@@ -4,6 +4,7 @@ import haxe.macro.Expr.TypeDefinition;
 
 using tink.CoreApi;
 using tink.macro.Positions;
+using StringTools;
 
 typedef Positions = tink.macro.Positions;
 typedef ExprTools = haxe.macro.ExprTools;
@@ -28,7 +29,20 @@ typedef TypeResolution = Ref<Either<String, TypeDefinition>>;
 
 class MacroApi {
   
-  static var idCounter = 0;  
+  static var MAIN_CANDIDATES = ['-main', '-x', '--run'];
+  static public function getMainClass():Option<String> {
+    var args = Sys.args();
+    
+    for (c in MAIN_CANDIDATES)
+      switch args.indexOf(c) {
+        case -1:
+        case v: return Some(args[v+1]);
+      }
+
+    return None;
+  }
+
+  @:persistent static var idCounter = 0;  
   
   @:noUsing static public inline function tempName(?prefix:String = 'tmp'):String
     return '__tink_' + prefix + Std.string(idCounter++);
@@ -36,4 +50,90 @@ class MacroApi {
   static public function pos() 
     return haxe.macro.Context.currentPos();
 
+  static public var completionPoint(default, null):Option<{
+    var file(default, never):String;
+    var pos(default, never):Int;
+  }>;
+
+  static public var args(default, null):Iterable<String>;
+  static var initialized = initArgs();
+
+  static function initArgs() {
+    var sysArgs = Sys.args();
+    args = sysArgs;
+    completionPoint = switch sysArgs.indexOf('--display') {
+      case -1: None;
+      case sysArgs[_ + 1] => arg: 
+        if (arg.startsWith('{"jsonrpc":')) {
+          var payload:{
+            jsonrpc:String,
+            method:String,
+            params:{
+              file:String,
+              offset:Int,
+            }
+          } = haxe.Json.parse(arg);
+          switch payload {
+            case { jsonrpc: '2.0', method: 'display/completion' }:
+              Some({
+                file: payload.params.file,
+                pos: payload.params.offset,
+              });
+            default: None;
+          }
+        }
+        else None;
+    }
+    try haxe.macro.Context.onMacroContextReused(initArgs)
+    catch (all:Dynamic) {}
+    return true;
+  }
+
 }
+
+
+#if (haxe_ver >= 4)
+  typedef ObjectField = haxe.macro.Expr.ObjectField;
+  typedef QuoteStatus = haxe.macro.Expr.QuoteStatus;
+#else
+  enum QuoteStatus {
+    Unquoted;
+    Quoted;
+  }
+  private typedef F = {
+    var field:String;
+    var expr:haxe.macro.Expr;
+  }
+
+  @:forward
+  abstract ObjectField(F) to F {
+
+    static var QUOTED = "@$__hx__"; 
+
+    inline function new(o) this = o;
+
+    public var field(get, never):String;
+    
+    function get_field()
+      return 
+        if (quotes == Quoted) 
+          this.field.substr(QUOTED.length);
+        else this.field;
+
+    public var quotes(get, never):QuoteStatus;
+    
+    function get_quotes()
+      return if (StringTools.startsWith(this.field, QUOTED)) Quoted else Unquoted;
+
+    @:from static function ofFull(o:{>F, quotes:QuoteStatus }):ObjectField
+      return switch o.quotes {
+        case null | Unquoted: 
+          new ObjectField({ field: o.field, expr: o.expr });
+        default:
+          new ObjectField({ field: QUOTED + o.field, expr: o.expr });
+      }
+
+    @:from static function ofOld(o:F):ObjectField
+      return new ObjectField(o);
+  }
+#end

src/tink/macro/BuildCache.hx

@@ -33,7 +33,7 @@ typedef BuildContext3 = {>BuildContext2,
 
 class BuildCache { 
   
-  static var cache = new Map();
+  @:persistent static var cache = new Map();
   
   static public function getType3(name, ?types, ?pos:Position, build:BuildContext3->TypeDefinition) {
      if (types == null)
@@ -74,7 +74,11 @@ class BuildCache {
     var compound = ComplexType.TAnonymous([for (i in 0...types.length) {
       name: 't$i',
       pos: pos,
-      kind: FVar(types[i].toComplexType()),
+      kind: FVar(switch types[i] {
+        case TInst(_.get().kind => KExpr(e), _): 
+          TPath('tink.macro.ConstParam'.asTypePath([TPExpr(e)]));
+        case t: t.toComplex();
+      }),
     }]).toType();
         
     return getType(name, compound, pos, function (ctx) return build({
@@ -137,7 +141,9 @@ class BuildCache {
         case v: v;
       }
     
-    return forName.get(type, pos.sanitize(), build);  
+    var ret = forName.get(type, pos.sanitize(), build);  
+    ret.getFields();// workaround for https://github.com/HaxeFoundation/haxe/issues/7905
+    return ret;
   }
 }
 

src/tink/macro/ClassBuilder.hx

@@ -63,7 +63,9 @@ class ClassBuilder {
           if (cl.constructor != null) {
             try {
               var ctor = cl.constructor.get();
-              var func = Context.getTypedExpr(ctor.expr()).getFunction().sure();
+              var ctorExpr = ctor.expr();
+              if (ctorExpr == null) throw 'Super constructor has no expression';
+              var func = Context.getTypedExpr(ctorExpr).getFunction().sure();
 
               for (arg in func.args) //this is to deal with type parameter substitutions
                 arg.type = null;
@@ -196,4 +198,4 @@ class ClassBuilder {
       p(builder);
     return builder.export(verbose);
   }
-}
+}

src/tink/macro/ConstParam.hx

@@ -0,0 +1,3 @@
+package tink.macro;
+
+class ConstParam<Const> {}

src/tink/macro/Constructor.hx

@@ -21,24 +21,24 @@ class Constructor {
   var afterArgs:Array<FunctionArg>;
   var pos:Position;
   var onGenerateHooks:Array<Function->Void>;
-  var superCall:Expr;
+  var superCall:Array<Expr>;
   var owner:ClassBuilder;
   var meta:Metadata;
   public var isPublic:Null<Bool>;
-  
+
   public function new(owner:ClassBuilder, f:Function, ?isPublic:Null<Bool> = null, ?pos:Position, ?meta:Metadata) {
     this.nuStatements = [];
     this.owner = owner;
     this.isPublic = isPublic;
     this.pos = pos.sanitize();
-    
+
     this.onGenerateHooks = [];
     this.args = [];
     this.beforeArgs = [];
     this.afterArgs = [];
     this.meta = meta;
-    
+
-    this.oldStatements = 
+    this.oldStatements =
       if (f == null) [];
       else {
         for (i in 0...f.args.length) {
@@ -49,62 +49,67 @@ class Constructor {
           }
           beforeArgs.push(a);
         }
-          
+
         if (f.expr == null) [];
         else
           switch (f.expr.expr) {
             case EBlock(exprs): exprs;
-            default: oldStatements = [f.expr]; 
+            default: oldStatements = [f.expr];
           }
       }
-    superCall = 
+
-      if (oldStatements.length == 0) [].toBlock();
+    for (i in 0...oldStatements.length)
-      else switch oldStatements[0] {
+      switch oldStatements[i] {
-        case macro super($a{_}): oldStatements.shift();
+        case macro super($a{_}):
-        default: [].toBlock();
+          superCall = oldStatements.splice(0, i + 1);
+          break;
+        default:
       }
+
+    if (superCall == null)
+      superCall = [];
   }
 
   public function getArgList():Array<FunctionArg>
     return beforeArgs.concat(args).concat(afterArgs);
 
-  public function addStatement(e:Expr, ?prepend) 
+  public function addStatement(e:Expr, ?prepend)
     if (prepend)
       this.nuStatements.unshift(e)
     else
       this.nuStatements.push(e);
-  
+
-  public function addArg(name:String, ?t:ComplexType, ?e:Expr, ?opt = false) 
+  public function addArg(name:String, ?t:ComplexType, ?e:Expr, ?opt = false)
     args.push( { name : name, opt : opt || e != null, type : t, value: e } );
-  
+
   public function init(name:String, pos:Position, with:FieldInit, ?options:{ ?prepend:Bool, ?bypass:Bool }) {
-    if (options == null) 
+    if (options == null)
       options = {};
     var e =
       switch with {
         case Arg(t, noPublish):
-          if (noPublish != true) 
+          if (noPublish != true)
             publish();
           args.push( { name : name, opt : false, type : t } );
           name.resolve(pos);
         case OptArg(e, t, noPublish):
-          if (noPublish != true) 
+          if (noPublish != true)
             publish();
           args.push( { name : name, opt : true, type : t, value: e } );
           name.resolve(pos);
         case Value(e): e;
       }
-      
+
     var tmp = MacroApi.tempName();
-    
+    var member = owner.memberByName(name).sure();
-    if (options.bypass) {
+
-      switch owner.memberByName(name) {
+    if (options.bypass && member.kind.match(FProp(_, 'never' | 'set', _, _))) {
-        case Success(member): member.addMeta(':isVar');
+
-        default:
+      member.addMeta(':isVar');
-      }
+
       addStatement((function () {
-        var fields = [for (f in Context.getLocalClass().get().fields.get()) f.name => f];
+        var fields = [for (f in  (macro this).typeof().sure().getClass().fields.get()) f.name => f];
-        
+
         function setDirectly(t:TypedExpr) {
           var direct = null;
           function seek(t:TypedExpr) {
@@ -112,16 +117,16 @@ class Constructor {
               case TField({ expr: TConst(TThis) }, FInstance(_, _, f)) if (f.get().name == name): direct = t;
               default: t.iter(seek);
             }
-          }			
+          }
           seek(t);
           if (direct == null) pos.error('nope');
           var direct = Context.storeTypedExpr(direct);
           return macro @:pos(pos) $direct = $e;
         }
-        
+
         return switch fields[name] {
-          case null: //trace(Context.getLocalClass().get().fields.get().length);  throw ('assert');
+          case null:
-            macro @:pos(pos) this.$name = $e;
+            pos.error('this direct initialization causes the compiler to do really weird things');
           case f:
             switch f.kind {
               case FVar(_, AccNormal | AccNo):
@@ -138,24 +143,24 @@ class Constructor {
                 pos.error('not implemented');
             }
         }
-      }).bounce(), options.prepend);    
+      }).bounce(), options.prepend);
     }
-    else 
+    else
       addStatement(macro @:pos(pos) this.$name = $e, options.prepend);
   }
-  public inline function publish() 
+  public inline function publish()
-    if (isPublic == null) 
+    if (isPublic == null)
       isPublic = true;
-  
+
-  function toBlock() 
+  function toBlock()
-    return [superCall]
+    return superCall
       .concat(nuStatements)
       .concat(oldStatements)
       .toBlock(pos);
-  
+
-  public function onGenerate(hook) 
+  public function onGenerate(hook)
     this.onGenerateHooks.push(hook);
-    
+
   public function toHaxe():Field {
     var f:Function = {
       args: this.beforeArgs.concat(this.args).concat(this.afterArgs),

src/tink/macro/Exprs.hx

@@ -43,8 +43,11 @@ class Exprs {
   }
 
   static public inline function is(e:Expr, c:ComplexType)
-    return ECheckType(e, c).at(e.pos).typeof().isSuccess();
+    return e.as(c).typeof().isSuccess();
-  
+
+  static public inline function as(e:Expr, c:ComplexType)
+    return ECheckType(e, c).at(e.pos);
+
   static public function finalize(e:Expr, ?nuPos:Position, ?rules:Dynamic<String>, ?skipFields = false, ?callPos:PosInfos) {
     if (nuPos == null)
       nuPos = Context.currentPos();

src/tink/macro/Functions.hx

@@ -4,9 +4,18 @@ import haxe.macro.Expr;
 
 using tink.macro.Exprs;
 
+#if haxe4
+private abstract Kind(FunctionKind) from FunctionKind to FunctionKind {
+  @:from static function ofString(s:String):Kind
+    return FNamed(s);
+}
+#else
+private typedef Kind = String;
+#end
+
 class Functions {
-  static public inline function asExpr(f:Function, ?name, ?pos) 
+  static public inline function asExpr(f:Function, ?kind:Kind, ?pos) 
-    return EFunction(name, f).at(pos);
+    return EFunction(kind, f).at(pos);
   
   static public inline function toArg(name:String, ?t, ?opt = false, ?value = null):FunctionArg {
     return {

src/tink/macro/Member.hx

@@ -9,7 +9,7 @@ abstract Member(Field) from Field to Field {
       name: name,
       pos: pos,
       access: [APublic],
-      kind: FProp(noread ? 'null' : 'get_' + name, nowrite ? 'null' : ('set_' + name), t),
+      kind: FProp(noread ? 'null' : 'get', nowrite ? 'null' : 'set', t),
     }
     return ret;
   }
@@ -32,6 +32,7 @@ abstract Member(Field) from Field to Field {
   }
   
   public var name(get, set):String;
+  public var meta(get, set):Metadata;
   public var doc(get, set):Null<String>;
   public var kind(get, set):FieldType;
   public var pos(get, set):Position;
@@ -39,6 +40,22 @@ abstract Member(Field) from Field to Field {
   public var isStatic(get, set):Bool;
   public var isPublic(get, set):Null<Bool>;
   public var isBound(get, set):Null<Bool>;
+  #if haxe4
+  /**
+   * Setting this to true will erase any getters/setters.
+   */
+  public var isFinal(get, set):Bool;
+    function get_isFinal() return hasAccess(AFinal);
+    function set_isFinal(param) {
+      if (setAccess(AFinal, param)) //TODO: perhaps also do something about AInline
+        switch kind {
+          case FProp(_, _, t, e):
+            kind = FVar(t, e);
+          default:
+        }
+      return param;
+    }
+  #end
   
   public function getFunction()
     return
@@ -76,6 +93,11 @@ abstract Member(Field) from Field to Field {
       }
     return pos.makeFailure('missing @$name');
   }
+
+  public function metaNamed(name) 
+    return 
+      if (this.meta == null) [];
+      else [for (tag in this.meta) if (tag.name == name) tag];
   
   public inline function asField():Field return this;
   public function publish() 
@@ -86,6 +108,12 @@ abstract Member(Field) from Field to Field {
       this.access.push(APublic);
     }
   
+  inline function get_meta() return switch this.meta {
+    case null: this.meta = [];
+    case v: v;
+  }
+  inline function set_meta(param) return this.meta = param;
+
   inline function get_name() return this.name;
   inline function set_name(param) return this.name = param;
   
@@ -99,21 +127,10 @@ abstract Member(Field) from Field to Field {
   inline function set_pos(param) return this.pos = param;
   
   inline function get_overrides() return hasAccess(AOverride);
-  inline function set_overrides(param) {
+  inline function set_overrides(param) return setAccess(AOverride, param);
-    changeAccess(
+
-      param ? AOverride : null, 
-      param ? null : AOverride
-    );
-    return param;
-  }
   inline function get_isStatic() return hasAccess(AStatic);
-  function set_isStatic(param) {
+  inline function set_isStatic(param) return setAccess(AStatic, param);
-    changeAccess(
-      param ? AStatic : null, 
-      param ? null : AStatic
-    );
-    return param;
-  }
   
   function get_isPublic() {
     if (this.access != null)    
@@ -167,6 +184,15 @@ abstract Member(Field) from Field to Field {
         if (x == a) return true;
     return false;
   }
+
+  function setAccess(a:Access, isset:Bool) {
+    changeAccess(
+      isset ? a : null, 
+      isset ? null : a
+    );
+    return isset;
+  }
+    
   
   function changeAccess(add:Access, remove:Access) {
     var i = 0;
@@ -190,4 +216,4 @@ abstract Member(Field) from Field to Field {
     if (add != null)
       this.access.push(add);
   }
-}
+}

src/tink/macro/Metadatas.hx

@@ -3,6 +3,7 @@ package tink.macro;
 import haxe.macro.Expr;
 
 class Metadatas {  
+  static var printer = new haxe.macro.Printer();
   static public function toMap(m:Metadata) {
     var ret = new Map<String,Array<Array<Expr>>>();
     if (m != null)
@@ -18,4 +19,8 @@ class Metadatas {
     return 
       if (m == null) [];
       else [for (meta in m) if (meta.name == name) meta.params];  
+      
+  static public inline function toString(m:MetadataEntry) {
+    return printer.printMetadata(m);
+  }
 }

src/tink/macro/Sisyphus.hx

@@ -23,14 +23,22 @@ class Sisyphus {
     if (cf.params.length == 0) {
       name: cf.name,
       doc: cf.doc,
-      access: cf.isPublic ? [ APublic ] : [ APrivate ],
+      access: 
+        (cf.isPublic ? [ APublic ] : [ APrivate ]) 
+          #if haxe4 .concat(if (cf.isFinal) [AFinal] else []) #end
+        ,
       kind: switch([ cf.kind, cf.type ]) {
+        #if haxe4
+        case [ FVar(_, _), ret ] if (cf.isFinal):
+          FVar(toComplexType(ret), null);
+        #end
         case [ FVar(read, write), ret ]:
           FProp(
             varAccessToString(read, "get"),
             varAccessToString(write, "set"),
             toComplexType(ret),
-            null);
+            null
+          );
         case [ FMethod(_), TFun(args, ret) ]:
           FFun({
             args: [
@@ -70,7 +78,16 @@ class Sisyphus {
       case TInst(_.get() => classType, params):
         switch (classType.kind) {
           case KTypeParameter(_):
-            direct();//TODO: check if the parameter is in scope, in which case the name can simply be used
+            var ct = Types.asComplexType(classType.name);
+            switch Types.toType(ct) {
+              case Success(TInst(_.get() => cl, _)) if (
+                cl.kind.match(KTypeParameter(_))
+                && cl.module == classType.module
+                && cl.pack.join('.') == classType.pack.join('.')
+              ): ct;                
+              default:
+                direct();
+            }
           default:
             TPath(toTypePath(classType, params));
         }

src/tink/macro/TypeMap.hx

@@ -5,7 +5,6 @@ import haxe.ds.BalancedTree;
 import haxe.macro.Context;
 import haxe.macro.Type;
 
-using haxe.macro.Tools;
 using tink.MacroApi;
 
 class TypeMap<V> extends BalancedTree<Type, V> implements IMap<Type, V> {
@@ -16,18 +15,7 @@ class TypeMap<V> extends BalancedTree<Type, V> implements IMap<Type, V> {
     super();
   }
   
-  override function compare(k1:Type, k2:Type):Int {
+  override function compare(k1:Type, k2:Type):Int
-    
+    return k1.compare(k2, follow);
-    if (follow) {
-      k1 = k1.reduce();
-      k2 = k2.reduce();
-    }
-    
-    return switch k1.getIndex() - k2.getIndex() {
-      case 0: 
-        Reflect.compare(k1.toString(), k2.toString());//much to my surprise, this actually seems to work (at least with 3.4)
-      case v: v;
-    }
-  }
   
 }

src/tink/macro/Types.hx

@@ -1,204 +1,282 @@
-package tink.macro;
+package tink.macro;
-
+
-import haxe.macro.Printer;
+import haxe.macro.Printer;
-import Type in Enums;
+
-
+import haxe.macro.Context;
-import haxe.macro.Context;
+import haxe.macro.Expr;
-import haxe.macro.Expr;
+import haxe.macro.Type;
-import haxe.macro.Type;
+
-
+using haxe.macro.Tools;
-using tink.macro.Exprs;
+using tink.MacroApi;
-using tink.macro.Positions;
+using tink.CoreApi;
-using tink.macro.Functions;
+
-using tink.CoreApi;
+class Types {
-
+
-class Types {
+  static public function definedType(typeName:String)
-
+    return
-  static public function definedType(typeName:String)
+      try {
-    return
+        Some(Context.getType(typeName));
-      try {
+      }
-        Some(Context.getType(typeName));
+      catch (e:Dynamic)
-      }
+        if (Std.string(e) == 'Type not found \'$typeName\'') None;
-      catch (e:Dynamic)
+        else tink.core.Error.rethrow(e);
-        if (Std.string(e) == 'Type not found \'$typeName\'') None;
+
-        else tink.core.Error.rethrow(e);
+  static var types = new Map<Int,Void->Type>();
-
+  static var idCounter = 0;
-  static var types = new Map<Int,Void->Type>();
+  static public function getID(t:Type, ?reduced = true)
-  static var idCounter = 0;
+    return
-  static public function getID(t:Type, ?reduced = true)
+      if (reduced)
-    return
+        getID(reduce(t), false);
-      if (reduced)
+      else
-        getID(reduce(t), false);
+        switch (t) {
-      else
+          case TAbstract(t, _): t.toString();
-        switch (t) {
+          case TInst(t, _): t.toString();
-          case TAbstract(t, _): t.toString();
+          case TEnum(t, _): t.toString();
-          case TInst(t, _): t.toString();
+          case TType(t, _): t.toString();
-          case TEnum(t, _): t.toString();
+          default: null;
-          case TType(t, _): t.toString();
+        }
-          default: null;
+
-        }
+  static public function accessToName(v:VarAccess, ?read = true)
-
+    return
-  static public function accessToName(v:VarAccess, ?read = true)
+      switch (v) {
-    return
+        case AccNormal, AccInline: 'default';
-      switch (v) {
+        case AccNo: 'null';
-        case AccNormal, AccInline: 'default';
+        case AccNever: 'never';
-        case AccNo: 'null';
+        case AccCall: if (read) 'get' else 'set';
-        case AccNever: 'never';
+        default:
-        case AccCall: if (read) 'get' else 'set';
+          throw 'not implemented';
-        default:
+      }
-          throw 'not implemented';
+
-      }
+  static public function getMeta(type:Type)
-
+    return switch type {
-  static public function getMeta(type:Type)
+      case TInst(_.get().meta => m, _): [m];
-    return switch type {
+      case TEnum(_.get().meta => m, _): [m];
-      case TInst(_.get().meta => m, _): [m];
+      case TAbstract(_.get().meta => m, _): [m];
-      case TEnum(_.get().meta => m, _): [m];
+      case TType(_.get() => t, _): [t.meta].concat(getMeta(t.type));
-      case TAbstract(_.get().meta => m, _): [m];
+      case TLazy(f): getMeta(f());
-      case TType(_.get() => t, _): [t.meta].concat(getMeta(t.type));
+      default: [];
-      case TLazy(f): getMeta(f());
+    }
-      default: [];
+
-    }
+  static function getDeclaredFields(t:ClassType, out:Array<ClassField>, marker:Map<String,Bool>) {
-
+    for (field in t.fields.get())
-  static function getDeclaredFields(t:ClassType, out:Array<ClassField>, marker:Map<String,Bool>) {
+      if (!marker.exists(field.name)) {
-    for (field in t.fields.get())
+        marker.set(field.name, true);
-      if (!marker.exists(field.name)) {
+        out.push(field);
-        marker.set(field.name, true);
+      }
-        out.push(field);
+    if (t.isInterface)
-      }
+      for (t in t.interfaces)
-    if (t.isInterface)
+        getDeclaredFields(t.t.get(), out, marker);
-      for (t in t.interfaces)
+    else if (t.superClass != null)
-        getDeclaredFields(t.t.get(), out, marker);
+      getDeclaredFields(t.superClass.t.get(), out, marker);
-    else if (t.superClass != null)
+  }
-      getDeclaredFields(t.superClass.t.get(), out, marker);
+
-  }
+  static var fieldsCache = new Map();
-
+  static public function getFields(t:Type, ?substituteParams = true)
-  static var fieldsCache = new Map();
+    return
-  static public function getFields(t:Type, ?substituteParams = true)
+      switch (reduce(t)) {
-    return
+        case TInst(c, params):
-      switch (reduce(t)) {
+          var id = c.toString(),
-        case TInst(c, params):
+              c = c.get();
-          var id = c.toString(),
+          if (!fieldsCache.exists(id)) {
-              c = c.get();
+            var fields = [];
-          if (!fieldsCache.exists(id)) {
+            getDeclaredFields(c, fields, new Map());
-            var fields = [];
+            fieldsCache.set(id, Success(fields));
-            getDeclaredFields(c, fields, new Map());
+          }
-            fieldsCache.set(id, Success(fields));
+          var ret = fieldsCache.get(id);
-          }
+          if (substituteParams && ret.isSuccess()) {
-          var ret = fieldsCache.get(id);
+            var fields = Reflect.copy(ret.sure());
-          if (substituteParams && ret.isSuccess()) {
+
-            var fields = Reflect.copy(ret.sure());
+            for (field in fields)
-
+              field.type = haxe.macro.TypeTools.applyTypeParameters(field.type, c.params, params);
-            for (field in fields)
+          }
-              field.type = haxe.macro.TypeTools.applyTypeParameters(field.type, c.params, params);
+          fieldsCache.remove(id);//TODO: find a proper solution to avoid stale cache
-          }
+          ret;
-          fieldsCache.remove(id);//TODO: find a proper solution to avoid stale cache
+        case TAnonymous(anon): Success(anon.get().fields);
-          ret;
+        default: Context.currentPos().makeFailure('type $t has no fields');
-        case TAnonymous(anon): Success(anon.get().fields);
+      }
-        default: Context.currentPos().makeFailure('type $t has no fields');
+
-      }
+  static public function getStatics(t:Type)
-
+    return
-  static public function getStatics(t:Type)
+      switch (reduce(t)) {
-    return
+        case TInst(t, _): Success(t.get().statics.get());
-      switch (reduce(t)) {
+        default: Failure('type has no statics');
-        case TInst(t, _): Success(t.get().statics.get());
+      }
-        default: Failure('type has no statics');
+      
-      }
+      
-
+  static public function getPosition(t:Type)
-  static public function toString(t:ComplexType)
+    return
-    return new Printer().printComplexType(t);
+      switch t {
-
+        case TInst(_.get() => {pos: pos}, _)
-  static public function isSubTypeOf(t:Type, of:Type, ?pos)
+        | TAbstract(_.get() => {pos: pos}, _)
-    return
+        | TType(_.get() => {pos: pos}, _)
-      ECheckType(ECheckType(macro null, toComplex(t)).at(pos), toComplex(of)).at(pos).typeof();
+        | TEnum(_.get() => {pos: pos}, _) : Success(pos);
-
+        case TMono(_.get() => t) if (t != null): getPosition(t);
-  static public function isDynamic(t:Type)
+        case TLazy(f): getPosition(f());
-    return switch reduce(t) {
+        case TDynamic(v) if(v != null): getPosition(v);
-      case TDynamic(_): true;
+        default: Failure('type "$t" has no position');
-      default: false;
+      }
-    }
+      
-
+      
-  static public function toType(t:ComplexType, ?pos:Position)
+
-    return (macro @:pos(pos.sanitize()) {
+  static public function toString(t:ComplexType)
-      var v:$t = null;
+    return new Printer().printComplexType(t);
-      v;
+
-    }).typeof();
+  static public function unifiesWith(from:Type, to:Type)
-
+    return Context.unify(from, to);
-  static public inline function instantiate(t:TypePath, ?args, ?pos)
+
-    return ENew(t, args == null ? [] : args).at(pos);
+  static public function isSubTypeOf(t:Type, of:Type, ?pos)
-
+    return
-  static public function asTypePath(s:String, ?params):TypePath {
+      if (Context.unify(t, of)) ECheckType(ECheckType(macro null, toComplex(t)).at(pos), toComplex(of)).at(pos).typeof();
-    var parts = s.split('.');
+      else Failure(new Error(t.toString() + ' should be ' + of.toString(), pos.sanitize()));
-    var name = parts.pop(),
+
-      sub = null;
+  static public function isDynamic(t:Type)
-    if (parts.length > 0 && parts[parts.length - 1].charCodeAt(0) < 0x5B) {
+    return switch reduce(t) {
-      sub = name;
+      case TDynamic(_): true;
-      name = parts.pop();
+      default: false;
-      if(sub == name) sub = null;
+    }
-    }
+
-    return {
+  static public function toType(t:ComplexType, ?pos:Position)
-      name: name,
+    return (macro @:pos(pos.sanitize()) {
-      pack: parts,
+      var v:$t = null;
-      params: params == null ? [] : params,
+      v;
-      sub: sub
+    }).typeof();
-    };
+
-  }
+  static public inline function instantiate(t:TypePath, ?args, ?pos)
-
+    return ENew(t, args == null ? [] : args).at(pos);
-  static public inline function asComplexType(s:String, ?params)
+
-    return TPath(asTypePath(s, params));
+  static public function asTypePath(s:String, ?params):TypePath {
-
+    var parts = s.split('.');
-  static public function reduce(type:Type, ?once) {
+    var name = parts.pop(),
-    function rec(t:Type)
+      sub = null;
-      return if (once) t else reduce(t, false);
+    if (parts.length > 0 && parts[parts.length - 1].charCodeAt(0) < 0x5B) {
-    return switch type {
+      sub = name;
-      case TAbstract(_.get() => { name: 'Null', pack: [] }, [t]): rec(t);
+      name = parts.pop();
-      case TLazy(f): rec(f());
+      if(sub == name) sub = null;
-      case TType(_, _): rec(Context.follow(type, once));
+    }
-      default: type;
+    return {
-    }
+      name: name,
-  }
+      pack: parts,
-
+      params: params == null ? [] : params,
-  static public function isVar(field:ClassField)
+      sub: sub
-    return switch (field.kind) {
+    };
-      case FVar(_, _): true;
+  }
-      default: false;
+
-    }
+  static public inline function asComplexType(s:String, ?params)
-
+    return TPath(asTypePath(s, params));
-  static public function register(type:Void->Type):Int {
+
-    types.set(idCounter, type);
+  static public function reduce(type:Type, ?once) {
-    return idCounter++;
+    function rec(t:Type)
-  }
+      return if (once) t else reduce(t, false);
-
+    return switch type {
-  static function paramsToComplex(params:Array<Type>):Array<TypeParam>
+      case TAbstract(_.get() => { name: 'Null', pack: [] }, [t]): rec(t);
-    return [for (p in params) TPType(toComplex(p))];
+      case TLazy(f): rec(f());
-
+      case TType(_, _): rec(Context.follow(type, once));
-  static function baseToComplex(t:BaseType, params:Array<Type>)
+      default: type;
-    return asComplexType(t.module + '.' + t.name, paramsToComplex(params));
+    }
-
+  }
-  static public function toComplex(type:Type, ?options:{ ?direct: Bool }):ComplexType {
+
-    var ret =
+  static public function isVar(field:ClassField)
-      if (options == null || options.direct != true) tink.macro.Sisyphus.toComplexType(type);
+    return switch (field.kind) {
-      else null;
+      case FVar(_, _): true;
-    if (ret == null)
+      default: false;
-      ret = lazyComplex(function () return type);
+    }
-    return ret;
+
-  }
+  static public function register(type:Void->Type):Int {
-
+    types.set(idCounter, type);
-  static public function lazyComplex(f:Void->Type)
+    return idCounter++;
-    return
+  }
-      TPath({
+
-        pack : ['tink','macro'],
+  static function paramsToComplex(params:Array<Type>):Array<TypeParam>
-        name : 'DirectType',
+    return [for (p in params) TPType(toComplex(p))];
-        params : [TPExpr(register(f).toExpr())],
+
-        sub : null,
+  static function baseToComplex(t:BaseType, params:Array<Type>)
-      });
+    return asComplexType(t.module + '.' + t.name, paramsToComplex(params));
-
+
-  static function resolveDirectType()
+  static public function toComplex(type:Type, ?options:{ ?direct: Bool }):ComplexType {
-    return
+    var ret =
-      switch reduce(Context.getLocalType()) {
+      if (options == null || options.direct != true) tink.macro.Sisyphus.toComplexType(type);
-        case TInst(_, [TInst(_.get() => { kind: KExpr(e) }, _)]):
+      else null;
-          types[e.getInt().sure()]();//When using compiler server, this call throws on occasion, in which case modifying this file (to update mtime and invalidate the cache) will solve the problem
+    if (ret == null)
-        default:
+      ret = lazyComplex(function () return type);
-          throw 'assert';
+    return ret;
-      }
+  }
-
+
-}
+  static public function intersect(types:Array<ComplexType>, ?pos:Position):Outcome<ComplexType, Error> {
+    
+    if (types.length == 1) return Success(types[1]);
+
+    var paths = [],
+        fields = [];
+
+    for (t in types)
+      switch t {
+        case TPath(p): paths.push(p);
+        case TAnonymous(f): 
+          
+          for (f in f) fields.push(f);
+
+        case TExtend(p, f): 
+          
+          for (f in f) fields.push(f);
+          for (p in p) paths.push(p);
+
+        default:
+          
+          return Failure(new Error(t.toString() + ' cannot be interesected', pos));
+      }
+
+    return Success(TExtend(paths, fields));
+  }
+
+  static public function lazyComplex(f:Void->Type)
+    return
+      TPath({
+        pack : ['tink','macro'],
+        name : 'DirectType',
+        params : [TPExpr(register(f).toExpr())],
+        sub : null,
+      });
+
+  static function resolveDirectType()
+    return
+      switch reduce(Context.getLocalType()) {
+        case TInst(_, [TInst(_.get() => { kind: KExpr(e) }, _)]):
+          types[e.getInt().sure()]();//When using compiler server, this call throws on occasion, in which case modifying this file (to update mtime and invalidate the cache) will solve the problem
+        default:
+          throw 'assert';
+      }
+
+  static public function compare(t1:Type, t2:Type, ?follow:Bool = true) {
+    if (follow) {
+      t1 = t1.reduce();
+      t2 = t2.reduce();
+    }
+    
+    return switch t1.getIndex() - t2.getIndex() {
+      case 0: 
+        Reflect.compare(t1.toString(), t2.toString());//much to my surprise, this actually seems to work (at least with 3.4)
+      case v: v;
+    }    
+  }
+
+  static var SUGGESTIONS = ~/ \(Suggestions?: .*\)$/;
+
+  static public function getFieldSuggestions(type:ComplexType, name:String):String 
+    return switch (macro (null : $type).$name).typeof() {
+      case Failure(SUGGESTIONS.match(_.message) => true): SUGGESTIONS.matched(0);
+      default: '';
+    }
+
+  static public function toDecl(p:TypeParameter):TypeParamDecl 
+    return {
+      name: p.name,
+      constraints: switch p.t {
+        case TInst(_.get() => { kind: KTypeParameter(c)}, _): [for(c in c) c.toComplex()];
+        case _: throw 'unreachable';
+      }
+    }
+
+  static public function toTypeParam(p:TypeParameter):TypeParam
+    return TPType(p.t.toComplex());
+
+}

tests/Functions.hx

@@ -0,0 +1,11 @@
+import haxe.macro.Context;
+import haxe.macro.Expr;
+using tink.MacroApi;
+
+class Functions extends Base {
+  function test() {
+    var f:Function = (macro function () {}).getFunction().sure();
+    f.asExpr('foo');
+    assertTrue(true);
+  }
+}

tests/Misc.hx

@@ -0,0 +1,10 @@
+import tink.MacroApi;
+import haxe.unit.TestCase;
+
+using tink.CoreApi;
+
+class Misc extends TestCase {
+  function testMain() {
+    assertEquals('Run', MacroApi.getMainClass().force());
+  }
+}

tests/Run.hx

@@ -12,6 +12,8 @@ class Run {
     new Types(),
     new Positions(),
     new TypeMapTest(),
+    new Functions(),
+    new Misc(),
   ];
   #end
   macro static function test() {

tests/Types.hx

@@ -1,5 +1,6 @@
 package ;
 
+#if macro
 import haxe.macro.Expr;
 import haxe.macro.Context;
 
@@ -20,6 +21,7 @@ class Types extends Base {
     assertFalse(o.isSuccess());
     
   function testIs() {
+    
     assertSuccess(resolve('Int').isSubTypeOf(resolve('Float')));
     assertFailure(resolve('Float').isSubTypeOf(resolve('Int')));
   }  
@@ -41,10 +43,20 @@ class Types extends Base {
     var bool = type(macro : Bool);
     assertTrue(blank().isSubTypeOf(bool).isSuccess());
     assertTrue(bool.isSubTypeOf(blank()).isSuccess());
-    
-    MacroApi.pos().makeBlankType().toString();
   }
 
+  #if haxe4
+  function testFinal() {
+    var t = macro : {
+      final foo:Int;
+    };
+    switch t.toType().sure() {
+      case TAnonymous(_.get().fields => [f]): assertTrue(f.isFinal);
+      default:
+    }
+  }
+  #end
+
   function testExpr() {
     assertEquals('VarChar<255>', (macro : VarChar<255>).toType().sure().toComplex().toString());
   }
@@ -53,4 +65,5 @@ class Types extends Base {
     assertEquals('String', Context.getType('String').toComplex().toString());
     assertEquals('tink.CoreApi.Noise', Context.getType('tink.CoreApi.Noise').toComplex().toString());
   }
-}
+}
+#end