Browse Source

Improved import order

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8635 8c9fc860-2736-0410-a75d-ab315db34111
negelef 6 years ago
parent
commit
48897f70a3
2 changed files with 3 additions and 4 deletions
  1. 2 3
      source/Coop.Heaps.Mod
  2. 1 1
      source/Release.Tool

+ 2 - 3
source/Coop.Heaps.Mod

@@ -10,7 +10,7 @@ MODULE Heaps;	(** AUTHOR "pjm/Luc Bläser/U. Glavitsch (ug)"; PURPOSE "Heap mana
 		Knuth, The Art of Computer Programming, Volume 1, Section 2.3.5, Algorithm C
 		Knuth, The Art of Computer Programming, Volume 1, Section 2.3.5, Algorithm C
 *)
 *)
 
 
-IMPORT SYSTEM, Trace, Machine;
+IMPORT SYSTEM, Trace, Machine, GarbageCollector;
 
 
 CONST
 CONST
 	Stats* = TRUE;					(* maintain statistical counters *)
 	Stats* = TRUE;					(* maintain statistical counters *)
@@ -213,8 +213,7 @@ BEGIN
 END CleanupModuleFinalizers;
 END CleanupModuleFinalizers;
 
 
 PROCEDURE InvokeGC*;
 PROCEDURE InvokeGC*;
-PROCEDURE Collect EXTERN "GarbageCollector.Collect";
-BEGIN Collect;
+BEGIN GarbageCollector.Collect;
 END InvokeGC;
 END InvokeGC;
 
 
 PROCEDURE LazySweepGC*;
 PROCEDURE LazySweepGC*;

+ 1 - 1
source/Release.Tool

@@ -330,7 +330,7 @@ PACKAGE Kernel ARCHIVE "Kernel.zip" SOURCE "KernelSrc.zip" DESCRIPTION "A2 Kerne
 	ZYNQ & ~COOP { Zynq.PsUartMin.Mod Zynq.TraceDevice.Mod Zynq.PrivateWatchdog.Mod ARM.Machine.Mod }
 	ZYNQ & ~COOP { Zynq.PsUartMin.Mod Zynq.TraceDevice.Mod Zynq.PrivateWatchdog.Mod ARM.Machine.Mod }
 
 
 	~COOP { Heaps.Mod }
 	~COOP { Heaps.Mod }
-	COOP { Coop.Heaps.Mod GarbageCollector.Mod }
+	COOP { GarbageCollector.Mod Coop.Heaps.Mod }
 
 
 	Modules.Mod
 	Modules.Mod