finals but polymod

Author: KoloInDaCrib

polymod/hscript/_internal/PolymodAbstractScriptClass.hx

@@ -117,6 +117,12 @@ abstract PolymodAbstractScriptClass(PolymodScriptClass) from PolymodScriptClass
 			case _:
 				if (this.findVar(name) != null)
 				{
+					var isFinal = this.findVar(name).isfinal;
+					if (isFinal && this._interp.variables.exists(name)) // The variable already exists and has a set value.
+					{
+						throw "Invalid access to field " + name;
+						return null;
+					}
 					this._interp.variables.set(name, value);
 					return value;
 				}

polymod/hscript/_internal/PolymodInterpEx.hx

@@ -186,6 +186,19 @@ class PolymodInterpEx extends Interp
 						return v;
 					}
 				}
+
+				@:privateAccess
+				{
+					if (_proxy != null)
+					{
+						var variable = _proxy.findVar(id);
+						if (variable.isfinal && _proxy._interp.variables.exists(id))
+						{
+							errorEx(EInvalidAccess(id));
+							return null;
+						}
+					}
+				}
 			case EField(e0, id):
 				// Make sure setting superclass fields works when using this.
 				// Also ensures property functions are accounted for.
@@ -213,6 +226,54 @@ class PolymodInterpEx extends Interp
 		return super.assign(e1, e2);
 	}
 
+	override function increment(e:Expr, prefix:Bool, delta:Int):Dynamic
+	{
+		switch (Tools.expr(e))
+		{
+			case EIdent(id):
+				@:privateAccess
+				{
+					if (_proxy != null)
+					{
+						var variable = _proxy.findVar(id);
+						if (variable.isfinal && _proxy._interp.variables.exists(id))
+						{
+							errorEx(EInvalidAccess(id));
+							return null;
+						}
+					}
+				}
+			default:
+		}
+	
+		return super.increment(e, prefix, delta);
+	}
+
+	override function evalAssignOp(op:String, fop:(Dynamic->Dynamic)->Dynamic, e1:Expr, e2:Expr):Dynamic 
+	{
+		switch(Tools.expr(e1)) 
+		{
+			case EIdent(id):
+				var v = fop(expr(e1),expr(e2));
+
+				@:privateAccess
+				{
+					if (_proxy != null)
+					{
+						var variable = _proxy.findVar(id);
+						if (variable.isfinal && _proxy._interp.variables.exists(id))
+						{
+							errorEx(EInvalidAccess(id));
+							return null;
+						}
+					}
+				}
+			default:
+		}
+
+		return super.evalAssignOp(op, fop, e1, e2);
+	}
+
 	public override function expr(e:Expr):Dynamic
 	{
 		// Override to provide some fixes, falling back to super.expr() when not needed.
@@ -231,6 +292,11 @@ class PolymodInterpEx extends Interp
 				var result = (e == null) ? null : expr(e);
 				locals.set(n, {r: result});
 				return null;
+			case EFinal(n, _, e): // Fix to ensure local variables are committed properly.
+				declared.push({n: n, old: locals.get(n)});
+				var result = (e == null) ? null : expr(e);
+				locals.set(n, {r: result, isfinal: true});
+				return null;
 			case EFunction(params, fexpr, name, _): // Fix to ensure callback functions catch thrown errors.
 				var capturedLocals = duplicate(locals);
 				var me = this;