Changeset 102

Timestamp:

Feb 11, 2017, 6:55:42 PM (8 years ago)

Author:

chronos

Message:

• Modified: Now project3 can interpret project2.
• Modified: To support standard input and output inside interpreter, all lines read from input starting with | symbol is passed to interpreted code. Also text written to standard output by interpretted program is prefixed with | symbol.

Location:

branches/interpreter

Files:

• Execute3.pas (modified) (9 diffs)
• Parser3.pas (modified) (7 diffs)
• Source3.pas (modified) (3 diffs)
• project2.lpr (modified) (1 diff)

branches/interpreter/Execute3.pas

@@ -52 +52 @@
 implementation
 
+uses
+  Parser3;
+
 procedure ExecuteCommand(Command: PCommand); forward;
 procedure ExecuteGetValue(GetValue: PGetValue; Value: PVariableValue); forward;
@@ -74 +77 @@
 procedure ShowErrorType(Variable: PVariableValue);
 begin
-  ShowError('Not suppoted type')
+  ShowError('Not supported type')
 end;
 
@@ -81 +84 @@
   case Result^.BaseType of
     btBoolean: ShowErrorType(Result);
-    btChar: ShowErrorType(Result);
+    btChar: begin
+      Result.BaseType := btShortString;
+      Result.ValueString := Result.ValueString + Operand.ValueChar;
+    end;
     btInteger: Result^.ValueInteger := Result^.ValueInteger + Operand^.ValueInteger;
-    btShortString: Result^.ValueString := Result^.ValueString + Operand^.ValueString;
+    btShortString: begin
+      if Operand^.BaseType = btShortString then
+        Result^.ValueString := Result^.ValueString + Operand^.ValueString
+      else if Operand^.BaseType = btChar then
+        Result^.ValueString := Result^.ValueString + Operand^.ValueChar
+      else ShowErrorType(Result);
+    end;
+  end;
+end;
+
+procedure VariableNot(Result, Operand: PVariableValue);
+begin
+  case Result^.BaseType of
+    btBoolean: Result^.ValueBoolean := not Operand^.ValueBoolean;
+    btChar: ShowErrorType(Result);
+    btInteger: ShowErrorType(Result);
+    btShortString: ShowErrorType(Result);
   end;
 end;
@@ -141 +163 @@
   I: Integer;
   SubValue: TVariableValue;
+  Operand1: TVariableValue;
 begin
   if Expression^.NodeType = ntOperator then begin
@@ -155 +178 @@
         // Just assign first operand
         case Expression^.OperatorType of
+          opNot: begin
+            Value.BaseType := btBoolean;
+            VariableNot(Value, @SubValue);
+          end;
           opAdd: AssignVariable(Value, @SubValue);
           opSubtract: AssignVariable(Value, @SubValue);
           opAnd: AssignVariable(Value, @SubValue);
           opOr: AssignVariable(Value, @SubValue);
-          opEqual: AssignVariable(Value, @SubValue);
-          opNotEqual: AssignVariable(Value, @SubValue);
+          opEqual: AssignVariable(@Operand1, @SubValue);
+          opNotEqual: AssignVariable(@Operand1, @SubValue);
           else ShowError('Unsupported operator type');
         end;
@@ -169 +196 @@
           opAnd: VariableAnd(Value, @SubValue);
           opOr: VariableOr(Value, @SubValue);
-          opEqual: VariableEqual(Value, Value, @SubValue);
-          opNotEqual: VariableNotEqual(Value, Value, @SubValue);
+          opEqual: begin
+            Value.BaseType := btBoolean;
+            VariableEqual(Value, @Operand1, @SubValue);
+          end;
+          opNotEqual: begin
+            Value.BaseType := btBoolean;
+            VariableNotEqual(Value, @Operand1, @SubValue);
+          end
           else ShowError('Unsupported operator type');
         end;
@@ -262 +295 @@
 begin
   if Execution^.Func^.Name = 'WriteLn' then begin
-    WriteLn(ExecutionContextCurrent^.VariableValues.GetByName('Text')^.ValueString)
+    WriteLn('|' + ExecutionContextCurrent^.VariableValues.GetByName('Text')^.ValueString)
   end else
   if Execution^.Func^.Name = 'Halt' then begin
     Halt;
   end else
+  if Execution^.Func^.Name = 'Read' then begin
+    ExecutionContextCurrent^.VariableValues.GetByName('Output')^.ValueChar := InnerText[InnerTextPos];
+    InnerTextPos := InnerTextPos + 1;
+  end else
   if Execution^.Func^.Name = 'Eof' then begin
     ExecuteBuildInSetResult(Execution, 'Boolean');
-    ExecutionContextCurrent^.VariableValues.GetByName('Result')^.ValueBoolean := True;
+    ExecutionContextCurrent^.VariableValues.GetByName('Result')^.ValueBoolean := InnerTextPos > Length(InnerText);
   end else ShowError('Unsupported build-in function.');
 end;
@@ -297 +334 @@
   ExecutionContexts.Items[Length(ExecutionContexts.Items) - 1] := NewContext;
 
-  //WriteLn('Executed ' + Execution^.Func^.Name);
+  WriteLn('Executed ' + Execution^.Func^.Name);
   if IsBuildInFunction(Execution^.Func^.Name) then ExecuteBuildIn(Execution)
     else ExecuteBeginEnd(@Execution^.Func^.BeginEnd);
   if (ReturnValue <> nil) and (Execution^.Func^.ReturnType <> nil) then
     AssignVariable(ReturnValue, ExecutionContextCurrent^.VariableValues.GetByName('Result'));
