diff options
| -rw-r--r-- | compiler.c | 39 | ||||
| -rw-r--r-- | tests/test_basic_2.tnsl | 5 | ||||
| -rw-r--r-- | tests/test_conditional_2.tnsl | 11 | ||||
| -rw-r--r-- | tests/test_conditional_3.tnsl | 10 | ||||
| -rw-r--r-- | tests/test_pointer_4.tnsl | 14 | ||||
| -rw-r--r-- | tnslc/iterator.tnsl | 39 |
6 files changed, 117 insertions, 1 deletions
@@ -1938,6 +1938,26 @@ void var_op_bxor(CompData *out, Variable *lhs, Variable *rhs) { // Nothing for now } +void var_op_inc(CompData *out, Variable *lhs) { + if (lhs->location == LOC_LITL) { + lhs->offset++; + } + char *store = _var_get_store(out, lhs); + vect_push_string(&out->text, "\tinc "); + vect_push_free_string(&out->text, store); + vect_push_string(&out->text, " ; Increment\n\n"); +} + +void var_op_dec(CompData *out, Variable *lhs) { + if (lhs->location == LOC_LITL) { + lhs->offset--; + } + char *store = _var_get_store(out, lhs); + vect_push_string(&out->text, "\tdec "); + vect_push_free_string(&out->text, store); + vect_push_string(&out->text, " ; Decrement\n\n"); +} + // Multiplies "base" by "mul" and sets "base" to the result. void var_op_mul(CompData *out, Variable *base, Variable *mul) { if(base->location == LOC_LITL) { @@ -4882,8 +4902,20 @@ Variable _eval(Scope *s, CompData *data, Vector *tokens, size_t start, size_t en return out; } else { printf("ERROR: Unexpected prefix token\n"); + p2_error = true; return rhs; } + } else if (op_pos == end - 1) { + Variable lhs = _eval(s, data, tokens, start, op_pos); + if (tok_str_eq(op_token, "++")) { + var_op_inc(data, &lhs); + } else if (tok_str_eq(op_token, "--")) { + var_op_dec(data, &lhs); + } else { + printf("ERROR: Unexpected suffix token\n"); + p2_error = true; + } + return lhs; } Variable rhs = _eval(s, data, tokens, op_pos + 1, end); @@ -5427,6 +5459,7 @@ void p2_compile_def(Scope *s, CompData *out, Vector *tokens, size_t *pos, Vector // Split def if(*pos - start > 1) { Variable store = _eval(s, out, tokens, start, *pos); + scope_free_all_tmp(s, out); var_end(&store); } start = *pos + 1; @@ -5439,6 +5472,7 @@ void p2_compile_def(Scope *s, CompData *out, Vector *tokens, size_t *pos, Vector var_end(&type); if (*pos - start > 1) { Variable store = _eval(s, out, tokens, start, *pos); + scope_free_all_tmp(s, out); var_end(&store); } } @@ -5586,6 +5620,7 @@ void p2_compile_control(Scope *s, Function *f, CompData *out, Vector *tokens, si if (build != start) { // Eval, check ending Variable v = _eval(&sub, out, tokens, start, build); + scope_free_all_tmp(&sub, out); if (strcmp(v.type->name, "bool") == 0 && tok_str_eq(t, ")")) { build = start - 1; start = b_end; @@ -5701,6 +5736,7 @@ void p2_compile_control(Scope *s, Function *f, CompData *out, Vector *tokens, si if (rep != start) { // Eval, check ending Variable v = _eval(&sub, out, tokens, start, rep); + scope_free_all_tmp(&sub, out); if (strcmp(v.type->name, "bool") == 0 && tok_str_eq(t, "]") && scope_name_eq(&sub, "loop")) { rep = start - 1; start = r_end; @@ -5735,11 +5771,12 @@ void p2_compile_control(Scope *s, Function *f, CompData *out, Vector *tokens, si while(!tok_str_eq(t, ")")) { if (t->type == TT_DELIMIT) { b_end = tnsl_find_closing(tokens, b_end); - b_end++; } + b_end++; t = vect_get(tokens, b_end); } Variable v = _eval(&sub, out, tokens, build, b_end); + scope_free_all_tmp(&sub, out); vect_push_string(&out->text, "\tjnz "); vect_push_free_string(&out->text, scope_label_start(&sub)); vect_push_string(&out->text, "; Conditional rep\n"); diff --git a/tests/test_basic_2.tnsl b/tests/test_basic_2.tnsl new file mode 100644 index 0000000..9f19415 --- /dev/null +++ b/tests/test_basic_2.tnsl @@ -0,0 +1,5 @@ +/; main [int] + int i = 68 + i++ + return i +;/ diff --git a/tests/test_conditional_2.tnsl b/tests/test_conditional_2.tnsl new file mode 100644 index 0000000..ac29d44 --- /dev/null +++ b/tests/test_conditional_2.tnsl @@ -0,0 +1,11 @@ +/; main [int] + int a, b + a = 69 + b = 0 + + /; if (a > b) + return a + ;/ + + return b +;/ diff --git a/tests/test_conditional_3.tnsl b/tests/test_conditional_3.tnsl new file mode 100644 index 0000000..3387d84 --- /dev/null +++ b/tests/test_conditional_3.tnsl @@ -0,0 +1,10 @@ +/; main [int] + + int i = 0 + + /; loop (int j = 0; j < 70) [j++] + i = j + ;/ + + return i +;/ diff --git a/tests/test_pointer_4.tnsl b/tests/test_pointer_4.tnsl new file mode 100644 index 0000000..f128285 --- /dev/null +++ b/tests/test_pointer_4.tnsl @@ -0,0 +1,14 @@ +/; set (int` i) + i = 69 +;/ + +/; set_b (int` j) + set(j) +;/ + +/; main [int] + int k = 0 + set_b(~k) + return k +;/ + diff --git a/tnslc/iterator.tnsl b/tnslc/iterator.tnsl new file mode 100644 index 0000000..19dda8c --- /dev/null +++ b/tnslc/iterator.tnsl @@ -0,0 +1,39 @@ +struct Iterator { + ~void data, + int size, + current, + _elsz +} + +/; method Iterator + + /; init (~void data, int count, int elsz) + self.data = data + self.size = size + self._elsz = elsz + self.current = 0 + ;/ + + /; next (int count) + self.current = self.current + count + /; if (self.current >= self.size) + self.current = self.size + ;/ + ;/ + + /; prev (int count) + self.current = self.current - count + /; if (self.current < 0) + self.current = 0 + ;/ + ;/ + + /; get [~void] + return self.data + current * _elsz + ;/ + + /; end [bool] + return self.current >= self.size + ;/ + +;/ |