Fix raw string literals handling in dep. iterator

Author: 4lex1v

code/cbuild_api.cpp

@@ -27,10 +27,10 @@ const char * get_argument_or_default (const Arguments *args, const char *key, co
 }
 
 bool find_toolchain_by_type (Project *project, Toolchain_Type type, Toolchain_Configuration *out_configuration) {
-  auto result = lookup_toolchain_by_type(&project->arena, type);
-  if (not result) return false;
+  auto [status, result] = lookup_toolchain_by_type(&project->arena, type);
+  check_status(status);
 
-  *out_configuration = *result;
+  *out_configuration = result;
 
   return true;
 }
@@ -51,8 +51,8 @@ void overwrite_toolchain (Project *project, Toolchain_Configuration toolchain) {
 }
 
 void set_toolchain (Project *project, Toolchain_Type type) {
-  auto result = lookup_toolchain_by_type(&project->arena, type);
-  if (not result) {
+  auto [status, result] = lookup_toolchain_by_type(&project->arena, type);
+  if (!status) {
     print(&project->arena, "FATAL ERROR: Requested toolchain wasn't found on the system.\n");
     exit(EXIT_FAILURE);
   }

code/dependency_iterator.cpp

@@ -5,6 +5,8 @@
 #include "core.hpp"
 #include "dependency_iterator.hpp"
 #include "platform.hpp"
+#include "runtime.hpp"
+#include "result.hpp"
 
 Dependency_Iterator::Dependency_Iterator (const File_Mapping *_mapping)
   : mapping { _mapping },
@@ -37,7 +39,9 @@ static const char* find_substring (const char *memory, size_t memory_size, const
   return nullptr;
 }
 
-bool get_next_include_value (Dependency_Iterator *iterator, String *include) {
+Result<bool> get_next_include_value (Dependency_Iterator *iterator, String *include) {
+  use(Status_Code);
+  
   auto cursor = iterator->cursor;
   auto end    = iterator->mapping->memory + iterator->mapping->size;
 
@@ -82,14 +86,21 @@ bool get_next_include_value (Dependency_Iterator *iterator, String *include) {
       auto end_of_safe_word = reinterpret_cast<const char *>(memchr(safe_word, '(', end - safe_word));
       if (end_of_safe_word == nullptr) return false;
 
-      auto safe_word_length        = end_of_safe_word - safe_word;
-      auto raw_string_end_position = find_substring(end_of_safe_word, end - end_of_safe_word, safe_word, safe_word_length);
-      assert(*(raw_string_end_position - 1) == ')');
+      auto safe_word_length = end_of_safe_word - safe_word;
+      char raw_string_closing_path[64] = { ')' };
+      copy_memory(raw_string_closing_path + 1, safe_word, safe_word_length);
+
+      auto raw_string_closing_path_length = safe_word_length + 1;
+      auto raw_string_end_position = find_substring(end_of_safe_word, end - end_of_safe_word,
+                                                    raw_string_closing_path, raw_string_closing_path_length);
+      if ((raw_string_end_position == nullptr) ||
+          (raw_string_end_position[raw_string_closing_path_length] != '"')) {
+        return Invalid_Value; // Unclosed string literal, TODO: report a proper error message
+      }
 
-      auto position = raw_string_end_position + safe_word_length;
-      assert(*position == '"');
+      auto position = raw_string_end_position + safe_word_length + 1;
 
-      cursor = position + 1;
+      cursor = position + 1; // closing " for a string literal
 
       continue;
     }

code/dependency_iterator.hpp

@@ -6,6 +6,8 @@
 struct String;
 struct File_Mapping;
 
+template <typename T> struct Result;
+
 struct Dependency_Iterator {
   const File_Mapping *mapping;
   const char         *cursor = nullptr;
@@ -17,4 +19,4 @@ struct Dependency_Iterator {
   Iterates over all user-defined #include directives in the mapped source file retrieving the provided value as-is.
   Resolution of the retrieved file path is left for the caller.
  */
-bool get_next_include_value (Dependency_Iterator *iterator, String *include_value);
+Result<bool> get_next_include_value (Dependency_Iterator *iterator, String *include_value);

code/main.cpp

@@ -148,8 +148,8 @@ int main (int argc, char **argv) {
     print_usage(&arena);
   }
   else {
-    auto default_toolchain = discover_toolchain(&arena);
-    if (not default_toolchain) {
+    auto [status, default_toolchain] = discover_toolchain(&arena);
+    if (!status) {
       print(&arena, "Couldn't find any suitable C/C++ toolchain installed on the system.");
       return EXIT_FAILURE;
     }

code/result.hpp

@@ -85,13 +85,6 @@ struct Result {
   bool operator == (Status_Code::Value code) {
     return status.value == code;
   }
-
-  bool operator ! () {
-    if constexpr (has_not_operator_v<T>) {
-      return (status != Status_Code::Success) || !this->value;
-    }
-    else return (status != Status_Code::Success);  
-  }
 };
 
 template <typename T> struct Is_Result:            std::false_type {};

code/target_builder.cpp

@@ -458,7 +458,13 @@ static Result<Chain_Status> scan_dependency_chains (Memory_Arena *arena, File *s
   };
 
   bool chain_has_updates = false;
-  while (get_next_include_value(&iterator, &include_value)) {
+  while (true) {
+    {
+      auto [status, has_more] = get_next_include_value(&iterator, &include_value);  
+      check_status(status);
+      if (!has_more) break;
+    }
+
     File_Path resolved_path;
     for (auto prefix: include_directories) {
       auto full_path = make_file_path(arena, prefix, include_value);
@@ -539,7 +545,13 @@ static Result<bool> scan_file_dependencies (Memory_Arena *_arena, File *source_f
   };
 
   bool chain_has_updates = false;
-  while (get_next_include_value(&iterator, &include_value)) {
+  while (true) {
+    {
+      auto [status, has_more] = get_next_include_value(&iterator, &include_value);
+      check_status(status);
+      if (!has_more) break;
+    }
+
     auto inner_local = local;
 
     File_Path resolved_path;

code/toolchain_win32.cpp

@@ -347,10 +347,10 @@ List<Pair<String, String>> setup_system_sdk (Memory_Arena *arena, Target_Arch ar
   add(&local, &existing_environment_values, { "LIB", lib_env_var });
 
   auto sdk = find_windows_sdk(&local);
-  if (!sdk) return {};
+  if (!sdk.status) return {};
 
   auto msvc = get_msvc_installation_path(&local);
-  if (!msvc) return {};
+  if (!msvc.status) return {};
 
   {
     auto sub_local = local;