+
+  WriteLn('Return from ' + Execution^.Func^.Name);
+
+  // Copy output parameters back to variable
+  NewContext := ExecutionContexts.Items[Length(ExecutionContexts.Items) - 1];
   ExecutionContexts.RemoveLast;
+
+  for I := 0 to Length(Execution^.Func^.Parameters.Items) - 1 do
+  if Execution^.Func^.Parameters.Items[I].Output then begin
+    DestVar := NewContext.VariableValues.GetByName(
+      Execution^.Func^.Parameters.Items[I].Name);
+    Param := @Execution^.Parameters.Items[I];
+    if (Param.ReadType = rtVariable) then
+      AssignVariable(ExecutionContextCurrent^.VariableValues.GetByName(Param.Variable.Name), DestVar)
+    else ShowError('Function var parameter can be only variable');
+  end;
 end;
 
@@ -311 +363 @@
 begin
   DestVariable := ExecutionContextCurrent^.VariableValues.GetByName(Assignment^.Destination^.Name);
+  WriteLn('Assignment to ' + Assignment^.Destination^.Name);
   FillChar(SrcVariable, SizeOf(TVariableValue), 0);
   ExecuteGetValue(@Assignment^.Source, @SrcVariable);

branches/interpreter/Parser3.pas

@@ -10 +10 @@
 procedure ParseProgram(ProgramCode: PProgramCode);
 
+
+var
+  InnerText: string;
+  InnerTextPos: Integer;
 
 implementation
@@ -61 +65 @@
 procedure ReadInputAll;
 var
+  LastC: Char;
   C: Char;
-begin
+  Inner: Boolean;
+begin
+  LastC := #0;
   InputTextPos := 1;
   InputText := '';
+  InnerTextPos := 1;
+  InnerText := '';
+  Inner := False;
   while not Eof do begin
     Read(C);
-    InputText := InputText + C;
+    if ((LastC = #0) or (LastC = #13) or (LastC = #10)) and (C = '|') then begin
+      Inner := True;
+      LastC := C;
+      Continue;
+    end else
+    if ((LastC = #0) or (LastC = #13) or (LastC = #10)) and (C <> '|') then begin
+      Inner := False;
+    end;
+    if Inner then InnerText := InnerText + C
+      else InputText := InputText + C;
+    LastC := C;
   end;
 end;
@@ -296 +316 @@
   I: Integer;
   II: Integer;
-begin
+  FoundOperator: Boolean;
+  OldPos: Integer;
+begin
+  OldPos := InputTextPos;
   Result := True;
+  FoundOperator := False;
   repeat
     if CheckNext('(') then begin
@@ -312 +336 @@
       Expression^.Items[Length(Expression^.Items) - 1].NodeType := ntOperator;
       Expression^.Items[Length(Expression^.Items) - 1].OperatorType := ExpOperator;
+      FoundOperator := True;
     end else
     if ParseGetValue(@GetValue, True) then begin
@@ -322 +347 @@
     end;
   until False;
+  if not FoundOperator then begin
+    Result := False;
+    InputTextPos := OldPos;
+    Exit;
+  end;
 
   if Length(Expression^.Items) > 0 then begin
@@ -340 +370 @@
             Expression^.Items[I].Associated := True;
             SetLength(Expression^.Items[I].Items, 2);
-            Expression^.Items[I].Items[1] := Expression^.Items[I - 1];
-            Expression^.Items[I].Items[0] := Expression^.Items[I + 1];
+            Expression^.Items[I].Items[0] := Expression^.Items[I - 1];
+            Expression^.Items[I].Items[1] := Expression^.Items[I + 1];
             DeleteExpressionItem(Expression, I + 1);
             DeleteExpressionItem(Expression, I - 1);
@@ -686 +716 @@
   ProgramCode^.Functions.Add(FunctionCreate('Read', nil));
   FuncRead := ProgramCode^.Functions.GetLast;
-  FuncRead^.Parameters.Add(FunctionParameterCreate('Output', TypeChar));
+  FuncRead^.Parameters.Add(FunctionParameterCreate('Output', TypeChar, True));
+  FuncRead^.Variables.Add(VariableCreate('Output', TypeChar));
   ProgramCode^.Functions.Add(FunctionCreate('Eof', TypeBoolean));
   ProgramCode^.Functions.Add(FunctionCreate('Length', TypeInteger));

branches/interpreter/Source3.pas

@@ -72 +72 @@
     Name: string;
     DataType: PType;
+    Output: Boolean;
   end;
 
@@ -185 +186 @@
 function FunctionCreate(Name: string; DataType: PType): TFunction;
 function TypeCreate(Name: string; BaseType: TBaseType): TType;
-function FunctionParameterCreate(Name: string; DataType: PType): TFunctionParameter;
+function FunctionParameterCreate(Name: string; DataType: PType; Output: Boolean = False): TFunctionParameter;
 
 var
@@ -216 +217 @@
 end;
 
-function FunctionParameterCreate(Name: string; DataType: PType): TFunctionParameter;
+function FunctionParameterCreate(Name: string; DataType: PType; Output: Boolean = False): TFunctionParameter;
 begin
   Result.Name := Name;
   Result.DataType := DataType;
+  Result.Output := Output;
 end;
 

branches/interpreter/project2.lpr

@@ -47 +47 @@
 end.
 
+|begin
+|end.