diff options
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/generator.cpp | 44 | ||||
| -rw-r--r-- | src/generator.hpp | 46 | ||||
| -rw-r--r-- | src/parser_state.cpp | 7 | ||||
| -rw-r--r-- | src/parser_state.hpp | 8 | ||||
| -rw-r--r-- | src/solar.cpp | 4 |
6 files changed, 99 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 67773dc..ca658c2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,5 @@ add_executable(solar + generator.cpp lex.cpp parser.cpp parser_state.cpp diff --git a/src/generator.cpp b/src/generator.cpp new file mode 100644 index 0000000..62c2584 --- /dev/null +++ b/src/generator.cpp @@ -0,0 +1,44 @@ +/* + Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net> + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + + +#include "generator.hpp" + + +namespace solar { + +generator_t::generator_t(const std::set<item_t> &rules0) { + for (item_t rule : rules0) { + rules.emplace(rule.get_lhs(), rule); + + while (rule.has_next()) { + items.emplace(rule.get_next_symbol(), rule); + rule.shift(); + } + } + +} + +} diff --git a/src/generator.hpp b/src/generator.hpp new file mode 100644 index 0000000..74108d7 --- /dev/null +++ b/src/generator.hpp @@ -0,0 +1,46 @@ +/* + Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net> + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + + +#pragma once + +#include "item.hpp" + +#include <set> +#include <map> + + +namespace solar { + +class generator_t { +private: + std::multimap<std::string, item_t> rules; + std::multimap<symbol_t, item_t> items; + +public: + generator_t(const std::set<item_t> &rules0); +}; + +} diff --git a/src/parser_state.cpp b/src/parser_state.cpp index c8053be..94f9c93 100644 --- a/src/parser_state.cpp +++ b/src/parser_state.cpp @@ -53,12 +53,7 @@ void parser_state_t::add_rule_terminal(unsigned char term) { } void parser_state_t::add_rule() { - rules.emplace(current.get_lhs(), current); - - while (current.has_next()) { - items.emplace(current.get_next_symbol(), current); - current.shift(); - } + rules.emplace(current); } } diff --git a/src/parser_state.hpp b/src/parser_state.hpp index a0341c6..b516dee 100644 --- a/src/parser_state.hpp +++ b/src/parser_state.hpp @@ -28,23 +28,21 @@ #include "item.hpp" -#include <map> -#include <utility> +#include <set> namespace solar { class parser_state_t { private: - std::multimap<std::string, item_t> rules; - std::multimap<symbol_t, item_t> items; + std::set<item_t> rules; item_t current; public: parser_state_t() : current("") {} - const std::multimap<std::string, item_t> & get_rules() const { + const std::set<item_t> & get_rules() const { return rules; } diff --git a/src/solar.cpp b/src/solar.cpp index f466db8..975ea22 100644 --- a/src/solar.cpp +++ b/src/solar.cpp @@ -26,6 +26,8 @@ #include "lex.hpp" #include "parser.hpp" +#include "generator.hpp" + #include <cstdio> #include <memory> @@ -79,5 +81,7 @@ int main() { if (!read_grammar("grammar.y", &state)) return 1; + generator_t generator(state.get_rules()); + return 0; } |