* \author Michal Krol
*/
-#include "imports.h"
+#include "main/imports.h"
+#include "slang_mem.h"
#include "slang_compile.h"
for (i = 0; i < scope->num_structs; i++)
slang_struct_destruct(scope->structs + i);
- slang_alloc_free(scope->structs);
+ _slang_free(scope->structs);
/* do not free scope->outer_scope */
}
GLuint i;
_slang_struct_scope_ctr(&z);
- z.structs =
- (slang_struct *) slang_alloc_malloc(y->num_structs *
- sizeof(slang_struct));
+ z.structs = (slang_struct *)
+ _slang_alloc(y->num_structs * sizeof(slang_struct));
if (z.structs == NULL) {
slang_struct_scope_destruct(&z);
return 0;
{
stru->a_name = SLANG_ATOM_NULL;
stru->fields = (slang_variable_scope *)
- slang_alloc_malloc(sizeof(slang_variable_scope));
+ _slang_alloc(sizeof(slang_variable_scope));
if (stru->fields == NULL)
return 0;
_slang_variable_scope_ctr(stru->fields);
stru->structs =
- (slang_struct_scope *) slang_alloc_malloc(sizeof(slang_struct_scope));
+ (slang_struct_scope *) _slang_alloc(sizeof(slang_struct_scope));
if (stru->structs == NULL) {
slang_variable_scope_destruct(stru->fields);
- slang_alloc_free(stru->fields);
+ _slang_free(stru->fields);
return 0;
}
_slang_struct_scope_ctr(stru->structs);
+ stru->constructor = NULL;
return 1;
}
slang_struct_destruct(slang_struct * stru)
{
slang_variable_scope_destruct(stru->fields);
- slang_alloc_free(stru->fields);
+ _slang_free(stru->fields);
slang_struct_scope_destruct(stru->structs);
- slang_alloc_free(stru->structs);
+ _slang_free(stru->structs);
}
int