Merge pull request #128 from tfoleyNV/improve-failure-modes

Try to improve handling of failures during compilation

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;
     }