oops

Author: hackx2

docs/context.md

@@ -22,7 +22,9 @@
 
 - `types` - Stores all previously `defined` types.
 
-- `variables` - **Public** & **Static** variables, each entry in this array is added using the meta `@:contextValue('public')`, or the keyword `public`.
+- `publicVariables` - **Public** variables, each entry in this array is added using the meta `@:contextValue('public')`, or the keyword `public`.
+
+- `staticVariables` - **Static** variables, each entry in this array is added using the meta `@:contextValue('static')`, or the keyword `static`.
 
 ---
 

rulescript/Context.hx

@@ -3,8 +3,8 @@ package rulescript;
 import rulescript.types.ScriptedAbstract;
 import rulescript.types.ScriptedType;
 import rulescript.scriptedClass.RuleScriptedClass.ScriptedClass;
-import rulescript.types.context.EVariableModifiers;
 import rulescript.types.context.EVariableDeclarations;
+import rulescript.types.context.TContextVariable;
 
 /**
  * The Context stores types to preserve repeated imports, 
@@ -14,10 +14,9 @@ import rulescript.types.context.EVariableDeclarations;
  */
 class Context {
 	public var types:Map<String, Dynamic> = [];
-	public var variables:Map<String, ContextVariable> = [];
-
-	@:deprecated public var publicVariables(default, never):Map<String, Dynamic> = [];
-	@:deprecated public var staticVariables(default, never):Map<String, Dynamic> = [];
+	
+	public var publicVariables:Map<String, TContextVariable> = new Map<String, TContextVariable>();
+	public var staticVariables:Map<String, TContextVariable> = new Map<String, TContextVariable>();
 
 	public function new() {}
 
@@ -28,7 +27,8 @@ class Context {
 	}
 
 	public function resetVariables():Void {
-		variables = []; // yuhuh -orbl
+		staticVariables = []; // yuhuh -orbl
+		publicVariables = [];
 	}
 
 	public function resolveType(path:String):Dynamic {
@@ -49,6 +49,4 @@ class Context {
 			return types[path] = t;
 		};
 	}
-}
-
-typedef ContextVariable = {modifier:EVariableModifiers, declaration:EVariableDeclarations, value:Dynamic, ?parent:String};
+}

rulescript/interps/RuleScriptInterp.hx

@@ -11,8 +11,8 @@ import rulescript.types.ScriptedEnum;
 import rulescript.types.ScriptedType;
 import rulescript.types.ScriptedTypeUtil;
 import rulescript.types.ScriptedTypedef;
-import rulescript.types.context.EVariableModifiers;
 import rulescript.types.context.EVariableDeclarations;
+import rulescript.types.context.TContextVariable;
 
 using rulescript.Tools;
 
@@ -98,8 +98,12 @@ class RuleScriptInterp extends hscript.Interp implements IInterp
 				v = get(superInstance, id);
 
 			// SHARED VARIABLES
-			if (v == null && context != null && context.variables.exists(id))
-				v = context.variables.get(id).value;
+			if (v == null && context != null) {
+				if (context.publicVariables.exists(id))
+					v = context.publicVariables.get(id).value;
+				else if (context.staticVariables.exists(id))
+					v = context.staticVariables.get(id).value;
+			}
 
 			if (v == null)
 				error(EUnknownVariable(id)); // fixes - orbl
@@ -143,19 +147,18 @@ class RuleScriptInterp extends hscript.Interp implements IInterp
 		}
 		return v;
 	}
-
-	override function setVar(name:String, v:Dynamic)
-	{
+	override function setVar(name:String, v:Dynamic) {
 		if (superInstance != null && (superFields.contains(name) || superFields.contains('set_' + name)))
 			Reflect.setProperty(superInstance, name, v);
-		else if (context != null && context.variables.exists(name)) {
-			final cv:rulescript.Context.ContextVariable = context.variables.get(name);
-			if (cv.declaration == FINAL && cv.parent != scriptName)
+		else if (context != null && (context.staticVariables.exists(name) || context.publicVariables.exists(name))) {
+			final vg:Map<String, TContextVariable> = context.staticVariables.exists(name) ? context.staticVariables : context.publicVariables;
+			final cv:TContextVariable = vg.get(name);
+			if (cv.declaration == FINAL && cv.parent != scriptName) {
 				error(ECustom('$name: Unable to override final variable defined by another script.'));
-			else context.variables.set(name, {modifier: cv.modifier, declaration:cv.declaration, value: v, parent: scriptName});
-		}
-		else
-		{
+			} else {
+				vg.set(name, {declaration: cv.declaration, value: v, parent: scriptName});
+			}
+		} else {
 			var lastValue = variables.get(name);
 
 			if (lastValue is Property)
@@ -241,7 +244,7 @@ class RuleScriptInterp extends hscript.Interp implements IInterp
 
 				if ((!locals.exists(id) && !variables.exists(id))
 					&& (!superFields.contains(id) && !superFields.contains('get_$id'))
-					&& (context == null || !context.variables.exists(id)))
+					&& (context == null || !context.publicVariables.exists(id) || context.staticVariables.exists(id)))
 				{
 					final typePath:String = path.join('.');
 
@@ -292,20 +295,20 @@ class RuleScriptInterp extends hscript.Interp implements IInterp
 
 						if (isFunction && depth == 0)
 						{
-							return context.variables[n] = {
+							(isStatic ? context.staticVariables : context.publicVariables)[n] = {
 								value: this.expr(e),
 								declaration: isFinal ? EVariableDeclarations.FINAL : EVariableDeclarations.VAR,
-								modifier: isStatic ? EVariableModifiers.STATIC : EVariableModifiers.PUBLIC,
 								parent: scriptName
 							};
+
+							return (isStatic ? context.staticVariables : context.publicVariables)[n];
 						}
 						else if (depth == 0)
 						{
 							this.expr(e);
-							context.variables.set(n, {
+							(isStatic ? context.staticVariables : context.publicVariables).set(n, {
 								value: resolve(n),
 								declaration: isFinal ? EVariableDeclarations.FINAL : EVariableDeclarations.VAR,
-								modifier: isStatic ? EVariableModifiers.STATIC : EVariableModifiers.PUBLIC,
 								parent: scriptName
 							});						
 						}
@@ -322,7 +325,7 @@ class RuleScriptInterp extends hscript.Interp implements IInterp
 			case EVar(n, _, e, global, _):
 				if (global)
 				{
-					if (context == null || !context.variables.exists(n))
+					if (context == null || (!context.staticVariables.exists(n) || !context.publicVariables.exists(n)))
 						variables.set(n, (e == null) ? null : this.expr(e));
 				}
 				else

rulescript/types/context/EVariableModifiers.hx

@@ -0,0 +1,3 @@
+package rulescript.types.context;
+
+typedef TContextVariable = {declaration:EVariableDeclarations, value:Dynamic, ?parent:String};