RuleScriptedClass bugfix #2 (inline error)

Fixed bug with override inline methods.

Author: Kriptel

rulescript/macro/RuleScriptedClass.hx

@@ -22,11 +22,18 @@ class RuleScriptedClass
 		var curType = Context.getLocalClass().get();
 
 		var constructor = curType.constructor?.get();
+
+		var inlinedFields:Array<String> = [];
 		while (curType != null)
 		{
 			for (field in curType.fields.get())
 			{
-				if (!typefields.exists(field.name) && !field.isFinal && field.kind.match(FMethod(_)) && !field.kind.match(FMethod(MethInline)))
+				if (!inlinedFields.contains(field.name) && field.kind.match(FMethod(MethInline)))
+				{
+					inlinedFields.push(field.name);
+				}
+
+				if (!typefields.exists(field.name) && !field.isFinal && field.kind.match(FMethod(_)) && !inlinedFields.contains(field.name))
 					typefields.set(field.name, field);
 			}
 			curType = curType.superClass?.t.get();

test/scripts/haxe/ScriptedClass.rhx

@@ -43,6 +43,6 @@ class ScriptedClass extends ScriptedClassTest
 	}
 
 	public function stringArray(arg:Array<T>){
-		return 'Script: stringArray -' + Std.string(arg);
+		return 'Script: stringArray - ' + Std.string(arg);
 	}
 }

test/src/test/ScriptedClassTest.hx

@@ -67,5 +67,12 @@ class SrcClassTest<T:Hello<K>, K>
 	public static function staticField() {}
 }
 
-class SrcClassTest2 extends SrcClassTest<Hello<Dynamic>, Dynamic> {}
+class SrcClassTest2 extends SrcClassTest<Hello<Dynamic>, Dynamic>
+{
+	inline override public function t(arg:Hello<Dynamic>):Hello<Dynamic>
+	{
+		return arg;
+	}
+}
+
 class ScriptedClassTest implements RuleScriptedClass extends SrcClassTest2 {}