From 089f970c867901c7c8954d192550736df1e820fc Mon Sep 17 00:00:00 2001
From: Lukas Neubert <40118727+serkonda7@users.noreply.github.com>
Date: Thu, 16 Jan 2025 21:19:55 +0100
Subject: [PATCH] reduce mix_name

---
 lib/bait/checker/fun.bt     |  1 +
 lib/bait/gen/js/comptime.bt |  2 +-
 lib/bait/gen/js/expr.bt     |  4 ++--
 lib/bait/gen/js/fun.bt      | 12 ++++++------
 lib/bait/gen/js/stmt.bt     |  2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/bait/checker/fun.bt b/lib/bait/checker/fun.bt
index 498f6956..f48622bb 100644
--- a/lib/bait/checker/fun.bt
+++ b/lib/bait/checker/fun.bt
@@ -101,6 +101,7 @@ fun (c Checker) fun_params(params []ast.Param){
 			c.scope.register(p.name, context.ScopeObject{
 				typ = p.typ
 				kind = .function
+				pkg = c.pkg
 			})
 		} else {
 			c.scope.register(p.name, context.ScopeObject{
diff --git a/lib/bait/gen/js/comptime.bt b/lib/bait/gen/js/comptime.bt
index e55934ca..90e4188c 100644
--- a/lib/bait/gen/js/comptime.bt
+++ b/lib/bait/gen/js/comptime.bt
@@ -25,7 +25,7 @@ fun (mut g Gen) get_comptime_val(kind token.ComptimeVar, pos token.Pos) string {
 			line := g.get_comptime_val(.line, pos)
 			'${file}:${line}'
 		}
-		.fun_ { g.cur_fun.mix_name }
+		.fun_ { g.cur_fun.name }
 
 		// Cached
 		.baitexe { g.comptime_baitexe() }
diff --git a/lib/bait/gen/js/expr.bt b/lib/bait/gen/js/expr.bt
index f380cd5f..17392e37 100644
--- a/lib/bait/gen/js/expr.bt
+++ b/lib/bait/gen/js/expr.bt
@@ -208,7 +208,7 @@ fun (mut g Gen) infix_expr(node ast.InfixExpr){
 		if node.op == .ne {
 			g.write('!')
 		}
-		g.write(js_esc(lsym.name + '_' + overload.mix_name))
+		g.write(js_esc(lsym.name + '_' + overload.name))
 		g.write('(')
 		g.expr(node.left)
 		g.write(', ')
@@ -325,7 +325,7 @@ fun (mut g Gen) expr_to_string(expr ast.Expr, typ ast.Type) {
 	}
 
 	str_def := g.table.get_method(sym, 'str')
-	if str_def.mix_name.length > 0 {
+	if str_def.name.length > 0 {
 		final_sym := g.table.get_sym(str_def.params[0].typ)
 		mut name := js_esc(final_sym.name)
 		g.write('${name}_str(')
diff --git a/lib/bait/gen/js/fun.bt b/lib/bait/gen/js/fun.bt
index 380e8669..e126d47d 100644
--- a/lib/bait/gen/js/fun.bt
+++ b/lib/bait/gen/js/fun.bt
@@ -5,9 +5,9 @@ package js
 import bait.ast
 
 fun (mut g Gen) fun_decl(node ast.FunDecl) {
-	if node.mix_name == 'testsuite_begin' {
+	if node.name == 'testsuite_begin' {
 		g.has_test_begin = true
-	} else if node.mix_name == 'testsuite_end' {
+	} else if node.name == 'testsuite_end' {
 		g.has_test_end = true
 	}
 
@@ -30,7 +30,7 @@ fun (mut g Gen) fun_decl(node ast.FunDecl) {
 	mut name := ''
 	if node.is_method {
 		sym := g.table.get_sym(node.params[0].typ)
-		name = js_esc(sym.name + '_' + node.mix_name)
+		name = js_esc(sym.name + '_' + node.name)
 	} else {
 		name = js_esc(node.mix_name)
 	}
@@ -98,7 +98,7 @@ fun (mut g Gen) call_expr(node ast.CallExpr) {
 fun (mut g Gen) call_expr_no_or(node ast.CallExpr) {
 	if node.is_method and node.lang != .bait {
 		g.expr(node.left)
-		g.write('.' + node.mix_name + '(')
+		g.write('.' + node.name + '(')
 		g.call_args(node.args)
 		g.write(')')
 		return
@@ -107,7 +107,7 @@ fun (mut g Gen) call_expr_no_or(node ast.CallExpr) {
 	if node.is_field {
 		g.expr(node.left)
 		g.write('.')
-		g.write(node.mix_name)
+		g.write(node.name)
 		g.write('(')
 		g.call_args(node.args)
 		g.write(')')
@@ -139,7 +139,7 @@ fun (mut g Gen) call_expr_no_or(node ast.CallExpr) {
 
 	g.write(name)
 
-	if not node.is_method and ['println', 'eprintln', 'print', 'eprint'].contains(node.mix_name) {
+	if not node.is_method and ['println', 'eprintln', 'print', 'eprint'].contains(node.name) {
 		g.write('(')
 		g.expr_to_string(node.args[0].expr, node.args[0].typ)
 		g.write(')')
diff --git a/lib/bait/gen/js/stmt.bt b/lib/bait/gen/js/stmt.bt
index d18b06db..611d4b61 100644
--- a/lib/bait/gen/js/stmt.bt
+++ b/lib/bait/gen/js/stmt.bt
@@ -162,7 +162,7 @@ fun (mut g Gen) assign_stmt(node ast.AssignStmt){
 	if lsym.overloads.contains(node.op.js_repr()) {
 		g.write(' = ')
 		overload := lsym.overloads[node.op.js_repr()]
-		g.write(js_esc(lsym.name + '_' + overload.mix_name))
+		g.write(js_esc(lsym.name + '_' + overload.name))
 		g.write('(')
 		g.expr(node.left)
 		g.write(', ')