Fix #284 #316

derppening · 2023-09-05T18:47:21+08:00

derppening commented

2023-09-05 18:47:21 +08:00

Fixes the issue where, if the loop variable is used after a range loop, the value would be off by one.

This MR fixes the problem by rewriting range loops into a do-while loop similar to

bool inc = step > 0;
if (inc ? value < end : value > end) {
  int next_value = start;
  do {
    int value = next_value;
    body(value);

    next_value = value + step;
    } while (inc ? next_value < end : next_value > end);
}

This MR also implements the behavior where when 0 is provided to the step argument of range, a ValueError will be raised.

In addition, some minor code cleanup has also been performed, namely

Add statement type to basic block label names
Add variable name to IR variables if able
Refactored the loop logic for iterables case to align with the standard C-style loop
```
for (size_t i = 0; i < len; ++i) {
  body(iterable[i]);
}
```

Fixes the issue where, if the loop variable is used after a `range` loop, the value would be off by one. This MR fixes the problem by rewriting `range` loops into a do-while loop similar to ```c bool inc = step > 0; if (inc ? value < end : value > end) { int next_value = start; do { int value = next_value; body(value); next_value = value + step; } while (inc ? next_value < end : next_value > end); } ``` This MR also implements the behavior where when 0 is provided to the `step` argument of `range`, a `ValueError` will be raised. In addition, some minor code cleanup has also been performed, namely - Add statement type to basic block label names - Add variable name to IR variables if able - Refactored the loop logic for iterables case to align with the standard C-style loop ```c for (size_t i = 0; i < len; ++i) { body(iterable[i]); } ```

sb10q was assigned by derppening

2023-09-05 18:47:21 +08:00

derppening added 8 commits 2023-09-05 18:47:22 +08:00

91749bb01b standalone: Adapt loop example to output loop variable

1e27986864 standalone: Prepend statement type to basic block label names

aaf7ea74b8 core: Add gen_{var_alloc,store_target}_named

For assigning custom names to stack-alloc variables and pointers.

be5775bbd5 core: Use AST var name for IR name

7b9f8e8aaa core: Preserve value of variable shadowed by for loop

Previously, the final value of the target expression would be one after
the last element of the loop, which does not match Python's behavior.

This commit fixes this problem while also preserving the last assigned
value of the loop beyond the loop, matching Python's behavior.

74034fe473 core: Add assertion for when `range` has step of 0

f46140d74a core: Remove redundant for.cond BB for iterable loops

18a3263af1 core: Use C-style for loop logic for iterables

Index increment is performed at the end of the loop body.

sb10q reviewed 2023-09-05 18:57:38 +08:00

nac3core/src/codegen/generator.rs Outdated

													
				@ -83,24 +83,49 @@ pub trait CodeGenerator {

				    /// Allocate memory for a variable and return a pointer pointing to it.

				    /// The default implementation places the allocations at the start of the function.

				    fn gen_var_alloc_named<'ctx, 'a>(