Changeset 222 for branches/interpreter2/USource.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/USource.pas (modified) (6 diffs)

branches/interpreter2/USource.pas

@@ -242 +242 @@
   end;
 
-  TExpressionOperator = (eoAdd, eoSub, eoMultiply, eoDivide, eoModulo, eoAnd, eoXor,
-    eoOr, eoShl, eoShr, eoEqual, eoNotEqual);
+  TExpressionOperator = (eoNone, eoAdd, eoSub, eoMultiply, eoDivide, eoIntDivide,
+    eoModulo, eoAnd, eoXor, eoOr, eoShl, eoShr, eoEqual, eoNotEqual, eoLesser,
+    eoHigher, eoLesserOrEqual, eoHigherOrEqual, eoNot);
 
   { TExpression }
@@ -270 +271 @@
   end;
 
-  TExpressionOperandType = (otVariableRef, otConstantRef, otConstantDirect, otFunctionCall);
+  TExpressionOperandType = (otVariableRef, otConstantRef, otConstantDirect,
+    otFunctionCall);
 
   { TExpressionOperand }
@@ -288 +290 @@
     function GetType: TType; override;
     constructor Create;
+    destructor Destroy; override;
+  end;
+
+  { TExpressionBrackets }
+
+  TExpressionBrackets = class(TExpression)
+    Expression: TExpression;
+    procedure GetValue(Index: Integer; out Value); override;
+    function GetField(Index: Integer): TField; override;
+    procedure SetValue(Index: Integer; var Value); override;
+    function GetType: TType; override;
     destructor Destroy; override;
   end;
@@ -442 +455 @@
       'Integer', 'Float', 'Color', 'Time', 'Date', 'DateTime', 'Enumeration',
       'Reference');
+    ExpressionOperatorText: array[TExpressionOperator] of string = ('', '+',
+      '-', '*', '/', 'div', 'mod', 'and', 'xor', 'or', 'shl',
+      'shr', '=', '<>', '<', '>', '<=','>=', 'not');
+    ExpressionOperatorFuncText: array[TExpressionOperator] of string = ('', '_Add',
+      '_Sub', '_Mul', '_Div', '_IntDiv', '_Mod', '_And', '_Xor', '_Or', '_Shl',
+      '_Shr', '_Equal', '_NotEqual', '_Lesser', '_Higher', '_LesserOrEqual',
+      '_HigherOrEqual', '_Not');
+
+  function GetOperatorByName(Name: string): TExpressionOperator;
 
 
@@ -452 +474 @@
   SYes = 'Yes';
   SNo = 'No';
+
+function GetOperatorByName(Name: string): TExpressionOperator;
+var
+  I: TExpressionOperator;
+begin
+  Result := eoNone;
+  for I := Succ(Low(TExpressionOperator)) to High(TExpressionOperator) do begin
+    if ExpressionOperatorText[I] = Name then begin
+      Result := I;
+      Break;
+    end;
+  end;
+end;
+
+{ TExpressionBrackets }
+
+procedure TExpressionBrackets.GetValue(Index: Integer; out Value);
+begin
+  if Index = 0 then begin
+    TExpression(Value) := Expression;
+  end
+  else inherited;
+end;
+
+function TExpressionBrackets.GetField(Index: Integer): TField;
+begin
+  if Index = 0 then Result := TField.Create(dtObject, 'Expression')
+  else inherited;
+end;
+
+procedure TExpressionBrackets.SetValue(Index: Integer; var Value);
+begin
+  if Index = 0 then begin
+    Expression := TExpression(Value);
+  end
+  else inherited;
+end;
+
+function TExpressionBrackets.GetType: TType;
+begin
+  Result := Expression.GetType;
+end;
+
+destructor TExpressionBrackets.Destroy;
+begin
+  FreeAndNil(Expression);
+  inherited;
+end;
 
 { TReturn }
@@ -1017 +1087 @@
 function TExpressionOperation.GetFunctionName: string;
 begin
-  if Operation = eoAdd then Result := '_Add'
-  else if Operation = eoSub then Result := '_Sub'
-  else if Operation = eoEqual then Result := '_Equal'
-  else if Operation = eoNotEqual then Result := '_NotEqual'
-  else raise Exception.Create('Unsupported operation type.');
+  Result := ExpressionOperatorFuncText[Operation];
 end;