merge the states for reasoning and evaluation into a single structure

1 files changed, 0 insertions, 127 deletions

diff --git a/src/runtime/c/pgf/evaluator.h b/src/runtime/c/pgf/evaluator.h
deleted file mode 100644
index 39d43559d..000000000
--- a/src/runtime/c/pgf/evaluator.h
+++ /dev/null
@@ -1,127 +0,0 @@
-#ifndef PGF_EVALUATOR_H_
-#define PGF_EVALUATOR_H_
-
-typedef struct {
-	PgfFunction code;
-} PgfClosure;
-
-typedef struct {
-	PgfClosure header;
-	PgfClosure* val;
-} PgfIndirection;
-
-typedef struct {
-	PgfPGF* pgf;
-	PgfEvalGates* eval_gates; // cached from pgf->abstr->eval_gates
-	GuPool* pool;
-	GuExn* err;
-	void* enter_stack_ptr;
-	void* tmp;              // for temporary register spills
-	PgfIndirection cafs[];  // derived from gu_seq_data(pgf->abstr->eval_gates->cafs)
-} PgfEvalState;
-
-typedef struct {
-	PgfLiteral lit;
-	GuBuf* consts;
-	void* enter_stack_ptr;
-} PgfEvalAccum;
-
-typedef struct PgfEnv PgfEnv;
-
-struct PgfEnv {
-	PgfEnv* next;
-	PgfClosure* closure;
-};
-
-typedef struct {
-	PgfClosure header;
-	PgfEnv*  env;
-	PgfExpr  expr;
-} PgfExprThunk;
-
-typedef struct {
-	PgfClosure header;
-	PgfClosure* con;
-	PgfClosure* args[];
-} PgfValue;
-
-typedef struct {
-	PgfClosure header;
-	int level;
-} PgfValueGen;
-
-typedef struct {
-	PgfClosure header;
-	PgfEnv*  env;
-	PgfMetaId id;
-} PgfValueMeta;
-
-typedef struct {
-	PgfClosure header;
-	PgfLiteral lit;
-} PgfValueLit;
-
-typedef struct {
-	PgfClosure header;
-	PgfLiteral lit;
-	GuBuf* consts;
-} PgfValueSum;
-
-typedef struct {
-	PgfClosure header;
-	PgfClosure* fun;
-	size_t      n_args;
-	PgfClosure* args[];
-} PgfValuePAP;
-
-struct PgfEvalGates {
-	PgfFunction evaluate_expr_thunk;
-	PgfFunction evaluate_indirection;
-	PgfFunction evaluate_value;
-	PgfFunction evaluate_value_lit;
-	PgfFunction evaluate_value_pap;
-	PgfFunction evaluate_value_lambda;
-	PgfFunction evaluate_value_const;
-	PgfFunction evaluate_meta;
-	PgfFunction evaluate_gen;
-	PgfFunction evaluate_sum;
-	PgfFunction evaluate_caf;
-
-	PgfFunction update_closure;
-	PgfFunction update_pap;
-
-	PgfFunction mk_const;
-
-	PgfClosure* (*enter)(PgfEvalState* state, PgfClosure* closure);
-
-	GuFinalizer fin;
-	GuSeq* cafs;
-};
-
-PgfClosure*
-pgf_evaluate_expr_thunk(PgfEvalState* state, PgfExprThunk* thunk);
-
-PgfClosure*
-pgf_evaluate_lambda_application(PgfEvalState* state, PgfExprThunk* lambda,
-                                                     PgfClosure* arg);
-
-void
-pgf_evaluate_accum_init_int(PgfEvalState* state, 
-                            PgfEvalAccum* accum, int val);
-
-void
-pgf_evaluate_accum_init_str(PgfEvalState* state, 
-                            PgfEvalAccum* accum, GuString val);
-                            
-void
-pgf_evaluate_accum_init_flt(PgfEvalState* state, 
-                            PgfEvalAccum* accum, float val);
-
-void
-pgf_evaluate_accum_add(PgfEvalState* state, 
-                       PgfEvalAccum* accum, PgfClosure* closure);
-
-PgfClosure*
-pgf_evaluate_accum_done(PgfEvalState* state, PgfEvalAccum* accum);
-
-#endif