AST Refactoring

Src/Data/Myc.Data.Value.pas

@@ -8,7 +8,7 @@ uses
     Myc.Data.Series;
 
 type
-    TDataValueKind = (vkVoid, vkScalar, vkInterface, vkText, vkSeries, vkRecordSeries, vkRecord, vkMemberSeries, vkGeneric);
+    TDataValueKind = (vkVoid, vkScalar, vkInterface, vkText, vkSeries, vkRecordSeries, vkRecord, vkMemberSeries, vkGeneric, vkMethod);
 
     TDataValue = record
     public
@@ -17,6 +17,9 @@ type
                 Value: T;
                 constructor Create(const AValue: T);
             end;
+
+            TFunc = reference to function(const ArgNodes: TArray<TDataValue>): TDataValue;
+
     private
         var
             FKind: TDataValueKind;
@@ -30,7 +33,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: IInterface): TDataValue; overload; inline;
+        class operator Implicit(const AValue: TDataValue.TFunc): TDataValue; overload; inline;
 
         class function From<T: record>(const [ref] AValue: T): TDataValue; static; inline;
         function AsVal<T: record>: TVal<T>; inline;
@@ -39,9 +42,11 @@ type
         class function FromRecordSeries(const [ref] AValue: TScalarRecordSeries): TDataValue; static; inline;
         class function FromRecord(const [ref] AValue: TScalarRecord): TDataValue; static; inline;
         class function FromMemberSeries(const [ref] AValue: TScalarMemberSeries): TDataValue; static; inline;
+        class function FromInterface(const [ref] AValue: IInterface): TDataValue; static; inline;
 
         function AsScalar: TScalar; inline;
         function AsInterface: IInterface; inline;
+        function AsMethod: TFunc; inline;
         function AsText: String; inline;
         function AsRecordSeries: TVal<TScalarRecordSeries>; inline;
         function AsRecord: TVal<TScalarRecord>; inline;
@@ -90,6 +95,13 @@ begin
     Result := TVal<TScalarMemberSeries>(FInterface);
 end;
 
+function TDataValue.AsMethod: TFunc;
+begin
+    if (FKind <> vkMethod) then
+        raise EInvalidCast.Create('Cannot read value as a method.');
+    Result := TFunc(FInterface);
+end;
+
 function TDataValue.AsVal<T>: TVal<T>;
 begin
     if (FKind <> vkGeneric) then
@@ -138,39 +150,34 @@ begin
     Result.FInterface := TVal<T>.Create(AValue);
 end;
 
+class function TDataValue.FromInterface(const [ref] AValue: IInterface): TDataValue;
+begin
+    Result.FKind := vkInterface;
+    Result.FInterface := AValue;
+end;
+
 class function TDataValue.FromMemberSeries(const [ref] AValue: TScalarMemberSeries): TDataValue;
 begin
     Result.FKind := vkMemberSeries;
     Result.FInterface := TVal<TScalarMemberSeries>.Create(AValue);
-    Result.FScalar := Default(TScalar);
 end;
 
 class function TDataValue.FromRecord(const [ref] AValue: TScalarRecord): TDataValue;
 begin
     Result.FKind := vkRecord;
     Result.FInterface := TVal<TScalarRecord>.Create(AValue);
-    Result.FScalar := Default(TScalar);
 end;
 
 class function TDataValue.FromRecordSeries(const [ref] AValue: TScalarRecordSeries): TDataValue;
 begin
     Result.FKind := vkRecordSeries;
     Result.FInterface := TVal<TScalarRecordSeries>.Create(AValue);
-    Result.FScalar := Default(TScalar);
 end;
 
 class function TDataValue.FromSeries(const [ref] AValue: TScalarSeries): TDataValue;
 begin
     Result.FKind := vkSeries;
     Result.FInterface := TVal<TScalarSeries>.Create(AValue);
-    Result.FScalar := Default(TScalar);
-end;
-
-class operator TDataValue.Implicit(const AValue: IInterface): TDataValue;
-begin
-    Result.FKind := vkInterface;
-    Result.FInterface := AValue;
-    Result.FScalar := Default(TScalar);
 end;
 
 class operator TDataValue.Implicit(const AValue: TScalar): TDataValue;
@@ -184,7 +191,6 @@ class operator TDataValue.Implicit(const AValue: String): TDataValue;
 begin
     Result.FKind := vkText;
     Result.FInterface := TVal<String>.Create(AValue);
-    Result.FScalar := Default(TScalar);
 end;
 
 function TDataValue.GetIsVoid: Boolean;
@@ -214,6 +220,8 @@ begin
         vkRecord: Result := '<record>';
         vkMemberSeries: Result := '<member_series>';
         vkVoid: Result := '<void>';
+        vkMethod: Result := '<method>';
+        vkGeneric: Result := '<generic>';
     else
         Result := '[Unknown DataValue]';
     end;
@@ -224,4 +232,10 @@ begin
     Result := Default(TDataValue);
 end;
 
+class operator TDataValue.Implicit(const AValue: TDataValue.TFunc): TDataValue;
+begin
+    Result.FKind := vkMethod;
+    TFunc(Result.FInterface) := AValue;
+end;
+
 end.