ast: improve error message for duplicated symbol

rivet-lang · Dec 27, 2024 · d4b0691 · d4b0691
1 parent bfbc1b4
commit d4b0691
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/compiler/ast/Scope.v b/compiler/ast/Scope.v
@@ -32,15 +32,25 @@ pub fn (sc &Scope) derive() &Scope {
 }
 
 pub fn (mut sc Scope) add_symbol(sym Symbol) ! {
-	if _ := sc.lookup(sym.name) {
-		return error('duplicate ${sym.type_of()} `${sym.name}`')
+	if other := sc.lookup(sym.name) {
+		m := if other.type_of() == sym.type_of() {
+			'duplicate ${sym.type_of()} `${sym.name}`'
+		} else {
+			'another symbol exists with the same name as `${sym.name}`'
+		}
+		return error(m)
 	}
 	sc.syms << sym
 }
 
 pub fn (mut sc Scope) add_local_symbol(sym Symbol) ! {
-	if _ := sc.find(sym.name) {
-		return error('duplicate symbol `${sym.name}`')
+	if other := sc.find(sym.name) {
+		m := if other.type_of() == sym.type_of() {
+			'duplicate ${sym.type_of()} `${sym.name}`'
+		} else {
+			'another symbol exists with the same name as `${sym.name}`'
+		}
+		return error(m)
 	}
 	sc.syms << sym
 }

diff --git a/compiler/sema/mod.v b/compiler/sema/mod.v
@@ -91,7 +91,7 @@ fn (mut sema Sema) fn_stmt(mut stmt ast.FnStmt) {
 		sema.scope.add_local_symbol(stmt.sym) or { context.error(err.msg(), stmt.name_pos) }
 		sema.scope = stmt.scope
 		for arg in stmt.args {
-			sema.scope.add_symbol(ast.Variable{
+			sema.scope.add_local_symbol(ast.Variable{
 				name:     arg.name
 				is_local: true
 				is_arg:   true