Changeset 212 for branches/interpreter2/UExecutor.pas

Timestamp:

Apr 22, 2020, 12:04:22 PM (5 years ago)

Author:

chronos

Message:

• Added: Support for custom functions.

File:

• branches/interpreter2/UExecutor.pas (modified) (1 diff)

branches/interpreter2/UExecutor.pas

@@ -630 +630 @@
   FuncName: string;
 begin
-  if Expression.Operation = eoAdd then FuncName := '_Add'
-  else if Expression.Operation = eoSub then FuncName := '_Sub'
-  else if Expression.Operation = eoEqual then FuncName := '_Equal'
-  else if Expression.Operation = eoNotEqual then FuncName := '_NotEqual'
-  else raise Exception.Create('Unsupported operation type.');
-
-  ExecutorFunction := Block.GetTypeFunction(Expression.TypeRef, FuncName);
+  FuncName := Expression.GetFunctionName;
+
+  ExecutorFunction := Block.GetTypeFunction(Expression.FunctionRef.ParentType, FuncName);
+  if not Assigned(ExecutorFunction) then
+    raise Exception.Create('Missing operator function ' + FuncName + ' for type ' + Expression.TypeRef.Name);
+
   Result := Expression.TypeRef.ValueClass.Create;