Fixed static variable initialization

SomeRanDev/reflaxe#46

Author: Davvex87

src/rluacompiler/subcompilers/Classes.hx

@@ -62,9 +62,18 @@ class Classes extends SubCompiler
 			if (properties.length > 0)
 				output += '${classType.name}.__properties__ = {${properties.join(", ")}}\n';
 
+			var inlinesStatics:Array<ClassVarData> = [];
 			for (varf in varFields)
 			{
-				if (varf.isStatic)
+				if (!varf.isStatic)
+					continue;
+				var expr = varf.field.expr();
+				if (expr == null)
+					continue;
+
+				if (expr.expr.match(TBlock(_)))
+					inlinesStatics.push(varf);
+				else
 					output += main.fieldsSubCompiler.compileStaticImpl(varf);
 			}
 
@@ -81,6 +90,18 @@ class Classes extends SubCompiler
 				if (r != null)
 					output += r;
 			}
+
+			if (inlinesStatics.length > 0)
+			{
+				output += "\ndo\n";
+				for (varf in inlinesStatics)
+				{
+					var r = main.expressionsSubCompiler.compileExpressionImpl(varf.field.expr(), 0);
+					if (r != null)
+						output += '\t' + StringTools.replace(r, "\n", "\n\t") + '\n';
+				}
+				output += 'end\n';
+			}
 		}
 
 		return output;

src/rluacompiler/subcompilers/Expressions.hx

@@ -319,9 +319,9 @@ class Expressions extends SubCompiler
 				});
 				var body = exprImpl(tfunc.expr, 1);
 
-				buff += 'function(${args.join(", ")})${buff.enter}';
+				buff += '(function(${args.join(", ")})${buff.enter}';
 				buff += body;
-				buff += '${buff.leave}end';
+				buff += '${buff.leave}end)';
 				buff;
 
 			case TVar(v, expr):

src/rluacompiler/subcompilers/Fields.hx

@@ -27,9 +27,18 @@ class Fields extends SubCompiler
 
 	public function compileStaticImpl(varf:ClassVarData):Null<String>
 	{
-		var output = '${varf.classType.name}.${varf.field.name}';
-		if (varf.field.expr() != null)
-			output += ' = ${main.expressionsSubCompiler.compileExpressionImpl(varf.field.expr(), 0)}';
+		var output = "";
+		var expr = varf.field.expr();
+		if (expr != null)
+			output += main.expressionsSubCompiler.compileExpressionImpl(cast {
+				expr: TBinop(OpAssign, {
+					expr: TIdent('${varf.classType.name}.${varf.field.name}'),
+					t: expr.t,
+					pos: expr.pos
+				}, expr),
+				t: expr.t,
+				pos: expr.pos
+			}, 0);
 		return output + "\n";
 	}