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

Timestamp:

Aug 9, 2010, 12:48:14 PM (14 years ago)

Author:

george

Message:

Support for function definition with result type.

File:

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

branches/DelphiToC/Analyze/UPascalParser.pas

@@ -424 +424 @@
       end;
     end;
-    Assign(TExpression(TExpression(Expressions.First).SubItems[1]));
+    if Assigned(TExpression(Expressions.First).SubItems[1]) then
+      Assign(TExpression(TExpression(Expressions.First).SubItems[1]));
     TExpression(Expressions.First).SubItems[1] := nil;
     //ShowMessage(IntToStr(Expressions.Count));
-    TExpression(Expressions[1]).SubItems[0] := nil;
+    if Expressions.Count > 1 then
+      TExpression(Expressions[1]).SubItems[0] := nil;
     Expressions.Destroy;
   end;
@@ -473 +475 @@
       end else
       if Assigned(SourceCode.Methods.Search(FNextToken)) then begin
-        Result := TMethodCall.Create;
-        TMethodCall(Result).CommonBlock := SourceCode;
-        TMethodCall(Result).Method := SourceCode.Methods.Search(FNextToken);
+        Result := TFunctionCall.Create;
+        TFunctionCall(Result).CommonBlock := SourceCode;
+        TFunctionCall(Result).FunctionRef := SourceCode.Methods.Search(FNextToken);
         ReadCode;
-  //      ParseMetVariable(TMethodCall(Result).Target);
+  //      ParseMetVariable(TFunctionCall(Result).Target);
       end else begin
         Result := nil;
@@ -560 +562 @@
       else if FNextToken = 'procedure' then
         ParseFunctionList(Methods)
+      else if FNextToken = 'function' then
+        ParseFunctionList(Methods)
       else begin
         ParseBeginEnd(Code);
@@ -604 +608 @@
     with TFunction(Items[Add(TFunction.Create)]) do begin
       Parent := SourceCode.Parent;
-      Expect('procedure');
+      if FNextToken = 'procedure' then begin
+        Expect('procedure');
+        HaveResult := False;
+      end else begin
+        Expect('function');
+        HaveResult := True;
+      end;
       Name := ReadCode;
+
       if FNextToken = '(' then begin
         Expect('(');
@@ -632 +643 @@
         end;
         Expect(')');
+
+        // Parse function result type
+        if HaveResult then begin
+          Expect(':');
+          TypeName := ReadCode;
+          NewValueType := Parent.Types.Search(TypeName);
+          if not Assigned(NewValueType) then ErrorMessage(STypeNotDefined, [TypeName])
+            else begin
+              ResultType := NewValueType;
+              with TVariable(Parent.Variables.Items[Parent.Variables.Add(TVariable.Create)]) do begin
+                Name := 'Result';
+                ValueType := NewValueType;
+              end;
+            end;
+        end;
       end;
     end;
     Expect(';');
-    ParseCommonBlock(TFunction(Items[Count - 1]));
+    ParseCommonBlock(TFunction(Last));
   end;
   Identifiers.Destroy;