Refactor StatusRef closes #56

Author: eelstork

Src/Decorators/Drive.cs

@@ -13,21 +13,19 @@ namespace Active.Core{
 public class Drive : AbstractDecorator{
 
     static int uid; internal static int id => uid = ID(uid);
-    //
-    static status hold;
 
     #if !AL_OPTIMIZE
-    internal static LogData logData;
+
     protected object target;
     #endif
 
     public Gate? this[status @in, bool crit]{ get{
-        hold = @in;
+        StatusRef.hold = @in;
         return @in.running ? Eval(crit) : Bypass();
     }}
 
     public Gate? this[bool @in, bool crit]{ get{
-        hold = @in ? status.cont() : status.fail();
+        StatusRef.hold = @in ? status.cont() : status.fail();
         return @in ? Eval(crit) : Bypass();
     }}
 
@@ -36,7 +34,7 @@ protected Gate Eval(bool crit, ValidString reason=null)
 
     protected Gate? Bypass(ValidString reason=null){
         #if !AL_OPTIMIZE
-        logData = new LogData(this, target, reason);
+        SetLogData(target, reason);
         #endif
         return null;
     }
@@ -62,51 +60,13 @@ public StatusRef this[status s]{ get{
             #if !AL_OPTIMIZE
             owner.target = s.targetScope;
             #endif
-            return new StatusRef(crit ? s : hold, logData);
+            return new StatusRef(crit ? s : StatusRef.hold, logData);
         }}
 
     }
 
     // ===============================================================
 
-    public readonly struct StatusRef{
-
-         readonly status x;
-         readonly LogData logData;
-
-         internal StatusRef(status value, LogData logData)
-         { x = value; this.logData = logData; }
-
-         #if AL_OPTIMIZE
-         public static implicit operator status(StatusRef? self)
-         => ToStatus(self);
-         #else
-         public static implicit operator status(StatusRef? self)
-         => status.log ? ToStatusWithLog(self) : ToStatus(self);
-         #endif
-
-         static status ToStatus(StatusRef? self)
-         => self?.x ?? Self.hold;
-
-         #if !AL_OPTIMIZE
-         static status ToStatusWithLog(StatusRef? self){
-             if(self.HasValue){
-                 var ι = self.Value;
-                 return ι.x.ViaDecorator(
-                             ι.logData.scope,
-                             log && ι.logData.Reason());
-             }else{
-                 if(Self.logData.scope == null) throw
-                    new InvOp("Log data is null");
-                 return hold.ViaDecorator(
-                             Self.logData.scope,
-                             log && Self.logData.Reason());
-             }
-        }
-        #endif
-
-    }  // StatusRef
-
 }
 
 #if !AL_BEST_PERF

Src/Decorators/Once.cs

