Set --run args only when we're actually running (#11524)

* set --run args only when we're actually running

see #11087

* add test

* add another test

src/compiler/compilationContext.ml

@@ -54,6 +54,7 @@ and compilation_context = {
 	mutable has_next : bool;
 	mutable has_error : bool;
 	comm : communication;
+	mutable runtime_args : string list;
 }
 
 type compilation_callbacks = {

src/compiler/compiler.ml

@@ -509,6 +509,7 @@ let create_context comm cs compilation_step params = {
 	has_next = false;
 	has_error = false;
 	comm = comm;
+	runtime_args = [];
 }
 
 module HighLevel = struct
@@ -614,7 +615,7 @@ module HighLevel = struct
 			| "--run" :: cl :: args ->
 				let acc = cl :: "-x" :: acc in
 				let ctx = create_context (List.rev acc) in
-				ctx.com.sys_args <- args;
+				ctx.runtime_args <- args;
 				[],Some ctx
 			| ("-L" | "--library" | "-lib") :: name :: args ->
 				let libs,args = find_subsequent_libs [name] args in

src/compiler/generate.ml

@@ -121,9 +121,16 @@ let generate ctx tctx ext actx =
 		| Java when not actx.jvm_flag -> Path.mkdir_from_path (com.file ^ "/.")
 		| _ -> Path.mkdir_from_path com.file
 	end;
-	if actx.interp then
-		Std.finally (Timer.timer ["interp"]) MacroContext.interpret tctx
-	else begin
+	if actx.interp then begin
+		let timer = Timer.timer ["interp"] in
+		let old = tctx.com.args in
+		tctx.com.args <- ctx.runtime_args;
+		let restore () =
+			tctx.com.args <- old;
+			timer ()
+		in
+		Std.finally restore MacroContext.interpret tctx
+	end else begin
 		let generate,name = match com.platform with
 		| Flash ->
 			let header = try

src/context/common.ml

@@ -354,8 +354,7 @@ type context = {
 	mutable json_out : json_api option;
 	(* config *)
 	version : int;
-	args : string list;
-	mutable sys_args : string list;
+	mutable args : string list;
 	mutable display : DisplayTypes.DisplayMode.settings;
 	mutable debug : bool;
 	mutable verbose : bool;
@@ -810,7 +809,6 @@ let create compilation_step cs version args display_mode =
 			display_module_has_macro_defines = false;
 			module_diagnostics = [];
 		};
-		sys_args = args;
 		debug = false;
 		display = display_mode;
 		verbose = false;

src/macro/eval/evalStdLib.ml

@@ -2569,7 +2569,7 @@ module StdSys = struct
 	open Common
 
 	let args = vfun0 (fun () ->
-		encode_array (List.map create_unknown ((get_ctx()).curapi.MacroApi.get_com()).sys_args)
+		encode_array (List.map create_unknown ((get_ctx()).curapi.MacroApi.get_com()).args)
 	)
 
 	let _command = vfun1 (fun cmd ->

tests/misc/projects/Issue11087/Main.hx

@@ -0,0 +1,9 @@
+macro function test() {
+	trace(Sys.args());
+	return macro null;
+}
+
+function main() {
+	test();
+	trace(Sys.args());
+}

tests/misc/projects/Issue11087/compile-interp.hxml

@@ -0,0 +1,2 @@
+--main Main
+--interp

tests/misc/projects/Issue11087/compile-interp.hxml.stdout

@@ -0,0 +1,2 @@
+Main.hx:2: [--main,Main,--interp]
+Main.hx:8: []

tests/misc/projects/Issue11087/compile.hxml

@@ -0,0 +1,2 @@
+--run Main
+arg

tests/misc/projects/Issue11087/compile.hxml.stdout

@@ -0,0 +1,2 @@
+Main.hx:2: [-x,Main]
+Main.hx:8: [arg]