change include folder to calyx

src/include/grammar.cpp → src/calyx/grammar.cpp

@@ -1,4 +1,4 @@
-#include "calyx.h"
+#include "grammar.h"
 
 using namespace calyx;
 

src/include/calyx.h → src/calyx/grammar.h

@@ -15,41 +15,10 @@
 #include "../options.h"
 #include "string_converter.h"
 #include "../errors.h"
-#include "../expansion.h"
+#include "result.h"
 
 namespace calyx
 {
-    /**
-     * @brief Class representing the result of a random generation of text from a grammar. Allows for access to the underlying
-     * expansion tree, as well as the ability to flatten the tree into a string.
-     */
-    class Result
-    {
-    public:
-        /**
-         * @brief Constructs the Result out of an expansion tree.
-         * @param tree The expansion tree of the result.
-         */
-        Result(Expansion tree);
-
-        /**
-         * @brief Get the expansion tree of the result
-         * 
-         * @return Returns a reference to the expansion tree of this result  
-         */
-        const Expansion& getTree() const;
-
-        /**
-         * @brief Flattens the text into a new string, and returns it
-         *
-         * @param options Options for evaluating the text.
-         * @return Returns a new string_t
-         */
-        String_t getText(const Options& options) const;
-
-    private:
-        Expansion _tree;
-    };
 
     /**
      * @brief Defines a grammar in calyx. Grammars are a set of mutually-recursive rules that are evaluated randomly in order to

src/include/result.cpp → src/calyx/result.cpp

@@ -1,4 +1,4 @@
-#include "calyx.h"
+#include "grammar.h"
 
 
 using namespace calyx;

src/calyx/result.h

@@ -0,0 +1,43 @@
+#pragma once
+
+#include <string>
+
+#include "filters.h"
+#include "../registry.h"
+#include "../options.h"
+#include "string_converter.h"
+
+namespace calyx
+{
+    /**
+     * @brief Class representing the result of a random generation of text from a grammar. Allows for access to the underlying
+     * expansion tree, as well as the ability to flatten the tree into a string.
+     */
+    class Result
+    {
+    public:
+        /**
+         * @brief Constructs the Result out of an expansion tree.
+         * @param tree The expansion tree of the result.
+         */
+        Result(Expansion tree);
+
+        /**
+         * @brief Get the expansion tree of the result
+         * 
+         * @return Returns a reference to the expansion tree of this result  
+         */
+        const Expansion& getTree() const;
+
+        /**
+         * @brief Flattens the text into a new string, and returns it
+         *
+         * @param options Options for evaluating the text.
+         * @return Returns a new string_t
+         */
+        String_t getText(const Options& options) const;
+
+    private:
+        Expansion _tree;
+    };
+}

