diff options
| -rw-r--r-- | source/slang/diagnostic-defs.h | 1 | ||||
| -rw-r--r-- | source/slang/preprocessor.cpp | 1 | ||||
| -rw-r--r-- | tests/diagnostics/undefined-in-preprocessor-conditional.slang | 10 | ||||
| -rw-r--r-- | tests/diagnostics/undefined-in-preprocessor-conditional.slang.expected | 6 |
4 files changed, 18 insertions, 0 deletions
diff --git a/source/slang/diagnostic-defs.h b/source/slang/diagnostic-defs.h index 83e82fc81..02edb6521 100644 --- a/source/slang/diagnostic-defs.h +++ b/source/slang/diagnostic-defs.h @@ -114,6 +114,7 @@ DIAGNOSTIC(15201, Error, syntaxErrorInPreprocessorExpression, "syntax error in p DIAGNOSTIC(15202, Error, divideByZeroInPreprocessorExpression, "division by zero in preprocessor expression"); DIAGNOSTIC(15203, Error, expectedTokenInDefinedExpression, "expected '$0' in 'defined' expression"); DIAGNOSTIC(15204, Warning, directiveExpectsExpression, "'$0' directive requires an expression"); +DIAGNOSTIC(15205, Warning, undefinedIdentifierInPreprocessorExpression, "undefined idenfier '$0' in preprocessor expression will evaluate to zero") DIAGNOSTIC(-1, Note, seeOpeningToken, "see opening '$0'") diff --git a/source/slang/preprocessor.cpp b/source/slang/preprocessor.cpp index 71c6fd4bb..d652d07bb 100644 --- a/source/slang/preprocessor.cpp +++ b/source/slang/preprocessor.cpp @@ -1213,6 +1213,7 @@ static PreprocessorExpressionValue ParseAndEvaluateUnaryExpression(PreprocessorD // An identifier here means it was not defined as a macro (or // it is defined, but as a function-like macro. These should // just evaluate to zero (possibly with a warning) + GetSink(context)->diagnose(token.loc, Diagnostics::undefinedIdentifierInPreprocessorExpression, token.getName()); return 0; } diff --git a/tests/diagnostics/undefined-in-preprocessor-conditional.slang b/tests/diagnostics/undefined-in-preprocessor-conditional.slang new file mode 100644 index 000000000..d46c68d33 --- /dev/null +++ b/tests/diagnostics/undefined-in-preprocessor-conditional.slang @@ -0,0 +1,10 @@ +//TEST(smoke):SIMPLE: + +// Use an undefined identifier in a preprocessor conditional + +#define FOO 1 +#define BORT 1 + +#if FOO && BART +#error Should not get here +#endif diff --git a/tests/diagnostics/undefined-in-preprocessor-conditional.slang.expected b/tests/diagnostics/undefined-in-preprocessor-conditional.slang.expected new file mode 100644 index 000000000..ac8be68a2 --- /dev/null +++ b/tests/diagnostics/undefined-in-preprocessor-conditional.slang.expected @@ -0,0 +1,6 @@ +result code = 0 +standard error = { +tests/diagnostics/undefined-in-preprocessor-conditional.slang(8): warning 15205: undefined idenfier 'BART' in preprocessor expression will evaluate to zero +} +standard output = { +} |