Public var

Author: Kriptel

rulescript/RuleScriptInterp.hx

@@ -169,10 +169,24 @@ class RuleScriptInterp extends hscript.Interp
 					usings.set(name, t);
 			case EMeta(name, args, e) if (onMeta != null):
 				return onMeta(name, args, e);
-			case EProp(n, g, s, type, e):
-				declared.push({n: n, old: locals.get(n)});
+			case EVar(n, _, e, global):
+				if (global)
+					variables.set(n, (e == null) ? null : this.expr(e));
+				else
+				{
+					declared.push({n: n, old: locals.get(n)});
+					locals.set(n, {r: (e == null) ? null : this.expr(e)});
+				}
+				return null;
+			case EProp(n, g, s, type, e, global):
 				var prop = createScriptProperty(n, g, s, type);
-				locals.set(n, {r: prop});
+				if (global)
+					variables.set(n, prop);
+				else
+				{
+					declared.push({n: n, old: locals.get(n)});
+					locals.set(n, {r: prop});
+				}
 				if (e != null)
 					prop._lazyValue = () -> this.expr(e);
 				return null;

rulescript/Tools.hx

@@ -103,11 +103,11 @@ class Tools
 							case KVar(v):
 								if (v.get == null && v.set == null)
 								{
-									pushExpr(EVar(field.name, v.type, v.expr));
+									pushExpr(EVar(field.name, v.type, v.expr, field.access.contains(APublic)));
 								}
 								else
 								{
-									pushExpr(EProp(field.name, v.get, v.set, v.type, v.expr));
+									pushExpr(EProp(field.name, v.get, v.set, v.type, v.expr, field.access.contains(APublic)));
 								}
 						}
 					}

rulescript/macro/ExprMacro.hx

@@ -15,7 +15,7 @@ class ExprMacro
 		var pos = Context.currentPos();
 
 		for (field in fields)
-			if (field.name == 'EFor')
+			if (field.name == 'EFor' || field.name == 'EVar')
 				fields.remove(field);
 
 		var newFields:Map<String, Expr> = [
@@ -24,7 +24,8 @@ class ExprMacro
 			'EImport' => macro function(name:String, star:Bool, alias:String, func:String) {},
 			'EUsing' => macro function(name:String) {},
 
-			'EProp' => macro function(n:String, g:String, s:String, ?t:CType, ?e:Expr) {},
+			'EVar' => macro function(n:String, ?t:CType, ?e:Expr, ?global:Bool) {},
+			'EProp' => macro function(n:String, g:String, s:String, ?t:CType, ?e:Expr, ?global:Bool) {},
 
 			'EFor' => macro function(key:String, it:Expr, e:Expr, ?value:String) {}
 		];