Changeset 99 for branches/interpreter/Source3.pas

Timestamp:

Feb 6, 2017, 12:11:54 AM (8 years ago)

Author:

chronos

Message:

• Modified: Better parsing of expression and commands.

File:

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

branches/interpreter/Source3.pas

@@ -6 +6 @@
 
 type
+  PBeginEnd = ^TBeginEnd;
+  PAssignment = ^TAssignment;
+  PVariable = ^TVariable;
+  PConstant = ^TConstant;
+  PIfThenElse = ^TIfThenElse;
+  PWhileDo = ^TWhileDo;
+  PExpression = ^TExpression;
+  PExecution = ^TExecution;
+
   TBaseType = (btBoolean, btInteger, btChar, btShortString, btArray);
 
@@ -26 +35 @@
     Name: string;
     DataType: PType;
-    case Integer of
-      0: (ValueChar: Char);
-      1: (ValueInteger: Integer);
-      2: (ValueString: ShortString);
-      3: (ValueBoolean: Boolean);
-  end;
-  PVariable = ^TVariable;
+    Index: Integer;
+  end;
 
   { TVariables }
@@ -41 +45 @@
     function GetByName(Name: string): PVariable;
   end;
+  PVariables = ^TVariables;
 
   TConstant = record
     Name: string;
     DataType: PType;
-    case Integer of
-      0: (ValueChar: Char);
-      1: (ValueInteger: Integer);
-      2: (ValueString: ShortString);
-      3: (ValueBoolean: Boolean);
-  end;
-  PConstant = ^TConstant;
+    Index: Integer;
+    case TBaseType of
+      btChar: (ValueChar: Char);
+      btInteger: (ValueInteger: Integer);
+      btShortString: (ValueString: ShortString);
+      btBoolean: (ValueBoolean: Boolean);
+  end;
+
+  { TConstants }
+
+  TConstants = record
+    Items: array of TConstant;
+    procedure Add(Constant: TConstant);
+    function GetByName(Name: string): PConstant;
+  end;
+  PConstants = ^TConstants;
 
   TFunctionParameter = record
@@ -72 +86 @@
     CmdType: TCmdType;
     Ptr: Pointer;
-{    case Integer of
-      0: (WhileDo: TWhileDo);
-      1: (IfThenElse: TIfThenElse);
-      2: (BeginEnd: TBeginEnd);
-      3: (Assignment: TAssignment);
-      4: (Execution: TExecution);
- } end;
+    case Integer of
+      0: (WhileDo: PWhileDo);
+      1: (IfThenElse: PIfThenElse);
+      2: (BeginEnd: PBeginEnd);
+      3: (Assignment: PAssignment);
+      4: (Execution: PExecution);
+  end;
   PCommand = ^TCommand;
+
+  { TBeginEnd }
 
   TBeginEnd = record
     Commands: array of TCommand;
-  end;
-  PBeginEnd = ^TBeginEnd;
+    procedure Add;
+    function GetLast: PCommand;
+  end;
+
+  TReadType = (rtVariable, rtConstant, rtExpression, rtFunctionCall);
+  TGetValue = record
+    ReadType: TReadType;
+    case TReadType of
+      rtVariable: (Variable: PVariable);
+      rtConstant: (Constant: PConstant);
+      rtExpression: (Expression: PExpression);
+      rtFunctionCall: (FunctionCall: PExecution);
+  end;
+  PGetValue = ^TGetValue;
+
+  TExpOperand = (eoNone, eoAdd, eoSubtract, eoAnd, eoOr, eoNot);
 
   TExpression = record
-  end;
-  PExpression = ^TExpression;
+    Operand: TExpOperand;
+    Items: array of TGetValue;
+  end;
 
   TAssignment = record
     Destination: PVariable;
-    Source: TExpression;
-  end;
-  PAssignment = ^TAssignment;
+    Source: TGetValue;
+  end;
 
   TIfThenElse = record
-    Condition: TExpression;
+    Condition: TGetValue;
     DoThen: TCommand;
     DoElse: TCommand;
   end;
-  PIfThenElse = ^TIfThenElse;
 
   TWhileDo = record
