Changeset 98

Timestamp:

Feb 3, 2017, 10:48:19 PM (8 years ago)

Author:

chronos

Message:

• Modified: Handling of constant and variables values with different type.

Location:

branches/interpreter

Files:

• Execute3.pas (modified) (5 diffs)
• Parser3.pas (modified) (1 diff)
• Source3.pas (modified) (7 diffs)
• project1.lps (deleted)
• project2.lps (deleted)
• project3.lps (deleted)

branches/interpreter/Execute3.pas

@@ -21 +21 @@
 end;
 
-function ExecuteExpression(Expression: PExpression): Boolean;
+function ExecuteExpressionBoolean(Expression: PExpression): Boolean;
 begin
 
@@ -28 +28 @@
 procedure ExecuteWhileDo(WhileDo: PWhileDo);
 begin
-  if ExecuteExpression(@WhileDo^.Condition) then
+  while ExecuteExpressionBoolean(@WhileDo^.Condition) do
     ExecuteCommand(@WhileDo^.Command);
 end;
@@ -34 +34 @@
 procedure ExecuteIfThenElse(IfThenElse: PIfThenElse);
 begin
-  if ExecuteExpression(@IfThenElse^.Condition) then
+  if ExecuteExpressionBoolean(@IfThenElse^.Condition) then
     ExecuteCommand(@IfThenElse^.DoThen)
     else ExecuteCommand(@IfThenElse^.DoElse);
@@ -40 +40 @@
 
 procedure ExecuteExecution(Execution: PExecution);
+var
+  I: Integer;
 begin
-  // Set parameters
+{  Execution^.Func^.Variables.Add(VariableCreate('Result', Execution^.Func^.ReturnType));
+  for I := 0 to Length(Execution^.Func^.Parameters.Items) - 1 do begin
+    Execution^.Func^.Variables.Add(VariableCreate(Execution^.Func^.Parameters.Items[I].Name,
+      Execution^.Func^.Parameters.Items[I].DataType));
+    case Assignment^.Destination^.DataType^.BaseType of
+      Execution^.Func^.Variables.Items[Length(Execution^.Func^.Variables.Items) - 1].V
+    end;
+  end;
+}
   ExecuteBeginEnd(@Execution^.Func^.BeginEnd);
 end;
@@ -47 +57 @@
 procedure ExecuteAssignment(Assignment: PAssignment);
 begin
-
+  case Assignment^.Destination^.DataType^.BaseType of
+    btBoolean: Assignment^.Destination.ValueBoolean := ExecuteExpressionBoolean(@Assignment^.Source);
+    //btChar: Assignment^.Destination.ValueBoolean := ExecuteExpressionChar(@Assignment^.Source);
+    //btString: Assignment^.Destination.ValueBoolean := ExecuteExpressionString(@Assignment^.Source);
+    //btInteger: Assignment^.Destination.ValueBoolean := ExecuteExpressionInteger(@Assignment^.Source);
+  end;
 end;
 

branches/interpreter/Parser3.pas

@@ -409 +409 @@
 begin
   SetLength(ProgramCode^.Types.Items, 0);
-  ProgramCode^.Types.Add(TypeCreate('string'));
+  ProgramCode^.Types.Add(TypeCreate('string', btInteger));
   TypeString := ProgramCode^.Types.GetLast;
-  ProgramCode^.Types.Add(TypeCreate('Boolean'));
+  ProgramCode^.Types.Add(TypeCreate('Boolean', btBoolean));
   TypeBoolean := ProgramCode^.Types.GetLast;
-  ProgramCode^.Types.Add(TypeCreate('Integer'));
+  ProgramCode^.Types.Add(TypeCreate('Integer', btInteger));
   TypeInteger := ProgramCode^.Types.GetLast;
-  ProgramCode^.Types.Add(TypeCreate('Char'));
+  ProgramCode^.Types.Add(TypeCreate('Char', btChar));
   TypeChar := ProgramCode^.Types.GetLast;
-  ProgramCode^.Types.Add(TypeCreate('Array'));
+  ProgramCode^.Types.Add(TypeCreate('Array', btArray));
   TypeArray := ProgramCode^.Types.GetLast;
 

branches/interpreter/Source3.pas

@@ -6 +6 @@
 
 type
+  TBaseType = (btBoolean, btInteger, btChar, btShortString, btArray);
+
   TType = record
     Name: string;
+    BaseType: TBaseType;
   end;
   PType = ^TType;
@@ -23 +26 @@
     Name: string;
     DataType: PType;
+    case Integer of
+      0: (ValueChar: Char);
+      1: (ValueInteger: Integer);
+      2: (ValueString: ShortString);
+      3: (ValueBoolean: Boolean);
   end;
   PVariable = ^TVariable;
@@ -33 +41 @@
     function GetByName(Name: string): PVariable;
   end;
+
+  TConstant = record
+    Name: string;
+    DataType: PType;
+    case Integer of
+      0: (ValueChar: Char);
+      1: (ValueInteger: Integer);
+      2: (ValueString: ShortString);
+      3: (ValueBoolean: Boolean);
+  end;
+  PConstant = ^TConstant;
 
   TFunctionParameter = record
@@ -59 +78 @@
       3: (Assignment: TAssignment);
       4: (Execution: TExecution);
-    end;
  } end;
   PCommand = ^TCommand;
@@ -98 +116 @@
     ReturnType: PType;
     BeginEnd: TBeginEnd;
+    Variables: TVariables;
   end;
   PFunction = ^TFunction;
@@ -131 +150 @@
 function VariableCreate(Name: string; DataType: PType): TVariable;
 function FunctionCreate(Name: string; DataType: PType): TFunction;
-function TypeCreate(Name: string): TType;
+function TypeCreate(Name: string; BaseType: TBaseType): TType;
 function FunctionParameterCreate(Name: string; DataType: PType): TFunctionParameter;
 
@@ -149 +168 @@
 end;
 
-function TypeCreate(Name: string): TType;
-begin
-  Result.Name := Name;
+function TypeCreate(Name: string; BaseType:TBaseType): TType;
+begin
+  Result.Name := Name;
+  Result.BaseType := BaseType;
 end;