Changeset 63 for trunk/Compiler/Analyze/UAnalyzerPascal.pas

Timestamp:

Jul 17, 2012, 10:54:18 AM (12 years ago)

Author:

chronos

Message:

• Fixed: Procedure/function header and body not paired properly.

File:

• trunk/Compiler/Analyze/UAnalyzerPascal.pas (modified) (2 diffs)

trunk/Compiler/Analyze/UAnalyzerPascal.pas

@@ -76 +76 @@
   SUnitNotFound = 'Unit "%s" not found.';
   SFunctionNotDeclared = 'Function "%s" not declared.';
+  SFunctionRedefinition = 'Function "%s" redefined.';
   SUnknownProcName = 'Unknown proc name "%s".';
   SUnknownModuleType = 'Unknown module name "%s".';
@@ -703 +704 @@
       end;
     end else begin
-      // Create new function
-      UseFunction := TFunction.Create;
-      UseFunction.Parent := SourceCode.Parent;
-      UseFunction.Name := UseName;
-      UseFunction.FunctionType := FunctionType;
-      UseFunction.Exported := Exported;
-      Add(UseFunction);
-      UseFunction.Parent.Order.Add(UseFunction);
-      ValidParams := False;
+      UseFunction := SourceCode.Search(UseName, True);
+      if not Assigned(UseFunction) then begin
+        // Create new function
+        UseFunction := TFunction.Create;
+        UseFunction.Parent := SourceCode.Parent;
+        UseFunction.Name := UseName;
+        UseFunction.FunctionType := FunctionType;
+        UseFunction.Exported := Exported;
+        Add(UseFunction);
+        UseFunction.Parent.Order.Add(UseFunction);
+        ValidParams := False;
+      end else begin
+        if not UseFunction.BodyLoaded then UseFunction.BodyLoaded := True
+          else begin
+            ErrorMessage(SFunctionRedefinition, [UseName]);
+            Exit;
+          end;
+      end;
     end;
     with UseFunction do begin