started converting stream to object type

1 files changed, 23 insertions, 9 deletions

diff --git a/src/struct.c b/src/struct.c
index dd56f1a0..b05276be 100644
--- a/src/struct.c
+++ b/src/struct.c
@@ -9,13 +9,11 @@ struct colm_tree *colm_get_global( Program *prg, long pos )
 	return colm_struct_get_field( prg->global, pos );
 }
 
-struct colm_struct *colm_struct_new( Program *prg, int id )
+static struct colm_struct *colm_struct_new_size( Program *prg, int size )
 {
-	int structSize = prg->rtd->selInfo[id].size;
-	size_t memsize = sizeof(struct colm_struct) + ( sizeof(Tree*) * structSize );
+	size_t memsize = sizeof(struct colm_struct) + ( sizeof(Tree*) * size );
 	struct colm_struct *item = (struct colm_struct*) malloc( memsize );
 	memset( item, 0, memsize );
-	item->id = id;
 
 	if ( prg->heap.head == 0 ) {
 		prg->heap.head = prg->heap.tail = item;
@@ -31,13 +29,29 @@ struct colm_struct *colm_struct_new( Program *prg, int id )
 	return item;
 }
 
+struct colm_struct *colm_struct_new( Program *prg, int id )
+{
+	struct colm_struct *s = colm_struct_new_size( prg, prg->rtd->selInfo[id].size );
+	s->id = id;
+	return s;
+}
+
+struct colm_struct *colm_struct_inbuilt( Program *prg, int size, void *destructor )
+{
+	struct colm_struct *s = colm_struct_new_size( prg, size );
+	s->id = -1;
+	return s;
+}
+
 void colm_struct_delete( Program *prg, Tree **sp, struct colm_struct *el )
 {
-	short *t = prg->rtd->selInfo[el->id].trees;
-	int i, len = prg->rtd->selInfo[el->id].treesLen;
-	for ( i = 0; i < len; i++ ) {
-		Tree *tree = colm_struct_get_field( el, t[i] );
-		treeDownref( prg, sp, tree );
+	if ( el->id >= 0 ) { 
+		short *t = prg->rtd->selInfo[el->id].trees;
+		int i, len = prg->rtd->selInfo[el->id].treesLen;
+		for ( i = 0; i < len; i++ ) {
+			Tree *tree = colm_struct_get_field( el, t[i] );
+			treeDownref( prg, sp, tree );
+		}
 	}
 	free( el );
 }