Changeset 105 for branches

Timestamp:

Feb 17, 2017, 11:19:22 PM (8 years ago)

Author:

chronos

Message:

• Modified: More work on record functions.

Location:

branches/interpreter/interpreter4

Files:

• Parser.pas (modified) (9 diffs)
• Source.pas (modified) (6 diffs)

branches/interpreter/interpreter4/Parser.pas

@@ -286 +286 @@
 begin
   OldPos := InputTextPos;
-  Next := ReadNext;
-  if FunctionContext = nil then
-    Variable := MainProgram^.Variables.GetByName(Next)
-    else Variable := FunctionContext^.Variables.GetByName(Next);
-  if Variable <> nil then begin
-    Result := True;
-  end else begin
-    Result := False;
-    InputTextPos := OldPos;
-  end;
+  Variable := nil;
+  repeat
+    Next := ReadNext;
+    if Assigned(Variable) and (Variable^.DataType^.BaseType = btRecord) then begin
+//      if FunctionContext = nil then
+//        Variable := MainProgram^.Variables.GetByName(Next)
+//        else Variable := FunctionContext^.Variables.GetByName(Next);
+    end else begin
+      if FunctionContext = nil then
+        Variable := MainProgram^.Variables.GetByName(Next)
+        else begin
+          Variable := FunctionContext^.Variables.GetByName(Next);
+        end;
+    end;
+    if Variable <> nil then begin
+      Result := True;
+    end else begin
+      Result := False;
+      InputTextPos := OldPos;
+    end;
+    if CheckNext('.') then begin
+      Expect('.');
+      Continue;
+    end else Break;
+  until False;
 end;
 
@@ -549 +564 @@
       I := 0;
       while I < Length(Func^.Parameters.Items) do begin
-        ParseGetValue(@Execution^.Parameters.Items[I]);
+        if ParseGetValue(@Execution^.Parameters.Items[I]) then begin
+        end else ShowError('Value exprected but found ' + ReadNext);
+
         if I < (Length(Func^.Parameters.Items) - 1) then Expect(',');
         I := I + 1;
@@ -711 +728 @@
   OldPos: Integer;
   Value: string;
+  I: Integer;
 begin
   if CheckNext('var') then begin
@@ -728 +746 @@
         if ParseType(VarType, False) then begin
           Variables^.Add(VariableCreate(VarName, VarType));
+          // Create subvariables for structured record type variable
+          if VarType^.BaseType = btRecord then begin
+            SetLength(Variables^.GetLast^.RecordVariables.Items, 0);
+            I := 0;
+            while (I < Length(VarType^.Fields^.Items)) do begin
+              Variables^.GetLast^.RecordVariables^.Add(
+                VariableCreate(VarType^.Fields^.Items[I].Name, @VarType^.Fields^.Items[I]));
+              I := I + 1;
+            end;
+          end;
         end else ShowError('Unknown variable type ' + ReadNext);
         if CheckNext('=') then begin
@@ -802 +830 @@
     Expect('function');
     FunctionContext := Func;
-    Func^.Name := ReadNext;
-    Func^.Parameters.TypeList := @MainProgram^.Types;
+    repeat
+      Func^.Name := ReadNext;
+      if CheckNext('.') then begin
+        Expect('.');
+        Func^.ParentRecord := Func^.Types.GetByName(Func^.Name);
+        Continue;
+      end else Break;
+    until False;
+    Func^.Parameters.TypeList := @Func^.Types;
     ParseParams(@Func^.Parameters);
     Expect(':');
     ReturnType := ReadNext;
-    DataType := MainProgram.Types.GetByName(ReturnType);
+    DataType := Func^.Types.GetByName(ReturnType);
     if DataType <> nil then Func^.ReturnType := DataType
       else ShowError('Unknown type ' + ReturnType);
@@ -826 +861 @@
     Expect('procedure');
     FunctionContext := Func;
-    Func^.Name := ReadNext;
-    Func^.Parameters.TypeList := @MainProgram^.Types;
+    repeat
+      Func^.Name := ReadNext;
+      if CheckNext('.') then begin
+        Expect('.');
+        Continue;
+      end else Break;
+    until False;
+    Func^.Parameters.TypeList := @Func^.Types;
     ParseParams(@Func^.Parameters);
     Expect(';');
@@ -1126 +1167 @@
   Directive: TDirective;
   NewType: TType;
+  NewFunc: TFunction;
 begin
   OldInputText := InputText;
@@ -1162 +1204 @@
 
   Expect('implementation');
+
+  repeat
+    SetLength(NewFunc.Parameters.Items, 0);
+    SetLength(NewFunc.Variables.Items, 0);
+    NewFunc.Types.ParentList := @UnitItem^.Types;
+    if ParseFunction(@NewFunc) then begin
+      UnitItem.Functions.Add(NewFunc);
+    end else
+    if ParseProcedure(@NewFunc) then begin
+      UnitItem.Functions.Add(NewFunc);
+    end else Break;
+  until False;
 
   Expect('end');
@@ -1269 +1323 @@
     SetLength(NewFunc.Parameters.Items, 0);
     SetLength(NewFunc.Variables.Items, 0);
+    NewFunc.Types.ParentList := @ProgramCode^.Types;
     if ParseFunction(@NewFunc) then begin
       ProgramCode.Functions.Add(NewFunc);

branches/interpreter/interpreter4/Source.pas

@@ -18 +18 @@
   PEnumerationStates = ^TEnumerationStates;
   PFunction = ^TFunction;
+  PVariables = ^TVariables;
 
   TOperator = (opNone, opAdd, opSubtract, opAnd, opOr, opNot, opEqual, opNotEqual);
@@ -58 +59 @@
     DataType: PType;
     Index: Integer;
+    RecordVariables: PVariables;
   end;
 
@@ -63 +65 @@
 
   TVariables = record
+    ParentList: PVariables;
     Items: array of TVariable;
     procedure Add(Variable: TVariable);
     function GetByName(Name: string): PVariable;
-  end;
-  PVariables = ^TVariables;
+    function GetLast: PVariable;
+  end;
 
   TConstant = record
@@ -173 +176 @@
     BeginEnd: TBeginEnd;
     Variables: TVariables;
+    Types: TTypes;
+    ParentRecord: PType;
   end;
 
@@ -210 +215 @@
     Constants: TConstants;
     UsesSection: TUses;
+    Functions: TFunctions;
   end;
   PUnit = ^TUnit;
@@ -343 +349 @@
   while (I < Length(Items)) and (Items[I].Name <> Name) do I := I + 1;
   if I < Length(Items) then Result := @Items[I]
-    else Result := nil;
+    else begin
+      if ParentList <> nil then Result := ParentList^.GetByName(Name)
+        else Result := nil;
+    end;
+end;
+
+function TVariables.GetLast: PVariable;
+begin
+  Result := @Items[Length(Items) - 1];
 end;