From bfeeac6e4889d1e9a1083b3c7efc59652981b168 Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Mon, 1 Aug 2016 08:20:23 +0200 Subject: o Moving the generation logic to Python, embedding a Python interpreter with the help of pybind11. o Adding install configuration to CMake to make it easier to reuse the project later on. o Splitting out the examples into its own project to make it easier to test the whole installation setup and python/template loading. o Trying to reorganize the code a bit, not very much better yet. --- include-priv/trygvis/antlr.h | 67 ------------------------------------- include-priv/trygvis/string_utils.h | 23 ------------- 2 files changed, 90 deletions(-) delete mode 100644 include-priv/trygvis/antlr.h delete mode 100644 include-priv/trygvis/string_utils.h (limited to 'include-priv/trygvis') diff --git a/include-priv/trygvis/antlr.h b/include-priv/trygvis/antlr.h deleted file mode 100644 index f5656ea..0000000 --- a/include-priv/trygvis/antlr.h +++ /dev/null @@ -1,67 +0,0 @@ -#pragma once - -#include "antlr4-runtime.h" - -namespace trygvis { -namespace antlr { - -// This namespace is shared copied code - -using ParseTree = antlr4::tree::ParseTree; - -class MissingParseTreeProperty : public std::out_of_range { -public: - explicit MissingParseTreeProperty(const std::string &what) : out_of_range(what) { } -}; - -template -class ParseTreeProperty { -public: - virtual V get(Ref node) { - return get(node.get()); - } - - virtual V get(ParseTree *const node) { - if (!debug) { - return _annotations.at(node); - } - - try { -// cerr << "node = " << node->getText() << endl; - return _annotations.at(node); - } catch (std::out_of_range &e) { - std::cerr << "get(" << node << "), text=" << node->getText() << std::endl; - std::stringstream buf; - buf << "out of range: " << node << ", text=" << node->getText(); - auto msg = buf.str(); - std::cerr << msg << std::endl; - throw MissingParseTreeProperty(msg); - } - } - - virtual void put(ParseTree *const node, V value) { - if (debug) { - std::cerr << "put(" << node << ", " << value << "), text: " << node->getText() << std::endl; - } - _annotations[node] = value; - } - - virtual V removeFrom(ParseTree *const node) { - auto it = _annotations.find(node); - - if (it == _annotations.end()) { - throw MissingParseTreeProperty(node->getText()); - } - - return it->second; - } - -protected: - std::map _annotations; - -private: -}; - -} // namespace antlr - -} diff --git a/include-priv/trygvis/string_utils.h b/include-priv/trygvis/string_utils.h deleted file mode 100644 index 9902a3f..0000000 --- a/include-priv/trygvis/string_utils.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include - -namespace trygvis { -namespace string_utils { - -/** - * Check if a starts with b. - */ -static bool startsWith(const std::string &a, const std::string &b) { - return b.length() <= a.length() && a.compare(0, b.length(), b) == 0; -} - -/** - * Check if a ends with b. - */ -static bool endsWith(const std::string &a, const std::string &b) { - return b.length() <= a.length() && a.compare(a.length() - b.length(), b.length(), b) == 0; -} - -} // namespace string_utils -} // namespace trygvis -- cgit v1.2.3