Changeset 6 for trunk/Compiler/Analyze/UPascalParser.pas

Timestamp:

Nov 5, 2010, 11:31:04 AM (14 years ago)

Author:

george

Message:

• Added: Typecasting support.
• Fixed: Function call in expressions.
• Added: Producer module specify generated file name, extension and placing.

File:

• trunk/Compiler/Analyze/UPascalParser.pas (modified) (7 diffs)

trunk/Compiler/Analyze/UPascalParser.pas

@@ -27 +27 @@
       Expressions: TListExpression): Boolean;
     function ParseExpressionFunctionCall(SourceCode: TExpression;
-      Expressions: TListExpression; var Func: TFunction): Boolean;
+      Expressions: TListExpression; var Func: TFunctionCall): Boolean;
     function ParseUses(SourceCode: TUsedModuleList; AExported: Boolean): Boolean;
     function ParseModule(ProgramCode: TProgram): TModule;
@@ -225 +225 @@
   UseConstant: TConstant;
   UseFunction: TFunction;
+  FunctionCall: TFunctionCall;
   NewExpression: TExpression;
   Identifier: string;
@@ -236 +237 @@
     if Assigned(UseType) then begin
       ReadToken;
+      if NextToken = '(' then begin
+        Expect('(');
+        // Typecasting
+        NewExpression := TExpression.Create;
+        NewExpression.CommonBlock := SourceCode.CommonBlock;
+        NewExpression.NodeType := ntTypecast;
+        NewExpression.UseType := UseType;
+        ParseExpression(NewExpression);
+        Expect(')');
+      end else
       if (UseType is TTypeRecord) or (UseType is TTypeClass) then begin
-        // type.variable or type.function
+        // Type context
         Expect('.');
         Identifier := ReadToken;
         UseVariable := TTypeRecord(UseType).CommonBlock.Variables.Search(Identifier);
         if Assigned(UseVariable) then begin
+          // Record or class variable
           NewExpression := TExpression.Create;
           NewExpression.CommonBlock := SourceCode.CommonBlock;
@@ -250 +262 @@
           UseFunction := TTypeRecord(UseType).CommonBlock.Functions.Search(Identifier);
           if Assigned(UseFunction) then begin
+            // Record or class functions
+            ParseExpressionFunctionCall(SourceCode, Expressions, FunctionCall);
             NewExpression := TExpression.Create;
             NewExpression.CommonBlock := SourceCode.CommonBlock;
             NewExpression.NodeType := ntFunction;
-            NewExpression.FunctionCall := UseFunction;
+            NewExpression.FunctionCall := FunctionCall;
           end;
         end;
@@ -273 +287 @@
     if not Assigned(NewExpression) then begin
       // Function call
-      ParseExpressionFunctionCall(SourceCode, Expressions, UseFunction);
-      if Assigned(UseFunction) then begin
+      ParseExpressionFunctionCall(SourceCode, Expressions, FunctionCall);
+      if Assigned(FunctionCall) then begin
         NewExpression := TExpression.Create;
         NewExpression.CommonBlock := SourceCode.CommonBlock;
         NewExpression.NodeType := ntFunction;
-        NewExpression.FunctionCall := UseFunction;
+        NewExpression.FunctionCall := FunctionCall;
       end;
     end;
@@ -319 +333 @@
 
 function TPascalParser.ParseExpressionFunctionCall(SourceCode: TExpression;
-  Expressions: TListExpression; var Func: TFunction): Boolean;
+  Expressions: TListExpression; var Func: TFunctionCall): Boolean;
 var
   UseFunction: TFunction;
+  NewExpression: TExpression;
+  I: Integer;
 begin
   Func := nil;
@@ -328 +344 @@
     if Assigned(UseFunction) then begin
       ReadToken;
-      Func := UseFunction;
+      Func := TFunctionCall.Create;
+      Func.CommonBlock := SourceCode.CommonBlock;
+      Func.FunctionRef := UseFunction;
       if NextToken = '(' then begin
         Expect('(');
-        while NextToken = ',' do begin
-          Expect(',');
-          Expect(')');
-        end;
+        for I := 0 to Func.FunctionRef.Parameters.Count - 1 do begin
+          if I > 0 then Expect(',');
+          NewExpression := TExpression.Create;
+          NewExpression.CommonBlock := SourceCode.CommonBlock;
+          ParseExpression(NewExpression);
+          Func.ParameterExpression.Add(NewExpression);
+        end;
+        Expect(')');
       end;
       Result := True;