From 42238b91630816933e76a72a734f7f201ce3942e Mon Sep 17 00:00:00 2001
From: Lauro Moura <lauromoura@expertisesolutions.com.br>
Date: Tue, 19 Nov 2019 19:19:49 -0300
Subject: WIP - Allowing common operators to be used off tree

---
 src/lib/eolian_cxx/grammar/alternative.hpp           | 4 ++--
 src/lib/eolian_cxx/grammar/attribute_conditional.hpp | 2 +-
 src/lib/eolian_cxx/grammar/attribute_reorder.hpp     | 4 ++--
 src/lib/eolian_cxx/grammar/attribute_replace.hpp     | 2 +-
 src/lib/eolian_cxx/grammar/attributes.hpp            | 2 +-
 src/lib/eolian_cxx/grammar/case.hpp                  | 4 ++--
 src/lib/eolian_cxx/grammar/counter.hpp               | 8 ++++----
 src/lib/eolian_cxx/grammar/eps.hpp                   | 2 +-
 src/lib/eolian_cxx/grammar/generator.hpp             | 2 +-
 src/lib/eolian_cxx/grammar/html_escaped_string.hpp   | 6 +++---
 src/lib/eolian_cxx/grammar/indentation.hpp           | 4 ++--
 src/lib/eolian_cxx/grammar/integral.hpp              | 6 +++---
 src/lib/eolian_cxx/grammar/kleene.hpp                | 2 +-
 src/lib/eolian_cxx/grammar/list.hpp                  | 2 +-
 src/lib/eolian_cxx/grammar/sequence.hpp              | 3 ++-
 src/lib/eolian_cxx/grammar/string.hpp                | 6 +++---
 16 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/lib/eolian_cxx/grammar/alternative.hpp b/src/lib/eolian_cxx/grammar/alternative.hpp
index 708efd685a..39dcb2890a 100644
--- a/src/lib/eolian_cxx/grammar/alternative.hpp
+++ b/src/lib/eolian_cxx/grammar/alternative.hpp
@@ -16,8 +16,8 @@
 #ifndef EOLIAN_CXX_ALTERNATIVE_HH
 #define EOLIAN_CXX_ALTERNATIVE_HH
 
