Merge branch 'main' into clang-tidy-target-level

Author: bavulapati

.github/workflows/website-build.yml

@@ -16,6 +16,7 @@ jobs:
       - run: >
           cmake -S . -B ./build
           -DCMAKE_BUILD_TYPE:STRING=Release
+          -DSOURCEMETA_CORE_LANG_IO:BOOL=OFF
           -DSOURCEMETA_CORE_TIME:BOOL=OFF
           -DSOURCEMETA_CORE_UUID:BOOL=OFF
           -DSOURCEMETA_CORE_GZIP:BOOL=OFF

.github/workflows/website-deploy.yml

@@ -26,6 +26,7 @@ jobs:
       - run: >
           cmake -S . -B ./build
           -DCMAKE_BUILD_TYPE:STRING=Release
+          -DSOURCEMETA_CORE_LANG_IO:BOOL=OFF
           -DSOURCEMETA_CORE_TIME:BOOL=OFF
           -DSOURCEMETA_CORE_UUID:BOOL=OFF
           -DSOURCEMETA_CORE_GZIP:BOOL=OFF

CMakeLists.txt

@@ -3,6 +3,7 @@ project(core VERSION 0.0.0 LANGUAGES C CXX DESCRIPTION "Sourcemeta Core")
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
 # Options
+option(SOURCEMETA_CORE_LANG_IO "Build the Sourcemeta Core language I/O library" ON)
 option(SOURCEMETA_CORE_TIME "Build the Sourcemeta Core time library" ON)
 option(SOURCEMETA_CORE_UUID "Build the Sourcemeta Core UUID library" ON)
 option(SOURCEMETA_CORE_GZIP "Build the Sourcemeta Core GZIP library" ON)
@@ -51,6 +52,10 @@ if(SOURCEMETA_CORE_INSTALL)
     COMPONENT sourcemeta_${PROJECT_NAME}_dev)
 endif()
 
+if(SOURCEMETA_CORE_LANG_IO)
+  add_subdirectory(src/lang/io)
+endif()
+
 if(SOURCEMETA_CORE_TIME)
   add_subdirectory(src/core/time)
 endif()
@@ -137,6 +142,10 @@ endif()
 if(SOURCEMETA_CORE_TESTS)
   enable_testing()
 
+  if(SOURCEMETA_CORE_LANG_IO)
+    add_subdirectory(test/io)
+  endif()
+
   if(SOURCEMETA_CORE_TIME)
     add_subdirectory(test/time)
   endif()

cmake/common/clang-tidy.cmake

@@ -105,10 +105,9 @@ function(sourcemeta_clang_tidy_attempt_enable)
         OUTPUT_VARIABLE MACOSX_RESOURCE_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
     set(SOURCEMETA_CXX_CLANG_TIDY
         "${CLANG_TIDY_BIN};--config-file=${CLANG_TIDY_CONFIG};-header-filter=${PROJECT_SOURCE_DIR}/src/*"
-        "--extra-arg=-std=c++${CMAKE_CXX_STANDARD}"
         "--extra-arg=-isysroot"
         "--extra-arg=${MACOSX_SDK_PATH}"
-        "--extra-arg=-resource-dir=${MACOSX_RESOURCE_PATH}" 
+        "--extra-arg=-resource-dir=${MACOSX_RESOURCE_PATH}"
         CACHE STRING "CXX_CLANG_TIDY")
   endif()
 

cmake/common/clang-tidy.config

@@ -1,19 +1,6 @@
----
-# See https://clang.llvm.org/extra/clang-tidy/index.html
-# First disable all default checks (with -*)
-Checks: '-*,
-          modernize-*'
-# TODO(bavulapati): iterate through the rules and enable them incrementally inorder to send smaller PRs
-          # bugprone-*,-bugprone-branch-clone,-bugprone-easily-swappable-parameters,-bugprone-empty-catch,
-          # clang-analyzer-*,
-          # clang-diagnostic-*,
-          # modernize-*,
-          # concurrency-*,
-          # cppcoreguidelines-*,-cppcoreguidelines-rvalue-reference-param-not-moved,
-          # performance-*,-performance-enum-size,
-          # portability-*,
-          # objc-*,
-          # misc-*,-misc-no-recursion,-misc-unused-parameters,-misc-const-correctness'
-WarningsAsErrors: '*'
-FormatStyle: none
-UseColor: true
+{
+  "Checks": "-*, concurrency-*, modernize-*, performance-*, portability-*",
+  "WarningsAsErrors": "*",
+  "FormatStyle": "none",
+  "UseColor": true
+}

config.cmake.in

@@ -4,6 +4,7 @@
 list(APPEND SOURCEMETA_CORE_COMPONENTS ${Core_FIND_COMPONENTS})
 list(APPEND SOURCEMETA_CORE_COMPONENTS ${core_FIND_COMPONENTS})
 if(NOT SOURCEMETA_CORE_COMPONENTS)
