Changeset 222 for branches/interpreter2/UExecutor.pas

Timestamp:

Nov 25, 2020, 12:18:45 AM (3 years ago)

Author:

chronos

Message:

• Added: Support for more expression operators.
• Added: Support for brackets in expressions.

File:

• branches/interpreter2/UExecutor.pas (modified) (11 diffs)

branches/interpreter2/UExecutor.pas

@@ -92 +92 @@
     function ExecuteStrToInt(Params: array of TValue): TValue;
     function ExecuteBooleanAssign(Params: array of TValue): TValue;
+    function ExecuteBooleanNot(Params: array of TValue): TValue;
     function ExecuteBooleanEqual(Params: array of TValue): TValue;
     function ExecuteBooleanNotEqual(Params: array of TValue): TValue;
@@ -101 +102 @@
     function ExecuteIntegerAdd(Params: array of TValue): TValue;
     function ExecuteIntegerSub(Params: array of TValue): TValue;
+    function ExecuteIntegerMul(Params: array of TValue): TValue;
+    function ExecuteIntegerIntDiv(Params: array of TValue): TValue;
+    function ExecuteIntegerMod(Params: array of TValue): TValue;
     function ExecuteIntegerEqual(Params: array of TValue): TValue;
     function ExecuteIntegerNotEqual(Params: array of TValue): TValue;
+    function ExecuteIntegerLesser(Params: array of TValue): TValue;
+    function ExecuteIntegerHigher(Params: array of TValue): TValue;
+    function ExecuteIntegerLesserOrEqual(Params: array of TValue): TValue;
+    function ExecuteIntegerHigherOrEqual(Params: array of TValue): TValue;
+    function ExecuteIntegerAnd(Params: array of TValue): TValue;
+    function ExecuteIntegerOr(Params: array of TValue): TValue;
+    function ExecuteIntegerXor(Params: array of TValue): TValue;
+    function ExecuteIntegerShr(Params: array of TValue): TValue;
+    function ExecuteIntegerShl(Params: array of TValue): TValue;
     procedure InitExecutorBlock(ExecutorBlock: TExecutorBlock; Block: TBlock);
   public
@@ -121 +134 @@
     function ExecuteExpressionOperation(Block: TExecutorBlock; Expression: TExpressionOperation): TValue;
     function ExecuteExpressionOperand(Block: TExecutorBlock; Expression: TExpressionOperand): TValue;
+    function ExecuteExpressionBrackets(Block: TExecutorBlock; Expression: TExpressionBrackets): TValue;
     procedure Run;
     procedure Output(Text: string);
@@ -323 +337 @@
 end;
 
+function TExecutor.ExecuteBooleanNot(Params: array of TValue): TValue;
+begin
+  Result := TValueBoolean.Create;
+  TValueBoolean(Result).Value := not TValueBoolean(Params[0]).Value;
+end;
+
 function TExecutor.ExecuteBooleanEqual(Params: array of TValue): TValue;
 begin
@@ -377 +397 @@
 end;
 
+function TExecutor.ExecuteIntegerMul(Params: array of TValue): TValue;
+begin
+  Result := TValueInteger.Create;
+  TValueInteger(Result).Value := TValueInteger(Params[0]).Value * TValueInteger(Params[1]).Value;
+end;
+
+function TExecutor.ExecuteIntegerIntDiv(Params: array of TValue): TValue;
+begin
+  Result := TValueInteger.Create;
+  TValueInteger(Result).Value := TValueInteger(Params[0]).Value div TValueInteger(Params[1]).Value;
+end;
+
+function TExecutor.ExecuteIntegerMod(Params: array of TValue): TValue;
+begin
+  Result := TValueInteger.Create;
+  TValueInteger(Result).Value := TValueInteger(Params[0]).Value mod TValueInteger(Params[1]).Value;
+end;
+
 function TExecutor.ExecuteIntegerEqual(Params: array of TValue): TValue;
 begin
@@ -387 +425 @@
   Result := TValueBoolean.Create;
   TValueBoolean(Result).Value := TValueInteger(Params[0]).Value <> TValueInteger(Params[1]).Value;
