empty file crash fix

f0xeri · Feb 24, 2024 · 8eb9451 · 8eb9451
1 parent 9e7532b
commit 8eb9451
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/driver/Driver.cpp b/driver/Driver.cpp
@@ -18,6 +18,7 @@ namespace Slangc {
         processUnit(mainModuleName, true);
         for (auto &error : errors)
             log() << error;
+        if (!errors.empty()) return;
         std::stringstream clangCallStream;
         clangCallStream << "clang ";
         std::ranges::copy(std::views::transform(options.getInputFilePaths(), [](const std::filesystem::path &p){ return p.string(); }), std::ostream_iterator<std::string>(clangCallStream, ".o "));
@@ -53,6 +54,8 @@ namespace Slangc {
         auto codeGen = CodeGen(*context, std::move(parser.moduleAST), isMainModule);
         if (!containsErrors(errors))
             codeGen.process(errors);
+        else
+            return context;
         //codeGen.dumpIRToFile(filepath.string() + ".ll");
         Optimizer optimizer(options.getOptimizationLevel());
         optimizer.run(*codeGen.getModule());

diff --git a/parser/ParseDecl.cpp b/parser/ParseDecl.cpp
@@ -13,7 +13,7 @@ namespace Slangc {
         context.moduleName = moduleName;
         moduleAST = create<ModuleDeclNode>(loc, moduleName, create<BlockStmtNode>(loc, std::vector<StmtPtrVariant>()));
         advance();
-        while (token->type != TokenType::Start)
+        while (token->type != TokenType::Start && token->type != TokenType::EndOfFile)
         {
             if (token->type == TokenType::Function || token->type == TokenType::Procedure || (token->type == TokenType::Extern && ((token + 1)->type == TokenType::Procedure || (token + 1)->type == TokenType::Function))) {
                 auto funcDecl = parseFuncDecl();

diff --git a/source/SourceBuffer.cpp b/source/SourceBuffer.cpp
@@ -15,14 +15,14 @@ namespace Slangc {
     auto SourceBuffer::CreateFromFile(std::string_view path) -> llvm::Expected<SourceBuffer> {
         std::string filename = std::string(path);
         if (!filename.ends_with(".sl")) {
-            return llvm::make_error<llvm::StringError>(filename + " : slang source file extension must be .sl", llvm::inconvertibleErrorCode());
+            return llvm::make_error<llvm::StringError>(filename + ": slang source file extension must be .sl", llvm::inconvertibleErrorCode());
         }
         constexpr auto read_size = std::size_t{4096};
         auto stream = std::basic_ifstream<char32_t>{path.data()};
         stream.exceptions(std::ios_base::badbit);
 
         if (!stream) {
-            return llvm::make_error<llvm::StringError>(filename + " : file not found", llvm::inconvertibleErrorCode());
+            return llvm::make_error<llvm::StringError>(filename + ": file not found", llvm::inconvertibleErrorCode());
         }
 
         auto result = std::u32string{};
@@ -34,6 +34,7 @@ namespace Slangc {
         std::string str;
         std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> converter;
         str = converter.to_bytes(result);
+        if (str.empty()) return llvm::make_error<llvm::StringError>(filename + ": file is empty", llvm::inconvertibleErrorCode());
         return SourceBuffer{std::move(filename), std::move(str)};
     }