Variable priority

Author: Kriptel

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - RuleScripted Classes.
 - RuleScriptedClassUtil.
 - RuleScriptedClass interface.
+- `this` in script.
 - Script Properties.
 - `hasErrorHandler` variable to RuleScript and RuleScriptInterp.
 - `errorHandler` variable to RuleScript and RuleScriptInterp.

rulescript/RuleScriptInterp.hx

@@ -2,6 +2,7 @@ package rulescript;
 
 import hscript.Expr;
 import rulescript.RuleScriptProperty.Property;
+import rulescript.scriptedClass.RuleScriptedClass;
 
 using rulescript.Tools;
 
@@ -52,6 +53,9 @@ class RuleScriptInterp extends hscript.Interp
 
 	override function resolve(id:String):Dynamic
 	{
+		if (id == 'this')
+			return this;
+
 		if (id == 'super' && superInstance != null)
 			return superInstance;
 
@@ -440,9 +444,25 @@ class RuleScriptInterp extends hscript.Interp
 	 */
 	override function get(o:Dynamic, f:String):Dynamic
 	{
+		if (o == this)
+		{
+			if (variables.exists(f))
+				return getScriptProp(variables.get(f));
+			else
+				o = superInstance;
+		}
+
 		var prop:Dynamic = super.get(o, f);
+
 		if (prop != null)
-			return prop;
+			return getScriptProp(prop);
+
+		if (o is RuleScriptedClass)
+		{
+			var cl:RuleScriptedClass = cast(o, RuleScriptedClass);
+			if (cl.variableExists(f))
+				return getScriptProp(cl.getVariable(f));
+		}
 
 		for (cl in usings)
 		{

rulescript/Tools.hx

@@ -56,9 +56,7 @@ class Tools
 
 	#if hscriptPos
 	inline public static function getExpr(e:Expr):ExprDef
-	{
 		return e.e;
-	}
 	#else
 	inline public static function getExpr(e:Expr):Expr
 		return e;
@@ -94,6 +92,16 @@ class Tools
 				case DUsing(path):
 					pushExpr(EUsing(path));
 				case DClass(c):
+					c.fields.sort((f1:FieldDecl, f2:FieldDecl) ->
+					{
+						return switch [f1.kind.match(KVar(_)), f2.kind.match(KVar(_))]
+						{
+							case [true, true], [false, false]: 0;
+							case [true, false]: -1;
+							case [false, true]: 1;
+						};
+					});
+
 					for (field in c.fields)
 					{
 						switch (field.kind)

rulescript/parsers/HxParser.hx

@@ -675,6 +675,16 @@ class HScriptParserPlus extends hscript.Parser
 			var part:Dynamic = parts[currentPart++];
 			if (part is String)
 				part = mk(EConst(CString(cast part)));
+			else
+			{
+				switch (Tools.getExpr(part))
+				{
+					case EConst(c):
+					default:
+						part = mk(EParent(part));
+				}
+			}
+
 			if (e == null)
 				e = part;
 			else

rulescript/scriptedClass/RuleScriptedClass.hx

@@ -1,4 +1,9 @@
 package rulescript.scriptedClass;
 
 @:autoBuild(rulescript.macro.RuleScriptedClass.build())
-interface RuleScriptedClass {}
+interface RuleScriptedClass
+{
+	function variableExists(name:String):Bool;
+	function getVariable(name:String):Dynamic;
+	function setVariable(name:String, value:Dynamic):Dynamic;
+}

test/scripts/haxe/ScriptedClass.rhx

@@ -2,6 +2,8 @@ package;
 
 class ScriptedClass extends test.ScriptedClassTest
 {
+	public var variable1(default,default) = 'variable1: Hello World';
+
 	public function new(customArg:Int,arg1:String)
 	{
 		trace('Constructor.pre: $customArg, $arg1');

test/scripts/haxe/importTest/ScriptImportTest.rhx

@@ -6,6 +6,7 @@ class ScriptImportTest{
 	function main(){
 		trace(Script.helloWorld());
 
-		new ScriptedClass(1,'ScriptImportTest');
+		var scriptedClass = new ScriptedClass(1,'ScriptImportTest');
+		trace(scriptedClass.variable1);
 	}
 }