From dc36220cee5d5c3c5219d8c764e98fcea246fa77 Mon Sep 17 00:00:00 2001
From: Nicolas Cannasse <ncannasse@gmail.com>
Date: Sat, 13 Sep 2014 10:48:04 +0200
Subject: [PATCH] added support for --no-inline

---
 hscript.hxproj    | 3 +++
 hscript/Interp.hx | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/hscript.hxproj b/hscript.hxproj
index bea2adc..cd957c7 100644
--- a/hscript.hxproj
+++ b/hscript.hxproj
@@ -21,6 +21,7 @@
   <build>
     <option directives="" />
     <option flashStrict="True" />
+    <option noInlineOnDebug="False" />
     <option mainClass="Test" />
     <option enabledebug="False" />
     <option additional="-dce no" />
@@ -47,6 +48,7 @@
     <hidden path="hscript9.swf" />
     <hidden path="release.bat" />
     <hidden path="release.zip" />
+    <hidden path="obj" />
   </hiddenPaths>
   <!-- Executed before build -->
   <preBuildCommand />
@@ -56,6 +58,7 @@
   <options>
     <option showHiddenPaths="False" />
     <option testMovie="Default" />
+    <option testMovieCommand="" />
   </options>
   <!-- Plugin storage -->
   <storage />
diff --git a/hscript/Interp.hx b/hscript/Interp.hx
index 4a45892..d14c01b 100644
--- a/hscript/Interp.hx
+++ b/hscript/Interp.hx
@@ -148,7 +148,7 @@ class Interp {
 			v = fop(arr[index],expr(e2));
 			arr[index] = v;
 		default:
-			error(EInvalidOp(op));
+			return error(EInvalidOp(op));
 		}
 		return v;
 	}
@@ -188,7 +188,7 @@ class Interp {
 				arr[index] = v + delta;
 			return v;
 		default:
-			error(EInvalidOp((delta > 0)?"++":"--"));
+			return error(EInvalidOp((delta > 0)?"++":"--"));
 		}
 	}
 
@@ -242,12 +242,13 @@ class Interp {
 		#end
 	}
 
-	inline function error(e : #if hscriptPos ErrorDef #else Error #end ) {
+	inline function error(e : #if hscriptPos ErrorDef #else Error #end ) : Dynamic {
 		#if hscriptPos
 		throw new Error(e, curExpr.pmin, curExpr.pmax);
 		#else
 		throw e;
 		#end
+		return null;
 	}
 
 	function resolve( id : String ) : Dynamic {