Merge pull request #81 from DoclerLabs/develop

prepare 0.35.0
DoclerLabs · Feb 19, 2018 · 7de1918 · 7de1918
2 parents da63d92 + 7f967d4
commit 7de1918
Show file tree

Hide file tree

Showing 32 changed files with 43 additions and 60 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -38,6 +38,9 @@ install:
 #hexUnit
   - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexUnit.git ./hexunit
   - haxelib dev hexunit ./hexunit
+#tink_macro
+  - haxelib install tink_macro 0.16.1
+#hexCore
   - haxelib dev hexcore .
   - haxelib path hexcore
   - export DISPLAY=:99.0;

diff --git a/haxelib.json b/haxelib.json
@@ -8,8 +8,9 @@
   "releasenote": "First release. Still alpha testing",
   "version": "git",
   "url": "https://github.com/DoclerLabs/hexCore",
-  "dependencies": 
+  "dependencies":
   {
-    "hexlog": "git:https://github.com/DoclerLabs/hexLog.git"
+    "hexlog": "git:https://github.com/DoclerLabs/hexLog.git",
+    "tink_macro": "0.16.1"
   }
 }
diff --git a/src/hex/util/MacroUtil.hx b/src/hex/util/MacroUtil.hx
@@ -57,6 +57,11 @@ class MacroUtil
 		}
 	}
 
+	static public function getIdent( e : Expr ) : String
+	{
+		return switch( e.expr ) { case EConst(CIdent(id)): id; case _: null; };
+	}
+
 	static public function getClassName( ct : ClassType ) : String
 	{
 		return ct.pack.join( "." ) + "." + ct.name;
@@ -143,7 +148,7 @@ class MacroUtil
 		}
 	}
 
-	static public function getClassType( qualifiedClassName : String, position : Position = null ) : ClassType
+	static public function getClassType( qualifiedClassName : String, position : Position = null, shouldThrow = true ) : ClassType
 	{
 		var type = null;
 
@@ -153,7 +158,14 @@ class MacroUtil
 		}
 		catch( e : Dynamic )
 		{
-			Context.error( "Fails to retrieve ClassType for class named '" + qualifiedClassName + "'\nError caught: " + e, position == null ? Context.currentPos() : position );
+			if ( shouldThrow )
+			{
+				Context.error( "Fails to retrieve ClassType for class named '" + qualifiedClassName + "'\nError caught: " + e, position == null ? Context.currentPos() : position );
+			}
+			else
+			{
+				return null;
+			}
 		}
 
 		switch type 
@@ -319,5 +331,8 @@ class MacroUtil
 		return TypeTools.toComplexType( 
 						Context.typeof( 
 							Context.parseInlineString( '( null : ${typeName})', Context.currentPos() ) ) );
+
+	static public inline function getTypeFromString( typeName : String ) : haxe.macro.Type
+		return Context.typeof( Context.parseInlineString( '( null : ${typeName})', Context.currentPos() ) );
 	#end
 }