-    Condition: TExpression;
+    Condition: TGetValue;
     Command: TCommand;
   end;
-  PWhileDo = ^TWhileDo;
 
   { TFunction }
@@ -130 +158 @@
 
   TExecutionParams = record
-    Items: array of TExpression;
+    Items: array of TGetValue;
   end;
 
@@ -137 +165 @@
     Parameters: TExecutionParams;
   end;
-  PExecution = ^TExecution;
 
   TProgramCode = record
     Name: string;
     Variables: TVariables;
+    Constants: TConstants;
     Types: TTypes;
     Functions: TFunctions;
@@ -180 +208 @@
 end;
 
-{ TVariables }
-
-procedure TVariables.Add(Variable: TVariable);
-begin
-  SetLength(Items, Length(Items) + 1);
-  Items[Length(Items) - 1] := Variable;
-end;
-
-function TVariables.GetByName(Name: string): PVariable;
+{ TBeginEnd }
+
+procedure TBeginEnd.Add;
+begin
+  SetLength(Commands, Length(Commands) + 1);
+end;
+
+function TBeginEnd.GetLast: PCommand;
+begin
+  Result := @Commands[Length(Commands) - 1];
+end;
+
+{ TConstants }
+
+procedure TConstants.Add(Constant: TConstant);
+begin
+  SetLength(Items, Length(Items) + 1);
+  Items[Length(Items) - 1] := Constant;
+  Items[Length(Items) - 1].Index := Length(Items) - 1;
+end;
+
+function TConstants.GetByName(Name: string): PConstant;
 var
   I: Integer;
@@ -198 +239 @@
 end;
 
-{ TFunctionParameters }
-
-procedure TFunctionParameters.Add(Param: TFunctionParameter);
-begin
-  SetLength(Items, Length(Items) + 1);
-  Items[Length(Items) - 1] := Param;
-end;
-
-{ TTypes }
-
-procedure TTypes.Add(DataType: TType);
-begin
-  SetLength(Items, Length(Items) + 1);
-  Items[Length(Items) - 1] := DataType;
-end;
-
-function TTypes.GetByName(Name: string): PType;
+{ TVariables }
+
+procedure TVariables.Add(Variable: TVariable);
+begin
+  SetLength(Items, Length(Items) + 1);
+  Items[Length(Items) - 1] := Variable;
+  Items[Length(Items) - 1].Index := Length(Items) - 1;
+end;
+
+function TVariables.GetByName(Name: string): PVariable;
 var
   I: Integer;
@@ -224 +258 @@
 end;
 
-function TTypes.GetLast: PType;
-begin
-  Result := @Items[Length(Items) - 1];
-end;
-
-{ TFunctions }
-
-procedure TFunctions.Add(Func: TFunction);
-begin
-  SetLength(Items, Length(Items) + 1);
-  Items[Length(Items) - 1] := Func;
-end;
-
-function TFunctions.GetByName(Name: string): PFunction;
+{ TFunctionParameters }
+
+procedure TFunctionParameters.Add(Param: TFunctionParameter);
+begin
+  SetLength(Items, Length(Items) + 1);
+  Items[Length(Items) - 1] := Param;
+end;
+
+{ TTypes }
+
+procedure TTypes.Add(DataType: TType);
+begin
+  SetLength(Items, Length(Items) + 1);
+  Items[Length(Items) - 1] := DataType;
+end;
+
+function TTypes.GetByName(Name: string): PType;
 var
   I: Integer;
@@ -247 +284 @@
 end;
 
+function TTypes.GetLast: PType;
+begin
+  Result := @Items[Length(Items) - 1];
+end;
+
+{ TFunctions }
+
+procedure TFunctions.Add(Func: TFunction);
+begin
+  SetLength(Items, Length(Items) + 1);
+  Items[Length(Items) - 1] := Func;
+end;
+
+function TFunctions.GetByName(Name: string): PFunction;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Length(Items)) and (Items[I].Name <> Name) do I := I + 1;
+  if I < Length(Items) then Result := @Items[I]
+    else Result := nil;
+end;
+
 function TFunctions.GetLast: PFunction;
 begin