-#include "grammar/generator.hpp"
-#include "grammar/meta.hpp"
+#include "generator.hpp"
+#include "meta.hpp"
 
 namespace efl { namespace eolian { namespace grammar {
 
diff --git a/src/lib/eolian_cxx/grammar/attribute_conditional.hpp b/src/lib/eolian_cxx/grammar/attribute_conditional.hpp
index fc2057f661..8f17f9fa42 100644
--- a/src/lib/eolian_cxx/grammar/attribute_conditional.hpp
+++ b/src/lib/eolian_cxx/grammar/attribute_conditional.hpp
@@ -16,7 +16,7 @@
 #ifndef EOLIAN_CXX_ATTRIBUTE_CONDITIONAL_HH
 #define EOLIAN_CXX_ATTRIBUTE_CONDITIONAL_HH
 
-#include "grammar/generator.hpp"
+#include "generator.hpp"
 
 namespace efl { namespace eolian { namespace grammar {
 
diff --git a/src/lib/eolian_cxx/grammar/attribute_reorder.hpp b/src/lib/eolian_cxx/grammar/attribute_reorder.hpp
index 9267e14783..b7b90b70f4 100644
--- a/src/lib/eolian_cxx/grammar/attribute_reorder.hpp
+++ b/src/lib/eolian_cxx/grammar/attribute_reorder.hpp
@@ -16,8 +16,8 @@
 #ifndef EOLIAN_CXX_ATTRIBUTE_REORDER_HH
 #define EOLIAN_CXX_ATTRIBUTE_REORDER_HH
 
-#include "grammar/generator.hpp"
-#include "grammar/attributes.hpp"
+#include "generator.hpp"
+#include "attributes.hpp"
 
 namespace efl { namespace eolian { namespace grammar {
 
diff --git a/src/lib/eolian_cxx/grammar/attribute_replace.hpp b/src/lib/eolian_cxx/grammar/attribute_replace.hpp
index 9478fc103f..39dedd117f 100644
--- a/src/lib/eolian_cxx/grammar/attribute_replace.hpp
+++ b/src/lib/eolian_cxx/grammar/attribute_replace.hpp
@@ -16,7 +16,7 @@
 #ifndef EOLIAN_CXX_ATTRIBUTE_REPLACE_HH
 #define EOLIAN_CXX_ATTRIBUTE_REPLACE_HH
 
-#include "grammar/generator.hpp"
+#include "generator.hpp"
 
 namespace efl { namespace eolian { namespace grammar {
 
diff --git a/src/lib/eolian_cxx/grammar/attributes.hpp b/src/lib/eolian_cxx/grammar/attributes.hpp
index 13c57b75b8..9519100bdd 100644
--- a/src/lib/eolian_cxx/grammar/attributes.hpp
+++ b/src/lib/eolian_cxx/grammar/attributes.hpp
@@ -18,7 +18,7 @@
 
 #include <tuple>
 #include <type_traits>
-#include "grammar/type_traits.hpp"
+#include "type_traits.hpp"
 
 namespace efl { namespace eolian { namespace grammar {
 
diff --git a/src/lib/eolian_cxx/grammar/case.hpp b/src/lib/eolian_cxx/grammar/case.hpp
index 6599f452ae..363293a172 100644
--- a/src/lib/eolian_cxx/grammar/case.hpp
+++ b/src/lib/eolian_cxx/grammar/case.hpp
@@ -16,8 +16,8 @@
 #ifndef EOLIAN_CXX_CASE_HH
 #define EOLIAN_CXX_CASE_HH
 
-#include "grammar/context.hpp"
-#include "grammar/generator.hpp"
+#include "context.hpp"
+#include "generator.hpp"
 
 namespace efl { namespace eolian { namespace grammar {
 
diff --git a/src/lib/eolian_cxx/grammar/counter.hpp b/src/lib/eolian_cxx/grammar/counter.hpp
index d5af50681d..ad051ea8a3 100644
--- a/src/lib/eolian_cxx/grammar/counter.hpp
+++ b/src/lib/eolian_cxx/grammar/counter.hpp
@@ -4,10 +4,10 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "grammar/generator.hpp"
-#include "grammar/attributes.hpp"
-#include "grammar/case.hpp"
-#include "grammar/integral.hpp"
+#include "generator.hpp"
+#include "attributes.hpp"
+#include "case.hpp"
+#include "integral.hpp"
 
 namespace efl { namespace eolian { namespace grammar {
 
diff --git a/src/lib/eolian_cxx/grammar/eps.hpp b/src/lib/eolian_cxx/grammar/eps.hpp
index 6416bc918f..c0f548c356 100644
--- a/src/lib/eolian_cxx/grammar/eps.hpp
+++ b/src/lib/eolian_cxx/grammar/eps.hpp
@@ -16,7 +16,7 @@
 #ifndef EOLIAN_CXX_EPS_HH
 #define EOLIAN_CXX_EPS_HH
 
-#include "grammar/generator.hpp"
+#include "generator.hpp"
 
 namespace efl { namespace eolian { namespace grammar {
 
diff --git a/src/lib/eolian_cxx/grammar/generator.hpp b/src/lib/eolian_cxx/grammar/generator.hpp
index 881786a438..d3c341c8cf 100644
--- a/src/lib/eolian_cxx/grammar/generator.hpp
+++ b/src/lib/eolian_cxx/grammar/generator.hpp
@@ -16,7 +16,7 @@
 #ifndef EOLIAN_CXX_GENERATOR_HH
 #define EOLIAN_CXX_GENERATOR_HH
 
-#include <type_traits>
+#include "type_traits"
 
 // EXPERIMENTAL
 //#define USE_EOCXX_INHERIT_ONLY
diff --git a/src/lib/eolian_cxx/grammar/html_escaped_string.hpp b/src/lib/eolian_cxx/grammar/html_escaped_string.hpp
index e5faa3bbbb..7ecd7839fe 100644
--- a/src/lib/eolian_cxx/grammar/html_escaped_string.hpp
+++ b/src/lib/eolian_cxx/grammar/html_escaped_string.hpp
@@ -19,9 +19,9 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "grammar/generator.hpp"
-#include "grammar/attributes.hpp"
-#include "grammar/string.hpp"
+#include "generator.hpp"
+#include "attributes.hpp"
+#include "string.hpp"
 
 namespace efl { namespace eolian { namespace grammar {
 
diff --git a/src/lib/eolian_cxx/grammar/indentation.hpp b/src/lib/eolian_cxx/grammar/indentation.hpp
index b88a14d392..aa27b2ad56 100644
--- a/src/lib/eolian_cxx/grammar/indentation.hpp
+++ b/src/lib/eolian_cxx/grammar/indentation.hpp
@@ -16,8 +16,8 @@
 #ifndef EOLIAN_CXX_GRAMMAR_INDENTATION_HPP
 #define EOLIAN_CXX_GRAMMAR_INDENTATION_HPP
 
-#include "grammar/generator.hpp"
-#include "grammar/attributes.hpp"
+#include "generator.hpp"
+#include "attributes.hpp"
 
 namespace efl { namespace eolian { namespace grammar {
 
diff --git a/src/lib/eolian_cxx/grammar/integral.hpp b/src/lib/eolian_cxx/grammar/integral.hpp
index 2086a0d6b8..b0111d731c 100644
--- a/src/lib/eolian_cxx/grammar/integral.hpp
+++ b/src/lib/eolian_cxx/grammar/integral.hpp
@@ -19,9 +19,9 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "grammar/generator.hpp"
-#include "grammar/attributes.hpp"
-#include "grammar/case.hpp"
+#include "generator.hpp"
+#include "attributes.hpp"
+#include "case.hpp"
 
 namespace efl { namespace eolian { namespace grammar {
 
diff --git a/src/lib/eolian_cxx/grammar/kleene.hpp b/src/lib/eolian_cxx/grammar/kleene.hpp
index 2ac1ce13ef..91c5bb3e49 100644
--- a/src/lib/eolian_cxx/grammar/kleene.hpp
+++ b/src/lib/eolian_cxx/grammar/kleene.hpp
@@ -16,7 +16,7 @@
 #ifndef EOLIAN_CXX_KLEENE_HH
 #define EOLIAN_CXX_KLEENE_HH
 
-#include "grammar/generator.hpp"
+#include "generator.hpp"
 
 namespace efl { namespace eolian { namespace grammar {
 
diff --git a/src/lib/eolian_cxx/grammar/list.hpp b/src/lib/eolian_cxx/grammar/list.hpp
index 2274e179c6..916b4f4342 100644
--- a/src/lib/eolian_cxx/grammar/list.hpp
+++ b/src/lib/eolian_cxx/grammar/list.hpp
@@ -16,7 +16,7 @@
 #ifndef EOLIAN_CXX_LIST_HH
 #define EOLIAN_CXX_LIST_HH
 
-#include "grammar/generator.hpp"
+#include "generator.hpp"
 
 namespace efl { namespace eolian { namespace grammar {
 
diff --git a/src/lib/eolian_cxx/grammar/sequence.hpp b/src/lib/eolian_cxx/grammar/sequence.hpp
index d85cb563fd..208c0bd0cc 100644
--- a/src/lib/eolian_cxx/grammar/sequence.hpp
+++ b/src/lib/eolian_cxx/grammar/sequence.hpp
@@ -16,7 +16,8 @@
 #ifndef EOLIAN_CXX_SEQUENCE_HH
 #define EOLIAN_CXX_SEQUENCE_HH
 
-#include "grammar/generator.hpp"
+#include "generator.hpp"
+#include "attributes.hpp"
 
 namespace efl { namespace eolian { namespace grammar {
 
diff --git a/src/lib/eolian_cxx/grammar/string.hpp b/src/lib/eolian_cxx/grammar/string.hpp
index fbbf1ecaab..56f50eb302 100644
--- a/src/lib/eolian_cxx/grammar/string.hpp
+++ b/src/lib/eolian_cxx/grammar/string.hpp
@@ -19,9 +19,9 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "grammar/generator.hpp"
-#include "grammar/attributes.hpp"
-#include "grammar/case.hpp"
+#include "generator.hpp"
+#include "attributes.hpp"
+#include "case.hpp"
 
 namespace efl { namespace eolian { namespace grammar {
 
-- 
cgit v1.2.1