Changeset 48 for branches/DelphiToC/Analyze/UPascalParser.pas

Timestamp:

Aug 9, 2010, 1:53:33 PM (14 years ago)

Author:

george

Message:

Added support of parameters for function call.

File:

• branches/DelphiToC/Analyze/UPascalParser.pas (modified) (8 diffs)

branches/DelphiToC/Analyze/UPascalParser.pas

@@ -49 +49 @@
   TPascalParser = class(TBaseParser)
     procedure ParseWhileDo(SourceCode: TWhileDo);
-    function ParseExpression(SourceCode: TExpression): TExpression;
+    procedure ParseExpression(SourceCode: TExpression);
     procedure ParseUsedModuleList(SourceCode: TUsedModuleList);
     procedure ParseModule(SourceCode: TModule);
@@ -290 +290 @@
 { TExpression }
 
-function TPascalParser.ParseExpression(SourceCode: TExpression): TExpression;
+procedure TPascalParser.ParseExpression(SourceCode: TExpression);
 var
   Identifier: string;
@@ -340 +340 @@
             end;
           end else begin
-            Method := CommonBlock.Methods.Search(Identifier);
+            Method := CommonBlock.Functions.Search(Identifier);
             if Assigned(Method) then begin
               // Referenced method
@@ -444 +444 @@
   LoopVariable: TVariable;
   IdentName: string;
+  FunctionName: string;
 begin
   begin
@@ -465 +466 @@
     if IsIdentificator(FNextToken) then begin
       if Assigned(SourceCode.Variables.Search(FNextToken)) then begin
+        // Variable assignment
         Result := TAssignment.Create;
         TAssignment(Result).CommonBlock := SourceCode;
@@ -474 +476 @@
         ParseExpression(TAssignment(Result).Source);
       end else
-      if Assigned(SourceCode.Methods.Search(FNextToken)) then begin
+      if Assigned(SourceCode.Functions.Search(FNextToken)) then begin
+        // Function call
+        FunctionName := ReadCode;
         Result := TFunctionCall.Create;
         TFunctionCall(Result).CommonBlock := SourceCode;
-        TFunctionCall(Result).FunctionRef := SourceCode.Methods.Search(FNextToken);
-        ReadCode;
-  //      ParseMetVariable(TFunctionCall(Result).Target);
+        TFunctionCall(Result).FunctionRef := SourceCode.Functions.Search(FunctionName);
+        if FNextToken = '(' then begin
+          Expect('(');
+          with TFunctionCall(Result) do begin
+            ParameterExpression.Add(TExpression.Create);
+            TExpression(ParameterExpression.Last).CommonBlock := SourceCode;
+            ParseExpression(TExpression(ParameterExpression.Last));
+          end;
+          Expect(')');
+        end;
       end else begin
         Result := nil;
@@ -561 +572 @@
         ParseTypeList(Types)
       else if FNextToken = 'procedure' then
-        ParseFunctionList(Methods)
+        ParseFunctionList(Functions)
       else if FNextToken = 'function' then
-        ParseFunctionList(Methods)
+        ParseFunctionList(Functions)
       else begin
         ParseBeginEnd(Code);
@@ -583 +594 @@
     Expect('begin');
     while (FNextToken <> 'end') and (FNextTokenType <> ttEndOfFile) do begin
-      Commands.Add(nil);
       NewCommand := ParseCommand(CommonBlock);
       if Assigned(NewCommand) then Commands.Add(NewCommand);