Introduce a new src/output module (#500)

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

.github/workflows/website-build.yml

@@ -18,6 +18,7 @@ jobs:
           -DCMAKE_BUILD_TYPE:STRING=Release
           -DBLAZE_COMPILER:BOOL=OFF
           -DBLAZE_EVALUATOR:BOOL=OFF
+          -DBLAZE_OUTPUT:BOOL=OFF
           -DBLAZE_LINTER:BOOL=OFF
           -DBLAZE_TESTS:BOOL=OFF
           -DBLAZE_DOCS:BOOL=ON

.github/workflows/website-deploy.yml

@@ -29,6 +29,7 @@ jobs:
           -DCMAKE_BUILD_TYPE:STRING=Release
           -DBLAZE_COMPILER:BOOL=OFF
           -DBLAZE_EVALUATOR:BOOL=OFF
+          -DBLAZE_OUTPUT:BOOL=OFF
           -DBLAZE_LINTER:BOOL=OFF
           -DBLAZE_TESTS:BOOL=OFF
           -DBLAZE_DOCS:BOOL=ON

CMakeLists.txt

@@ -7,6 +7,7 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 # Options
 option(BLAZE_COMPILER "Build the Blaze compiler library" ON)
 option(BLAZE_EVALUATOR "Build the Blaze evaluator library" ON)
+option(BLAZE_OUTPUT "Build the Blaze output formats library" ON)
 option(BLAZE_LINTER "Build the Blaze linter rule library" ON)
 option(BLAZE_TESTS "Build the Blaze tests" OFF)
 option(BLAZE_BENCHMARK "Build the Blaze benchmarks" OFF)
@@ -48,6 +49,10 @@ if(BLAZE_EVALUATOR)
   add_subdirectory(src/evaluator)
 endif()
 
+if(BLAZE_OUTPUT)
+  add_subdirectory(src/output)
+endif()
+
 if(BLAZE_LINTER)
   add_subdirectory(src/linter)
 endif()
@@ -87,6 +92,10 @@ if(BLAZE_TESTS)
     add_subdirectory(test/evaluator)
   endif()
 
+  if(BLAZE_OUTPUT)
+    add_subdirectory(test/output)
+  endif()
+
   if(BLAZE_LINTER)
     add_subdirectory(test/linter)
   endif()

config.cmake.in

@@ -6,6 +6,7 @@ list(APPEND BLAZE_COMPONENTS ${blaze_FIND_COMPONENTS})
 if(NOT BLAZE_COMPONENTS)
   list(APPEND BLAZE_COMPONENTS compiler)
   list(APPEND BLAZE_COMPONENTS evaluator)
+  list(APPEND BLAZE_COMPONENTS output)
   list(APPEND BLAZE_COMPONENTS linter)
 endif()
 
@@ -21,7 +22,11 @@ foreach(component ${BLAZE_COMPONENTS})
   elseif(component STREQUAL "linter")
     include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_blaze_evaluator.cmake")
     include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_blaze_compiler.cmake")
+    include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_blaze_output.cmake")
     include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_blaze_linter.cmake")
+  elseif(component STREQUAL "output")
+    include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_blaze_evaluator.cmake")
+    include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_blaze_output.cmake")
   else()
     message(FATAL_ERROR "Unknown Blaze component: ${component}")
   endif()

contrib/CMakeLists.txt

@@ -33,6 +33,8 @@ if(BLAZE_COMPILER AND BLAZE_EVALUATOR)
     PRIVATE sourcemeta::blaze::compiler)
   target_link_libraries(sourcemeta_blaze_contrib_trace
     PRIVATE sourcemeta::blaze::evaluator)
+  target_link_libraries(sourcemeta_blaze_contrib_trace
+    PRIVATE sourcemeta::blaze::output)
 
   if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     sourcemeta_executable(NAMESPACE sourcemeta PROJECT blaze NAME contrib_perf

contrib/trace.cc

@@ -3,6 +3,7 @@
 
 #include <sourcemeta/blaze/compiler.h>
 #include <sourcemeta/blaze/evaluator.h>
+#include <sourcemeta/blaze/output.h>
 
 #include <algorithm>  // std::sort, std::max
 #include <cstdlib>    // EXIT_SUCCESS, EXIT_FAILURE

src/compiler/CMakeLists.txt

@@ -1,12 +1,9 @@
 sourcemeta_library(NAMESPACE sourcemeta PROJECT blaze NAME compiler
   FOLDER "Blaze/Compiler"
-  PRIVATE_HEADERS error.h output.h unevaluated.h
+  PRIVATE_HEADERS error.h unevaluated.h
   SOURCES
     compile.cc compile_json.cc
     compile_helpers.h default_compiler.cc unevaluated.cc
-    compile_output_simple.cc
-    compile_output_trace.cc
-    compile_output_standard.cc
     default_compiler_2020_12.h
     default_compiler_2019_09.h
     default_compiler_draft7.h

src/compiler/include/sourcemeta/blaze/compiler.h

@@ -6,7 +6,6 @@
 #endif
 
 #include <sourcemeta/blaze/compiler_error.h>
-#include <sourcemeta/blaze/compiler_output.h>
 #include <sourcemeta/blaze/compiler_unevaluated.h>
 
 #include <sourcemeta/blaze/evaluator.h>