From 8828582606732da9cc5396dd5a28c01d20ef4325 Mon Sep 17 00:00:00 2001 From: bdemsky Date: Wed, 14 Jun 2017 15:44:45 -0700 Subject: [PATCH] Switch to C for Zach --- src/{boolean.cc => boolean.c} | 0 src/classlist.h | 38 ++++++++++++----- src/{constraint.cc => constraint.c} | 0 src/csolver.c | 65 +++++++++++++++++++++++++++++ src/{element.cc => element.c} | 0 src/{function.cc => function.c} | 0 src/{inc_solver.cc => inc_solver.c} | 0 src/{mutableset.cc => mutableset.c} | 0 src/mymemory.h | 2 +- src/{order.cc => order.c} | 0 src/{predicate.cc => predicate.c} | 0 src/{set.cc => set.c} | 0 src/{table.cc => table.c} | 0 13 files changed, 94 insertions(+), 11 deletions(-) rename src/{boolean.cc => boolean.c} (100%) rename src/{constraint.cc => constraint.c} (100%) create mode 100644 src/csolver.c rename src/{element.cc => element.c} (100%) rename src/{function.cc => function.c} (100%) rename src/{inc_solver.cc => inc_solver.c} (100%) rename src/{mutableset.cc => mutableset.c} (100%) rename src/{order.cc => order.c} (100%) rename src/{predicate.cc => predicate.c} (100%) rename src/{set.cc => set.c} (100%) rename src/{table.cc => table.c} (100%) diff --git a/src/boolean.cc b/src/boolean.c similarity index 100% rename from src/boolean.cc rename to src/boolean.c diff --git a/src/classlist.h b/src/classlist.h index 4c48778..53555ed 100644 --- a/src/classlist.h +++ b/src/classlist.h @@ -13,16 +13,34 @@ #include "mymemory.h" #include -class Constraint; -class Boolean; -class IncrementalSolver; -class Set; -class MutableSet; -class Element; -class Function; -class Predicate; -class Table; -class Order; +struct Constraint; +typedef struct Constraint Constraint; + +struct Boolean; +typedef struct Boolean Boolean; + +struct IncrementalSolver; +typedef struct IncrementSolver IncrementalSolver; + +struct Set; +typedef struct Set Set; + +typedef struct Set MutableSet; + +struct Element; +typedef struct Element Element; + +struct Function; +typedef struct Function Function; + +struct Predicate; +typedef struct Predicat Predicate; + +struct Table; +typedef struct Table Table; + +struct Order; +typedef struct Order Order; typedef unsigned int uint; typedef uint64_t VarType; diff --git a/src/constraint.cc b/src/constraint.c similarity index 100% rename from src/constraint.cc rename to src/constraint.c diff --git a/src/csolver.c b/src/csolver.c new file mode 100644 index 0000000..20e729a --- /dev/null +++ b/src/csolver.c @@ -0,0 +1,65 @@ +#include "csolver.h" + +CSolver * allocCSolver() { + CSolver * tmp=(CSolver *) ourmalloc(sizeof(CSolver)); + tmp->constraint=allocVector(); + return tmp; +} + +Set * createSet(CSolver * solver, Type type, uint64_t ** elements) { + +} + +Set * createSet(CSolver * solver, Type type, uint64_t lowrange, uint64_t highrange) { +} + +MutableSet * createMutableSet(CSolver * solver, Type type) { +} + +void CSolver::addItem(MutableSet * set, uint64_t element) { +} + +int64_t CSolver::createUniqueItem(MutableSet * set) { +} + +Element * CSolver::getElementVar(Set * set) { +} + +Boolean * CSolver::getBooleanVar() { +} + +Function * CSolver::createFunctionOperator(enum ArithOp op, Set ** domain, Set * range, enum OverFlowBehavior overflowbehavior, Boolean * overflowstatus) { +} + +Function * CSolver::createFunctionOperator(enum ArithOp op) { +} + +Predicate * CSolver::createPredicateOperator(enum CompOp op, Set ** domain) { +} + +Table * CSolver::createTable(Set **domains, Set * range) { +} + +void CSolver::addTableEntry(Element ** inputs, Element *result) { +} + +Function * CSolver::completeTable(struct Table *) { +} + +Element * CSolver::applyFunction(Function * function, Element ** array) { +} + +Boolean * CSolver::applyPredicate(Predicate * predicate, Element ** inputs) { +} + +Boolean * CSolver::applyLogicalOperation(enum LogicOp op, Boolean ** array) { +} + +void CSolver::addBoolean(Boolean * constraint) { +} + +Order * CSolver::createOrder(enum OrderType type, Set * set) { +} + +Boolean * CSolver::orderedConstraint(Order * order, uint64_t first, uint64_t second) { +} diff --git a/src/element.cc b/src/element.c similarity index 100% rename from src/element.cc rename to src/element.c diff --git a/src/function.cc b/src/function.c similarity index 100% rename from src/function.cc rename to src/function.c diff --git a/src/inc_solver.cc b/src/inc_solver.c similarity index 100% rename from src/inc_solver.cc rename to src/inc_solver.c diff --git a/src/mutableset.cc b/src/mutableset.c similarity index 100% rename from src/mutableset.cc rename to src/mutableset.c diff --git a/src/mymemory.h b/src/mymemory.h index aabb169..d55c138 100644 --- a/src/mymemory.h +++ b/src/mymemory.h @@ -13,7 +13,7 @@ #ifndef _MY_MEMORY_H #define _MY_MEMORY_H -#include +#include #include #include diff --git a/src/order.cc b/src/order.c similarity index 100% rename from src/order.cc rename to src/order.c diff --git a/src/predicate.cc b/src/predicate.c similarity index 100% rename from src/predicate.cc rename to src/predicate.c diff --git a/src/set.cc b/src/set.c similarity index 100% rename from src/set.cc rename to src/set.c diff --git a/src/table.cc b/src/table.c similarity index 100% rename from src/table.cc rename to src/table.c -- 2.34.1