Fixed some mem things, found an odd parsing bug where a // comment before a function definition at top level does not parse. Deferring for now.

This commit is contained in:
Nathan Braswell
2014-07-20 20:42:26 -07:00
parent 93a170408f
commit eae538907d
3 changed files with 23 additions and 11 deletions

View File

@@ -22,6 +22,7 @@ void free(char* memPtr) {
}
}
/* we have a template version so we don't have to cast */
template <T> void free(T* memPtr) {
__if_comp__ __C__ {
__simple_passthrough__ """
@@ -41,7 +42,6 @@ template <T> int sizeof() {
return result;
}
template <T> T* new(int count) {
return malloc( sizeof<T>() * count );
}
@@ -50,18 +50,24 @@ template <T> T* new() {
return new<T>(1);
}
template <T> void delete(T* toDelete, int itemDestructCount) {
/* We specilize on the trait Destructable to decide on whether or not the destructor should be called */
template <T> void delete(T* toDelete, int itemCount) {
delete<T>(toDelete);
}
template <T(Destructable)> void delete(T* toDelete, int itemCount) {
for (int i = 0; i < itemDestructCount; i++;)
toDelete[i].destruct();
delete<T>(toDelete);
}
/* We specilize on the trait Destructable to decide on whether or not the destructor should be called */
template <T> void delete(T* toDelete) {
delete<T>(toDelete, true);
free(toDelete);
}
template <T> void delete(T* toDelete, bool destruct) {
template <T(Destructable)> void delete(T* toDelete) {
if (destruct)
toDelete->destruct();
free<T>(toDelete);
free(toDelete);
}