+end;
+
+function TExecutor.ExecuteIntegerLesser(Params: array of TValue): TValue;
+begin
+  Result := TValueBoolean.Create;
+  TValueBoolean(Result).Value := TValueInteger(Params[0]).Value < TValueInteger(Params[1]).Value;
+end;
+
+function TExecutor.ExecuteIntegerHigher(Params: array of TValue): TValue;
+begin
+  Result := TValueBoolean.Create;
+  TValueBoolean(Result).Value := TValueInteger(Params[0]).Value > TValueInteger(Params[1]).Value;
+end;
+
+function TExecutor.ExecuteIntegerLesserOrEqual(Params: array of TValue): TValue;
+begin
+  Result := TValueBoolean.Create;
+  TValueBoolean(Result).Value := TValueInteger(Params[0]).Value <= TValueInteger(Params[1]).Value;
+end;
+
+function TExecutor.ExecuteIntegerHigherOrEqual(Params: array of TValue): TValue;
+begin
+  Result := TValueBoolean.Create;
+  TValueBoolean(Result).Value := TValueInteger(Params[0]).Value >= TValueInteger(Params[1]).Value;
+end;
+
+function TExecutor.ExecuteIntegerAnd(Params: array of TValue): TValue;
+begin
+  Result := TValueInteger.Create;
+  TValueInteger(Result).Value := TValueInteger(Params[0]).Value and TValueInteger(Params[1]).Value;
+end;
+
+function TExecutor.ExecuteIntegerOr(Params: array of TValue): TValue;
+begin
+  Result := TValueInteger.Create;
+  TValueInteger(Result).Value := TValueInteger(Params[0]).Value or TValueInteger(Params[1]).Value;
+end;
+
+function TExecutor.ExecuteIntegerXor(Params: array of TValue): TValue;
+begin
+  Result := TValueInteger.Create;
+  TValueInteger(Result).Value := TValueInteger(Params[0]).Value xor TValueInteger(Params[1]).Value;
+end;
+
+function TExecutor.ExecuteIntegerShr(Params: array of TValue): TValue;
+begin
+  Result := TValueInteger.Create;
+  TValueInteger(Result).Value := TValueInteger(Params[0]).Value shr TValueInteger(Params[1]).Value;
+end;
+
+function TExecutor.ExecuteIntegerShl(Params: array of TValue): TValue;
+begin
+  Result := TValueInteger.Create;
+  TValueInteger(Result).Value := TValueInteger(Params[0]).Value shl TValueInteger(Params[1]).Value;
 end;
 
@@ -410 +502 @@
           ExecutorFunction.Callback := ExecuteBooleanNotEqual;
         end;
+        if ExecutorFunction.FunctionDef.Name = '_Not' then begin
+          ExecutorFunction.Callback := ExecuteBooleanNot;
+        end else
       end else
       if ExecutorType.TypeRef.Name = 'string' then begin
@@ -435 +530 @@
           ExecutorFunction.Callback := ExecuteIntegerSub;
         end else
+        if ExecutorFunction.FunctionDef.Name = '_Mul' then begin
+          ExecutorFunction.Callback := ExecuteIntegerMul;
+        end else
+        if ExecutorFunction.FunctionDef.Name = '_IntDiv' then begin
+          ExecutorFunction.Callback := ExecuteIntegerIntDiv;
+        end else
+        if ExecutorFunction.FunctionDef.Name = '_IntMod' then begin
+          ExecutorFunction.Callback := ExecuteIntegerMod;
+        end else
         if ExecutorFunction.FunctionDef.Name = '_Equal' then begin
           ExecutorFunction.Callback := ExecuteIntegerEqual;
@@ -440 +544 @@
         if ExecutorFunction.FunctionDef.Name = '_NotEqual' then begin
           ExecutorFunction.Callback := ExecuteIntegerNotEqual;
+        end;
+        if ExecutorFunction.FunctionDef.Name = '_Lesser' then begin
+          ExecutorFunction.Callback := ExecuteIntegerLesser;
+        end else
+        if ExecutorFunction.FunctionDef.Name = '_Higher' then begin
+          ExecutorFunction.Callback := ExecuteIntegerHigher;
+        end;
+        if ExecutorFunction.FunctionDef.Name = '_LesserOrEqual' then begin
+          ExecutorFunction.Callback := ExecuteIntegerLesserOrEqual;
+        end else
+        if ExecutorFunction.FunctionDef.Name = '_HigherOrEqual' then begin
+          ExecutorFunction.Callback := ExecuteIntegerHigherOrEqual;
+        end;
+        if ExecutorFunction.FunctionDef.Name = '_And' then begin
+          ExecutorFunction.Callback := ExecuteIntegerAnd;
+        end;
+        if ExecutorFunction.FunctionDef.Name = '_Or' then begin
+          ExecutorFunction.Callback := ExecuteIntegerOr;
+        end;
+        if ExecutorFunction.FunctionDef.Name = '_Xor' then begin
+          ExecutorFunction.Callback := ExecuteIntegerXor;
+        end;
+        if ExecutorFunction.FunctionDef.Name = '_Shr' then begin
+          ExecutorFunction.Callback := ExecuteIntegerShr;
+        end;
+        if ExecutorFunction.FunctionDef.Name = '_Shl' then begin
+          ExecutorFunction.Callback := ExecuteIntegerShl;
         end;
       end;
@@ -692 +823 @@
   if Expression is TExpressionOperand then
     Result := ExecuteExpressionOperand(Block, TExpressionOperand(Expression))
-  else raise Exception.Create('Unknown expression class.');
+  else
+  if Expression is TExpressionBrackets then
+    Result := ExecuteExpressionBrackets(Block, TExpressionBrackets(Expression))
+  else
+  raise Exception.Create('Unknown expression class.');
 end;
 
@@ -733 +868 @@
 end;
 
+function TExecutor.ExecuteExpressionBrackets(Block: TExecutorBlock;
+  Expression: TExpressionBrackets): TValue;
+begin
+  Result := ExecuteExpression(Block, Expression.Expression);
+end;
+
 procedure TExecutor.Run;
 begin