diff options
| author | Tim Foley <tfoley@nvidia.com> | 2017-07-19 09:36:35 -0700 |
|---|---|---|
| committer | Tim Foley <tfoley@nvidia.com> | 2017-07-19 18:15:37 -0700 |
| commit | 3f48e1c0d84bf4909954154ad147559656e87516 (patch) | |
| tree | 0b93a109d51e6565560ad785519a863386490e2a /source/slang/parser.cpp | |
| parent | a2b8b4c20632d79721052abd232fe2d1bdf2700d (diff) | |
Try to improve handling of failures during compilation
The change is mostly about trying to make sure the compiler "fails safe" when it encounters an internal assumption that isn't met.
Most internal errors will now throw exceptions (yes, exceptions are evil, but this will work for now), and these get caught in `spCompile` so that they don't propagate to the user (they just see a message that compilation aborted due to an internal error).
Subsequent changes are going to need to work on diagnosing as many of these situations as possible, so that users can at least know what construct in their code was unexpected or unhandled by the compiler.
Diffstat (limited to 'source/slang/parser.cpp')
| -rw-r--r-- | source/slang/parser.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/slang/parser.cpp b/source/slang/parser.cpp index a624c58c5..801628e30 100644 --- a/source/slang/parser.cpp +++ b/source/slang/parser.cpp @@ -848,8 +848,9 @@ namespace Slang } else { + SLANG_DIAGNOSE_UNEXPECTED(parser->sink, parser->tokenReader.PeekLoc(), "needed a modifier"); + parser->ReadToken(TokenType::Identifier); - assert(!"unexpected"); } } } @@ -1377,7 +1378,7 @@ namespace Slang void addDecl( RefPtr<Decl> newDecl) { - assert(newDecl); + SLANG_ASSERT(newDecl); if( decl ) { @@ -1715,7 +1716,7 @@ namespace Slang RefPtr<Modifier> result; RefPtr<Modifier>* link = &result; - assert(!*link); + SLANG_ASSERT(!*link); for (;;) { @@ -2440,7 +2441,7 @@ namespace Slang ParseDeclBody(this, program, TokenType::EndOfFile); PopScope(); - assert(currentScope == outerScope); + SLANG_RELEASE_ASSERT(currentScope == outerScope); currentScope = nullptr; } |
