bugfixes

GrammaticalFramework · Dec 30, 2023 · 51ea392 · 51ea392
1 parent 87b6094
commit 51ea392
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 104 deletions.
diff --git a/src/runtime/c/pgf/data.h b/src/runtime/c/pgf/data.h
@@ -266,7 +266,6 @@ struct PGF_INTERNAL_DECL PgfConcrPrintname {
 struct PGF_INTERNAL_DECL PgfLRShift {
     size_t next_state;
     ref<PgfConcrLincat> lincat;
-    bool exact;
     size_t r;
 };
 
@@ -278,18 +277,6 @@ struct PGF_INTERNAL_DECL PgfLRProduction {
     ref<Vector<ref<PgfLRReduceArg>>> args;
 };
 
-struct PGF_INTERNAL_DECL PgfLRReducePop {
-    static const uint8_t tag = 1;
-
-    static inline object from_idx(size_t stk_idx) {
-        return ref<PgfLRReducePop>(stk_idx * (MALLOC_ALIGN_MASK+1)).tagged();
-    }
-
-    static inline size_t to_idx(object o) {
-        return o / (MALLOC_ALIGN_MASK+1);
-    }
-};
-
 struct PGF_INTERNAL_DECL PgfLRReduceArg {
     static const uint8_t tag = 2;
 
@@ -302,7 +289,13 @@ struct PGF_INTERNAL_DECL PgfLRReduce {
     object lin_obj;
     size_t seq_idx;
     size_t depth;
-    ref<Vector<object>> args;
+
+    struct Arg {
+        ref<PgfLRReduceArg> arg;
+        size_t stk_idx;
+    };
+
+    ref<Vector<Arg>> args;
 };
 
 struct PGF_INTERNAL_DECL PgfLRState {