-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14 from sillydan1/feature/tree_interpreter
Feature/tree interpreter
- Loading branch information
Showing
23 changed files
with
596 additions
and
118 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,7 +22,7 @@ | |
| cmake_minimum_required(VERSION 3.21) | ||
| # to generate a changelog, use: (python3 -m pip install git-changelog) | ||
| # $ git-changelog -s conventional . -o CHANGELOG.MD | ||
| project(expr VERSION 2.0.0) | ||
| project(expr VERSION 2.1.0) | ||
| include(cmake/CPM.cmake) | ||
| configure_file(src/config.h.in config.h) | ||
| set(CMAKE_CXX_STANDARD 20) | ||
|
|
@@ -33,12 +33,12 @@ option(ENABLE_Z3 "Enables the download and compilation of the expr::z3_driver dr | |
|
|
||
| # DEPENDENCIES | ||
| CPMAddPackage("gh:yalibs/[email protected]") | ||
| CPMAddPackage("gh:yalibs/yatree@1.0.1") | ||
| CPMAddPackage("gh:yalibs/yatree@1.2.1") | ||
| CPMAddPackage("gh:yalibs/[email protected]") | ||
| CPMAddPackage("gh:yalibs/[email protected]") | ||
| CPMAddPackage("gh:sillydan1/[email protected]") | ||
| if(ENABLE_Z3) | ||
| CPMAddPackage("gh:Z3Prover/z3#z3-4.11.0") | ||
| CPMAddPackage("gh:Z3Prover/z3#z3-4.11.2") | ||
| endif() | ||
|
|
||
| set(${PROJECT_NAME}_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE STRING "expr_BUILD_DIR" FORCE) | ||
|
|
@@ -74,6 +74,8 @@ add_library(${PROJECT_NAME} SHARED | |
| ${BISON_expr_parser_OUTPUTS} | ||
| ${FLEX_expr_lexer_OUTPUTS} | ||
| src/drivers/interpreter.cpp | ||
| src/drivers/tree_interpreter.cpp | ||
| src/drivers/tree_compiler.cpp | ||
| src/drivers/compiler.cpp | ||
|
|
||
| src/clock.cpp | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* MIT License | ||
| * | ||
| * Copyright (c) 2022 Asger Gitz-Johansen | ||
| * | ||
| * 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. | ||
| */ | ||
| #ifndef EXPR_GENERIC_SYMBOL_OPERATOR_H | ||
| #define EXPR_GENERIC_SYMBOL_OPERATOR_H | ||
| #include "operations.h" | ||
|
|
||
| namespace expr { | ||
| struct generic_symbol_operator : public arithmetic_operator, boolean_operator, compare_operator { | ||
| auto add(const symbol_value_t &a, const symbol_value_t &b) const -> symbol_value_t override { return ::operator+(a,b); }; | ||
| auto sub(const symbol_value_t &a, const symbol_value_t &b) const -> symbol_value_t override { return a - b; }; | ||
| auto mul(const symbol_value_t &a, const symbol_value_t &b) const -> symbol_value_t override { return a * b; }; | ||
| auto div(const symbol_value_t &a, const symbol_value_t &b) const -> symbol_value_t override { return a / b; }; | ||
| auto mod(const symbol_value_t &a, const symbol_value_t &b) const -> symbol_value_t override { return a % b; }; | ||
| auto pow(const symbol_value_t &a, const symbol_value_t &b) const -> symbol_value_t override { return a ^ b; }; | ||
|
|
||
| auto _not(const symbol_value_t &a) const -> symbol_value_t override { return not_(a); } | ||
| auto _and(const symbol_value_t &a, const symbol_value_t &b) const -> symbol_value_t override { return and_(a,b); } | ||
| auto _or(const symbol_value_t &a, const symbol_value_t &b) const -> symbol_value_t override { return or_(a,b); } | ||
| auto _xor(const symbol_value_t &a, const symbol_value_t &b) const -> symbol_value_t override { return xor_(a,b); } | ||
| auto _implies(const symbol_value_t &a, const symbol_value_t &b) const -> symbol_value_t override { return implies_(a,b); } | ||
|
|
||
| auto gt(const symbol_value_t &a, const symbol_value_t &b) const -> symbol_value_t override { return gt_(a,b); } | ||
| auto ge(const symbol_value_t &a, const symbol_value_t &b) const -> symbol_value_t override { return ge_(a,b); } | ||
| auto ee(const symbol_value_t &a, const symbol_value_t &b) const -> symbol_value_t override { return ee_(a,b); } | ||
| auto ne(const symbol_value_t &a, const symbol_value_t &b) const -> symbol_value_t override { return ne_(a,b); } | ||
| auto le(const symbol_value_t &a, const symbol_value_t &b) const -> symbol_value_t override { return le_(a,b); } | ||
| auto lt(const symbol_value_t &a, const symbol_value_t &b) const -> symbol_value_t override { return lt_(a,b); } | ||
| }; | ||
| } | ||
|
|
||
| #endif //EXPR_GENERIC_SYMBOL_OPERATOR_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* MIT License | ||
| * | ||
| * Copyright (c) 2022 Asger Gitz-Johansen | ||
| * | ||
| * 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. | ||
| */ | ||
| #ifndef EXPR_TREE_COMPILER_H | ||
| #define EXPR_TREE_COMPILER_H | ||
| #include "tree_driver.h" | ||
|
|
||
| namespace expr { | ||
| struct tree_compiler : tree_driver { | ||
| using compiled_expr_t = syntax_tree_t; | ||
| #ifndef NDEBUG | ||
| using compiled_expr_collection_t = std::map<std::string, compiled_expr_t>; | ||
| #else | ||
| using compiled_expr_collection_t = std::unordered_map<std::string, compiled_expr_t>; | ||
| #endif | ||
| explicit tree_compiler(const symbol_table_tree_t::iterator& scope) : tree_driver{scope}, trees{} {} | ||
| int parse(const std::string &f) override; | ||
| auto get_symbol(const std::string &identifier) -> syntax_tree_t override; | ||
| void add_tree(const syntax_tree_t& tree) override; | ||
| void add_tree(const std::string& identifier, const syntax_tree_t& tree) override; | ||
| void add_tree(const std::string& access_modifier, const std::string& identifier, const syntax_tree_t& tree) override; | ||
|
|
||
| compiled_expr_collection_t trees; | ||
| }; | ||
| } | ||
|
|
||
| #endif //EXPR_TREE_COMPILER_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* MIT License | ||
| * | ||
| * Copyright (c) 2022 Asger Gitz-Johansen | ||
| * | ||
| * 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. | ||
| */ | ||
| #ifndef EXPR_TREE_DRIVER_H | ||
| #define EXPR_TREE_DRIVER_H | ||
| #include "driver.h" | ||
|
|
||
| namespace expr { | ||
| struct tree_driver : public driver { | ||
| tree_driver(const symbol_table_tree_t::iterator& it) : driver{}, it{it} {} | ||
| auto find(const std::string& identifier) const -> expr::symbol_table_t::const_iterator override { | ||
| auto* x = &(*it); | ||
| while(x) { | ||
| auto i = x->node.find(identifier); | ||
| if(i != x->node.end()) | ||
| return i; | ||
| if(!x->parent().has_value()) | ||
| return end; | ||
| x = x->parent().value(); | ||
| } | ||
| return end; | ||
| } | ||
| private: | ||
| symbol_table_tree_t::iterator it; | ||
| }; | ||
| } | ||
|
|
||
| #endif //EXPR_TREE_DRIVER_H |
Oops, something went wrong.