Changeset 142 for branches/easy compiler/UCompiler.pas

Timestamp:

Jan 16, 2018, 3:19:23 PM (7 years ago)

Author:

chronos

Message:

• Added: Support for begin end block.

File:

• branches/easy compiler/UCompiler.pas (modified) (9 diffs)

branches/easy compiler/UCompiler.pas

@@ -41 +41 @@
   private
     Tokenizer: TTokenizer;
-    procedure Parse(Tokens: TSourceTokens; Code: TSourceCode);
+    procedure Parse(Code: TSourceCode);
+    procedure ParseBeginEnd(BeginEnd: TSourceBeginEnd);
   public
     procedure Compile(Source: string; SourceCode: TSourceCode);
@@ -168 +169 @@
 { TCompiler }
 
-procedure TCompiler.Parse(Tokens: TSourceTokens; Code: TSourceCode);
+procedure TCompiler.Parse(Code: TSourceCode);
+begin
+  Tokenizer.TokenIndex := 0;
+  ParseBeginEnd(Code.Main);
+end;
+
+procedure TCompiler.ParseBeginEnd(BeginEnd: TSourceBeginEnd);
 var
   Token: TSourceToken;
@@ -186 +193 @@
     NewReference := TSourceReferenceConstant.Create;
     TSourceReferenceConstant(NewReference).Constant :=
-      Code.Constants.AddNewString(Token.Text);
+      BeginEnd.SourceCode.Constants.AddNewString(Token.Text);
   end else
   if Token.Kind = stIdentifier then begin
     NewReference := TSourceReferenceVariable.Create;
     TSourceReferenceVariable(NewReference).Variable :=
-      Code.Variables.Search(Token.Text);
+      BeginEnd.SourceCode.Variables.Search(Token.Text);
     if TSourceReferenceVariable(NewReference).Variable = nil then
       raise Exception.Create('Variable not found: ' + Token.Text);
@@ -198 +205 @@
     NewReference := TSourceReferenceConstant.Create;
     TSourceReferenceConstant(NewReference).Constant :=
-      Code.Constants.AddNewInteger(StrToInt(Token.Text));
+      BeginEnd.SourceCode.Constants.AddNewInteger(StrToInt(Token.Text));
   end else
   raise Exception.Create('Unexpected parameter');
@@ -210 +217 @@
     NewReference := TSourceReferenceVariable.Create;
     TSourceReferenceVariable(NewReference).Variable :=
-      Code.Variables.Search(Token.Text);
+      BeginEnd.SourceCode.Variables.Search(Token.Text);
     if TSourceReferenceVariable(NewReference).Variable = nil then
       raise Exception.Create('Variable not found: ' + Token.Text);
@@ -219 +226 @@
 
 begin
-  Tokenizer.TokenIndex := 0;
-  while Tokenizer.TokenIndex < Length(Tokens.Tokens) do begin
+  while True do begin
     Token := Tokenizer.GetNext;
+    if Token.Kind = stEof then Break
+    else
     if Token.Kind = stIdentifier then begin
       Keyword := LowerCase(Token.Text);
@@ -229 +237 @@
         if Token2.Kind <> stIdentifier then
           raise Exception.Create('Expected type parameter');
-        Variable := Code.Variables.Search(Token.Text);
+        Variable := BeginEnd.SourceCode.Variables.Search(Token.Text);
         if not Assigned(Variable) then begin
-          ValueType := Code.Types.Search(Token2.Text);
+          ValueType := BeginEnd.SourceCode.Types.Search(Token2.Text);
           if not Assigned(ValueType) then
             raise Exception.Create('Unsupported type: ' + Token2.Text);
-          Variable := Code.Variables.AddNew(Token.Text,
+          Variable := BeginEnd.SourceCode.Variables.AddNew(Token.Text,
             ValueType);
-        end else raise Exception.Create('Variable redefined');
-      end else begin
-        Funct := Code.Functions.Search(Keyword);
+        end else raise Exception.Create('Variable redefined: ' + Token.Text);
+      end else
+      if Keyword = 'begin' then begin
+        Instruction := TSourceBeginEnd.Create;
+        BeginEnd.Instructions.Add(Instruction);
+        TSourceBeginEnd(Instruction).SourceCode := BeginEnd.SourceCode;
+        ParseBeginEnd(TSourceBeginEnd(Instruction));
+      end else
+      if Keyword = 'end' then begin
+        Break;
+      end else
+      begin
+        Funct := BeginEnd.SourceCode.Functions.Search(Keyword);
         if Assigned(Funct) then begin
-          Instruction := TSourceInstructionFunction.Create;
-          TSourceInstructionFunction(Instruction).Name := Keyword;
+          Instruction := TSourceFunctionCall.Create;
+          TSourceFunctionCall(Instruction).Name := Keyword;
           for Param in Funct.Parameters do
           if Param.Kind = pkString then begin
-            TSourceInstructionFunction(Instruction).AddParameter(ParseReference)
+            TSourceFunctionCall(Instruction).AddParameter(ParseReference)
           end else
           if Param.Kind = pkVariable then begin
-            TSourceInstructionFunction(Instruction).AddParameter(ParseReferenceVariable(True));
+            TSourceFunctionCall(Instruction).AddParameter(ParseReferenceVariable(True));
           end else
           raise Exception.Create('Unsupported parameter type.');
-          Code.Instructions.Add(Instruction);
+          BeginEnd.Instructions.Add(Instruction);
         end else raise Exception.Create('Unsupported keyword: ' + Token.Text);
       end;
@@ -265 +283 @@
 
   Tokenizer.Tokenize(Source, SourceTokens);
-  Parse(SourceTokens, SourceCode);
+  Parse(SourceCode);
 
   Tokenizer.Free;
@@ -277 +295 @@
   TargetInstruction: TTargetInstruction;
 begin
-  Target.Instructions.Count := 0;
+{  Target.Instructions.Count := 0;
   for I := 0 to SourceCode.Instructions.Count - 1 do begin
     Instruction := TSourceInstruction(SourceCode.Instructions[I]);
-    if Instruction is TSourceInstructionFunction then begin
+    if Instruction is TSourceFunctionCall then begin
       TargetInstruction := TTargetInstruction.Create;
       TargetInstruction.Kind := tiFunction;
-      TargetInstruction.Name := TSourceInstructionFunction(Instruction).Name;
+      TargetInstruction.Name := TSourceFunctionCall(Instruction).Name;
       Target.Instructions.Add(TargetInstruction)
     end else raise Exception.Create('Unsupported source instruction');
   end;
+  }
 end;