Skip to content

Commit

Permalink
Merge pull request #58 from DoclerLabs/develop
Browse files Browse the repository at this point in the history
prepare 0.16.0
  • Loading branch information
aliokan authored Mar 6, 2017
2 parents e5761ab + 6ddc430 commit f2b2dc9
Show file tree
Hide file tree
Showing 90 changed files with 1,277 additions and 1,929 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
hexCore.iml
bin
.haxelib
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,15 @@ before_install:
- sudo apt-get install -qq libgtk2.0-0:i386

install:
- haxelib newrepo
#hexLog
- git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexLog.git ./hexlog
- haxelib dev hexlog ./hexlog
#hexUnit
- git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexUnit.git ./hexunit
- haxelib dev hexunit ./hexunit
- haxelib dev hexcore .
- haxelib path hexcore
- export DISPLAY=:99.0;
- export AUDIODEV=null;
- haxe flash/install.hxml
Expand Down
7 changes: 5 additions & 2 deletions build-each.hxml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
-main MainCoreTest
-cp src
-lib hexcore
-lib hexunit
-lib hexlog

-cp test
-cp hexunit/src

-D debug=true
4 changes: 2 additions & 2 deletions haxelib.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"description": "Independent core elements for building OOP projects and frameworks",
"contributors": ["doclerlabs"],
"releasenote": "First release. Still alpha testing",
"version": "0.1.0",
"version": "git",
"url": "https://github.com/DoclerLabs/hexCore",
"dependencies":
{
"hexlog": "git:https://github.com/DoclerLabs/hexLog.git"
}
}
2 changes: 1 addition & 1 deletion src/hex/collection/HashMap.hx
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ class HashMap<K, V> implements IHashMap<K, V>
{
s = '_B' + o;
}
else if ( Std.is( o, Float ) || Std.is( o, Int ) )
else if ( Std.is( o, Float ) )
{
s = '_N' + o;
}
Expand Down
2 changes: 1 addition & 1 deletion src/hex/collection/Locator.hx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import hex.error.IllegalArgumentException;
import hex.error.NoSuchElementException;
import hex.event.ITrigger;
import hex.event.ITriggerOwner;
import hex.log.Stringifier;
import hex.util.Stringifier;

/**
* ...
Expand Down
10 changes: 6 additions & 4 deletions src/hex/collection/LocatorMessage.hx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package hex.collection;

import hex.error.PrivateConstructorException;
import hex.event.MessageType;

/**
Expand All @@ -8,11 +9,12 @@ import hex.event.MessageType;
*/
class LocatorMessage
{
inline static public var REGISTER = new MessageType( "onRegister" );
inline static public var UNREGISTER = new MessageType( "onUnregister" );

/** @private */
function new()
{

throw new PrivateConstructorException();
}

inline static public var REGISTER = new MessageType( "onRegister" );
inline static public var UNREGISTER = new MessageType( "onUnregister" );
}
47 changes: 0 additions & 47 deletions src/hex/control/AsyncHandler.hx

This file was deleted.

116 changes: 0 additions & 116 deletions src/hex/control/AsyncHandlerUtil.hx

This file was deleted.

26 changes: 26 additions & 0 deletions src/hex/control/Callback.hx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package hex.control;

/**
* ...
* @author back2dos
*/
abstract Callback<T>( T->Void ) from ( T->Void )
{
inline function new(f)
this = f;

@:from static function fromNiladic<A>( f : Void->Void ) : Callback<A> //inlining this seems to cause recursive implicit casts
return new Callback( function ( r ) f() );

public inline function invoke( data : T ) : Void //TODO: consider swallowing null here
( this )( data );

@:to inline function toFunction()
return this;

@:from static function fromMany<A>( callbacks : Array<Callback<A>> ) : Callback<A>
return
function ( v : A )
for ( callback in callbacks )
callback.invoke( v );
}
Loading

0 comments on commit f2b2dc9

Please sign in to comment.