src/errors.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "include/string_converter.h"
+#include "calyx/string_converter.h"
 
 namespace calyx
 {

src/expansion.h

@@ -4,7 +4,7 @@
 #include <vector>
 #include <vector>
 
-#include "include/string_converter.h"
+#include "calyx/string_converter.h"
 #include "options.h"
 
 namespace calyx

src/options.h

@@ -4,7 +4,7 @@
 #include <random>
 #include <memory>
 #include <stdint.h>
-#include "include/string_converter.h"
+#include "calyx/string_converter.h"
 #include "errors.h"
 
 

src/production/uniform_branch.h

@@ -6,7 +6,7 @@
 #include "../production.h"
 #include "../registry.h"
 #include "../expansion.h"
-#include "../include/string_converter.h"
+#include "../calyx/string_converter.h"
 
 namespace calyx
 {

src/registry.h

@@ -10,8 +10,8 @@
 #include "rule.h"
 #include "expansion.h"
 #include "cycle.h"
-#include "include/filters.h"
-#include "include/string_converter.h"
+#include "calyx/filters.h"
+#include "calyx/string_converter.h"
 
 namespace calyx
 {

src/rule.h

@@ -6,7 +6,7 @@
 #include <optional>
 
 #include "expansion.h"
-#include "include/string_converter.h"
+#include "calyx/string_converter.h"
 #include "production.h"
 
 namespace calyx

src/syntax/atom_node.h

@@ -4,7 +4,7 @@
 #include "../registry.h"
 #include "../production.h"
 #include "../expansion.h"
-#include "../include/string_converter.h"
+#include "../calyx/string_converter.h"
 #include "../options.h"
 
 namespace calyx

src/syntax/expression_node.h

@@ -4,7 +4,7 @@
 
 #include "../production.h"
 #include "../expansion.h"
-#include "../include/string_converter.h"
+#include "../calyx/string_converter.h"
 #include "../options.h"
 #include "../registry.h"
 

src/syntax/template_node.h

@@ -2,7 +2,7 @@
 
 #include "../production.h"
 #include "../expansion.h"
-#include "../include/string_converter.h"
+#include "../calyx/string_converter.h"
 #include "../options.h"
 #include "../registry.h"
 

src/syntax/unique_node.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "../production.h"
-#include "../include/string_converter.h"
+#include "../calyx/string_converter.h"
 
 namespace calyx
 {

test/cycle_test.cpp

@@ -1,7 +1,7 @@
 #include <catch2/catch_all.hpp>
 
 #include <memory>
-#include <include/calyx.h>
+#include <calyx/grammar.h>
 #include <cycle.h>
 
 using namespace calyx;

test/expansion_test.cpp

@@ -1,6 +1,6 @@
 #include <catch2/catch_all.hpp>
 
-#include <include/calyx.h>
+#include <calyx/grammar.h>
 #include <expansion.h>
 #include <vector>
 #include <options.h>

test/filter_test.cpp

@@ -1,6 +1,6 @@
 #include <catch2/catch_all.hpp>
 
-#include "include/calyx.h"
+#include "calyx/grammar.h"
 
 using namespace calyx;
 

test/options_test.cpp

@@ -1,6 +1,6 @@
 #include <catch2/catch_all.hpp>
 
-#include <include/calyx.h>
+#include <calyx/grammar.h>
 #include <options.h>
 #include <stdint.h>
 

test/production/weighted_branch_test.cpp

@@ -2,7 +2,7 @@
 
 #include <catch2/catch_all.hpp>
 
-#include <include/calyx.h>
+#include <calyx/grammar.h>
 
 using namespace calyx;
 

test/registry_test.cpp

@@ -1,6 +1,6 @@
 #include <catch2/catch_all.hpp>
 
-#include <include/calyx.h>
+#include <calyx/grammar.h>
 #include <registry.h>
 
 using namespace calyx;

test/result_test.cpp

@@ -1,6 +1,6 @@
 #include <catch2/catch_all.hpp>
 
-#include <include/calyx.h>
+#include <calyx/grammar.h>
 #include <expansion.h>
 #include <vector>
 

test/syntax/atom_node_test.cpp

@@ -1,7 +1,7 @@
 #include <catch2/catch_all.hpp>
 #include <memory>
 
-#include <include/calyx.h>
+#include <calyx/grammar.h>
 #include <syntax/atom_node.h>
 #include <errors.h>
 

test/syntax/expression_chain_test.cpp

@@ -1,6 +1,6 @@
 #include <catch2/catch_all.hpp>
 
-#include <include/calyx.h>
+#include <calyx/grammar.h>
 #include <iostream>
 
 using namespace calyx;

test/syntax/expression_node_test.cpp

@@ -2,7 +2,7 @@
 
 #include <vector>
 #include <string>
-#include <include/calyx.h>
+#include <calyx/grammar.h>
 #include <syntax/expression_node.h>
 
 using namespace calyx;

test/syntax/memo_node_test.cpp

@@ -2,7 +2,7 @@
 
 #include <catch2/catch_all.hpp>
 
-#include <include/calyx.h>
+#include <calyx/grammar.h>
 
 using namespace calyx;
 

test/syntax/template_fragment_test.cpp

@@ -2,7 +2,7 @@
 
 #include <vector>
 #include <string>
-#include <include/calyx.h>
+#include <calyx/grammar.h>
 #include <syntax/template_node.h>
 
 using namespace calyx;

test/syntax/template_node_test.cpp

@@ -1,5 +1,5 @@
 #include <catch2/catch_all.hpp>
-#include <include/calyx.h>
+#include <calyx/grammar.h>
 #include <syntax/template_node.h>
 
 using namespace calyx;

test/syntax/unique_node_test.cpp

@@ -2,7 +2,7 @@
 
 #include <catch2/catch_all.hpp>
 
-#include "include/calyx.h"
+#include "calyx/grammar.h"
 #include "syntax/template_node.h"
 
 using namespace calyx;