allow macros-in-macros in interp mode (use -D interp instead of -D macro), fixed issue #837

main.ml

@@ -895,7 +895,7 @@ try
 			com.package_rules <- PMap.add pack (Remap target) com.package_rules;
 		),"<package:target> : remap a package to another one");
 		("--interp", Arg.Unit (fun() ->
-			Common.define com "macro";
+			Common.define com "interp";
 			set_platform Neko "";
 			no_output := true;
 			interp := true;

std/DateTools.hx

@@ -32,7 +32,7 @@
 class DateTools {
 
 	#if php
-	#elseif (neko && !macro)
+	#elseif (neko && !(macro || interp))
 	static var date_format = neko.Lib.load("std","date_format",2);
 	#else
 	private static function __format_get( d : Date, e : String ) : String {
@@ -114,7 +114,7 @@ class DateTools {
 		formats are not supported.
 	**/
 	public static function format( d : Date, f : String ) : String {
-		#if (neko && !macro)
+		#if (neko && !(macro || interp))
 			return new String(untyped date_format(d.__t, f.__s));
 		#elseif php
 			return untyped __call__("strftime",f,d.__t);

std/neko/_std/Array.hx

@@ -287,7 +287,7 @@
 		return a;
 	}
 
-	#if !macro
+	#if !(macro || interp)
 	static function __init__() : Void {
 		try {
 			var msort : Dynamic = neko.Lib.load("std","merge_sort",3);

tests/unit/Test.hx

@@ -195,7 +195,7 @@ package unit;
 			new TestXML(),
 			new TestMisc(),
 			new TestResource(),
-			new TestInt64(),			
+			new TestInt64(),
 			new TestReflect(),
 			new TestSerialize(),
 			new TestMeta(),
@@ -211,7 +211,7 @@ package unit;
 		];
 		var current = null;
 		#if (!fail_eager)
-		try 
+		try
 		#end
 		{
 			asyncWaits.push(null);