Changeset 108 for branches/interpreter/interpreter4/Source.pas

Timestamp:

Jul 26, 2017, 11:35:26 PM (7 years ago)

Author:

chronos

Message:

*Modified: Better parsing of variable reference.

File:

• branches/interpreter/interpreter4/Source.pas (modified) (7 diffs)

branches/interpreter/interpreter4/Source.pas

@@ -9 +9 @@
   PAssignment = ^TAssignment;
   PVariable = ^TVariable;
+  PVariableRef = ^TVariableRef;
   PConstant = ^TConstant;
   PIfThenElse = ^TIfThenElse;
@@ -19 +20 @@
   PFunction = ^TFunction;
   PVariables = ^TVariables;
-
-  TOperator = (opNone, opAdd, opSubtract, opAnd, opOr, opNot, opEqual, opNotEqual);
+  PGetValue = ^TGetValue;
+
+  TOperator = (opNone, opAdd, opSubtract, opAnd, opOr, opNot, opEqual, opNotEqual,
+  opLess, opGreater, opLessOrEqual, opGreaterOrEqual);
 
   TBaseType = (btNone, btBoolean, btInteger, btChar, btShortString, btArray,
@@ -94 +97 @@
   end;
 
+  TVariableRef = record
+    Variable: PVariable;
+    case TBaseType of
+      btRecord: (Field: PType);
+      btArray: (Index: PGetValue);
+  end;
+
   TFunctionParameter = record
     Name: string;
@@ -135 +145 @@
     ReadType: TReadType;
     case TReadType of
-      rtVariable: (Variable: PVariable);
+      rtVariable: (VariableRef: PVariableRef);
       rtConstant: (Constant: PConstant);
       rtExpression: (Expression: PExpression);
@@ -141 +151 @@
       rtValue: (Value: TConstant);
   end;
-  PGetValue = ^TGetValue;
 
   TExpNodeType = (ntNone, ntValue, ntOperator);
@@ -155 +164 @@
 
   TAssignment = record
-    Destination: PVariable;
+    Destination: PVariableRef;
     Source: TGetValue;
   end;
@@ -249 +258 @@
 var
   OperatorString: array[TOperator] of string = ('', '+', '-', 'and', 'or', 'not',
-    '=', '<>');
+    '=', '<>', '<', '>', '<=', '>=');
 
 const
-  OperatorPrecedence: array[0..6] of TOperator = (opNot, opAnd, opOr, opAdd,
-    opSubtract, opEqual, opNotEqual);
+  OperatorPrecedence: array[0..10] of TOperator = (opNot, opAnd, opOr, opAdd,
+    opSubtract, opEqual, opNotEqual, opLess, opGreater, opLessOrEqual, opGreaterOrEqual);
   Keywords: array[0..18] of string = ('begin', 'end', 'if', 'then', 'else', 'while',
     'do', 'type', 'var', 'const', 'uses', 'unit', 'program', 'array', 'procedure',