Merge branch 'main' into base-fnf-port-remake

2024-09-20 14:21:36 +02:00
parent a07bcf0ce5 47cf72d53b
commit 7cf99ae7bc
8 changed files with 99 additions and 60 deletions
@@ -75,34 +75,13 @@ class EventMacro {
 				// add a "set this" expr for each variable
 				for(v in values) {
 					var name = v.name;
-					exprs.push({
-						pos: Context.currentPos(),
-						expr: EBinop(OpAssign, {
-								pos: Context.currentPos(),
-								expr: EField({
-									pos: Context.currentPos(),
-									expr: EConst(CIdent("this"))
-								}, name)
-							}, {
-								pos: Context.currentPos(),
-								expr: EConst(CIdent(name))
-							})
-					});
+					exprs.push(macro this.$name = $i{name});
 				}

 				// add a "set this" expr to reset each private/hidden variables
 				for(v in hiddenValues) {
 					var name = v.name;
-					exprs.push({
-						pos: Context.currentPos(),
-						expr: EBinop(OpAssign, {
-								pos: Context.currentPos(),
-								expr: EField({
-									pos: Context.currentPos(),
-									expr: EConst(CIdent("this"))
-								}, name)
-							}, v.expr)
-					});
+					exprs.push(macro this.$name = ${v.expr});
 				}

 				exprs.push(macro return this);