Changeset 14 for branches/Void/UCompilator.pas

Timestamp:

Nov 10, 2009, 8:19:41 AM (15 years ago)

Author:

george

Message:

• Upraveno: Lepší zpracování parametrů procedůr.

File:

• branches/Void/UCompilator.pas (modified) (4 diffs)

branches/Void/UCompilator.pas

@@ -10 +10 @@
 type
   TOnErrorEvent = procedure (Text: string; var Terminate: Boolean; Position: TPoint) of object;
-
-  { TCompilator }
 
   TCompilator = class
@@ -135 +133 @@
   Command: TProcedure;
   Variable: TVariable;
+  SourceVariable: TVariable;
   VariableName: string;
   Value: string;
+  P: Integer;
 begin
   Parser.ParseNextToken;
@@ -151 +151 @@
             Name := CommandName;
             Parser.ParseNextToken;
-            if (Parser.TokenType = ttSymbol) and (Parser.TokenValue = '(') then begin
-              Parser.ParseNextToken;
-              if (Parser.TokenType <> ttString) then DoError('Expected string');
-              Parameters.Add(Parser.TokenValue);
-              Parser.ParseNextToken;
-              if (Parser.TokenType <> ttSymbol) and (Parser.TokenValue = ')') then
-                DoError('Expected )');
+            if Command.Parameters.Count > 0 then begin
+              if (Parser.TokenType = ttSymbol) and (Parser.TokenValue = '(') then begin
+                Parser.ParseNextToken;
+                for P := 0 to Command.Parameters.Count - 1 do begin
+                  if (Parser.TokenType = ttString) then
+                  with TVariableValue(Parameters[Parameters.Add(TVariableValue.Create)]) do begin
+                    ValueType := vtString;
+                    StringConstant := Parser.TokenValue;
+                  end else
+                  if (Parser.TokenType = ttIdentifier) then
+                  with TVariableValue(Parameters[Parameters.Add(TVariableValue.Create)]) do begin
+                    ValueType := vtVariable;
+                    SourceVariable := FindVariableByName(Parser.TokenValue);
+                    if Assigned(SourceVariable) then begin
+                      VariableDef := SourceVariable;
+                    end else DoError('Unknown identifier ' + Parser.TokenValue);
+                  end else DoError('Unknown parameter ' + Parser.TokenValue);
+                  if P <> Command.Parameters.Count - 1 then begin
+                    Parser.ParseNextToken;
+                    if (Parser.TokenType <> ttSymbol) and (Parser.TokenValue = ',') then
+                      DoError('Expected ,');
+                  end;
+                  Parser.ParseNextToken;
+                end;
+                if (Parser.TokenType <> ttSymbol) and (Parser.TokenValue = ')') then
+                  DoError('Expected )');
+              end else DoError('Expected (');
             end;
           end;
@@ -173 +193 @@
             Value := Parser.TokenValue;
             if Parser.TokenType = ttIdentifier then begin
-              Variable := FindVariableByName(CommandName);
-              if Assigned(Variable) then
-              with TCommand(Commands[Commands.Add(TCommand.Create)]) do begin
-                Name := 'Assignment';
-                Parameters.Add(CommandName);
-                Parameters.Add(Value);
-              end else DoError('Undefined variable ' + CommandName);
+              SourceVariable := FindVariableByName(Value);
+              if not Assigned(SourceVariable) then DoError('Undefined source variable ' + Value)
+              else begin
+                Variable := FindVariableByName(CommandName);
+                if Assigned(Variable) then
+                with TCommand(Commands[Commands.Add(TCommand.Create)]) do begin
+                  Name := 'Assignment';
+                  with TVariableValue(Parameters[Parameters.Add(TVariableValue.Create)]) do begin
+                    ValueType := vtVariable;
+                    Variable := Variable;
+                  end;
+                  with TVariableValue(Parameters[Parameters.Add(TVariableValue.Create)]) do begin
+                    ValueType := vtVariable;
+                    VariableDef := SourceVariable;
+                  end;
+                end;
+              end;
             end else if Parser.TokenType = ttString then begin
               with TCommand(Commands[Commands.Add(TCommand.Create)]) do begin
                 Name := 'Assignment';
-                Parameters.Add(CommandName);
-                Parameters.Add(Value);
+                with TVariableValue(Parameters[Parameters.Add(TVariableValue.Create)]) do begin
+                  ValueType := vtVariable;
+                  VariableDef := Variable;
+                end;
+                with TVariableValue(Parameters[Parameters.Add(TVariableValue.Create)]) do begin
+                  ValueType := vtString;
+                  StringConstant := Parser.TokenValue;
+                end;
               end;
             end else DoError('Expected variable or string')