From 7223ae474ad69563c748436f4bf40e12eb46f58b Mon Sep 17 00:00:00 2001
From: back2dos <back2dos@gmail.com>
Date: Mon, 30 Sep 2013 17:08:30 +0200
Subject: [PATCH] Reviewed constructor API.

---
 src/tink/macro/ClassBuilder.hx | 17 +++++++------
 src/tink/macro/Constructor.hx  | 46 +++++++++++++++++++++++-----------
 2 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/src/tink/macro/ClassBuilder.hx b/src/tink/macro/ClassBuilder.hx
index aee4052..6f626dd 100644
--- a/src/tink/macro/ClassBuilder.hx
+++ b/src/tink/macro/ClassBuilder.hx
@@ -44,14 +44,16 @@ class ClassBuilder {
 				addMember(field);
 	}
 	
-	public function getConstructor():Constructor {
+	public function getConstructor(?fallback:Function):Constructor {
 		if (constructor == null) 
-			if (target.superClass != null && target.superClass.t.get().constructor != null) {
+			if (fallback != null)
+				new Constructor(fallback);
+			else if (target.superClass != null && target.superClass.t.get().constructor != null) {
 				try {
 					var ctor = Context.getLocalClass().get().superClass.t.get().constructor.get();
 					var func = Context.getTypedExpr(ctor.expr()).getFunction().sure();
 					
-					//TODO: Make sure the code below is no longer necessary
+					//TODO: Check that the code below is no longer necessary
 					// for (arg in func.args)
 						// arg.type = null;
 						
@@ -87,18 +89,16 @@ class ClassBuilder {
 		}
 		for (m in macros)
 			ret.push(m);
+		
 		if (verbose) 
 			for (field in ret) 
 				Context.warning(new Printer().printField(field), field.pos);
+		
 		return ret;		
 	}
 	public function iterator():Iterator<Member>
 		return this.memberList.copy().iterator();
 		
-	public function getOwnMember(name:String):Member
-		return 
-			memberMap.get(name);
-	
 	public function hasOwnMember(name:String):Bool
 		return 
 			macros.exists(name) || memberMap.exists(name);
@@ -136,7 +136,8 @@ class ClassBuilder {
 			
 		if (hasOwnMember(m.name)) 
 			m.pos.error('duplicate member declaration ' + m.name);
-			
+		if (!m.isStatic && hasSuperField(m.name))
+			m.overrides = true;
 		memberMap.set(m.name, m);
 		if (front) 
 			memberList.unshift(m);
diff --git a/src/tink/macro/Constructor.hx b/src/tink/macro/Constructor.hx
index c6ae900..991b004 100644
--- a/src/tink/macro/Constructor.hx
+++ b/src/tink/macro/Constructor.hx
@@ -1,9 +1,15 @@
 package tink.macro;
 
 import haxe.macro.Expr;
-
+import tink.core.Pair;
 using tink.MacroApi;
 
+enum FieldInit {
+	Value(e:Expr);
+	Arg(?t:ComplexType, ?noPublish:Bool);
+	OptArg(?e:Expr, ?t:ComplexType, ?noPublish:Bool);
+}
+
 class Constructor {
 	var oldStatements:Array<Expr>;
 	var nuStatements:Array<Expr>;
@@ -15,7 +21,7 @@ class Constructor {
 	var superCall:Expr;
 	public var isPublic:Null<Bool>;
 	
-	public function new(f:Function, ?isPublic:Null<Bool> = null, ?pos:Position) {
+	public function new(f:Function, ?isPublic:Null<Bool> = null, ?pos:Position, ?meta:Metadata) {
 		this.nuStatements = [];
 		this.isPublic = isPublic;
 		this.pos = pos.sanitize();
@@ -56,19 +62,30 @@ class Constructor {
 			this.nuStatements.unshift(e)
 		else
 			this.nuStatements.push(e);
+	
+	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, ?prepend:Bool) {
+		var e =
+			switch with {
+				case Arg(t, noPublish):
+					if (noPublish != true) 
+						publish();
+					args.push( { name : name, opt : false, type : t } );
+					name.resolve(pos);
+				case OptArg(e, t, noPublish):
+					if (noPublish != true) 
+						publish();
+					args.push( { name : name, opt : true, type : t, value: e } );
+					name.resolve(pos);
+				case Value(e): e;
+			}
 			
-	public function init(name:String, pos:Position, ?e:Expr, ?def:Expr, ?prepend:Bool, ?t:ComplexType) {
-		if (e == null) {
-			e = name.resolve(pos);
-			args.push( { name : name, opt : def != null, type : t, value : def } );
-			if (isPublic == null) 
-				isPublic = true;
-		}
-		if (t != null)
-			e = ECheckType(e, t).at(e.pos);
-		var s = EUntyped('this'.resolve(pos)).at(pos).field(name, pos).assign(e, pos);
-			
-		addStatement(s, prepend);
+		var tmp = MacroApi.tempName();
+		
+		addStatement(macro @:pos(pos) if (false) { var $tmp = this.$name; $i{tmp} = $e; }, true);
+		addStatement(macro @:pos(pos) (untyped this).$name = $e, prepend);
 	}
 	public inline function publish() 
 		if (isPublic == null) 
@@ -88,6 +105,7 @@ class Constructor {
 			params: []
 		};
 		for (hook in onGenerateHooks) hook(f);
+		onGenerateHooks = [];
 		return {
 			name: 'new',
 			doc : null,