+  list(APPEND SOURCEMETA_CORE_COMPONENTS io)
   list(APPEND SOURCEMETA_CORE_COMPONENTS time)
   list(APPEND SOURCEMETA_CORE_COMPONENTS uuid)
   list(APPEND SOURCEMETA_CORE_COMPONENTS gzip)
@@ -21,7 +22,9 @@ endif()
 include(CMakeFindDependencyMacro)
 
 foreach(component ${SOURCEMETA_CORE_COMPONENTS})
-  if(component STREQUAL "time")
+  if(component STREQUAL "io")
+    include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_core_io.cmake")
+  elseif(component STREQUAL "time")
     include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_core_time.cmake")
   elseif(component STREQUAL "uuid")
     include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_core_uuid.cmake")
@@ -38,6 +41,7 @@ foreach(component ${SOURCEMETA_CORE_COMPONENTS})
     find_dependency(uriparser CONFIG)
     include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_core_uri.cmake")
   elseif(component STREQUAL "json")
+    include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_core_io.cmake")
     include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_core_json.cmake")
   elseif(component STREQUAL "jsonl")
     include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_core_json.cmake")
@@ -57,6 +61,7 @@ foreach(component ${SOURCEMETA_CORE_COMPONENTS})
   elseif(component STREQUAL "yaml")
     include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_core_json.cmake")
     find_dependency(yaml CONFIG)
+    include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_core_io.cmake")
     include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_core_yaml.cmake")
   elseif(component STREQUAL "alterschema")
     find_dependency(uriparser CONFIG)

src/core/json/CMakeLists.txt

@@ -5,3 +5,5 @@ sourcemeta_library(NAMESPACE sourcemeta PROJECT core NAME json
 if(SOURCEMETA_CORE_INSTALL)
   sourcemeta_library_install(NAMESPACE sourcemeta PROJECT core NAME json)
 endif()
+
+target_link_libraries(sourcemeta_core_json PRIVATE sourcemeta::core::io)

src/core/json/include/sourcemeta/core/json.h

@@ -132,29 +132,6 @@ SOURCEMETA_CORE_JSON_EXPORT
 auto read_json(const std::filesystem::path &path,
                const JSON::ParseCallback &callback = nullptr) -> JSON;
 
-// TODO: Move this function to a system integration component, as it
-// is not JSON specific
-
-/// @ingroup json
-///
-/// A convenience function to read a document from a file. For example:
-///
-/// ```cpp
-/// #include <sourcemeta/core/json.h>
-/// #include <cassert>
-/// #include <iostream>
-///
-/// auto stream = sourcemeta::core::read_file("/tmp/foo.json");
-/// const auto document = sourcemeta::core::parse_json(stream);
-/// sourcemeta::core::stringify(document, std::cout);
-/// std::cout << std::endl;
-/// ```
-///
-/// If parsing fails, sourcemeta::core::JSONParseError will be thrown.
-SOURCEMETA_CORE_JSON_EXPORT
-auto read_file(const std::filesystem::path &path)
-    -> std::basic_ifstream<JSON::Char, JSON::CharTraits>;
-
 /// @ingroup json
 ///
 /// Stringify the input JSON document into a given C++ standard output stream in

src/core/json/include/sourcemeta/core/json_auto.h

@@ -161,7 +161,7 @@ auto from_json(const JSON &value) -> std::optional<T> {
 // JSON?
 /// @ingroup json
 template <typename T>
-  requires std::is_same_v<T, JSON::Object::Container::hash_type>
+  requires std::is_same_v<T, JSON::Object::hash_type>
 auto to_json(const T &hash) -> JSON {
   auto result{JSON::make_array()};
 #if defined(__SIZEOF_INT128__)
@@ -182,7 +182,7 @@ auto to_json(const T &hash) -> JSON {
 // JSON?
 /// @ingroup json
 template <typename T>
-  requires std::is_same_v<T, JSON::Object::Container::hash_type>
+  requires std::is_same_v<T, JSON::Object::hash_type>
 auto from_json(const JSON &value) -> std::optional<T> {
   if (!value.is_array() || value.size() != 4 || !value.at(0).is_integer() ||
       !value.at(1).is_integer() || !value.at(2).is_integer() ||
@@ -209,11 +209,20 @@ auto from_json(const JSON &value) -> std::optional<T> {
 
 /// @ingroup json
 template <typename T>
-  requires std::constructible_from<JSON, T>
+  requires(std::constructible_from<JSON, T> &&
+           // Otherwise MSVC gets confused
+           !std::is_same_v<T, unsigned long long>)
 auto to_json(const T &value) -> JSON {
   return JSON{value};
 }
 
+/// @ingroup json
+template <typename T>
+  requires std::is_same_v<T, unsigned long long>
+auto to_json(const T value) -> JSON {
+  return JSON{static_cast<std::int64_t>(value)};
+}
+
 /// @ingroup json
 template <typename T>
   requires std::is_same_v<T, JSON>