go/ferret
1
0
Fork 0
mirror of https://github.com/MontFerret/ferret.git synced 2025-08-15 20:02:56 +02:00
Code Issues Releases Activity

Refactor loop compilation to ensure scope management with EnterScope and ExitScope, update variable declaration for key/value names, and ensure compatibility with FOR-IN loops.

Browse Source
This commit is contained in:
Tim Voronov
2025-07-07 16:29:07 -04:00
parent f20e75f1b1
commit d39c5ce889
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/compiler/internal/loop_sort.go
View File

@@ -137,6 +137,9 @@ func (c *LoopSortCompiler) finalizeSorting(loop *core.Loop, kv *core.KV, sorter
// Finalize the current loop iteration // Finalize the current loop iteration
loop.EmitFinalization(c.ctx.Emitter) loop.EmitFinalization(c.ctx.Emitter)
c.ctx.Symbols.ExitScope()
c.ctx.Symbols.EnterScope()
// Replace the loop source with sorted results // Replace the loop source with sorted results
c.ctx.Emitter.EmitAB(vm.OpMove, loop.Src, sorter) c.ctx.Emitter.EmitAB(vm.OpMove, loop.Src, sorter)
@@ -147,10 +150,14 @@ func (c *LoopSortCompiler) finalizeSorting(loop *core.Loop, kv *core.KV, sorter
if loop.Kind != core.ForInLoop { if loop.Kind != core.ForInLoop {
// We switched from a ForWhileLoop to a ForInLoop because the underlying data is Iterable now. // We switched from a ForWhileLoop to a ForInLoop because the underlying data is Iterable now.
loop.Kind = core.ForInLoop loop.Kind = core.ForInLoop
loop.ValueName = loop.KeyName }
loop.Value = loop.Key
loop.Key = vm.NoopOperand if loop.KeyName != "" {
loop.KeyName = "" loop.DeclareValueVar(loop.KeyName, c.ctx.Symbols)
}
if loop.ValueName != "" {
loop.DeclareValueVar(loop.ValueName, c.ctx.Symbols)
} }
// Reinitialize the loop to iterate over sorted data // Reinitialize the loop to iterate over sorted data