Fix a few parity issues

Author: NotHyper-474

polymod/hscript/_internal/HLWrapperMacro.hx

@@ -1,5 +1,37 @@
 package polymod.hscript._internal;
 
+#if (!macro && hl)
+@:build(polymod.hscript._internal.HLWrapperMacro.buildWrapperClass())
+class HLMath extends Math {}
+
+@:build(polymod.hscript._internal.HLWrapperMacro.buildWrapperClass())
+@:haxe.warning("-WDeprecated")
+class HLStd extends Std {
+	public static function is(v:Dynamic, t:Dynamic)
+		return isOfType(v, t);
+
+	public static function isOfType(v:Dynamic, t:Dynamic):Bool
+	{
+		// HL oddly uses hl.Bytes for strings sometimes
+		// We do a hack since we can't just do isOfType(v, hl.Bytes)
+		if (t == String && !Std.isOfType(v, String))
+		{
+			function bytesTest(_:hl.Bytes) {}
+			try
+			{
+				bytesTest(v);
+				return true;
+			}
+			catch (_)
+			{
+				return false;
+			}
+		}
+
+		return Std.isOfType(v, t);
+	}
+}
+#else
 import haxe.macro.MacroStringTools;
 import haxe.macro.TypedExprTools;
 import haxe.macro.Context;
@@ -12,14 +44,6 @@ using haxe.macro.ComplexTypeTools;
 using haxe.macro.ExprTools;
 using StringTools;
 
-#if (!macro && hl)
-@:build(polymod.hscript._internal.HLWrapperMacro.buildWrapperClass())
-class HLMath extends Math {}
-
-@:build(polymod.hscript._internal.HLWrapperMacro.buildWrapperClass())
-@:haxe.warning("-WDeprecated")
-class HLStd extends Std {}
-#else
 /**
  * Macro that generates wrapper fields for substitutes of `std` classes to make them avaliable to Reflection.
  * Currently only works for static fields.
@@ -144,4 +168,4 @@ class HLWrapperMacro
 		}
 	}
 }
-#end
+#end

polymod/hscript/_internal/PolymodInterpEx.hx

@@ -974,7 +974,12 @@ class PolymodInterpEx extends Interp
 		{
 			try
 			{
+				#if hl
+				// HL is a bit weird with iterators with arguments
+				v = Reflect.callMethod(v, v.iterator, []);
+				#else
 				v = v.iterator();
+				#end
 			}
 			catch (e:Dynamic)
 			{
@@ -1161,10 +1166,11 @@ class PolymodInterpEx extends Interp
 			// #end
 			// return result;
 		}
-		#if hl
+		#if (hl && haxe4)
 		else if (Std.isOfType(o, Enum))
 		{
-			try {
+			try
+			{
 				return (o:Enum<Dynamic>).createByName(f);
 			}
 			catch (e)
@@ -1180,6 +1186,12 @@ class PolymodInterpEx extends Interp
 		}
 
 		// Default behavior
+		#if hl
+		// On HL, hasField on properties returns true but Reflect.field
+		//might return null so we have to check if a getter exists too.
+		// This happens mostly when the programmer mistakenly makes the field access (get, null) instead of (get, never)
+		return Reflect.getProperty(o, f);
+		#else
 		if (Reflect.hasField(o, f)) {
 			return Reflect.field(o, f);
 		} else {
@@ -1189,6 +1201,7 @@ class PolymodInterpEx extends Interp
 				return Reflect.field(o, f);
 			}
 		}
+		#end
 		// return super.get(o, f);
 	}