Fix broken compile

Author: jbreams

CMakeLists.txt

@@ -1,11 +1,13 @@
 cmake_minimum_required(VERSION 3.4.3)
 project(RTBasic)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-find_package(LLVM REQUIRED CONFIG)
+find_package(LLVM REQUIRED CONFIG
+             PATHS ${search_paths}
+             NO_DEFAULT_PATH)
 
 message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
@@ -27,7 +29,7 @@ add_executable(rtbasic
 
 # Find the libraries that correspond to the LLVM components
 # that we wish to use
-llvm_map_components_to_libnames(llvm_libs all)
+llvm_map_components_to_libnames(llvm_libs core support codegen)
 
 # Link against LLVM libraries
-target_link_libraries(rtbasic LLVM-5.0)
+target_link_libraries(rtbasic LLVM)

LICENSE-third-party

@@ -0,0 +1,25 @@
+License for https://github.com/mpark/variant:
+
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

ast.cpp

@@ -4,7 +4,7 @@
 #include <list>
 #include <sstream>
 
-#include "boost/optional.hpp"
+#include <optional>
 
 #include "ast.h"
 #include "controlflow.h"
@@ -244,7 +244,7 @@ struct OperatorInfo {
 
     OperatorInfo(int p) : precedence(p), associativity(Left) {}
 
-    using Handle = boost::optional<const OperatorInfo&>;
+    using Handle = std::optional<OperatorInfo>;
     static Handle get(const Token& tok);
 };
 
@@ -258,7 +258,7 @@ OperatorInfo::Handle OperatorInfo::get(const Token& tok) {
     };
     auto it = operators.find(tok.tag);
     if (it == operators.end())
-        return boost::none;
+        return std::nullopt;
     return it->second;
 }
 

codegen.cpp

@@ -104,9 +104,9 @@ llvm::Value* BlockAST::codegen() {
 
 llvm::Value* NumberExprAST::codegen() {
     if (token().tag == Token::Double) {
-        return ctx()->makeLiteralDouble(boost::get<double>(token().value));
+        return ctx()->makeLiteralDouble(mpark::get<double>(*token().value));
     } else if (token().tag == Token::Integer) {
-        return ctx()->makeLiteralInteger(boost::get<int64_t>(token().value));
+        return ctx()->makeLiteralInteger(mpark::get<int64_t>(*token().value));
     } else {
         std::cerr << "Invalid token for number expr" << std::endl;
         return nullptr;

controlflow.cpp

@@ -13,11 +13,11 @@ std::string lexString(Lexer* lexer) {
         gotoName = labelTok.strValue;
     } else if (labelTok.tag == Token::Double) {
         std::stringstream ss;
-        ss << boost::get<double>(labelTok.value);
+        ss << mpark::get<double>(*labelTok.value);
         gotoName = ss.str();
     } else if (labelTok.tag == Token::Integer) {
         std::stringstream ss;
-        ss << boost::get<int64_t>(labelTok.value);
+        ss << mpark::get<int64_t>(*labelTok.value);
         gotoName = ss.str();
     }
     return gotoName;

lexer.cpp

@@ -61,15 +61,16 @@ const CharToTagMap& charToTagMap() {
 std::ostream& operator<<(std::ostream& stream, const Token& tok) {
     if (!tok.strValue.empty()) {
         stream << "Tag: " << tok.tag << " value: \"" << tok.strValue << "\"";
-    } else if (tok.value.empty()) {
+    } else if (!tok.value.has_value()) {
         stream << "Tag: " << tok.tag;
         if (tok.tag == Token::Eof) {
             stream << " value: Eof";
         } else if (tok.tag == Token::Newline) {
             stream << " value: Newline";
         }
     } else {
-        stream << "Tag: " << tok.tag << " value: " << tok.value;
+        stream << "Tag: " << tok.tag << " value: ";
+        mpark::visit([&](const auto val) { stream << val; }, *tok.value);
     }
 
     auto prefix = tok.line->substr(0, tok.startPos);

lexer.h

@@ -1,8 +1,9 @@
 #pragma once
 
-#include <boost/variant.hpp>
+#include "variant.hpp"
 #include <deque>
 #include <istream>
+#include <optional>
 #include <ostream>
 #include <string>
 
@@ -97,8 +98,8 @@ struct Token {
     }
 
     Tag tag = MaxTag;
-    using NumValue = boost::variant<int64_t, double, char>;
-    NumValue value;
+    using NumValue = mpark::variant<int64_t, double, char>;
+    std::optional<NumValue> value;
     std::string strValue;
 
     std::shared_ptr<std::string> line;

main.cpp

@@ -125,7 +125,7 @@ int main(int argc, char** argv) {
             return 0;
     }
 
-    if (target->addPassesToEmitFile(passManager, *output, fileType)) {
+    if (target->addPassesToEmitFile(passManager, *output, nullptr, fileType)) {
         std::cerr << "Cannot emit file of this type" << std::endl;
         return 1;
     }

variables.cpp

@@ -162,7 +162,7 @@ std::unique_ptr<ExprAST> DimAST::parse(const Token& tok, BasicContext* ctx) {
             if (tok.tag != Token::Integer) {
                 throw ParseException(tok, "Expected integer list for array dimensions");
             }
-            return boost::get<int64_t>(tok.value);
+            return mpark::get<int64_t>(*tok.value);
         });
 
         // Consume the RParens

variables.h

@@ -146,7 +146,7 @@ class ArgumentAST : public VariableDeclartionAST {
     bool isGlobal() const override {
         return _isGlobal;
     }
-    llvm::Type* nativeType() const;
+    llvm::Type* nativeType() const override;
 
 private:
     VariableType _parseType(const Token& name) {