From 0df63892a80f76f06bd39c6e8852cd4f80ff0c05 Mon Sep 17 00:00:00 2001 From: Brian Demsky Date: Thu, 22 Jun 2017 15:07:06 -0700 Subject: [PATCH] Add initialization of TableEntry vector --- src/AST/table.c | 21 +++++++++++---------- src/AST/table.h | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/AST/table.c b/src/AST/table.c index 2705f13..ea4b6d2 100644 --- a/src/AST/table.c +++ b/src/AST/table.c @@ -7,23 +7,24 @@ Table * allocTable(Set **domains, uint numDomain, Set * range){ Table* table = (Table*) ourmalloc(sizeof(Table)); - allocInlineArrayInitSet(&table->domains, domains, numDomain); + allocInlineArrayInitSet(&table->domains, domains, numDomain); + allocInlineDefVectorTableEntry(&table->entries); table->range =range; - return table; + return table; } void addNewTableEntry(Table* table, uint64_t* inputs, uint inputSize, uint64_t result){ ASSERT(getSizeVectorSet( table->domains) == inputSize); - pushVectorTableEntry(table->entries, allocTableEntry(inputs, inputSize, result)); + pushVectorTableEntry(&table->entries, allocTableEntry(inputs, inputSize, result)); } void deleteTable(Table* table){ - deleteInlineArraySet(&table->domains); - uint size = getSizeVectorTableEntry(table->entries); - for(uint i=0; ientries, i)); - } - deleteVectorTableEntry(table->entries); - ourfree(table); + deleteInlineArraySet(&table->domains); + uint size = getSizeVectorTableEntry(&table->entries); + for(uint i=0; ientries, i)); + } + deleteVectorArrayTableEntry(&table->entries); + ourfree(table); } diff --git a/src/AST/table.h b/src/AST/table.h index a7a322c..90f5001 100644 --- a/src/AST/table.h +++ b/src/AST/table.h @@ -7,7 +7,7 @@ struct Table { ArraySet domains; Set * range; - VectorTableEntry* entries; + VectorTableEntry entries; }; Table * allocTable(Set **domains, uint numDomain, Set * range); -- 2.34.1