refactoring

src/runtime/c/pgf/generator.h

@@ -1,42 +1,37 @@
 #ifndef GENERATOR_H
 #define GENERATOR_H
 
-struct PGF_INTERNAL_DECL Scope {
+class PGF_INTERNAL_DECL PgfGenerator : public PgfUnmarshaller
+{
+protected:
     constexpr static prob_t VAR_PROB = 0.1;
 
-    Scope *next;
-    PgfType type;
-    PgfMarshaller *m;
-    PgfBindType bind_type;
-    PgfText var;
-};
+    struct Scope {
+
+        Scope *next;
+        PgfType type;
+        PgfMarshaller *m;
+        PgfBindType bind_type;
+        PgfText var;
+    };
 
-class PGF_INTERNAL_DECL PgfRandomGenerator : public PgfUnmarshaller
-{
     ref<PgfPGF> pgf;
     size_t depth;
-    uint64_t *seed;
-    prob_t prob;
     PgfMarshaller *m;
     PgfInternalMarshaller i_m;
     PgfUnmarshaller *u;
 
-    Scope *scope;
-    size_t scope_len;
-
-    prob_t rand() {
-        *seed = *seed * 1103515245 + 12345;
-        return (prob_t)((*seed/65536) % 32768)/32768;
+    PgfGenerator(ref<PgfPGF> pgf,
+                 size_t depth,
+                 PgfMarshaller *m, PgfUnmarshaller *u)
+    {
+        this->pgf = pgf;
+        this->depth = depth;
+        this->m = m;
+        this->u = u;
     }
 
 public:
-    PgfRandomGenerator(ref<PgfPGF> pgf, size_t depth, uint64_t *seed,
-                       PgfMarshaller *m, PgfUnmarshaller *u);
-    prob_t getProb() { return prob; }
-    ~PgfRandomGenerator();
-
-    PgfExpr descend(PgfExpr expr, size_t n_hypos, PgfTypeHypo *hypos);
-
     virtual PgfExpr eabs(PgfBindType btype, PgfText *name, PgfExpr body);
     virtual PgfExpr eapp(PgfExpr fun, PgfExpr arg);
     virtual PgfExpr elit(PgfLiteral lit);
@@ -54,29 +49,50 @@ public:
     virtual void free_ref(object x);
 };
 
-class PGF_INTERNAL_DECL PgfExhaustiveGenerator : public PgfUnmarshaller, public PgfExprEnum
+class PGF_INTERNAL_DECL PgfRandomGenerator : public PgfGenerator 
+{
+    uint64_t *seed;
+    prob_t prob;
+
+    Scope *scope;
+    size_t scope_len;
+
+    prob_t rand() {
+        *seed = *seed * 1103515245 + 12345;
+        return (prob_t)((*seed/65536) % 32768)/32768;
+    }
+
+public:
+    PgfRandomGenerator(ref<PgfPGF> pgf, size_t depth, uint64_t *seed,
+                       PgfMarshaller *m, PgfUnmarshaller *u);
+    prob_t getProb() { return prob; }
+    ~PgfRandomGenerator();
+
+    PgfExpr descend(PgfExpr expr, size_t n_hypos, PgfTypeHypo *hypos);
+
+    virtual PgfType dtyp(size_t n_hypos, PgfTypeHypo *hypos,
+                         PgfText *cat,
+                         size_t n_exprs, PgfExpr *exprs);
+};
+
+class PGF_INTERNAL_DECL PgfExhaustiveGenerator : public PgfGenerator, public PgfExprEnum
 {
     struct Result;
 
-    ref<PgfPGF> pgf;
-    size_t depth;
-    PgfMarshaller *m;
-    PgfUnmarshaller *u;
-    PgfInternalMarshaller i_m;
     Result *top_res;
     size_t top_res_index;
 
     struct State {
         Result *res;
         prob_t prob;
-        virtual bool process(PgfExhaustiveGenerator *gen, PgfUnmarshaller *u) = 0;
+        virtual bool process(PgfExhaustiveGenerator *gen) = 0;
         virtual void free_refs(PgfUnmarshaller *u);
         static void release(State *state, PgfUnmarshaller *u);
     };
 
     struct State0 : State {
         PgfProbspace space;
-        virtual bool process(PgfExhaustiveGenerator *gen, PgfUnmarshaller *u);
+        virtual bool process(PgfExhaustiveGenerator *gen);
     };
 
     struct State1 : State {
@@ -84,12 +100,11 @@ class PGF_INTERNAL_DECL PgfExhaustiveGenerator : public PgfUnmarshaller, public
         size_t n_args;
         PgfExpr expr;
 
-        virtual bool process(PgfExhaustiveGenerator *gen, PgfUnmarshaller *u);
+        virtual bool process(PgfExhaustiveGenerator *gen);
         virtual void free_refs(PgfUnmarshaller *u);
         void combine(PgfExhaustiveGenerator *gen, 
-                     Scope *scope, PgfExpr expr, prob_t prob,
-                     PgfUnmarshaller *u);
-        void complete(PgfExhaustiveGenerator *gen, PgfUnmarshaller *u);
+                     Scope *scope, PgfExpr expr, prob_t prob);
+        void complete(PgfExhaustiveGenerator *gen);
     };
 
     typedef std::pair<ref<PgfText>,Scope*> Goal;
@@ -125,7 +140,7 @@ class PGF_INTERNAL_DECL PgfExhaustiveGenerator : public PgfUnmarshaller, public
     std::priority_queue<State*, std::vector<State*>, CompareState> queue;
     std::vector<Scope*> scopes;
 
-    void predict_literal(ref<PgfText> cat, Result *res, PgfUnmarshaller *u);
+    void predict_literal(ref<PgfText> cat, Result *res);
     void push_left_states(PgfProbspace space, PgfText *cat, Result *res, prob_t outside_prob);
 
 public:
@@ -133,24 +148,11 @@ public:
                            PgfMarshaller *m, PgfUnmarshaller *u);
     virtual ~PgfExhaustiveGenerator();
 
-    virtual PgfExpr eabs(PgfBindType btype, PgfText *name, PgfExpr body);
-    virtual PgfExpr eapp(PgfExpr fun, PgfExpr arg);
-    virtual PgfExpr elit(PgfLiteral lit);
-    virtual PgfExpr emeta(PgfMetaId meta);
-    virtual PgfExpr efun(PgfText *name);
-    virtual PgfExpr evar(int index);
-    virtual PgfExpr etyped(PgfExpr expr, PgfType typ);
-    virtual PgfExpr eimplarg(PgfExpr expr);
-    virtual PgfLiteral lint(size_t size, uintmax_t *v);
-    virtual PgfLiteral lflt(double v);
-    virtual PgfLiteral lstr(PgfText *v);
     virtual PgfType dtyp(size_t n_hypos, PgfTypeHypo *hypos,
                          PgfText *cat,
                          size_t n_exprs, PgfExpr *exprs);
-    virtual void free_ref(object x);
 
-    virtual PgfExpr fetch(PgfDB *db, PgfUnmarshaller *u, prob_t *prob);
-    virtual void free_refs(PgfUnmarshaller *u);
+    virtual PgfExpr fetch(PgfDB *db, prob_t *prob);
 };
 
 #endif