aboutsummaryrefslogtreecommitdiff
path: root/test/cases/compile_errors
diff options
context:
space:
mode:
authorVeikka Tuominen <git@vexu.eu>2022-10-06 17:05:34 +0300
committerVeikka Tuominen <git@vexu.eu>2022-10-07 11:04:02 +0300
commit29ae6515f3adc23df3d889acaf7ec62a2d01b707 (patch)
treef774b68521f6aca221628201408e47b2b24f481a /test/cases/compile_errors
parent11dce78944ecfab1838cd678f75c354aa376a8bf (diff)
downloadzig-29ae6515f3adc23df3d889acaf7ec62a2d01b707.tar.gz
zig-29ae6515f3adc23df3d889acaf7ec62a2d01b707.zip
AstGen: use 'shadows' instead of 'redeclaration' when names are in different scopes
Closes #8532
Diffstat (limited to 'test/cases/compile_errors')
-rw-r--r--test/cases/compile_errors/decl_shadows_local.zig4
-rw-r--r--test/cases/compile_errors/local_shadows_global_that_occurs_later.zig2
-rw-r--r--test/cases/compile_errors/local_variable_redeclares_parameter.zig2
-rw-r--r--test/cases/compile_errors/local_variable_shadowing_global.zig2
-rw-r--r--test/cases/compile_errors/parameter_shadowing_global.zig2
5 files changed, 6 insertions, 6 deletions
diff --git a/test/cases/compile_errors/decl_shadows_local.zig b/test/cases/compile_errors/decl_shadows_local.zig
index cb48cafa45..44066ab659 100644
--- a/test/cases/compile_errors/decl_shadows_local.zig
+++ b/test/cases/compile_errors/decl_shadows_local.zig
@@ -16,7 +16,7 @@ fn bar(a: usize) void {
// backend=stage2
// target=native
//
-// :3:15: error: redeclaration of function parameter 'a'
+// :3:15: error: declaration 'a' shadows function parameter from outer scope
// :1:8: note: previous declaration here
-// :9:19: error: redeclaration of function parameter 'a'
+// :9:19: error: declaration 'a' shadows function parameter from outer scope
// :6:8: note: previous declaration here
diff --git a/test/cases/compile_errors/local_shadows_global_that_occurs_later.zig b/test/cases/compile_errors/local_shadows_global_that_occurs_later.zig
index 1d88ac2c88..4c55060c52 100644
--- a/test/cases/compile_errors/local_shadows_global_that_occurs_later.zig
+++ b/test/cases/compile_errors/local_shadows_global_that_occurs_later.zig
@@ -8,5 +8,5 @@ fn foo() void {}
// backend=stage2
// target=native
//
-// :2:9: error: local shadows declaration of 'foo'
+// :2:9: error: local variable shadows declaration of 'foo'
// :5:1: note: declared here
diff --git a/test/cases/compile_errors/local_variable_redeclares_parameter.zig b/test/cases/compile_errors/local_variable_redeclares_parameter.zig
index f5693ca9b6..6e523c2c8f 100644
--- a/test/cases/compile_errors/local_variable_redeclares_parameter.zig
+++ b/test/cases/compile_errors/local_variable_redeclares_parameter.zig
@@ -7,5 +7,5 @@ export fn entry() void { f(1); }
// backend=stage2
// target=native
//
-// :2:11: error: redeclaration of function parameter 'a'
+// :2:11: error: local constant 'a' shadows function parameter from outer scope
// :1:6: note: previous declaration here
diff --git a/test/cases/compile_errors/local_variable_shadowing_global.zig b/test/cases/compile_errors/local_variable_shadowing_global.zig
index 1320bfcb41..91df6a7c3d 100644
--- a/test/cases/compile_errors/local_variable_shadowing_global.zig
+++ b/test/cases/compile_errors/local_variable_shadowing_global.zig
@@ -10,5 +10,5 @@ export fn entry() void {
// backend=stage2
// target=native
//
-// :5:9: error: local shadows declaration of 'Bar'
+// :5:9: error: local variable shadows declaration of 'Bar'
// :2:1: note: declared here
diff --git a/test/cases/compile_errors/parameter_shadowing_global.zig b/test/cases/compile_errors/parameter_shadowing_global.zig
index 47d112807b..5cc837f05e 100644
--- a/test/cases/compile_errors/parameter_shadowing_global.zig
+++ b/test/cases/compile_errors/parameter_shadowing_global.zig
@@ -8,5 +8,5 @@ export fn entry() void {
// backend=stage2
// target=native
//
-// :2:6: error: local shadows declaration of 'Foo'
+// :2:6: error: function parameter shadows declaration of 'Foo'
// :1:1: note: declared here