From a22fb3227c03bdc818b820bf597277206c03f70b Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Sun, 3 Jan 2010 15:20:21 -0300 Subject: [PATCH] Make gc a package --- Makefile | 10 +++++----- gcalloc.d => gc/alloc.d | 1 + gcbits.d => gc/bits.d | 1 + gc.d => gc/gc.d | 6 ++++-- gcstats.d => gc/stats.d | 1 + gcx.d => gc/x.d | 8 +++++--- 6 files changed, 17 insertions(+), 10 deletions(-) rename gcalloc.d => gc/alloc.d (99%) rename gcbits.d => gc/bits.d (99%) rename gc.d => gc/gc.d (99%) rename gcstats.d => gc/stats.d (98%) rename gcx.d => gc/x.d (99%) diff --git a/Makefile b/Makefile index bdd709b..9db7095 100644 --- a/Makefile +++ b/Makefile @@ -32,11 +32,11 @@ LD_OUTPUT_OPTION = -o $@ # GC sources sources := \ - gc.d \ - gcalloc.d \ - gcbits.d \ - gcstats.d \ - gcx.d + gc/gc.d \ + gc/alloc.d \ + gc/bits.d \ + gc/stats.d \ + gc/x.d # Default target all: $B/cdgc.so diff --git a/gcalloc.d b/gc/alloc.d similarity index 99% rename from gcalloc.d rename to gc/alloc.d index a7f1ca6..cad30f2 100644 --- a/gcalloc.d +++ b/gc/alloc.d @@ -24,6 +24,7 @@ * Authors: Walter Bright, David Friedman, Sean Kelly */ +module gc.alloc; version (Win32) { diff --git a/gcbits.d b/gc/bits.d similarity index 99% rename from gcbits.d rename to gc/bits.d index 4a7f54c..e8e9263 100644 --- a/gcbits.d +++ b/gc/bits.d @@ -24,6 +24,7 @@ * Authors: Walter Bright, David Friedman, Sean Kelly */ +module gc.bits; import tango.core.BitManip; import tango.stdc.string; diff --git a/gc.d b/gc/gc.d similarity index 99% rename from gc.d rename to gc/gc.d index 7ffca3b..979b81b 100644 --- a/gc.d +++ b/gc/gc.d @@ -24,8 +24,10 @@ * Authors: Walter Bright, Sean Kelly */ -import gcx; -import gcstats; +module gc.gc; + +import gc.x; +import gc.stats; import tango.stdc.stdlib; version=GCCLASS; diff --git a/gcstats.d b/gc/stats.d similarity index 98% rename from gcstats.d rename to gc/stats.d index 18f21ab..84368ea 100644 --- a/gcstats.d +++ b/gc/stats.d @@ -24,6 +24,7 @@ * Authors: Walter Bright, Sean Kelly */ +module gc.stats; /** * diff --git a/gcx.d b/gc/x.d similarity index 99% rename from gcx.d rename to gc/x.d index cc5db89..966c81e 100644 --- a/gcx.d +++ b/gc/x.d @@ -24,6 +24,8 @@ * Authors: Walter Bright, David Friedman, Sean Kelly */ +module gc.x; + // D Programming Language Garbage Collector implementation /************** Debugging ***************************/ @@ -46,9 +48,9 @@ version = MULTI_THREADED; // produce multithreaded version /***************************************************/ -import gcbits; -import gcstats; -import gcalloc; +import gc.bits; +import gc.stats; +import gc.alloc; import cstdlib = tango.stdc.stdlib : calloc, free, malloc, realloc; import cstring = tango.stdc.string : memcpy, memmove, memset; -- 2.43.0