Mercurial > projects > ldc
changeset 1184:a6dbd571d417
Moved ir/irtype.* into ir/irdtype.*.
Renamed IrType to IrDType, analogous to IrDSymbol.
author | Tomas Lindquist Olsen <tomas.l.olsen gmail.com> |
---|---|
date | Tue, 31 Mar 2009 20:21:28 +0200 |
parents | df386fd4030e |
children | 7562457bb7f3 |
files | dmd/mtype.h gen/toobj.cpp ir/irdtype.cpp ir/irdtype.h ir/irtype.cpp ir/irtype.h |
diffstat | 6 files changed, 63 insertions(+), 63 deletions(-) [+] |
line wrap: on
line diff
--- a/dmd/mtype.h Tue Mar 31 03:06:19 2009 +0200 +++ b/dmd/mtype.h Tue Mar 31 20:21:28 2009 +0200 @@ -23,7 +23,7 @@ #if IN_LLVM // llvm -#include "../ir/irtype.h" +#include "../ir/irdtype.h" #include "../ir/irfuncty.h" namespace llvm { class Type; } struct Ir; @@ -279,7 +279,7 @@ #if IN_LLVM // LDC - IrType ir; + IrDType ir; static Ir* sir; #endif };
--- a/gen/toobj.cpp Tue Mar 31 03:06:19 2009 +0200 +++ b/gen/toobj.cpp Tue Mar 31 20:21:28 2009 +0200 @@ -96,7 +96,7 @@ // reset all IR data stored in Dsymbols and Types IrDsymbol::resetAll(); - IrType::resetAll(); + IrDType::resetAll(); sir->setState(&ir);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ir/irdtype.cpp Tue Mar 31 20:21:28 2009 +0200 @@ -0,0 +1,34 @@ +#include "gen/llvm.h" +#include "ir/ir.h" +#include "ir/irdtype.h" + +std::set<IrDType*> IrDType::list; + +void IrDType::resetAll() +{ + std::set<IrDType*>::iterator it; + for(it = list.begin(); it != list.end(); ++it) + (*it)->reset(); +} + +IrDType::IrDType() +{ + assert(list.insert(this).second); + reset(); +} + +IrDType::IrDType(const IrDType& s) +{ + assert(list.insert(this).second); + type = s.type; +} + +IrDType::~IrDType() +{ + list.erase(this); +} + +void IrDType::reset() +{ + type = NULL; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ir/irdtype.h Tue Mar 31 20:21:28 2009 +0200 @@ -0,0 +1,26 @@ +#ifndef LDC_IR_IRTYPE_H +#define LDC_IR_IRTYPE_H + +#include <set> + +namespace llvm { + class PATypeHolder; +} + +struct IrDType +{ + static std::set<IrDType*> list; + static void resetAll(); + + // overload all of these to make sure + // the static list is up to date + IrDType(); + IrDType(const IrDType& s); + ~IrDType(); + + void reset(); + + llvm::PATypeHolder* type; +}; + +#endif
--- a/ir/irtype.cpp Tue Mar 31 03:06:19 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -#include "gen/llvm.h" -#include "ir/ir.h" -#include "ir/irtype.h" - -std::set<IrType*> IrType::list; - -void IrType::resetAll() -{ - std::set<IrType*>::iterator it; - for(it = list.begin(); it != list.end(); ++it) - (*it)->reset(); -} - -IrType::IrType() -{ - assert(list.insert(this).second); - reset(); -} - -IrType::IrType(const IrType& s) -{ - assert(list.insert(this).second); - type = s.type; -} - -IrType::~IrType() -{ - list.erase(this); -} - -void IrType::reset() -{ - type = NULL; -}
--- a/ir/irtype.h Tue Mar 31 03:06:19 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -#ifndef LDC_IR_IRTYPE_H -#define LDC_IR_IRTYPE_H - -#include <set> - -namespace llvm { - class PATypeHolder; -} - -struct IrType -{ - static std::set<IrType*> list; - static void resetAll(); - - // overload all of these to make sure - // the static list is up to date - IrType(); - IrType(const IrType& s); - ~IrType(); - - void reset(); - - llvm::PATypeHolder* type; -}; - -#endif