Streamlining data values

Src/AST/Myc.Ast.RTL.Core.pas

@@ -130,7 +130,9 @@ begin
     if Args[0].Kind <> vkMethod then
         raise EArgumentException.Create('The argument to Memoize must be a function.');
 
-    var cCache: TManaged<TDictionary<Int64, TDataValue>> := TDictionary<Int64, TDataValue>.Create;
+    // create a managed dictionary
+    var cCache: TDataValue := TDictionary<Int64, TDataValue>.Create;
+
     funcToMemoize := Args[0].AsMethod();
 
     memoizedFunc :=
@@ -151,7 +153,7 @@ begin
             else
                 key := argScalar.Value.AsInt64;
 
-            var cache: TDictionary<Int64, TDataValue> := cCache;
+            var cache := cCache.AsObject as TDictionary<Int64, TDataValue>;
 
             if cache.TryGetValue(key, Result) then
                 exit;

Src/Data/Myc.Data.Value.pas

@@ -4,11 +4,12 @@ interface
 
 uses
     System.SysUtils,
+    Myc.Utils,
     Myc.Data.Scalar,
     Myc.Data.Series;
 
 type
-    TDataValueKind = (vkVoid, vkScalar, vkText, vkSeries, vkRecordSeries, vkRecord, vkMethod, vkGeneric);
+    TDataValueKind = (vkVoid, vkScalar, vkText, vkSeries, vkRecordSeries, vkRecord, vkManagedObject, vkMethod, vkGeneric);
 
     TDataValue = record
         type
@@ -24,6 +25,10 @@ type
                 constructor Create(const AValue: T);
             end;
 
+            TObjVal = class(TVal<TObject>)
+                destructor Destroy; override;
+            end;
+
             ILazy = interface
                 function GetKind: TDataValueKind;
                 function GetValue: TDataValue;
@@ -50,6 +55,7 @@ type
         class operator Implicit(const AValue: TScalar): TDataValue; overload; inline;
         class operator Implicit(const AValue: String): TDataValue; overload; inline;
         class operator Implicit(const AValue: TDataValue.TFunc): TDataValue; overload; inline;
+        class operator Implicit(const AValue: TObject): TDataValue; overload; inline;
 
         class function FromGeneric<T>(const [ref] AValue: T): TDataValue; static; inline;
         function AsGeneric<T>: T; inline;
@@ -68,6 +74,7 @@ type
         function AsRecordSeries: IRecordSeries; inline;
         function AsRecord: TScalarRecord; inline;
         function AsSeries: ISeries; inline;
+        function AsObject: TObject; overload; inline;
 
         function ToString: String;
         property IsVoid: Boolean read GetIsVoid;
@@ -214,6 +221,15 @@ begin
     Result := TVal<T>(FInterface).Value;
 end;
 
+function TDataValue.AsObject: TObject;
+begin
+    if FKind = Ord(vkLazy) then
+        exit(AsLazy.Value.AsObject);
+    if (FKind <> Ord(vkManagedObject)) then
+        raise EInvalidCast.Create('Cannot read value as object.');
+    Result := (FInterface as TObjVal).Value;
+end;
+
 function TDataValue.AsRecord: TScalarRecord;
 begin
     if FKind = Ord(vkLazy) then
@@ -413,6 +429,12 @@ begin
     TFunc(Result.FInterface) := AValue;
 end;
 
+class operator TDataValue.Implicit(const AValue: TObject): TDataValue;
+begin
+    Result.FKind := Ord(vkManagedObject);
+    Result.FInterface := TObjVal.Create(AValue);
+end;
+
 { TDataValueKindHelper }
 
 function TDataValueKindHelper.ToString: string;
@@ -466,4 +488,10 @@ begin
     Result := mappedValue.AsScalar;
 end;
 
+destructor TDataValue.TObjVal.Destroy;
+begin
+    Value.Free;
+    inherited;
+end;
+
 end.