Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
68 changes: 68 additions & 0 deletions compiler/src/dmd/errorsink.d
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ abstract class ErrorSink
void vdeprecation(Loc loc, const(char)* format, va_list ap);
void vdeprecationSupplemental(Loc loc, const(char)* format, va_list ap);

static if (__VERSION__ < 2092)
{
void error(Loc loc, const(char)* format, ...)
{
va_list ap;
Expand Down Expand Up @@ -96,6 +98,72 @@ abstract class ErrorSink
vdeprecationSupplemental(loc, format, ap);
va_end(ap);
}
}
else
{
pragma(printf)
void error(Loc loc, const(char)* format, ...)
{
va_list ap;
va_start(ap, format);
verror(loc, format, ap);
va_end(ap);
}

pragma(printf)
void errorSupplemental(Loc loc, const(char)* format, ...)
{
va_list ap;
va_start(ap, format);
verrorSupplemental(loc, format, ap);
va_end(ap);
}

pragma(printf)
void warning(Loc loc, const(char)* format, ...)
{
va_list ap;
va_start(ap, format);
vwarning(loc, format, ap);
va_end(ap);
}

pragma(printf)
void warningSupplemental(Loc loc, const(char)* format, ...)
{
va_list ap;
va_start(ap, format);
vwarningSupplemental(loc, format, ap);
va_end(ap);
}

pragma(printf)
void message(Loc loc, const(char)* format, ...)
{
va_list ap;
va_start(ap, format);
vmessage(loc, format, ap);
va_end(ap);
}

pragma(printf)
void deprecation(Loc loc, const(char)* format, ...)
{
va_list ap;
va_start(ap, format);
vdeprecation(loc, format, ap);
va_end(ap);
}

pragma(printf)
void deprecationSupplemental(Loc loc, const(char)* format, ...)
{
va_list ap;
va_start(ap, format);
vdeprecationSupplemental(loc, format, ap);
va_end(ap);
}
}

/**
* This will be called to indicate compilation has either
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dmd/targetcompiler.d
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ mixin template HostObjectNotFound()
else version (MARS)
{
eSink.errorSupplemental(loc, "dmd might not be correctly installed. Run 'dmd -man' for installation instructions.");
eSink.errorSupplemental(loc, "config file: %.*s", configFile.length, configFile.ptr);
eSink.errorSupplemental(loc, "config file: %.*s", cast(int)configFile.length, configFile.ptr);
}
else
static assert(0, "unknown compiler being built");
Expand Down
Loading