From 9183cf0997d2e313cf5e977cdc5d73c3fae5fb9d Mon Sep 17 00:00:00 2001
From: Eduard Urbach <eduard@urbach.dev>
Date: Tue, 29 Jul 2025 13:16:25 +0200
Subject: [PATCH] Renamed environment instances

---
 src/core/Function.go        |  2 +-
 src/core/compileAssert.go   |  2 +-
 src/core/evaluateCall.go    |  2 +-
 src/core/evaluateDot.go     |  4 ++--
 src/core/evaluateToken.go   |  6 +++---
 src/core/needsStackFrame.go |  2 +-
 src/scanner/Scan.go         | 16 ++++++++--------
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/core/Function.go b/src/core/Function.go
index 5ff0e86..ba841b7 100644
--- a/src/core/Function.go
+++ b/src/core/Function.go
@@ -16,7 +16,7 @@ type Function struct {
 	File         *fs.File
 	Type         *types.Function
 	Err          error
-	All          *Environment
+	Env          *Environment
 	Input        []*ssa.Parameter
 	Output       []*ssa.Parameter
 	Body         token.List
diff --git a/src/core/compileAssert.go b/src/core/compileAssert.go
index 4a016b6..2dea00f 100644
--- a/src/core/compileAssert.go
+++ b/src/core/compileAssert.go
@@ -14,6 +14,6 @@ func (f *Function) compileAssert(assert *ast.Assert) error {
 	}
 
 	f.Append(&ssa.Assert{Condition: cond})
-	f.Dependencies.Add(f.All.Function("run", "crash"))
+	f.Dependencies.Add(f.Env.Function("run", "crash"))
 	return nil
 }
\ No newline at end of file
diff --git a/src/core/evaluateCall.go b/src/core/evaluateCall.go
index 6cff4cb..d11552f 100644
--- a/src/core/evaluateCall.go
+++ b/src/core/evaluateCall.go
@@ -33,7 +33,7 @@ func (f *Function) evaluateCall(expr *expression.Expression) (ssa.Value, error)
 	}
 
 	ssaFunc := funcValue.(*ssa.Function)
-	pkg := f.All.Packages[ssaFunc.Package]
+	pkg := f.Env.Packages[ssaFunc.Package]
 	fn := pkg.Functions[ssaFunc.Name]
 	inputExpressions := expr.Children[1:]
 
diff --git a/src/core/evaluateDot.go b/src/core/evaluateDot.go
index f28abc6..9acf731 100644
--- a/src/core/evaluateDot.go
+++ b/src/core/evaluateDot.go
@@ -22,9 +22,9 @@ func (f *Function) evaluateDot(expr *expression.Expression) (ssa.Value, error) {
 
 	switch leftValue := leftValue.(type) {
 	case *ssa.Package:
-		pkg := f.All.Packages[leftText]
+		pkg := f.Env.Packages[leftText]
 
-		if !pkg.IsExtern && f != f.All.Init {
+		if !pkg.IsExtern && f != f.Env.Init {
 			imp, exists := f.File.Imports[leftText]
 
 			if !exists {
diff --git a/src/core/evaluateToken.go b/src/core/evaluateToken.go
index bfcc4b0..97c42ea 100644
--- a/src/core/evaluateToken.go
+++ b/src/core/evaluateToken.go
@@ -19,7 +19,7 @@ func (f *Function) evaluateLeaf(expr *expression.Expression) (ssa.Value, error)
 			return value, nil
 		}
 
-		constant, exists := f.All.Packages[f.Package].Constants[name]
+		constant, exists := f.Env.Packages[f.Package].Constants[name]
 
 		if exists {
 			number, err := toNumber(constant.Value.Token, constant.File)
@@ -36,13 +36,13 @@ func (f *Function) evaluateLeaf(expr *expression.Expression) (ssa.Value, error)
 			return v, nil
 		}
 
-		_, exists = f.All.Packages[name]
+		_, exists = f.Env.Packages[name]
 
 		if exists {
 			return &ssa.Package{Name: name}, nil
 		}
 
-		function := f.All.Function(f.File.Package, name)
+		function := f.Env.Function(f.File.Package, name)
 
 		if function != nil {
 			f.Dependencies.Add(function)
diff --git a/src/core/needsStackFrame.go b/src/core/needsStackFrame.go
index c701300..25612b4 100644
--- a/src/core/needsStackFrame.go
+++ b/src/core/needsStackFrame.go
@@ -4,5 +4,5 @@ import "git.urbach.dev/cli/q/src/config"
 
 // needsStackFrame returns true if the function needs a stack frame.
 func (f *Function) needsStackFrame() bool {
-	return f.All.Build.Arch == config.ARM && !f.IsLeaf() && f != f.All.Init
+	return f.Env.Build.Arch == config.ARM && !f.IsLeaf() && f != f.Env.Init
 }
\ No newline at end of file
diff --git a/src/scanner/Scan.go b/src/scanner/Scan.go
index 5121045..df953bc 100644
--- a/src/scanner/Scan.go
+++ b/src/scanner/Scan.go
@@ -29,7 +29,7 @@ func Scan(build *config.Build) (*core.Environment, error) {
 		close(s.errors)
 	}()
 
-	all := &core.Environment{
+	env := &core.Environment{
 		Build:    build,
 		Files:    make([]*fs.File, 0, 8),
 		Packages: make(map[string]*core.Package, 8),
@@ -43,10 +43,10 @@ func Scan(build *config.Build) (*core.Environment, error) {
 				continue
 			}
 
-			f.All = all
-			pkg := all.AddPackage(f.Package, f.IsExtern())
+			f.Env = env
+			pkg := env.AddPackage(f.Package, f.IsExtern())
 			pkg.Functions[f.Name] = f
-			all.NumFunctions++
+			env.NumFunctions++
 
 		case file, ok := <-s.files:
 			if !ok {
@@ -54,7 +54,7 @@ func Scan(build *config.Build) (*core.Environment, error) {
 				continue
 			}
 
-			all.Files = append(all.Files, file)
+			env.Files = append(env.Files, file)
 
 		case constant, ok := <-s.constants:
 			if !ok {
@@ -62,7 +62,7 @@ func Scan(build *config.Build) (*core.Environment, error) {
 				continue
 			}
 
-			pkg := all.AddPackage(constant.File.Package, false)
+			pkg := env.AddPackage(constant.File.Package, false)
 			pkg.Constants[constant.Name] = constant
 
 		case err, ok := <-s.errors:
@@ -71,9 +71,9 @@ func Scan(build *config.Build) (*core.Environment, error) {
 				continue
 			}
 
-			return all, err
+			return env, err
 		}
 	}
 
-	return all, nil
+	return env, nil
 }
\ No newline at end of file
-- 
2.51.2