Compilation optimization

hscript/Interp.hx

@@ -123,13 +123,13 @@ class Interp {
 	public var warnHandler:Error->Void;
 	public var importFailedCallback:Array<String>->Null<String>->Bool;
 
-	public var customClasses:Map<String, CustomClassHandler>;
-	public var variables:Map<String, Dynamic>;
-	public var publicVariables:Map<String, Dynamic>;
-	public var staticVariables:Map<String, Dynamic>;
+	public var customClasses:StringMap <CustomClassHandler>;
+	public var variables:StringMap<Dynamic>;
+	public var publicVariables:StringMap<Dynamic>;
+	public var staticVariables:StringMap<Dynamic>;
 
 	// warning can be null
-	public var locals:Map<String, DeclaredVar>;
+	public var locals:StringMap<DeclaredVar>;
 	var binops:StringMap<Expr->Expr->Dynamic>;
 
 	var depth:Int = 0;
@@ -147,29 +147,42 @@ class Interp {
 	public var allowStaticVariables:Bool = false;
 	public var allowPublicVariables:Bool = false;
 
+	public var optimizeEnabled:Bool = true;
+	public var optimizeLevel:Int = 4;
+
+	public var enableConstantFolding:Bool = true;
+	public var enableExpressionSimplification:Bool = true;
+	public var enableDeadCodeElimination:Bool = true;
+	public var enableBranchOptimization:Bool = true;
+
+	public var optimizerDebug:Bool = false;
+
 	// TODO: move this to an external class
 	public var importBlocklist:Array<String> = [
 		// "flixel.FlxG"
 	];
 
+	public var optimizer:Optimizer;
+
 	var usingHandler:UsingHandler;
 
 	#if hscriptPos
 	var curExpr:Expr;
 	#end
 
 	public function new() {
-		locals = new Map();
+		locals = new StringMap();
 		declared = [];
 		resetVariables();
 		initOps();
+		optimizer = new Optimizer();
 	}
 
 	private function resetVariables():Void {
-		customClasses = new Map<String, CustomClassHandler>();
-		variables = new Map<String, Dynamic>();
-		publicVariables = new Map<String, Dynamic>();
-		staticVariables = new Map<String, Dynamic>();
+		customClasses = new StringMap<CustomClassHandler>();
+		variables = new StringMap<Dynamic>();
+		publicVariables = new StringMap<Dynamic>();
+		staticVariables = new StringMap<Dynamic>();
 
 		usingHandler = new UsingHandler();
 
@@ -531,9 +544,17 @@ class Interp {
 
 	public function execute(expr:Expr):Dynamic {
 		depth = 0;
-		locals = new Map();
+		locals = new StringMap();
 		declared = [];
-		return exprReturn(expr);
+		optimizer.enabled = optimizeEnabled;
+		optimizer.optimizeLevel = optimizeLevel;
+		optimizer.enableConstantFolding = enableConstantFolding;
+		optimizer.enableExpressionSimplification = enableExpressionSimplification;
+		optimizer.enableDeadCodeElimination = enableDeadCodeElimination;
+		optimizer.enableBranchOptimization = enableBranchOptimization;
+		optimizer.debug = optimizerDebug;
+		var optimizedExpr = optimizer.optimize(expr);
+		return exprReturn(optimizedExpr);
 	}
 
 	public var printCallStack:Bool = false;
@@ -948,11 +969,11 @@ class Interp {
 				if (depth == 0) {
 					if(allowStaticVariables && isStatic == true) {
 						if(!staticVariables.exists(n)) // make it so it only sets it once
-							staticVariables.set(n, locals[n].r);
+							staticVariables.set(n, locals.get(n).r);
 					} else if(allowPublicVariables && isPublic == true) {
-						publicVariables.set(n, locals[n].r);
+						publicVariables.set(n, locals.get(n).r);
 					} else {
-						variables.set(n, locals[n].r);
+						variables.set(n, locals.get(n).r);
 					}
 				}
 				return null;
@@ -1651,4 +1672,4 @@ class Interp {
 
 		return Type.createInstance(c, args);
 	}
-}
+}