From 3790435c34bc6c073e861c2aec36701c0da1b221 Mon Sep 17 00:00:00 2001
From: Daniel Kolesa <daniel@octaforge.org>
Date: Fri, 9 Apr 2021 03:22:34 +0200
Subject: [PATCH] add more codegen utils

---
 src/cs_gen.cc    | 16 ++++++++++++++++
 src/cs_gen.hh    |  5 +++++
 src/cs_parser.cc | 34 +++++++++++++++++-----------------
 3 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/src/cs_gen.cc b/src/cs_gen.cc
index 2fda80b..317b2d2 100644
--- a/src/cs_gen.cc
+++ b/src/cs_gen.cc
@@ -15,6 +15,10 @@ bcode_ref gen_state::steal_ref() {
     return bcode_ref{reinterpret_cast<bcode *>(cp + 1)};
 }
 
+void gen_state::gen_pop() {
+    code.push_back(BC_INST_POP);
+}
+
 void gen_state::gen_val_null() {
     code.push_back(BC_INST_VAL_INT | BC_RET_NULL);
 }
@@ -239,6 +243,18 @@ void gen_state::gen_lookup_svar(ident &id, int ltype) {
     );
 }
 
+void gen_state::gen_compile(bool cond) {
+    if (cond) {
+        code.push_back(BC_INST_COND);
+    } else {
+        code.push_back(BC_INST_COMPILE);
+    }
+}
+
+void gen_state::gen_ident_lookup() {
+    code.push_back(BC_INST_IDENT_U);
+}
+
 void gen_state::gen_main_null() {
     code.reserve(code.size() + 4);
     code.push_back(BC_INST_START);
diff --git a/src/cs_gen.hh b/src/cs_gen.hh
index 91dc9bb..e029f23 100644
--- a/src/cs_gen.hh
+++ b/src/cs_gen.hh
@@ -24,6 +24,8 @@ struct gen_state {
 
     bcode_ref steal_ref();
 
+    void gen_pop();
+
     void gen_val_null();
 
     void gen_val_integer(integer_type v = 0);
@@ -49,6 +51,9 @@ struct gen_state {
     void gen_lookup_fvar(ident &id, int ltype);
     void gen_lookup_svar(ident &id, int ltype);
 
+    void gen_compile(bool cond = false);
+    void gen_ident_lookup();
+
     void gen_main_null();
     void gen_main_integer(integer_type v);
     void gen_main_float(float_type v);
diff --git a/src/cs_parser.cc b/src/cs_parser.cc
index 0117f0a..0ff2cdd 100644
--- a/src/cs_parser.cc
+++ b/src/cs_parser.cc
@@ -440,11 +440,11 @@ lookupid:
                             break;
                         case VAL_CODE:
                             gs.gs.gen_lookup_ivar(id, ltype);
-                            gs.gs.code.push_back(BC_INST_COMPILE);
+                            gs.gs.gen_compile();
                             break;
                         case VAL_IDENT:
                             gs.gs.gen_lookup_ivar(id, ltype);
-                            gs.gs.code.push_back(BC_INST_IDENT_U);
+                            gs.gs.gen_ident_lookup();
                             break;
                     }
                     return;
@@ -454,11 +454,11 @@ lookupid:
                             break;
                         case VAL_CODE:
                             gs.gs.gen_lookup_fvar(id, ltype);
-                            gs.gs.code.push_back(BC_INST_COMPILE);
+                            gs.gs.gen_compile();
                             break;
                         case VAL_IDENT:
                             gs.gs.gen_lookup_fvar(id, ltype);
-                            gs.gs.code.push_back(BC_INST_IDENT_U);
+                            gs.gs.gen_ident_lookup();
                             break;
                     }
                     return;
@@ -583,16 +583,16 @@ lookupid:
 done:
     switch (ltype) {
         case VAL_POP:
-            gs.gs.code.push_back(BC_INST_POP);
+            gs.gs.gen_pop();
             break;
         case VAL_CODE:
-            gs.gs.code.push_back(BC_INST_COMPILE);
+            gs.gs.gen_compile();
             break;
         case VAL_COND:
-            gs.gs.code.push_back(BC_INST_COND);
+            gs.gs.gen_compile(true);
             break;
         case VAL_IDENT:
-            gs.gs.code.push_back(BC_INST_IDENT_U);
+            gs.gs.gen_ident_lookup();
             break;
     }
     return;
@@ -755,28 +755,28 @@ static void compileblockmain(parser_state &gs, int wordtype) {
     switch (wordtype) {
         case VAL_POP:
             if (concs || gs.source - 1 > start) {
-                gs.gs.code.push_back(BC_INST_POP);
+                gs.gs.gen_pop();
             }
             break;
         case VAL_COND:
             if (!concs && gs.source - 1 <= start) {
                 gs.gs.gen_val_null();
             } else {
-                gs.gs.code.push_back(BC_INST_COND);
+                gs.gs.gen_compile(true);
             }
             break;
         case VAL_CODE:
             if (!concs && gs.source - 1 <= start) {
                 gs.gs.gen_block();
             } else {
-                gs.gs.code.push_back(BC_INST_COMPILE);
+                gs.gs.gen_compile();
             }
             break;
         case VAL_IDENT:
             if (!concs && gs.source - 1 <= start) {
                 gs.gs.gen_val_ident();
             } else {
-                gs.gs.code.push_back(BC_INST_IDENT_U);
+                gs.gs.gen_ident_lookup();
             }
             break;
         case VAL_STRING:
@@ -859,16 +859,16 @@ static bool compilearg(
             }
             switch (wordtype) {
                 case VAL_POP:
-                    gs.gs.code.push_back(BC_INST_POP);
+                    gs.gs.gen_pop();
                     break;
                 case VAL_COND:
-                    gs.gs.code.push_back(BC_INST_COND);
+                    gs.gs.gen_compile(true);
                     break;
                 case VAL_CODE:
-                    gs.gs.code.push_back(BC_INST_COMPILE);
+                    gs.gs.gen_compile();
                     break;
                 case VAL_IDENT:
-                    gs.gs.code.push_back(BC_INST_IDENT_U);
+                    gs.gs.gen_ident_lookup();
                     break;
             }
             return true;
@@ -1173,7 +1173,7 @@ static void compile_if(
         std::size_t start1 = gs.gs.code.size();
         more = compilearg(gs, VAL_CODE);
         if (!more) {
-            gs.gs.code.push_back(BC_INST_POP);
+            gs.gs.gen_pop();
             gs.gs.code.push_back(BC_INST_NULL | ret_code(rettype));
         } else {
             std::size_t start2 = gs.gs.code.size();