D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-10 17:56:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix deprecation messages for non-vendor pragmas.

Browse Source 
The deprecation message for non-vendor pragmas was never shown.
This commit is contained in:
kai
2013-02-28 08:00:43 +01:00
parent a7bed6c488
commit 820f6dbc7c
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dmd2/mars.h
View File

@@ -518,6 +518,7 @@ void fatal();
void err_nomem();
#if IN_LLVM
void error(const char *format, ...) IS_PRINTF(1);
void warning(const char *format, ...) IS_PRINTF(1);
#else
int runLINK();
void deleteExeFile();

9
dmd2/statement.c
View File

@@ -31,6 +31,8 @@
#include "import.h"
#if IN_LLVM
// From pragma.cpp
bool matchPragma(Identifier* needle, Identifier* ident, Identifier* oldIdent);
#if defined(_MSC_VER)
#include <windows.h>
#else
@@ -3169,13 +3171,8 @@ Statement *PragmaStatement::semantic(Scope *sc)
}
#if IN_LLVM
// FIXME Move to pragma.cpp
else if (ident == Id::LDC_allow_inline || ident == Id::allow_inline)
else if (matchPragma(ident, Id::LDC_allow_inline, Id::allow_inline))
{
#if DMDV2
if (ident == Id::allow_inline && !global.params.useDeprecated)
error("non-vendor-prefixed pragma '%s' is deprecated; use '%s' instead",
Id::allow_inline->toChars(), Id::LDC_allow_inline->toChars());
#endif
sc->func->allowInlining = true;
}
#endif

16
gen/pragma.cpp
View File

@@ -46,15 +46,23 @@ static bool parseIntExp(Expression* e, dinteger_t& res)
static void pragmaDeprecated(Identifier* oldIdent, Identifier* newIdent)
{
#ifndef DMDV1
#if !DMDV1
// Do not print a deprecation warning for D1 – we do not want to
// introduce needless breakage at this stage.
if (!global.params.useDeprecated)
error("non-vendor-prefixed pragma '%s' is deprecated; use '%s' instead");
if (global.params.useDeprecated == 0)
{
error("non-vendor-prefixed pragma '%s' is deprecated; use '%s' instead",
oldIdent->toChars(), newIdent->toChars());
}
else if (global.params.useDeprecated == 2)
{
warning("non-vendor-prefixed pragma '%s' is deprecated; use '%s' instead",
oldIdent->toChars(), newIdent->toChars());
}
#endif
}
static bool matchPragma(Identifier* needle, Identifier* ident, Identifier* oldIdent)
bool matchPragma(Identifier* needle, Identifier* ident, Identifier* oldIdent)
{
if (needle == ident) return true;
if (needle == oldIdent)