Changeset 100 for branches/interpreter/Source3.pas

Timestamp:

Feb 11, 2017, 12:47:38 PM (8 years ago)

Author:

chronos

Message:

• Modified: Better expression parsing.
• Added: Executor function call context for storing local variables.

File:

• branches/interpreter/Source3.pas (modified) (6 diffs)

branches/interpreter/Source3.pas

@@ -15 +15 @@
   PExecution = ^TExecution;
 
+  TOperator = (opNone, opAdd, opSubtract, opAnd, opOr, opNot, opEqual, opNotEqual);
+
   TBaseType = (btBoolean, btInteger, btChar, btShortString, btArray);
 
@@ -48 +50 @@
 
   TConstant = record
-    Name: string;
+    Name: shortstring;
     DataType: PType;
     Index: Integer;
@@ -85 +87 @@
   TCommand = record
     CmdType: TCmdType;
-    Ptr: Pointer;
     case Integer of
       0: (WhileDo: PWhileDo);
@@ -103 +104 @@
   end;
 
-  TReadType = (rtVariable, rtConstant, rtExpression, rtFunctionCall);
+  TReadType = (rtVariable, rtConstant, rtExpression, rtFunctionCall, rtValue);
   TGetValue = record
     ReadType: TReadType;
@@ -111 +112 @@
       rtExpression: (Expression: PExpression);
       rtFunctionCall: (FunctionCall: PExecution);
+      rtValue: (Value: TConstant);
   end;
   PGetValue = ^TGetValue;
 
-  TExpOperand = (eoNone, eoAdd, eoSubtract, eoAnd, eoOr, eoNot);
+  TExpNodeType = (ntNone, ntValue, ntOperator);
 
   TExpression = record
-    Operand: TExpOperand;
-    Items: array of TGetValue;
+    NodeType: TExpNodeType;
+    OperatorType: TOperator;
+    Items: array of TExpression;
+    Value: TGetValue;
+    Parentheses: Boolean;
+    Associated: Boolean;
   end;
 
@@ -181 +187 @@
 function FunctionParameterCreate(Name: string; DataType: PType): TFunctionParameter;
 
+var
+  OperatorString: array[TOperator] of string = ('', '+', '-', 'and', 'or', 'not',
+    '=', '<>');
+
+const
+  OperatorPrecedence: array[0..6] of TOperator = (opNot, opAnd, opOr, opAdd,
+    opSubtract, opEqual, opNotEqual);
+
 
 implementation