Fixed variable lifetime in loops

src/build/core/Scope.go

@@ -2,6 +2,7 @@ package core
 
 import (
 	"git.akyoto.dev/cli/q/src/build/ast"
+	"git.akyoto.dev/cli/q/src/build/config"
 	"git.akyoto.dev/cli/q/src/build/cpu"
 	"git.akyoto.dev/cli/q/src/build/token"
 )
@@ -10,6 +11,7 @@ import (
 type Scope struct {
 	cpu.State
 	variables map[string]*Variable
+	inLoop    bool
 }
 
 // Scope returns the current scope.
@@ -18,13 +20,14 @@ func (s *state) Scope() *Scope {
 }
 
 // pushScope pushes a new scope to the top of the stack.
-func (s *state) pushScope(body ast.AST) {
+func (f *Function) pushScope(body ast.AST) *Scope {
 	scope := &Scope{}
 
-	if len(s.scopes) > 0 {
-		lastScope := s.scopes[len(s.scopes)-1]
+	if len(f.scopes) > 0 {
+		lastScope := f.scopes[len(f.scopes)-1]
 		scope.State = lastScope.State
 		scope.variables = make(map[string]*Variable, len(lastScope.variables))
+		scope.inLoop = lastScope.inLoop
 
 		for k, v := range lastScope.variables {
 			count := ast.Count(body, token.Identifier, v.Name)
@@ -44,10 +47,20 @@ func (s *state) pushScope(body ast.AST) {
 		scope.variables = map[string]*Variable{}
 	}
 
-	s.scopes = append(s.scopes, scope)
+	f.scopes = append(f.scopes, scope)
+
+	if config.Comments {
+		f.Comment("scope %d start", len(f.scopes))
+	}
+
+	return scope
 }
 
 // popScope removes the scope at the top of the stack.
-func (s *state) popScope() {
-	s.scopes = s.scopes[:len(s.scopes)-1]
+func (f *Function) popScope() {
+	if config.Comments {
+		f.Comment("scope %d end", len(f.scopes))
+	}
+
+	f.scopes = f.scopes[:len(f.scopes)-1]
 }