Skip to content

access.d: fix error messages to use syntax highlighting #6788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlang-bot merged 1 commit into from
May 15, 2017
Merged

access.d: fix error messages to use syntax highlighting #6788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ddmd/access.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ extern (C++) bool checkAccess(AggregateDeclaration ad, Loc loc, Scope* sc, Dsymb
}
if (!result)
{
ad.error(loc, "member %s is not accessible", smember.toChars());
ad.error(loc, "member `%s` is not accessible", smember.toChars());
//printf("smember = %s %s, prot = %d, semanticRun = %d\n",
// smember.kind(), smember.toPrettyChars(), smember.prot(), smember.semanticRun);
return true;
Expand Down Expand Up @@ -412,7 +412,7 @@ extern (C++) bool checkAccess(Loc loc, Scope* sc, Expression e, Declaration d)
{
if (d.prot().kind == PROTprivate && d.getAccessModule() != sc._module || d.prot().kind == PROTpackage && !hasPackageAccess(sc, d))
{
error(loc, "%s %s is not accessible from module %s", d.kind(), d.toPrettyChars(), sc._module.toChars());
error(loc, "%s `%s` is not accessible from module `%s`", d.kind(), d.toPrettyChars(), sc._module.toChars());
return true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/fail_compilation/diag10169.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
TEST_OUTPUT:
---
fail_compilation/diag10169.d(12): Deprecation: imports.a10169.B.x is not visible from module diag10169
fail_compilation/diag10169.d(12): Error: struct imports.a10169.B member x is not accessible
fail_compilation/diag10169.d(12): Error: struct imports.a10169.B member `x` is not accessible
---
*/
import imports.a10169;
Expand Down
16 changes: 8 additions & 8 deletions test/fail_compilation/diag5385.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
TEST_OUTPUT:
---
fail_compilation/diag5385.d(27): Deprecation: imports.fail5385.C.privX is not visible from module diag5385
fail_compilation/diag5385.d(27): Error: class imports.fail5385.C member privX is not accessible
fail_compilation/diag5385.d(27): Error: class imports.fail5385.C member `privX` is not accessible
fail_compilation/diag5385.d(28): Deprecation: imports.fail5385.C.packX is not visible from module diag5385
fail_compilation/diag5385.d(28): Error: class imports.fail5385.C member packX is not accessible
fail_compilation/diag5385.d(28): Error: class imports.fail5385.C member `packX` is not accessible
fail_compilation/diag5385.d(29): Deprecation: imports.fail5385.C.privX2 is not visible from module diag5385
fail_compilation/diag5385.d(29): Error: class imports.fail5385.C member privX2 is not accessible
fail_compilation/diag5385.d(29): Error: class imports.fail5385.C member `privX2` is not accessible
fail_compilation/diag5385.d(30): Deprecation: imports.fail5385.C.packX2 is not visible from module diag5385
fail_compilation/diag5385.d(30): Error: class imports.fail5385.C member packX2 is not accessible
fail_compilation/diag5385.d(30): Error: class imports.fail5385.C member `packX2` is not accessible
fail_compilation/diag5385.d(31): Deprecation: imports.fail5385.S.privX is not visible from module diag5385
fail_compilation/diag5385.d(31): Error: struct imports.fail5385.S member privX is not accessible
fail_compilation/diag5385.d(31): Error: struct imports.fail5385.S member `privX` is not accessible
fail_compilation/diag5385.d(32): Deprecation: imports.fail5385.S.packX is not visible from module diag5385
fail_compilation/diag5385.d(32): Error: struct imports.fail5385.S member packX is not accessible
fail_compilation/diag5385.d(32): Error: struct imports.fail5385.S member `packX` is not accessible
fail_compilation/diag5385.d(33): Deprecation: imports.fail5385.S.privX2 is not visible from module diag5385
fail_compilation/diag5385.d(33): Error: struct imports.fail5385.S member privX2 is not accessible
fail_compilation/diag5385.d(33): Error: struct imports.fail5385.S member `privX2` is not accessible
fail_compilation/diag5385.d(34): Deprecation: imports.fail5385.S.packX2 is not visible from module diag5385
fail_compilation/diag5385.d(34): Error: struct imports.fail5385.S member packX2 is not accessible
fail_compilation/diag5385.d(34): Error: struct imports.fail5385.S member `packX2` is not accessible
---
*/

Expand Down
10 changes: 5 additions & 5 deletions test/fail_compilation/dip22a.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ REQUIRED_ARGS: -de
TEST_OUTPUT:
---
fail_compilation/dip22a.d(21): Deprecation: imports.dip22a.Klass.bar is not visible from module dip22a
fail_compilation/dip22a.d(21): Error: class imports.dip22a.Klass member bar is not accessible
fail_compilation/dip22a.d(21): Error: class imports.dip22a.Klass member `bar` is not accessible
fail_compilation/dip22a.d(22): Deprecation: imports.dip22a.Struct.bar is not visible from module dip22a
fail_compilation/dip22a.d(22): Error: struct imports.dip22a.Struct member bar is not accessible
fail_compilation/dip22a.d(22): Error: struct imports.dip22a.Struct member `bar` is not accessible
fail_compilation/dip22a.d(23): Error: imports.dip22a.bar is not visible from module dip22a
fail_compilation/dip22a.d(23): Error: function imports.dip22a.bar is not accessible from module dip22a
fail_compilation/dip22a.d(23): Error: function `imports.dip22a.bar` is not accessible from module `dip22a`
fail_compilation/dip22a.d(24): Error: imports.dip22a.Template!int.bar is not visible from module dip22a
fail_compilation/dip22a.d(24): Error: function imports.dip22a.Template!int.bar is not accessible from module dip22a
fail_compilation/dip22a.d(24): Error: function `imports.dip22a.Template!int.bar` is not accessible from module `dip22a`
fail_compilation/dip22a.d(25): Deprecation: imports.dip22a.bar is not visible from module dip22a
fail_compilation/dip22a.d(25): Error: function imports.dip22a.bar is not accessible from module dip22a
fail_compilation/dip22a.d(25): Error: function `imports.dip22a.bar` is not accessible from module `dip22a`
---
*/
import imports.dip22a;
Expand Down
2 changes: 1 addition & 1 deletion test/fail_compilation/dip22e.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ REQUIRED_ARGS: -transition=checkimports -de
TEST_OUTPUT:
---
fail_compilation/dip22e.d(16): Deprecation: imports.dip22d.foo is not visible from module dip22e
fail_compilation/dip22e.d(16): Error: function imports.dip22d.foo is not accessible from module dip22e
fail_compilation/dip22e.d(16): Error: function `imports.dip22d.foo` is not accessible from module `dip22e`
fail_compilation/dip22e.d(17): Deprecation: local import search method found overloadset dip22e.bar (2 overloads) instead of function imports.dip22e.bar
---
*/
Expand Down
8 changes: 4 additions & 4 deletions test/fail_compilation/fail10528.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ fail_compilation/fail10528.d(26): Error: module fail10528 enum member a10528.b i
fail_compilation/fail10528.d(26): Deprecation: a10528.b is not visible from module fail10528
fail_compilation/fail10528.d(27): Error: a10528.b is not visible from module fail10528
fail_compilation/fail10528.d(29): Deprecation: a10528.S.c is not visible from module fail10528
fail_compilation/fail10528.d(29): Error: variable a10528.S.c is not accessible from module fail10528
fail_compilation/fail10528.d(30): Error: variable a10528.S.c is not accessible from module fail10528
fail_compilation/fail10528.d(29): Error: variable `a10528.S.c` is not accessible from module `fail10528`
fail_compilation/fail10528.d(30): Error: variable `a10528.S.c` is not accessible from module `fail10528`
fail_compilation/fail10528.d(32): Deprecation: a10528.C.d is not visible from module fail10528
fail_compilation/fail10528.d(32): Error: variable a10528.C.d is not accessible from module fail10528
fail_compilation/fail10528.d(33): Error: variable a10528.C.d is not accessible from module fail10528
fail_compilation/fail10528.d(32): Error: variable `a10528.C.d` is not accessible from module `fail10528`
fail_compilation/fail10528.d(33): Error: variable `a10528.C.d` is not accessible from module `fail10528`
---
*/

Expand Down
8 changes: 4 additions & 4 deletions test/fail_compilation/fail14407.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ fail_compilation/fail14407.d(23): Deprecation: allocator imports.a14407.C.new is
fail_compilation/fail14407.d(23): Error: pure function 'fail14407.testC' cannot call impure allocator 'imports.a14407.C.new'
fail_compilation/fail14407.d(23): Error: @safe function 'fail14407.testC' cannot call @system allocator 'imports.a14407.C.new'
fail_compilation/fail14407.d(23): Error: @nogc function 'fail14407.testC' cannot call non-@nogc allocator 'imports.a14407.C.new'
fail_compilation/fail14407.d(23): Error: class imports.a14407.C member new is not accessible
fail_compilation/fail14407.d(23): Error: class imports.a14407.C member `new` is not accessible
fail_compilation/fail14407.d(23): Error: pure function 'fail14407.testC' cannot call impure constructor 'imports.a14407.C.this'
fail_compilation/fail14407.d(23): Error: @safe function 'fail14407.testC' cannot call @system constructor 'imports.a14407.C.this'
fail_compilation/fail14407.d(23): Error: @nogc function 'fail14407.testC' cannot call non-@nogc constructor 'imports.a14407.C.this'
fail_compilation/fail14407.d(23): Error: class imports.a14407.C member this is not accessible
fail_compilation/fail14407.d(23): Error: class imports.a14407.C member `this` is not accessible
fail_compilation/fail14407.d(23): Error: allocator 'imports.a14407.C.new' is not nothrow
fail_compilation/fail14407.d(23): Error: constructor 'imports.a14407.C.this' is not nothrow
fail_compilation/fail14407.d(21): Error: nothrow function 'fail14407.testC' may throw
Expand All @@ -31,11 +31,11 @@ fail_compilation/fail14407.d(46): Deprecation: allocator imports.a14407.S.new is
fail_compilation/fail14407.d(46): Error: pure function 'fail14407.testS' cannot call impure allocator 'imports.a14407.S.new'
fail_compilation/fail14407.d(46): Error: @safe function 'fail14407.testS' cannot call @system allocator 'imports.a14407.S.new'
fail_compilation/fail14407.d(46): Error: @nogc function 'fail14407.testS' cannot call non-@nogc allocator 'imports.a14407.S.new'
fail_compilation/fail14407.d(46): Error: struct imports.a14407.S member new is not accessible
fail_compilation/fail14407.d(46): Error: struct imports.a14407.S member `new` is not accessible
fail_compilation/fail14407.d(46): Error: pure function 'fail14407.testS' cannot call impure constructor 'imports.a14407.S.this'
fail_compilation/fail14407.d(46): Error: @safe function 'fail14407.testS' cannot call @system constructor 'imports.a14407.S.this'
fail_compilation/fail14407.d(46): Error: @nogc function 'fail14407.testS' cannot call non-@nogc constructor 'imports.a14407.S.this'
fail_compilation/fail14407.d(46): Error: struct imports.a14407.S member this is not accessible
fail_compilation/fail14407.d(46): Error: struct imports.a14407.S member `this` is not accessible
fail_compilation/fail14407.d(46): Error: allocator 'imports.a14407.S.new' is not nothrow
fail_compilation/fail14407.d(46): Error: constructor 'imports.a14407.S.this' is not nothrow
fail_compilation/fail14407.d(44): Error: nothrow function 'fail14407.testS' may throw
Expand Down
4 changes: 2 additions & 2 deletions test/fail_compilation/test15785.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
TEST_OUTPUT:
---
fail_compilation/test15785.d(17): Deprecation: imports.test15785.Base.foo is not visible from module test15785
fail_compilation/test15785.d(17): Error: class test15785.Derived member foo is not accessible
fail_compilation/test15785.d(17): Error: class test15785.Derived member `foo` is not accessible
fail_compilation/test15785.d(18): Deprecation: imports.test15785.Base.bar is not visible from module test15785
fail_compilation/test15785.d(18): Error: class test15785.Derived member bar is not accessible
fail_compilation/test15785.d(18): Error: class test15785.Derived member `bar` is not accessible
---
*/
import imports.test15785;
Expand Down