Changeset 140 for branches/easy compiler/UCompiler.pas

Timestamp:

Jan 16, 2018, 10:38:33 AM (7 years ago)

Author:

chronos

Message:

• Modified: General definition of functions. Static functions are now dynamic predefined.

File:

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

branches/easy compiler/UCompiler.pas

@@ -159 +159 @@
   Instruction: TSourceInstruction;
   NewReference: TSourceReference;
+  Funct: TSourceFunction;
+  Param: TSourceFunctionParameter;
 
 function ParseReference: TSourceReference;
@@ -171 +173 @@
     NewReference := TSourceReferenceVariable.Create;
     TSourceReferenceVariable(NewReference).Variable :=
-      Code.Variables.Find(Token.Text);
+      Code.Variables.Search(Token.Text);
     if TSourceReferenceVariable(NewReference).Variable = nil then
       raise Exception.Create('Variable not found: ' + Token.Text);
@@ -184 +186 @@
     NewReference := TSourceReferenceVariable.Create;
     TSourceReferenceVariable(NewReference).Variable :=
-      Code.Variables.Find(Token.Text);
+      Code.Variables.Search(Token.Text);
     if TSourceReferenceVariable(NewReference).Variable = nil then begin
       if Initialize then
@@ -201 +203 @@
     if Token.Kind = stIdentifier then begin
       Keyword := LowerCase(Token.Text);
-      if Keyword = 'print' then begin
+      Funct := Code.Functions.Search(Keyword);
+      if Assigned(Funct) then begin
         Instruction := TSourceInstructionFunction.Create;
-        TSourceInstructionFunction(Instruction).Name := 'print';
-        TSourceInstructionFunction(Instruction).AddParameter(ParseReference);
-        Code.Instructions.Add(Instruction);
-      end else
-      if Keyword = 'println' then begin
-        Instruction := TSourceInstructionFunction.Create;
-        TSourceInstructionFunction(Instruction).Name := 'println';
-        TSourceInstructionFunction(Instruction).AddParameter(ParseReference);
-        Code.Instructions.Add(Instruction);
-      end else
-      if Keyword = 'assign' then begin
-        Instruction := TSourceInstructionFunction.Create;
-        TSourceInstructionFunction(Instruction).Name := 'assign';
-        TSourceInstructionFunction(Instruction).AddParameter(ParseReferenceVariable(True));
-        TSourceInstructionFunction(Instruction).AddParameter(ParseReference);
+        TSourceInstructionFunction(Instruction).Name := Keyword;
+        for Param in Funct.Parameters do
+        if Param.Kind = pkString then begin
+          TSourceInstructionFunction(Instruction).AddParameter(ParseReference)
+        end else
+        if Param.Kind = pkVariable then begin
+          TSourceInstructionFunction(Instruction).AddParameter(ParseReferenceVariable(True));
+        end else
+        raise Exception.Create('Unsupported parameter type.');
         Code.Instructions.Add(Instruction);
       end else raise Exception.Create('Unsupported keyword: ' + Token.Text);