refac: improve handling of FunDecl and CallExpr

CHANGELOG.md

@@ -15,13 +15,15 @@ All notable changes are documented in this file.
 - Properly warn if FFI is used in a file intended for a different backend
 - Improve various error messages and reduce noise
 - Functions can no longer be shadowed by variables
+- fix: change `unnecessary mut` to be a warning
 
 ### Other Changes
 - `static` visibility is now controlled by `pub` keyword
 - lexer: Disallow floats with trailing decimal point
 - fix(c): Prevent c error if blank identifier is used
 
 ### Compiler internals
+- refac: improve handling of FunDecl and CallExpr
 - refac(gen): move generation of test main function into transformer
 
 

lib/bait/ast/ast.bt

@@ -91,7 +91,7 @@ pub struct FunDecl {
 	pub is_pub bool
 	pub lang Language
 	pub name string
-	pub mix_name string // TMP
+	pub key string // TODO rework generics and possibly remove this field
 	pub params []Param
 	pub return_type Type
 	pub is_test bool
@@ -112,7 +112,7 @@ pub struct Param {
 }
 
 pub fun (fn FunDecl) is_main() bool {
-	return not fn.is_method and fn.mix_name == 'main'
+	return not fn.is_method and fn.name == 'main'
 }
 
 pub struct LoopControlStmt {
@@ -199,7 +199,7 @@ pub struct BoolLiteral {
 
 pub struct CallExpr {
 	global lang Language
-	pub pkg string
+	global pkg string
 	global name string
 	global mix_name string // TMP
 	global return_type Type

lib/bait/ast/repr.bt

@@ -11,7 +11,7 @@ pub fun (e Expr) repr() string {
 		AsCast { e.expr.repr() + ' as XX' }
 		BlankIdent { '_' }
 		BoolLiteral { e.str() }
-		CallExpr{ e.mix_name + '()'}
+		CallExpr{ e.full_name() + '()'}
 		CharLiteral { e.val }
 		ComptimeVar { e.kind.str() }
 		EnumVal{ e.val }
@@ -36,10 +36,3 @@ pub fun (e Expr) repr() string {
 		InvalidExpr { 'InvalidExpr' }
 	}
 }
-
-pub fun (fn FunDecl) key() string {
-	if fn.is_method {
-		return '${fn.params[0].typ}.${fn.mix_name}'
-	}
-	return fn.mix_name
-}

lib/bait/ast/table.bt

@@ -3,7 +3,6 @@
 package ast
 
 pub struct Table {
-	pub mut fun_decls map[string]FunDecl
 	pub mut type_idxs map[string]Type
 	pub mut type_symbols []TypeSymbol
 	pub mut needed_equality_funs []Type
@@ -176,7 +175,7 @@ pub fun (t Table) get_method(sym TypeSymbol, name string) FunDecl {
 	mut s := sym
 	for true {
 		for m in s.methods {
-			if m.mix_name == name {
+			if m.name == name {
 				return m
 			}
 		}

lib/bait/ast/types.bt

@@ -104,7 +104,7 @@ pub fun (sym TypeSymbol) find_field(name string, t Table) StructField {
 
 pub fun (sym TypeSymbol) has_method(name string) bool {
 	for m in sym.methods {
-		if m.mix_name == name {
+		if m.name == name {
 			return true
 		}
 	}

lib/bait/checker/attribute.bt

@@ -101,12 +101,12 @@ fun (c Checker) attr_export(attr ast.Attribute) {
 	c.export_names.push(attr.value)
 }
 
-fun (c Checker) check_fun_attrs_on_call(call ast.CallExpr, def ast.FunDecl) {
+fun (c Checker) check_fun_attrs_on_call(call ast.CallExpr, attrs []ast.Attribute) {
 	mut is_deprecated := false
 	mut depr_attr := ast.Attribute{}
 	mut depr_date_attr := ast.Attribute{}
 
-	for attr in def.attrs {
+	for attr in attrs {
 		if attr.name == 'deprecated_after' {
 			depr_date_attr = attr
 			is_deprecated = true
@@ -118,7 +118,7 @@ fun (c Checker) check_fun_attrs_on_call(call ast.CallExpr, def ast.FunDecl) {
 	}
 
 	if is_deprecated {
-		mut depr_message := 'function "${call.mix_name}" '
+		mut depr_message := 'function "${call.full_name()}" '
 		if depr_date_attr.name.length > 0 {
 			depr_message += 'will be deprecated after ${depr_date_attr.value}'
 		} else {