Browse Source

remove redundant @:keep (implied by type-level @:keep)

Simon Krajewski 11 years ago
parent
commit
0fbd6aa294
2 changed files with 17 additions and 18 deletions
  1. 9 8
      std/python/Boot.hx
  2. 8 10
      std/python/internal/ArrayImpl.hx

+ 9 - 8
std/python/Boot.hx

@@ -33,7 +33,7 @@ _hx_c._hx_AnonObject = _hx_AnonObject
 ")
 ")
 @:keep class Boot {
 @:keep class Boot {
 
 
-	@:keep static function __init__ () {
+	static function __init__ () {
 		Internal.importAsPrefixed("inspect", "boot_inspect");
 		Internal.importAsPrefixed("inspect", "boot_inspect");
 		Boot.inspect = Internal.pythonCodePrefixed("boot_inspect");
 		Boot.inspect = Internal.pythonCodePrefixed("boot_inspect");
 
 
@@ -106,9 +106,11 @@ _hx_c._hx_AnonObject = _hx_AnonObject
 	inline static function inspectIsClass(o:Dynamic):Bool {
 	inline static function inspectIsClass(o:Dynamic):Bool {
 		return Syntax.callField(inspect, "isclass", o);
 		return Syntax.callField(inspect, "isclass", o);
 	}
 	}
+
 	inline static function inspectIsFunction(o:Dynamic):Bool {
 	inline static function inspectIsFunction(o:Dynamic):Bool {
 		return Syntax.callField(inspect, "isclass", o);
 		return Syntax.callField(inspect, "isclass", o);
 	}
 	}
+
 	inline static function inspectIsMethod(o:Dynamic):Bool {
 	inline static function inspectIsMethod(o:Dynamic):Bool {
 		return Syntax.callField(inspect, "isclass", o);
 		return Syntax.callField(inspect, "isclass", o);
 	}
 	}
@@ -116,27 +118,26 @@ _hx_c._hx_AnonObject = _hx_AnonObject
 	static var builtin:Dynamic;
 	static var builtin:Dynamic;
 	static var inspect:Dynamic;
 	static var inspect:Dynamic;
 
 
-	@:keep static inline function isClass(o:Dynamic) : Bool {
+	static inline function isClass(o:Dynamic) : Bool {
 		return o != null && (o == String || inspectIsClass(o));
 		return o != null && (o == String || inspectIsClass(o));
 	}
 	}
 
 
-	@:keep static inline function isAnonObject (o:Dynamic) {
+	static inline function isAnonObject (o:Dynamic) {
 		return isInstance(o, AnonObject);
 		return isInstance(o, AnonObject);
 	}
 	}
 
 
-	@:keep private static function _add_dynamic(a:Dynamic,b:Dynamic):Dynamic
-	{
+	private static function _add_dynamic(a:Dynamic,b:Dynamic):Dynamic {
 		if (isInstance(a, String) || isInstance(b, String)) {
 		if (isInstance(a, String) || isInstance(b, String)) {
 			return toString1(a,"") + toString1(b,"");
 			return toString1(a,"") + toString1(b,"");
 		}
 		}
 		return Syntax.binop(a, "+", b);
 		return Syntax.binop(a, "+", b);
 	}
 	}
 
 
-	@:keep static function toString (o:Dynamic) {
+	static function toString (o:Dynamic) {
 		return toString1(o, "");
 		return toString1(o, "");
 	}
 	}
 
 
-	@:keep private static function toString1(o:Dynamic,s:String):String {
+	private static function toString1(o:Dynamic,s:String):String {
 
 
 		if (s == null) s = "";
 		if (s == null) s = "";
 		if( o == null ) return "null";
 		if( o == null ) return "null";
@@ -327,7 +328,7 @@ _hx_c._hx_AnonObject = _hx_AnonObject
 		return isInstance(o, Array);
 		return isInstance(o, Array);
 	}
 	}
 
 
-	@:keep static function field( o : Dynamic, field : String ) : Dynamic {
+	static function field( o : Dynamic, field : String ) : Dynamic {
 		if (field == null) return null;
 		if (field == null) return null;
 
 
 		switch (field) {
 		switch (field) {

+ 8 - 10
std/python/internal/ArrayImpl.hx

@@ -43,7 +43,7 @@ class ArrayImpl {
 		return Syntax.field(builtin(), "list")(x);
 		return Syntax.field(builtin(), "list")(x);
 	}
 	}
 
 
-	@:keep public static inline function iterator<T>(x:Array<T>) : Iterator<T> {
+	public static inline function iterator<T>(x:Array<T>) : Iterator<T> {
 		return new HaxeIterator(Syntax.callField(x, "__iter__"));
 		return new HaxeIterator(Syntax.callField(x, "__iter__"));
 	}
 	}
 
 
@@ -93,7 +93,7 @@ class ArrayImpl {
 		return x.insert(0,e);
 		return x.insert(0,e);
 	}
 	}
 
 
-	@:keep public static function remove<T>(x:Array<T>,e : T) : Bool {
+	public static function remove<T>(x:Array<T>,e : T) : Bool {
 		try {
 		try {
 			Syntax.callField(x, "remove", e);
 			Syntax.callField(x, "remove", e);
 			return true;
 			return true;
@@ -123,11 +123,11 @@ class ArrayImpl {
 		return res;
 		return res;
 	}
 	}
 
 
-	@:keep public static inline function map<S,T>(x:Array<T>, f : T -> S ) : Array<S> {
+	public static inline function map<S,T>(x:Array<T>, f : T -> S ) : Array<S> {
 		return Syntax.field(builtin(), "list")(Syntax.field(builtin(), "map")(f, x));
 		return Syntax.field(builtin(), "list")(Syntax.field(builtin(), "map")(f, x));
 	}
 	}
 
 
-	@:keep public static inline function filter<T>(x:Array<T>, f : T -> Bool ) : Array<T> {
+	public static inline function filter<T>(x:Array<T>, f : T -> Bool ) : Array<T> {
 		return Syntax.field(builtin(), "list")(Syntax.field(builtin(), "filter")(f, x));
 		return Syntax.field(builtin(), "list")(Syntax.field(builtin(), "filter")(f, x));
 	}
 	}
 
 
@@ -139,13 +139,11 @@ class ArrayImpl {
 		Syntax.callField(a, "reverse");
 		Syntax.callField(a, "reverse");
 	}
 	}
 
 
-	@:keep private static inline function __get<T>(x:Array<T>, idx:Int):T
-	{
+	private static inline function __get<T>(x:Array<T>, idx:Int):T {
 		return if (idx < x.length && idx > -1) Syntax.arrayAccess(x, idx) else null;
 		return if (idx < x.length && idx > -1) Syntax.arrayAccess(x, idx) else null;
 	}
 	}
 
 
-	@:keep private static inline function __set<T>(x:Array<T>, idx:Int, v:T):T
-	{
+	private static inline function __set<T>(x:Array<T>, idx:Int, v:T):T {
 		var l = x.length;
 		var l = x.length;
 		while (l < idx) {
 		while (l < idx) {
 			x.push(null);
 			x.push(null);
@@ -159,11 +157,11 @@ class ArrayImpl {
 		return v;
 		return v;
 	}
 	}
 
 
-	@:keep private static inline function __unsafe_get<T>(x:Array<T>,idx:Int):T {
+	private static inline function __unsafe_get<T>(x:Array<T>,idx:Int):T {
 		return Syntax.arrayAccess(x, idx);
 		return Syntax.arrayAccess(x, idx);
 	}
 	}
 
 
-	@:keep private static inline function __unsafe_set<T>(x:Array<T>,idx:Int, val:T):T {
+	private static inline function __unsafe_set<T>(x:Array<T>,idx:Int, val:T):T {
 		Syntax.assign(Syntax.arrayAccess(x, idx), val);
 		Syntax.assign(Syntax.arrayAccess(x, idx), val);
 		return val;
 		return val;
 	}
 	}