diff --git a/src/hex/util/TinkHelper.hx b/src/hex/util/TinkHelper.hx
@@ -0,0 +1,20 @@
+package hex.util;
+
+#if macro
+using tink.MacroApi;
+
+/**
+ * ...
+ * @author Francis Bourre
+ */
+class TinkHelper 
+{
+	function new() {}
+
+	static public function fcqn( ct : haxe.macro.Expr.ComplexType ) : String
+	{
+		var s = ct.toType().sure().toComplex().toString();
+		return s.split( 'StdTypes.' ).join( '' ).split(' ').join('');
+	}
+}
+#end
diff --git a/test/hex/collection/ArrayMapTest.hx b/test/hex/collection/ArrayMapTest.hx
@@ -9,8 +9,6 @@ import hex.unittest.assertion.Assert;
  */
 class ArrayMapTest
 {
-	public function new() { }
-
 	var _map : ArrayMap<MockKeyClass, MockValueClass>;
 
 	@Before

diff --git a/test/hex/collection/HashMapTest.hx b/test/hex/collection/HashMapTest.hx
@@ -9,8 +9,6 @@ import hex.unittest.assertion.Assert;
  */
 class HashMapTest
 {
-	public function new() { }
-
 	var _map : HashMap<MockKeyClass, MockValueClass>;
 
 	@Before

diff --git a/test/hex/collection/LocatorMessageTest.hx b/test/hex/collection/LocatorMessageTest.hx
@@ -8,8 +8,6 @@ import hex.unittest.assertion.Assert;
  */
 class LocatorMessageTest
 {
-	public function new() { }
-
 	@Test( "test constructor is private" ) 
 	public function testPrivateConstructor() : Void
 	{

diff --git a/test/hex/collection/LocatorTest.hx b/test/hex/collection/LocatorTest.hx
@@ -12,8 +12,6 @@ import hex.unittest.assertion.Assert;
  */
 class LocatorTest
 {
-	public function new() { }
-
 	var _locator : MockLocator;
 
 	@Before

diff --git a/test/hex/control/AsyncCallbackTest.hx b/test/hex/control/AsyncCallbackTest.hx
@@ -15,8 +15,6 @@ import hex.unittest.assertion.Assert;
  */
 class AsyncCallbackTest 
 {
-	public function new() { }
-
 	@Test( 'Test with argument result' )
 	public function testWithArgumentResult() : Void
 	{

diff --git a/test/hex/control/payload/ExecutionPayloadTest.hx b/test/hex/control/payload/ExecutionPayloadTest.hx
@@ -13,8 +13,6 @@ class ExecutionPayloadTest
 {
 	var _data 				: MockData;
 	var _executionPayload 	: ExecutionPayload;
-
-	public function new() { }
 
     @Before
     public function setUp() : Void

diff --git a/test/hex/control/payload/PayloadUtilTest.hx b/test/hex/control/payload/PayloadUtilTest.hx
@@ -13,8 +13,6 @@ import hex.unittest.assertion.Assert;
  */
 class PayloadUtilTest
 {
-	public function new() { }
-
 	@Test( "test constructor is private" ) 
 	public function testPrivateConstructor() : Void
 	{

diff --git a/test/hex/core/HashCodeFactoryTest.hx b/test/hex/core/HashCodeFactoryTest.hx
@@ -5,8 +5,6 @@ import hex.unittest.assertion.Assert;
 
 class HashCodeFactoryTest
 {
-	public function new() { }
-
 	@Test( "test constructor is private" ) 
 	public function testPrivateConstructor() : Void
 	{

diff --git a/test/hex/data/GUIDTest.hx b/test/hex/data/GUIDTest.hx
@@ -8,8 +8,6 @@ import hex.unittest.assertion.Assert;
  */
 class GUIDTest
 {
-	public function new() { }
-
 	@Test( "test constructor is private" ) 
 	public function testPrivateConstructor() : Void
 	{

diff --git a/test/hex/domain/DefaultDomainTest.hx b/test/hex/domain/DefaultDomainTest.hx
@@ -8,8 +8,6 @@ import hex.unittest.assertion.Assert;
  */
 class DefaultDomainTest
 {
-	public function new() { }
-
     @Test( "Test if DefaultDomain static variable exists" )
     public function testIfDefaultDomainStaticVariableExists() : Void
     {

diff --git a/test/hex/domain/DomainTest.hx b/test/hex/domain/DomainTest.hx
@@ -11,8 +11,6 @@ import hex.unittest.assertion.Assert;
  */
 class DomainTest
 {
-	public function new() { }
-
     @Test( "Test 'name' property passed to constructor" )
     public function testConstructor() : Void
     {

diff --git a/test/hex/domain/NoDomainTest.hx b/test/hex/domain/NoDomainTest.hx
@@ -8,8 +8,6 @@ import hex.unittest.assertion.Assert;
  */
 class NoDomainTest
 {
-	public function new() { }
-
 	@Test( "Test if NoDomain static variable exists" )
     public function testIfNoDomainStaticVariableExists() : Void
     {

diff --git a/test/hex/domain/TopLevelDomainTest.hx b/test/hex/domain/TopLevelDomainTest.hx
@@ -8,8 +8,6 @@ import hex.unittest.assertion.Assert;
  */
 class TopLevelDomainTest
 {
-	public function new() { }
-
 	@Test( "Test if 'TopLevelDomain' static variable exists" )
     public function testIfTopLevelDomainStaticVariableExists() : Void
     {

diff --git a/test/hex/error/ExceptionTest.hx b/test/hex/error/ExceptionTest.hx
@@ -8,8 +8,6 @@ import hex.unittest.assertion.Assert;
  */
 class ExceptionTest 
 {
-	public function new() { }
-
 	@Test( "Test 'name' property passed to constructor" )
     public function testConstructor() : Void
     {

diff --git a/test/hex/event/BasicEventTest.hx b/test/hex/event/BasicEventTest.hx
@@ -8,8 +8,6 @@ import hex.unittest.assertion.Assert;
  */
 class BasicEventTest
 {
-	public function new() { }
-
     @Test( "Test 'type' parameter passed to constructor" )
     public function testType() : Void
     {

diff --git a/test/hex/event/ClosuredispatcherTest.hx b/test/hex/event/ClosuredispatcherTest.hx
@@ -11,8 +11,6 @@ class ClosuredispatcherTest
     var _dispatcher   		: ClosureDispatcher;
     var _listener     		: MockEventListener;
 
-	public function new() { }
-
     @Before
     public function setUp() : Void
     {

diff --git a/test/hex/event/CompositeDispatcherTest.hx b/test/hex/event/CompositeDispatcherTest.hx
@@ -8,8 +8,6 @@ class CompositeDispatcherTest
 {
 	var _dispatcher : CompositeDispatcher;
 
-	public function new() { }
-
 	@Before
     public function setUp() : Void
     {

diff --git a/test/hex/event/DispatcherTest.hx b/test/hex/event/DispatcherTest.hx
@@ -12,8 +12,6 @@ class DispatcherTest
 	var _dispatcher   		: Dispatcher<IMockListener>;
     var _listener     		: MockEventListener;
 
-	public function new() { }
-
     @Before
     public function setUp() : Void
     {

diff --git a/test/hex/event/FullClosureDispatcherTest.hx b/test/hex/event/FullClosureDispatcherTest.hx
@@ -10,8 +10,6 @@ class FullClosureDispatcherTest
     var _dispatcher   		: FullClosureDispatcher;
     var _listener     		: MockEventListener;
 
-	public function new() { }
-
     @Before
     public function setUp() : Void
     {

diff --git a/test/hex/event/TriggerTest.hx b/test/hex/event/TriggerTest.hx
@@ -11,8 +11,6 @@ import hex.unittest.assertion.Assert;
  */
 class TriggerTest
 {
-	public function new() { }
-
 	@Test( "test trigger instantiation and callbacks" )
     public function testTriggerInstantiationAndCallbacks() : Void
     {

diff --git a/test/hex/model/ModelDispatcherTest.hx b/test/hex/model/ModelDispatcherTest.hx
@@ -11,8 +11,6 @@ class ModelDispatcherTest
 {
 	var _dispatcher : MockDispatcher;
 
-	public function new() { }
-
 	@Before
 	public function setUp() : Void
 	{

diff --git a/test/hex/service/ServiceConfigurationTest.hx b/test/hex/service/ServiceConfigurationTest.hx
@@ -8,8 +8,6 @@ import hex.unittest.assertion.Assert;
  */
 class ServiceConfigurationTest
 {
-	public function new() { }
-
     @Test( "Test 'timeout' property passed to constructor" )
     public function testConstructor() : Void
     {

diff --git a/test/hex/structures/PointFTest.hx b/test/hex/structures/PointFTest.hx
@@ -8,8 +8,6 @@ import hex.unittest.assertion.Assert;
  */
 class PointFTest
 {
-	public function new() { }
-
 	@Test( "test constructor" )
 	public function testConstructor() 
 	{

diff --git a/test/hex/structures/PointFactoryTest.hx b/test/hex/structures/PointFactoryTest.hx
@@ -8,8 +8,6 @@ import hex.unittest.assertion.Assert;
  */
 class PointFactoryTest 
 {
-	public function new() { }
-
 	@Test( "test constructor is private" ) 
 	public function testPrivateConstructor() : Void
 	{

diff --git a/test/hex/structures/PointTest.hx b/test/hex/structures/PointTest.hx
@@ -8,8 +8,6 @@ import hex.unittest.assertion.Assert;
  */
 class PointTest
 {
-	public function new() { }
-
 	@Test( "test constructor" )
 	public function testConstructor() 
 	{

diff --git a/test/hex/structures/SizeTest.hx b/test/hex/structures/SizeTest.hx
@@ -8,8 +8,6 @@ import hex.unittest.assertion.Assert;
  */
 class SizeTest
 {
-	public function new() { }
-
     @Test( "Test 'width' and 'height' property passed to constructor" )
     public function testConstructor() : Void
     {

diff --git a/test/hex/util/ClassUtilTest.hx b/test/hex/util/ClassUtilTest.hx
@@ -12,8 +12,6 @@ class ClassUtilTest
 	public static var STATIC_REF : String = "static_ref";
 	public static inline var STATIC_INLINE_REF : String = "static_inline_ref";
 
-	public function new() { }
-
 	@Test( "test constructor is private" ) 
 	public function testPrivateConstructor() : Void
 	{

diff --git a/test/hex/util/StringifierTest.hx b/test/hex/util/StringifierTest.hx
@@ -8,8 +8,6 @@ import hex.unittest.assertion.Assert;
  */
 class StringifierTest 
 {
-	public function new() { }
-
 	@Test( "test constructor is private" ) 
 	public function testPrivateConstructor() : Void
 	{
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,8 +9,6 @@ import hex.unittest.assertion.Assert; @@
      */
     class ArrayMapTest
     {
-    	public function new() { }
     	var _map : ArrayMap<MockKeyClass, MockValueClass>;
     	@Before
@@ Expand Down @@