Property fix

Author: Kriptel

rulescript/RuleScriptInterp.hx

@@ -176,6 +176,11 @@ class RuleScriptInterp extends hscript.Interp
 				if (e != null)
 					prop._lazyValue = () -> this.expr(e);
 				return null;
+			case EIdent(id):
+				var l = locals.get(id);
+				if (l != null)
+					return getScriptProp(l.r);
+				return resolve(id);
 			case EFor(key, it, e, value):
 				if (value == null)
 					forLoop(key, it, e);

rulescript/RuleScriptProperty.hx

@@ -20,6 +20,8 @@ class RuleScriptProperty
 
 	@:isVar public var value(get, set):Dynamic;
 
+	var _inProperty:Bool = false;
+
 	public function new(?get:Property = DEFAULT, ?set:Property = DEFAULT)
 	{
 		this._get = get;
@@ -28,30 +30,48 @@ class RuleScriptProperty
 
 	function get_value():Dynamic
 	{
+		if (_inProperty)
+			return this.value;
+
 		initLazy();
 
-		return switch (_get)
+		_inProperty = true;
+
+		var v:Dynamic = switch (_get)
 		{
 			case DEFAULT | NULL: this.value;
 			case GET(f): f();
 			case SET(f): throw 'Custom property accessor is no longer supported, please use `get`';
 			case DYNAMIC(f): f();
 			case NEVER: throw 'This expression cannot be accessed for reading';
 		}
+
+		_inProperty = false;
+
+		return v;
 	}
 
 	function set_value(v:Dynamic):Dynamic
 	{
+		if (_inProperty)
+			return this.value = v;
+
 		initLazy();
 
-		return switch (_set)
+		_inProperty = true;
+
+		var v:Dynamic = switch (_set)
 		{
 			case DEFAULT | NULL: this.value = v;
 			case GET(f): throw 'Custom property accessor is no longer supported, please use `set`';
 			case SET(f): f(v);
 			case DYNAMIC(f): f(v);
 			case NEVER: throw 'This expression cannot be accessed for writing';
 		}
+
+		_inProperty = false;
+
+		return v;
 	}
 
 	inline function initLazy()

test/scripts/haxe/PropertyTest.rhx

@@ -16,4 +16,4 @@ function set_a(v:String):String
 
 a = 'Hello World';
 
-return _a;
+return a;

test/src/Main.hx

@@ -283,7 +283,7 @@ class Main
 
 		// Custom constructor can't have extra args
 
-		new ScriptedClassTestStrict('ScriptedClass', 'Script');
+		new ScriptedClassTestStrict('ScriptedClassStrict', 'Script');
 
 		var srcClass = new SrcClassTest<Hello<Int>, Int>('Src'),
 			scriptClass = new ScriptedClassTest('ScriptedClass', [4, 'Script']);