fix(cmake): Add cmake install targets

Also, move the json AST printer to cxx-frontend.

Author: robertoraggi

CMakeLists.txt

@@ -22,16 +22,20 @@ cmake_minimum_required(VERSION 3.16)
 project(cplusplus)
 
 include(FetchContent)
+include(GNUInstallDirs)
+include(CMakePackageConfigHelpers)
 
-find_package(fmt 8.0.1 CONFIG QUIET)
+find_package(fmt 7.1.3 CONFIG QUIET)
+
+file(READ "${CMAKE_CURRENT_SOURCE_DIR}/version.txt" version)
 
 set(CMAKE_CXX_STANDARD 20)
 
 if(NOT fmt_FOUND)
 FetchContent_Declare(
     fmt
-    GIT_REPOSITORY https://github.com/fmtlib/fmt
-    GIT_TAG        7.1.3
+    GIT_REPOSITORY  https://github.com/fmtlib/fmt
+    GIT_TAG         7.1.3
     GIT_SHALLOW     1
 )
 
@@ -62,15 +66,21 @@ add_subdirectory(tools/kwgen)
 
 aux_source_directory(src/cxx SOURCES)
 
-add_library(CPlusPlus ${SOURCES}
+add_library(cxx ${SOURCES}
     # generated files
     keywords-priv.h
 )
 
-target_include_directories(CPlusPlus PUBLIC src)
-target_include_directories(CPlusPlus PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
-target_link_libraries(CPlusPlus fmt::fmt-header-only utf8::cpp)
-target_link_libraries(CPlusPlus nlohmann_json::nlohmann_json)
+target_include_directories(cxx
+    PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
+    PUBLIC  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+
+target_link_libraries(cxx
+    PUBLIC  $<BUILD_INTERFACE:fmt::fmt-header-only>
+            $<BUILD_INTERFACE:utf8::cpp>
+)
 
 add_custom_command(OUTPUT keywords-priv.h
     COMMAND kwgen < ${CMAKE_CURRENT_SOURCE_DIR}/src/cxx/keywords.kwgen > keywords-priv.h
@@ -80,7 +90,7 @@ add_custom_command(OUTPUT keywords-priv.h
 aux_source_directory(src/frontend FRONTEND_SOURCES)
 
 add_executable(cxx-frontend ${FRONTEND_SOURCES})
-target_link_libraries(cxx-frontend CPlusPlus)
+target_link_libraries(cxx-frontend cxx nlohmann_json::nlohmann_json)
 
 if(EMSCRIPTEN)
     target_link_options(cxx-frontend PUBLIC
@@ -94,7 +104,7 @@ if(EMSCRIPTEN)
 
     add_executable(cxx-js src/cxx-js/api.cc)
 
-    target_link_libraries(cxx-js CPlusPlus)
+    target_link_libraries(cxx-js cxx)
 
     target_link_options(cxx-js PUBLIC
         "SHELL:--bind"
@@ -110,16 +120,47 @@ if(EMSCRIPTEN)
 
 endif()
 
-add_custom_target(unit
-    DEPENDS tests/unit/source.cc
-    COMMAND clang++ -E -stdlib=libc++ -xc++ -std=c++20 ${CMAKE_CURRENT_SOURCE_DIR}/tests/unit/source.cc | grep -v ^\# > unit.cc
+enable_testing()
+
+add_subdirectory(tests)
+
+file(GLOB CXX_INCLUDE_HEADER_FILES src/cxx/*.h)
+
+configure_package_config_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
+    "${CMAKE_CURRENT_BINARY_DIR}/cxxConfig.cmake"
+    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cxx
 )
 
-add_custom_target(unit.tokens
-    DEPENDS unit cxx-frontend
-    COMMAND cxx-frontend --dump-tokens unit.cc > unit.tokens
+write_basic_package_version_file(
+    "${CMAKE_CURRENT_BINARY_DIR}/cxxConfigVersion.cmake"
+    VERSION "${version}"
+    COMPATIBILITY AnyNewerVersion
 )
 
-enable_testing()
+install(
+    TARGETS cxx
+    EXPORT cxxTargets
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
 
-add_subdirectory(tests)
+install(
+    EXPORT cxxTargets
+    FILE cxxTargets.cmake
+    NAMESPACE cxx::
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cxx
+)
+
+install(
+    FILES ${CXX_INCLUDE_HEADER_FILES}
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cxx
+)
+
+install(FILES
+    "${CMAKE_CURRENT_BINARY_DIR}/cxxConfig.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/cxxConfigVersion.cmake"
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cxx
+)

Config.cmake.in

@@ -0,0 +1,24 @@
+# Copyright (c) 2014-2020 Roberto Raggi <[email protected]>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/cxxTargets.cmake")
+
+check_required_components(cxx)

src/cxx/diagnostics_client.cc

@@ -22,8 +22,11 @@
 
 // cxx
 #include <cxx/preprocessor.h>
+#include <fmt/format.h>
+#include <fmt/ostream.h>
 
 #include <cctype>
+#include <cstdlib>
 #include <iostream>
 
 namespace cxx {
@@ -72,6 +75,10 @@ void DiagnosticsClient::report(const Diagnostic& diag) {
   } else {
     fmt::print(std::cerr, "{}\n", diag.message());
   }
+
+  if (diag.severity() == Severity::Fatal ||
+      (diag.severity() == Severity::Error && fatalErrors_))
+    exit(EXIT_FAILURE);
 }
 
 }  // namespace cxx

src/cxx/diagnostics_client.h

@@ -22,12 +22,6 @@
 
 #include <cxx/diagnostic.h>
 
-// fmt
-#include <fmt/format.h>
-#include <fmt/ostream.h>
-
-#include <cstdlib>
-
 namespace cxx {
 
 class Preprocessor;
@@ -57,19 +51,12 @@ class DiagnosticsClient {
     return blockErrors;
   }
 
-  template <typename... Args>
-  void report(const Token& token, Severity kind, const std::string_view& format,
-              const Args&... args) {
+  void report(const Token& token, Severity severity, std::string message) {
     if (blockErrors_) return;
 
-    Diagnostic diag(kind, token,
-                    fmt::vformat(format, fmt::make_format_args(args...)));
+    Diagnostic diag{severity, token, std::move(message)};
 
     report(diag);
-
-    if (diag.severity() == Severity::Fatal ||
-        (diag.severity() == Severity::Error && fatalErrors_))
-      exit(EXIT_FAILURE);
   }
 
  private:
@@ -78,4 +65,4 @@ class DiagnosticsClient {
   bool fatalErrors_ = false;
 };
 
-}  // namespace cxx
+}  // namespace cxx

src/cxx/expression_codegen.cc

@@ -31,6 +31,8 @@
 #include <cxx/type_environment.h>
 #include <cxx/type_visitor.h>
 #include <cxx/types.h>
+#include <fmt/format.h>
+#include <fmt/ostream.h>
 
 #include <stdexcept>
 

src/cxx/literals.h

@@ -19,7 +19,6 @@
 // SOFTWARE.
 
 #include <cxx/cxx_fwd.h>
-#include <fmt/format.h>
 
 #include <cstdlib>
 #include <string>

src/cxx/parser.cc

@@ -29,6 +29,8 @@
 #include <cxx/token.h>
 #include <cxx/type_environment.h>
 #include <cxx/types.h>
+#include <fmt/format.h>
+#include <fmt/ostream.h>
 
 #include <algorithm>
 #include <cassert>
@@ -208,6 +210,31 @@ const Token& Parser::LA(int n) const {
   return unit->tokenAt(SourceLocation(cursor_ + n));
 }
 
+bool Parser::match(TokenKind tk) {
+  if (LA().isNot(tk)) return false;
+  (void)consumeToken();
+  return true;
+}
+
+bool Parser::match(TokenKind tk, SourceLocation& location) {
+  if (LA().isNot(tk)) return false;
+  const auto loc = consumeToken();
+  location = loc;
+  return true;
+}
+
+bool Parser::expect(TokenKind tk) {
+  if (match(tk)) return true;
+  parse_error(fmt::format("expected '{}'", Token::spell(tk)));
+  return false;
+}
+
+bool Parser::expect(TokenKind tk, SourceLocation& location) {
+  if (match(tk, location)) return true;
+  parse_error(fmt::format("expected '{}'", Token::spell(tk)));
+  return false;
+}
+
 bool Parser::operator()(UnitAST*& ast) {
   auto result = parse(ast);
   return result;
@@ -604,13 +631,13 @@ bool Parser::parse_primary_expression(ExpressionAST*& yyast,
     ast->symbol = sem->scope()->unqualifiedLookup(nameSem.name);
 
     if (!ast->symbol)
-      parse_warn(ast->name->firstSourceLocation(), "undefined symbol '{}'",
-                 *nameSem.name);
+      parse_warn(ast->name->firstSourceLocation(),
+                 fmt::format("undefined symbol '{}'", *nameSem.name));
     else {
 #if 0
       parse_warn(ast->name->firstSourceLocation(),
-                 "'{}' resolved to '{}' with type '{}'", *nameSem.name,
-                 typeid(*ast->symbol).name(), ast->symbol->type());
+                 fmt::format("'{}' resolved to '{}' with type '{}'", *nameSem.name,
+                 typeid(*ast->symbol).name(), ast->symbol->type()));
 #endif
     }
   }

src/cxx/parser.h

@@ -76,33 +76,25 @@ class Parser final {
     bool templArg = false;
   };
 
-  template <typename... Args>
-  bool parse_warn(const std::string_view& format, const Args&... args) {
-    unit->warning(SourceLocation(cursor_), format, args...);
+  bool parse_warn(std::string message) {
+    unit->warning(SourceLocation(cursor_), std::move(message));
     return true;
   }
 
-  template <typename... Args>
-  bool parse_warn(SourceLocation loc, const std::string_view& format,
-                  const Args&... args) {
-    unit->warning(loc, format, args...);
+  bool parse_warn(SourceLocation loc, std::string message) {
+    unit->warning(loc, std::move(message));
     return true;
   }
 
-  template <typename... Args>
-  bool parse_error(const std::string_view& format, const Args&... args) {
+  bool parse_error(std::string message) {
     if (lastErrorCursor_ == cursor_) return true;
     lastErrorCursor_ = cursor_;
-    unit->error(SourceLocation(cursor_), format, args...);
-    // throw std::runtime_error("error");
+    unit->error(SourceLocation(cursor_), std::move(message));
     return true;
   }
 
-  template <typename... Args>
-  bool parse_error(SourceLocation loc, const std::string_view& format,
-                   const Args&... args) {
-    unit->error(loc, format, args...);
-    // throw std::runtime_error("error");
+  bool parse_error(SourceLocation loc, std::string message) {
+    unit->error(loc, std::move(message));
     return true;
   }
 
@@ -437,30 +429,11 @@ class Parser final {
  private:
   const Token& LA(int n = 0) const;
 
-  bool match(TokenKind tk) {
-    if (LA().isNot(tk)) return false;
-    (void)consumeToken();
-    return true;
-  }
-
-  bool expect(TokenKind tk) {
-    if (match(tk)) return true;
-    parse_error("expected '{}'", Token::spell(tk));
-    return false;
-  }
+  bool match(TokenKind tk);
+  bool match(TokenKind tk, SourceLocation& location);
 
-  bool match(TokenKind tk, SourceLocation& location) {
-    if (LA().isNot(tk)) return false;
-    const auto loc = consumeToken();
-    location = loc;
-    return true;
-  }
-
-  bool expect(TokenKind tk, SourceLocation& location) {
-    if (match(tk, location)) return true;
-    parse_error("expected '{}'", Token::spell(tk));
-    return false;
-  }
+  bool expect(TokenKind tk);
+  bool expect(TokenKind tk, SourceLocation& location);
 
   SourceLocation consumeToken() { return SourceLocation(cursor_++); }