Add something

.travis.yml

@@ -171,7 +171,7 @@ matrix:
 
     - os: linux
       env:
-        - TEST=macro,hl,js,php,flash9,as3,java,cs,python,lua
+        - TEST=macro,hl,js,php,flash9,as3,java,jvm,cs,python,lua
         - SAUCE=1
       addons:
         sauce_connect: true
@@ -202,7 +202,7 @@ matrix:
     - os: osx
       osx_image: xcode9.4 # to compile faster
       env:
-        - TEST=macro,hl,java,cs,lua,js,php,flash9,python
+        - TEST=macro,hl,java,jvm,cs,lua,js,php,flash9,python
       install: *install_osx
 
     - os: osx

Makefile

@@ -29,7 +29,7 @@ STATICLINK?=0
 # Configuration
 
 # Modules in these directories should only depend on modules that are in directories to the left
-HAXE_DIRECTORIES=core core/json core/display syntax context context/display codegen codegen/gencommon generators optimization filters macro macro/eval typing compiler
+HAXE_DIRECTORIES=core core/json core/display syntax context context/display codegen codegen/gencommon generators generators/jvm optimization filters macro macro/eval typing compiler
 EXTLIB_LIBS=extlib-leftovers extc neko javalib swflib ttflib ilib objsize pcre ziplib
 OCAML_LIBS=unix str threads dynlink
 OPAM_LIBS=sedlex xml-light extlib ptmap sha

appveyor.yml

@@ -14,7 +14,7 @@ environment:
           secure: ewwkKcjnSKl/Vtrz1SXmI6XKk1ENmJDyzm5YaR2wi03foRhTke29TvymB21rDTSl
     matrix:
         - ARCH: 64
-          TEST: "neko,hl,python,cs,java,php"
+          TEST: "neko,hl,python,cs,java,jvm,php"
         - ARCH: 64
           TEST: "cpp"
         - ARCH: 64

extra/ImportAll.hx

@@ -56,6 +56,8 @@ class ImportAll {
 			if ( !Context.defined("target.threaded") ) return;
 		case "java":
 			if( !Context.defined("java") ) return;
+		case "jvm":
+			if( !Context.defined("jvm") ) return;
 		case "cs":
 			if( !Context.defined("cs") ) return;
 		case "python":

extra/all.hxml

@@ -34,6 +34,12 @@
 -xml java.xml
 -D xmldoc
 
+--next
+-java all_jvm
+-D jvm
+-xml jvm.xml
+-D xmldoc
+
 --next
 -cs all_cs
 -D unsafe

src/compiler/main.ml

@@ -259,7 +259,9 @@ module Initialize = struct
 					old_flush()
 				);
 				Java.before_generate com;
-				add_std "java"; "java"
+				if defined com Define.Jvm then add_std "jvm";
+				add_std "java";
+				"java"
 			| Python ->
 				add_std "python";
 				if not (Common.defined com Define.PythonVersion) then
@@ -318,7 +320,10 @@ let generate tctx ext xml_out interp swf_header =
 		| Cs ->
 			Gencs.generate,"cs"
 		| Java ->
-			Genjava.generate,"java"
+			if Common.defined com Jvm then
+				Genjvm.generate,"java"
+			else
+				Genjava.generate,"java"
 		| Python ->
 			Genpy.generate,"python"
 		| Hl ->

src/context/common.ml

@@ -364,6 +364,7 @@ let get_config com =
 			pf_pad_nulls = true;
 			pf_overload = true;
 			pf_supports_threads = true;
+			pf_this_before_super = false;
 		}
 	| Python ->
 		{

src/core/define.ml

@@ -56,6 +56,7 @@ type strict_defined =
 	| JsUnflatten
 	| JsSourceMap
 	| JsEnumsAsArrays
+	| Jvm
 	| SourceMap
 	| KeepOldOutput
 	| LoopUnrollMaxCost
@@ -168,6 +169,7 @@ let infos = function
 	| JsEnumsAsArrays -> "js_enums_as_arrays",("Generate enum representation as array instead of as object",[Platform Js])
 	| JsUnflatten -> "js_unflatten",("Generate nested objects for packages and types",[Platform Js])
 	| JsSourceMap -> "js_source_map",("Generate JavaScript source map even in non-debug mode",[Platform Js])
+	| Jvm -> "jvm",("Generate jvm directly",[Platform Java])
 	| SourceMap -> "source_map",("Generate source map for compiled files (Currently supported for php only)",[Platform Php])
 	| KeepOldOutput -> "keep_old_output",("Keep old source files in the output directory (for C#/Java)",[Platforms [Cs;Java]])
 	| LoopUnrollMaxCost -> "loop_unroll_max_cost",("Maximum cost (number of expressions * iterations) before loop unrolling is canceled (default 250)",[])

src/filters/capturedVars.ml

@@ -129,7 +129,7 @@ let captured_vars com e =
 			let rec browse = function
 				| Block f | Loop f | Function f -> f browse
 				| Use ({ v_extra = Some( _ :: _, _) })
-				| Assign ({ v_extra = Some( _ :: _, _) }) when com.platform = Cs || com.platform = Java ->
+				| Assign ({ v_extra = Some( _ :: _, _) }) when com.platform = Cs || (com.platform = Java && not (Common.defined com Define.Jvm)) ->
 					(* Java and C# deal with functions with type parameters in a different way *)
 					(* so they do should not be wrapped *)
 					()
@@ -220,7 +220,7 @@ let captured_vars com e =
 					f (collect_vars false);
 					decr depth;
 				| Use ({ v_extra = Some( _ :: _, _) })
-				| Assign ({ v_extra = Some( _ :: _, _) }) when com.platform = Cs || com.platform = Java ->
+				| Assign ({ v_extra = Some( _ :: _, _) }) when com.platform = Cs || (com.platform = Java && not (Common.defined com Define.Jvm)) ->
 					(* Java/C# use a special handling for functions with type parmaters *)
 					()
 				| Declare v ->
@@ -257,7 +257,7 @@ let captured_vars com e =
 		| Declare v ->
 			vars := PMap.add v.v_id !depth !vars;
 		| Use ({ v_extra = Some( _ :: _, _) })
-		| Assign ({ v_extra = Some( _ :: _, _) }) when com.platform = Cs || com.platform = Java ->
+		| Assign ({ v_extra = Some( _ :: _, _) }) when com.platform = Cs || (com.platform = Java && not (Common.defined com Define.Jvm)) ->
 			()
 		| Use v ->
 			(try

src/filters/filters.ml

@@ -807,7 +807,7 @@ let run com tctx main =
 			filters @ [
 				TryCatchWrapper.configure_cs com
 			]
-		| Java ->
+		| Java when not (Common.defined com Jvm)->
 			SetHXGen.run_filter com new_types;
 			filters @ [
 				TryCatchWrapper.configure_java com