updates for J & K tmp variables

ryan-hodgman1 · Oct 20, 2018 · 4ffdd58 · 4ffdd58
1 parent 4151cdf
commit 4ffdd58
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 2 deletions.
diff --git a/src/match_token.rl b/src/match_token.rl
@@ -29,6 +29,8 @@
         "DRUNK.WRAP"  => { MATCH_OP(E_OP_DRUNK_WRAP); };
         "FLIP"        => { MATCH_OP(E_OP_FLIP); };
         "I"           => { MATCH_OP(E_OP_I); };
+        "J"           => { MATCH_OP(E_OP_J); };
+        "K"           => { MATCH_OP(E_OP_K); };
         "O"           => { MATCH_OP(E_OP_O); };
         "O.INC"       => { MATCH_OP(E_OP_O_INC); };
         "O.MAX"       => { MATCH_OP(E_OP_O_MAX); };

diff --git a/src/ops/delay.c b/src/ops/delay.c
@@ -46,6 +46,8 @@ static bool delay_common_add(scene_state_t *ss, exec_state_t *es,
         ss->delay.time[i] = delay_time;
         ss->delay.origin_script[i] = es_variables(es)->script_number;
         ss->delay.origin_i[i] = es_variables(es)->i;
+        ss->delay.origin_j[i] = es_variables(es)->j;
+        ss->delay.origin_k[i] = es_variables(es)->k;
         copy_command(&ss->delay.commands[i], post_command);
 
         return true;

diff --git a/src/ops/op.c b/src/ops/op.c
@@ -38,7 +38,7 @@
 const tele_op_t *tele_ops[E_OP__LENGTH] = {
     // variables
     &op_A, &op_B, &op_C, &op_D, &op_DRUNK, &op_DRUNK_MAX, &op_DRUNK_MIN,
-    &op_DRUNK_WRAP, &op_FLIP, &op_I, &op_O, &op_O_INC, &op_O_MAX, &op_O_MIN,
+    &op_DRUNK_WRAP, &op_FLIP, &op_I, &op_J, &op_K, &op_O, &op_O_INC, &op_O_MAX, &op_O_MIN,
     &op_O_WRAP, &op_T, &op_TIME, &op_TIME_ACT, &op_LAST, &op_X, &op_Y, &op_Z,
 
     // init

diff --git a/src/ops/op_enum.h b/src/ops/op_enum.h
@@ -16,6 +16,8 @@ typedef enum {
     E_OP_DRUNK_WRAP,
     E_OP_FLIP,
     E_OP_I,
+    E_OP_J,
+    E_OP_K,
     E_OP_O,
     E_OP_O_INC,
     E_OP_O_MAX,

diff --git a/src/ops/variables.c b/src/ops/variables.c
@@ -26,6 +26,14 @@ static void op_I_get(const void *data, scene_state_t *ss, exec_state_t *es,
                      command_state_t *cs);
 static void op_I_set(const void *data, scene_state_t *ss, exec_state_t *es,
                      command_state_t *cs);
+static void op_J_get(const void *data, scene_state_t *ss, exec_state_t *es,
+                     command_state_t *cs);
+static void op_J_set(const void *data, scene_state_t *ss, exec_state_t *es,
+                     command_state_t *cs);
+static void op_K_get(const void *data, scene_state_t *ss, exec_state_t *es,
+                     command_state_t *cs);
+static void op_K_set(const void *data, scene_state_t *ss, exec_state_t *es,
+                     command_state_t *cs);
 static void op_TIME_get(const void *data, scene_state_t *ss, exec_state_t *es,
                         command_state_t *cs);
 static void op_TIME_set(const void *data, scene_state_t *ss, exec_state_t *es,
@@ -59,6 +67,8 @@ const tele_op_t op_DRUNK = MAKE_GET_SET_OP(DRUNK, op_DRUNK_get, op_DRUNK_set, 0,
 const tele_op_t op_FLIP  = MAKE_GET_SET_OP(FLIP , op_FLIP_get , op_FLIP_set , 0, true);
 const tele_op_t op_O     = MAKE_GET_SET_OP(O    , op_O_get    , op_O_set    , 0, true);
 const tele_op_t op_I     = MAKE_GET_SET_OP(I    , op_I_get, op_I_set, 0, true);
+const tele_op_t op_J     = MAKE_GET_SET_OP(J    , op_J_get, op_J_set, 0, true);
+const tele_op_t op_K     = MAKE_GET_SET_OP(K    , op_K_get, op_K_set, 0, true);
 // clang-format on
 
 static void op_TIME_get(const void *NOTUSED(data), scene_state_t *ss,
@@ -159,3 +169,23 @@ static void op_I_set(const void *NOTUSED(data), scene_state_t *NOTUSED(ss),
                      exec_state_t *es, command_state_t *cs) {
     es_variables(es)->i = cs_pop(cs);
 }
+
+static void op_J_get(const void *NOTUSED(data), scene_state_t *NOTUSED(ss),
+                     exec_state_t *es, command_state_t *cs) {
+    cs_push(cs, es_variables(es)->j);
+}
+
+static void op_J_set(const void *NOTUSED(data), scene_state_t *NOTUSED(ss),
+                     exec_state_t *es, command_state_t *cs) {
+    es_variables(es)->j = cs_pop(cs);
+}
+
+static void op_K_get(const void *NOTUSED(data), scene_state_t *NOTUSED(ss),
+                     exec_state_t *es, command_state_t *cs) {
+    cs_push(cs, es_variables(es)->k);
+}
+
+static void op_K_set(const void *NOTUSED(data), scene_state_t *NOTUSED(ss),
+                     exec_state_t *es, command_state_t *cs) {
+    es_variables(es)->k = cs_pop(cs);
+}
diff --git a/src/ops/variables.h b/src/ops/variables.h
@@ -13,6 +13,8 @@ extern const tele_op_t op_DRUNK_MIN;
 extern const tele_op_t op_DRUNK_WRAP;
 extern const tele_op_t op_FLIP;
 extern const tele_op_t op_I;
+extern const tele_op_t op_J;
+extern const tele_op_t op_K;
 extern const tele_op_t op_O;
 extern const tele_op_t op_O_INC;
 extern const tele_op_t op_O_MAX;

diff --git a/src/state.c b/src/state.c
@@ -506,10 +506,16 @@ size_t es_push(exec_state_t *es) {
                 es->variables[es->exec_depth - 1].if_else_condition;
             es->variables[es->exec_depth].i =
                 es->variables[es->exec_depth - 1].i;
+            es->variables[es->exec_depth].j =
+                es->variables[es->exec_depth - 1].j;
+            es->variables[es->exec_depth].k =
+                es->variables[es->exec_depth - 1].k;
         }
         else {
             es->variables[es->exec_depth].if_else_condition = true;
             es->variables[es->exec_depth].i = 0;
+            es->variables[es->exec_depth].j = 0;
+            es->variables[es->exec_depth].k = 0;
         }
         es->variables[es->exec_depth].breaking = false;
         es->exec_depth += 1;  // exec_depth = 1 at the root

diff --git a/src/state.h b/src/state.h
@@ -116,8 +116,10 @@ typedef struct {
     tele_command_t commands[DELAY_SIZE];
     int16_t time[DELAY_SIZE];
     uint8_t origin_script[DELAY_SIZE];
-    int16_t origin_i[DELAY_SIZE];
     uint8_t count;
+    int16_t origin_i[DELAY_SIZE];
+    int16_t origin_j[DELAY_SIZE];
+    int16_t origin_k[DELAY_SIZE];
 } scene_delay_t;
 
 typedef struct {
@@ -299,6 +301,8 @@ void ss_reset_param_cal(scene_state_t *);
 typedef struct {
     bool if_else_condition;
     int16_t i;
+    int16_t j;
+    int16_t k;
     bool while_continue;
     uint16_t while_depth;
     bool breaking;

diff --git a/src/teletype.c b/src/teletype.c
@@ -341,6 +341,8 @@ void tele_tick(scene_state_t *ss, uint8_t time) {
                 es_variables(&es)->delayed = true;
                 es_variables(&es)->script_number = ss->delay.origin_script[i];
                 es_variables(&es)->i = ss->delay.origin_i[i];
+                es_variables(&es)->j = ss->delay.origin_j[i];
+                es_variables(&es)->k = ss->delay.origin_k[i];
 
                 run_script_with_exec_state(ss, &es, TEMP_SCRIPT);