[java] moved haxe.lang.* package to java.internal

std/java/Boot.hx

@@ -1,11 +1,11 @@
 package java;
-import haxe.lang.Exceptions;
-import haxe.lang.Function;
-import haxe.lang.HxObject;
-import haxe.lang.Runtime;
-import haxe.lang.Iterator;
+import java.internal.Exceptions;
+import java.internal.Function;
+import java.internal.HxObject;
+import java.internal.Runtime;
+import java.internal.Iterator;
 import java.Lib;
-//import haxe.lang.StringExt;
+//import java.internal.StringExt;
 import java.StdTypes;
 import Hash;
 import Reflect;
@@ -14,12 +14,8 @@ import java.lang.Character;
 import java.lang.Class;
 import java.lang.Number;
 import java.lang.Throwable;
-import haxe.lang.StringExt;
-import haxe.lang.FieldLookup;
-/**
- * ...
- * @author waneck
- */
+import java.internal.StringExt;
+import java.internal.FieldLookup;
 
 extern class Boot 
 {

std/java/_std/Reflect.hx

@@ -1,4 +1,4 @@
-import haxe.lang.Function;
+import java.internal.Function;
 import java.Boot;
 /*
  * Copyright (c) 2005, The haXe Project Contributors

std/java/_std/Std.hx

@@ -24,7 +24,7 @@
  */
 import java.Boot;
 import java.Lib;
-import haxe.lang.Exceptions;
+import java.internal.Exceptions;
  
 @:core_api @:nativegen class Std {
 	public static function is( v : Dynamic, t : Dynamic ) : Bool 

std/java/_std/haxe/lang/Exceptions.hx → std/java/internal/Exceptions.hx

@@ -1,11 +1,6 @@
-package haxe.lang;
+package java.internal;
 import java.lang.Throwable;
 
-/**
- * ...
- * @author waneck
- */
-
 @:nativegen @:keep @:native("haxe.lang.HaxeException") private class HaxeException extends RuntimeException
 {
 	private var obj:Dynamic;

std/java/_std/haxe/lang/FieldLookup.hx → std/java/internal/FieldLookup.hx

@@ -1,4 +1,4 @@
-package haxe.lang;
+package java.internal;
 
 @:native('haxe.lang.FieldLookup')
 @:static private class FieldLookup 

std/java/_std/haxe/lang/Function.hx → std/java/internal/Function.hx

@@ -1,5 +1,5 @@
-package haxe.lang;
-import haxe.lang.Runtime;
+package java.internal;
+import java.internal.Runtime;
 
 /**
  * These classes are automatically generated by the compiler. They are only
@@ -24,7 +24,7 @@ import haxe.lang.Runtime;
 	}
 }
 
-@:nativegen class VarArgsFunction extends VarArgsBase
+@:nativegen @:native('haxe.lang.VarArgsFunction') class VarArgsFunction extends VarArgsBase
 {
 	private var fun:Array<Dynamic>->Dynamic;
 	
@@ -40,7 +40,7 @@ import haxe.lang.Runtime;
 	}
 }
 
-@:nativegen class Closure extends VarArgsBase
+@:nativegen @:native('haxe.lang.Closure') class Closure extends VarArgsBase
 {
 	private var obj:Dynamic;
 	private var field:String;

std/java/internal/HxObject.hx

@@ -0,0 +1 @@
+package java.internal;
import java.internal.IEquatable;
private typedef StdType = Type;

@:native('haxe.lang.HxObject')
private class HxObject implements IHxObject
{
	
}

@:native('haxe.lang.IHxObject')
private interface IHxObject
{
	
}

@:native('haxe.lang.DynamicObject')
@:replaceReflection
private class DynamicObject extends HxObject, implements Dynamic
{
	public function toString():String
	{
		var ret = new StringBuf();
		ret.add("{");
		var first = true;
		for (f in Reflect.fields(this))
		{
			if( first )
				first = false;
			else
				ret.add(",");
			ret.add(" "); ret.add(f);
			ret.add(" : ");
			ret.add(Reflect.field(this, f));
		}
		if (!first) ret.add(" ");
		ret.add("}");
		
		return ret.toString();
	}
}

@:native('haxe.lang.Enum')
//@:skip_ctor
@:nativegen
private class Enum
{
	@:readonly private var index:Int;
	@:readonly private var params:Array<{}>;
	
	public function new(index:Int, params:Array<{}>)
	{
		this.index = index;
		this.params = params;
	}
	
	@:final public function getTag():String
	{
		var cl:Dynamic = StdType.getEnum(cast this);
		return cl.constructs[index];
	}
	
	public function toString():String
	{
		if (params == null) return getTag();
		var ret = new StringBuf();
		ret.add(getTag()); ret.add("(");
		
		var first = true;
		
		for (p in params)
		{
			if (first)
				first = false;
			else
				ret.add(",");
			ret.add(p);
		}
		
		ret.add(")");
		return ret.toString();
	}
	
	public function equals(obj:Dynamic)
	{
		if (obj == this) //we cannot use == as .Equals !
			return true;
		
		var obj:Enum = cast obj;
		var ret = obj != null && Std.is(obj, StdType.getEnum(cast this)) && obj.index == this.index;
		if (!ret) 
			return false;
		if (obj.params == this.params)
			return true;
		var len = 0;
		if (obj.params == null || this.params == null || (len = this.params.length) != obj.params.length)
			return false;
		
		for (i in 0...len)
		{
			if (!StdType.enumEq(obj.params[i], this.params[i]))
				return false;
		}
		return true;
	}
}

std/java/_std/haxe/lang/IEquatable.hx → std/java/internal/IEquatable.hx

@@ -1,10 +1,6 @@
-package haxe.lang;
-
-/**
- * ...
- * @author waneck
- */
+package java.internal;
 
+@:native('haxe.lang.IEquatable')
 interface IEquatable 
 {
 	

std/java/_std/haxe/lang/Iterator.hx → std/java/internal/Iterator.hx

@@ -1,10 +1,6 @@
-package haxe.lang;
-
-/**
- * ...
- * @author waneck
- */
+package java.internal;
 
+@:native('haxe.lang.Iterator')
 interface Iterator<T>
 {
 	
@@ -14,6 +10,7 @@ interface Iterator<T>
 	
 }
 
+@:native('haxe.lang.Iterable')
 interface Iterable<T>
 {
 	

std/java/_std/haxe/lang/Runtime.hx → std/java/internal/Runtime.hx

@@ -1,10 +1,11 @@
-package haxe.lang;
+package java.internal;
 
 /**
  This class is meant for internal compiler use only. It provides the Haxe runtime
  compatibility to the host language. Do not access it directly.
 **/
 
+@:native('haxe.lang.Runtime')
 @:nativegen
 @:classContents('
 	public static java.lang.Object getField(haxe.lang.IHxObject obj, java.lang.String field, boolean throwErrors)