@@ -13,14 +13,11 @@ namespace Active.Core{
 public class Once : AbstractDecorator{
 
     static int uid; internal static int id => uid = ID(uid);
-    //
-    static status hold;
     //
 	internal status state = cont();
     int frame = 0;
 
     #if !AL_OPTIMIZE
-    internal static LogData logData;
     protected object target;
     #endif
 
@@ -34,9 +31,9 @@ protected Gate Eval(ValidString reason=null)
 
     protected Gate? Bypass(ValidString reason=null){
         #if !AL_OPTIMIZE
-        logData = new LogData(this, target, reason);
+        SetLogData(target, reason);
         #endif
-        hold = state;
+        StatusRef.hold = state;
         return null;
     }
 
@@ -63,47 +60,7 @@ public StatusRef this[status s]{ get{
 
     }
 
-    // ===============================================================
-
-    public readonly struct StatusRef{
-
-         readonly status x;
-         readonly LogData logData;
-
-         internal StatusRef(status value, LogData logData)
-         { x = value; this.logData = logData; }
-
-         #if AL_OPTIMIZE
-         public static implicit operator status(StatusRef? self)
-         => ToStatus(self);
-         #else
-         public static implicit operator status(StatusRef? self)
-         => status.log ? ToStatusWithLog(self) : ToStatus(self);
-         #endif
-
-         internal static status ToStatus(StatusRef? self)
-         => self?.x ?? Once.hold;
-
-         #if !AL_OPTIMIZE
-         internal static status ToStatusWithLog(StatusRef? self){
-             if(self.HasValue){
-                 var ι = self.Value;
-                 return ι.x.ViaDecorator(
-                             ι.logData.scope,
-                             log && ι.logData.Reason());
-             }else{
-                 if(Self.logData.scope == null) throw
-                    new InvOp("Log data is null");
-                 return hold.ViaDecorator(
-                             Self.logData.scope,
-                             log && Self.logData.Reason());
-             }
-        }
-        #endif
-
-    }  // StatusRef
-
-}
+}  // Once
 
 #if !AL_BEST_PERF
 partial class Task{

Src/Details/ConditionalDetails.cs

@@ -0,0 +1 @@
+namespace Active.Core{ public interface IDecorator{} }

Src/Details/IDecorator.cs

@@ -6,9 +6,10 @@ public class LogString{
     public string str;
     public bool valid{ get; private set; }
 
-    LogString(string str){ this.str = str; }
+    internal LogString(string str){ this.str = str; }
 
-    LogString(string str, bool valid) { this.str = str; this.valid = valid; }
+    internal LogString(string str, bool valid)
+    { this.str = str; this.valid = valid; }
 
     override public string ToString(){
         return valid ? str : throw new Ex("Can't extract invalid string");

Src/Details/LogString.cs

@@ -2,22 +2,26 @@
 #define AL_OPTIMIZE
 #endif
 
+using ArgEx = System.ArgumentException;
 using Active.Core.Details;
 
 namespace Active.Core{
 
-public interface IDecorator{}
-
 partial class AbstractDecorator{
 
-    protected static readonly LogString log = null;
+    internal static readonly LogString log = null;
     static int MaxId = 0;
 
     public abstract action Reset();
 
     override public string ToString()
     => StatusFormat.Decorator(this);
 
+    #if !AL_OPTIMIZE
+    protected void SetLogData(object target, string reason)
+    => StatusRef.SetLogData(this, target, reason);
+    #endif
+
     internal readonly struct LogData{
 
         public readonly AbstractDecorator scope;
@@ -26,6 +30,7 @@ internal readonly struct LogData{
 
         // NOTE: s == null allowed only for testing purposes
         public LogData(AbstractDecorator s, object tg, string r){
+            //if(s == null) throw new ArgEx("Scope cannot be null");
             scope = s; target = tg; reason = r;
         }
 

Src/Details/AbstractDecoratorDetails.cs renamed to Src/Details/Stateful/AbstractDecoratorDetails.cs

@@ -0,0 +1,35 @@
+#if !(UNITY_EDITOR || DEBUG)
+#define AL_OPTIMIZE
+#endif
+
+using Active.Core.Details;
+using InvOp = System.InvalidOperationException;
+using Self = Active.Core.Conditional;
+
+namespace Active.Core{
+partial class Conditional{
+
+    #if !AL_OPTIMIZE
+    protected object target;
+    #endif
+
+    public readonly struct Gate{
+
+        readonly Self owner; readonly LogData logData;
+
+        internal Gate(Self owner, LogData logData)
+        { this.owner = owner; this.logData = logData; }
+
+        public StatusRef this[status s]{ get{
+            #if !AL_OPTIMIZE
+            owner.target = s.targetScope;
+            #endif
+            owner.OnStatus(s);
+            return new StatusRef(s, logData);
+        }}
+
+    }  // Gate
+
+}  // Conditional
+
+}  // Active.Core

Src/Details/Composite.cs renamed to Src/Details/Stateful/Composite.cs

@@ -1,7 +1,7 @@
 namespace Active.Core.Details{
 public abstract class Iterator{
 
-    protected static readonly LogString log = null;
+    internal static readonly LogString log = null;
 
     protected int i;
     protected readonly Composite κ;