Organized Packages into Subfolders

hscript/Async.hx

@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 package hscript;
-import hscript.Expr;
 
+import hscript.expr.Expr;
 
 enum VarMode {
 	Defined;

hscript/Bytes.hx

@@ -20,7 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 package hscript;
-import hscript.Expr;
+
+import hscript.expr.Expr;
 
 class Bytes {
 

hscript/Checker.hx

@@ -1,5 +1,6 @@
 package hscript;
-import hscript.Expr;
+
+import hscript.expr.Expr;
 
 /**
 	This is a special type that can be used in API.

hscript/Interp.hx

@@ -28,14 +28,20 @@
  */
 package hscript;
 
+import hscript.behaviours.*;
+import hscript.expr.*;
+
+import hscript.utils.Tools;
+import hscript.utils.UsingHandler;
+import hscript.utils.UnsafeReflect;
+import hscript.expr.HEnum.HEnumValue;
+import hscript.expr.HEnum;
+import hscript.expr.Expr;
+
 import haxe.Exception;
 import haxe.ds.StringMap;
-import hscript.HEnum.HEnumValue;
 import haxe.CallStack;
-import hscript.utils.UsingHandler;
-import hscript.utils.UnsafeReflect;
 import haxe.PosInfos;
-import hscript.Expr;
 import haxe.Constraints.IMap;
 
 using StringTools;
@@ -83,7 +89,7 @@ class RedeclaredVar {
 	public var depth:Int;
 }
 
-@:access(hscript.CustomClass)
+@:access(hscript.expr.CustomClass)
 @:analyzer(optimize, local_dce, fusion, user_var_fusion)
 class Interp {
 	private var hasScriptObject(default, null):Bool = false;
@@ -1751,7 +1757,7 @@ class Interp {
 	}
 
 	// Custom Class Static Extension
-	@:access(hscript.CustomClassHandler)
+	@:access(hscript.expr.CustomClassHandler)
 	function setCustomClassUsing(name:String, cls:CustomClassHandler) {
 		if (usingHandler.entryExists(name)) return;
 

hscript/Parser.hx

@@ -20,7 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 package hscript;
-import hscript.Expr;
+
+import hscript.expr.Expr;
 
 using StringTools;
 

hscript/Printer.hx

@@ -20,7 +20,10 @@
  * DEALINGS IN THE SOFTWARE.
  */
 package hscript;
-import hscript.Expr;
+
+import hscript.expr.Expr;
+import hscript.expr.Expr.Error;
+import hscript.utils.Tools;
 
 class Printer {
 
@@ -468,7 +471,7 @@ class Printer {
 		return new Printer().exprToString(e);
 	}
 
-	public static function errorToString( e : Expr.Error ):String {
+	public static function errorToString( e : Error ):String {
 		var message = switch( #if hscriptPos e.e #else e #end ) {
 			case EInvalidChar(c): "Invalid character: '"+(StringTools.isEof(c) ? "EOF (End Of File)" : String.fromCharCode(c))+"' ("+c+")";
 			case EUnexpected(s): "Unexpected token: \""+s+"\"";

hscript/TemplateClass.hx

@@ -0,0 +1,43 @@
+package hscript;
+
+import hscript.behaviours.IHScriptCustomAccessBehaviour;
+import hscript.behaviours.IHScriptCustomBehaviour;
+import hscript.Interp;
+
+/**
+ * This is for backwards compatibility with old hscript-improved, since some scripts use it
+**/
+@:dox(hide)
+@:keep
+class TemplateClass implements IHScriptCustomBehaviour implements IHScriptCustomAccessBehaviour {
+	public var __interp:Interp;
+	public var __allowSetGet:Bool = true;
+
+	public function hset(name:String, val:Dynamic):Dynamic {
+		var variables = __interp.variables;
+		if(__allowSetGet && variables.exists("set_" + name))
+			return __callSetter(name, val);
+		variables.set(name, val);
+		return val;
+	}
+	public function hget(name:String):Dynamic {
+		var variables = __interp.variables;
+		if(__allowSetGet && variables.exists("get_" + name))
+			return __callGetter(name);
+		return variables.get(name);
+	}
+
+	public function __callGetter(name:String):Dynamic {
+		__allowSetGet = false;
+		var v = __interp.variables.get("get_" + name)();
+		__allowSetGet = true;
+		return v;
+	}
+
+	public function __callSetter(name:String, val:Dynamic):Dynamic {
+		__allowSetGet = false;
+		var v = __interp.variables.get("set_" + name)(val);
+		__allowSetGet = true;
+		return v;
+	}
+}

hscript/IHScriptAbstractBehaviour.hx → hscript/behaviours/IHScriptAbstractBehaviour.hx

@@ -1,4 +1,4 @@
-package hscript;
+package hscript.behaviours;
 
 // Soon...
 interface IHScriptAbstractBehaviour extends IHScriptCustomBehaviour {

hscript/IHScriptCustomAccessBehaviour.hx → hscript/behaviours/IHScriptCustomAccessBehaviour.hx

@@ -1,4 +1,4 @@
-package hscript;
+package hscript.behaviours;
 
 /**
  * Same Interface as IHScriptCustomBehaviour but for Property.

hscript/IHScriptCustomBehaviour.hx → hscript/behaviours/IHScriptCustomBehaviour.hx

@@ -1,4 +1,4 @@
-package hscript;
+package hscript.behaviours;
 
 /**
  * Special Interface for handling field access behaviour.

hscript/IHScriptCustomClassBehaviour.hx → hscript/behaviours/IHScriptCustomClassBehaviour.hx

@@ -1,4 +1,4 @@
-package hscript;
+package hscript.behaviours;
 
 /**
  * Special Interface to make a class usable for Custom Classes.

hscript/IHScriptCustomConstructor.hx → hscript/behaviours/IHScriptCustomConstructor.hx

@@ -1,4 +1,4 @@
-package hscript;
+package hscript.behaviours;
 
 /**
  * Special Interface for handling new instances of an object.

hscript/CustomClass.hx → hscript/expr/CustomClass.hx

@@ -1,6 +1,10 @@
-package hscript;
+package hscript.expr;
 
+import hscript.behaviours.IHScriptCustomClassBehaviour;
 import hscript.utils.UnsafeReflect;
+import hscript.utils.Tools;
+import hscript.Interp;
+
 import haxe.Constraints.Function;
 
 using Lambda;
@@ -12,7 +16,7 @@ using Lambda;
  * 
  * @author Jamextreme140
  */
-@:access(hscript.CustomClassHandler)
+@:access(hscript.expr.CustomClassHandler)
 class CustomClass implements IHScriptCustomClassBehaviour {
 	public var className(get, never):String;
 

hscript/CustomClassHandler.hx → hscript/expr/CustomClassHandler.hx

@@ -1,10 +1,16 @@
-package hscript;
+package hscript.expr;
+
+import hscript.behaviours.IHScriptCustomAccessBehaviour;
+import hscript.behaviours.IHScriptCustomConstructor;
+import hscript.behaviours.IHScriptCustomBehaviour;
+import hscript.utils.Tools;
+import hscript.Interp;
 
 /**
  * Provides handlers for static custom class fields and instantiation.
  */
-@:access(hscript.Property)
-class CustomClassHandler implements IHScriptCustomConstructor implements IHScriptCustomAccessBehaviour{
+@:access(hscript.expr.Property)
+class CustomClassHandler implements IHScriptCustomConstructor implements IHScriptCustomAccessBehaviour {
 	public var ogInterp:Interp;
 	public var name:String;
 	public var fields:Array<Expr>;
@@ -148,42 +154,3 @@ class CustomClassHandler implements IHScriptCustomConstructor implements IHScrip
 		return name;
 	}
 }
-
-
-/**
- * This is for backwards compatibility with old hscript-improved, since some scripts use it
-**/
-@:dox(hide)
-@:keep
-class TemplateClass implements IHScriptCustomBehaviour implements IHScriptCustomAccessBehaviour {
-	public var __interp:Interp;
-	public var __allowSetGet:Bool = true;
-
-	public function hset(name:String, val:Dynamic):Dynamic {
-		var variables = __interp.variables;
-		if(__allowSetGet && variables.exists("set_" + name))
-			return __callSetter(name, val);
-		variables.set(name, val);
-		return val;
-	}
-	public function hget(name:String):Dynamic {
-		var variables = __interp.variables;
-		if(__allowSetGet && variables.exists("get_" + name))
-			return __callGetter(name);
-		return variables.get(name);
-	}
-
-	public function __callGetter(name:String):Dynamic {
-		__allowSetGet = false;
-		var v = __interp.variables.get("get_" + name)();
-		__allowSetGet = true;
-		return v;
-	}
-
-	public function __callSetter(name:String, val:Dynamic):Dynamic {
-		__allowSetGet = false;
-		var v = __interp.variables.get("set_" + name)(val);
-		__allowSetGet = true;
-		return v;
-	}
-}

hscript/Expr.hx → hscript/expr/Expr.hx

@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package hscript;
+package hscript.expr;
 
 typedef Int8 = #if cpp cpp.Int8 #elseif java java.Int8 #elseif cs cs.Int8 #else Int #end;
 typedef Int16 = #if cpp cpp.Int16 #elseif java java.Int16 #elseif cs cs.Int16 #else Int #end;

hscript/HEnum.hx → hscript/expr/HEnum.hx

@@ -1,5 +1,6 @@
-package hscript;
+package hscript.expr;
 
+import hscript.behaviours.IHScriptCustomBehaviour;
 import hscript.utils.UnsafeReflect;
 
 /**

hscript/Property.hx → hscript/expr/Property.hx

@@ -1,8 +1,8 @@
-package hscript;
+package hscript.expr;
 
 import hscript.utils.UnsafeReflect;
 import hscript.Interp;
-import hscript.Expr.FieldPropertyAccess;
+import hscript.expr.Expr.FieldPropertyAccess;
 
 /**
  * Special variable that handles 'getter/setter' function calls

hscript/macros/AbstractHandler.hx

@@ -8,6 +8,8 @@ import haxe.macro.Context;
 import haxe.macro.Printer;
 import haxe.macro.Compiler;
 
+import hscript.Config;
+
 using StringTools;
 
 class AbstractHandler {