From 97bf419957f74ae90692570a887235ec46ed4664 Mon Sep 17 00:00:00 2001 From: bdemsky Date: Tue, 20 Jun 2017 13:38:08 -0700 Subject: [PATCH] Edits --- src/AST/table.c | 25 ++++++++++--------------- src/AST/table.h | 7 ++++--- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/AST/table.c b/src/AST/table.c index 1f95f43..6482d83 100644 --- a/src/AST/table.c +++ b/src/AST/table.c @@ -7,10 +7,9 @@ Table * allocTable(Set **domains, uint numDomain, Set * range){ Table* table = (Table*) ourmalloc(sizeof(Table)); - table->domains = allocDefVectorSet(); - for(int i=0; idomains, domains[i]); - } + table->numDomains=numDomain; + table->domains = ourmalloc(numDomain*sizeof(Set *)); + memcpy(table->domains, domains, numDomain * sizeof(Set *)); table->range =range; return table; } @@ -21,16 +20,12 @@ void addNewTableEntry(Table* table, uint64_t* inputs, uint inputSize, uint64_t r } void deleteTable(Table* table){ - uint size = getSizeVectorSet(table->domains); - for(uint i=0; idomains,i)); - } - ourfree(table->domains); - ourfree(table->range); - size = getSizeVectorTableEntry(table->entries); - for(uint i=0; ientries, i)); - } - ourfree(table); + ourfree(table->domains); + uint size = getSizeVectorTableEntry(table->entries); + for(uint i=0; ientries, i)); + } + deleteVectorTableEntry(table->entries); + ourfree(table); } diff --git a/src/AST/table.h b/src/AST/table.h index 21e3223..cff8ec6 100644 --- a/src/AST/table.h +++ b/src/AST/table.h @@ -5,9 +5,10 @@ #include "structs.h" struct Table { - VectorSet* domains; - Set * range; - VectorTableEntry* entries; + Set ** domains; + Set * range; + uint numDomains; + VectorTableEntry* entries; }; Table * allocTable(Set **domains, uint numDomain, Set * range); -- 2.34.1