cxx: Modify how to generate C++ headers and allow cyclic dependencies

Allow cyclic dependencies in generated C++ headers by changing order
of includes and creating forward declarations.

13 files changed, 144 insertions, 16 deletions

diff --git a/src/lib/.gitignore b/src/lib/.gitignore
index 190a85e1d6..aaec4c069e 100644
--- a/src/lib/.gitignore
+++ b/src/lib/.gitignore
@@ -1,11 +1,12 @@
 /ecore_x/ecore_x_version.h
 /efl/Efl_Config.h
-/efl/Efl.hh
 /eina/eina_config.h
-/ecore_audio/Ecore_Audio.hh
 /ecore/Ecore.eo.hh
-/evas/Evas.hh
-/edje/Edje.hh
 /edje/Edje.eo.hh
-/eio/Eio.hh
-/eldbus/Eldbus_Model.hh
+/eio/Eio.eo.hh
+/elementary/Elementary.eo.hh
+/evas/Evas.eo.hh
+/efl/Efl.eo.hh
+/eldbus/Eldbus_Model.eo.hh
+
+
diff --git a/src/lib/edje/Edje.hh b/src/lib/edje/Edje.hh
new file mode 100644
index 0000000000..4550181ac8
--- /dev/null
+++ b/src/lib/edje/Edje.hh
@@ -0,0 +1,9 @@
+#ifndef EFL_CXX_EDJE_HH
+#define EFL_CXX_EDJE_HH
+
+#ifdef EFL_BETA_API_SUPPORT
+
+#include <Edje.eo.hh>
+
+#endif
+#endif
diff --git a/src/lib/efl/.gitignore b/src/lib/efl/.gitignore
index 3732c0ce33..e69de29bb2 100644
--- a/src/lib/efl/.gitignore
+++ b/src/lib/efl/.gitignore
@@ -1 +0,0 @@
-Efl.hh
diff --git a/src/lib/efl/Efl.hh b/src/lib/efl/Efl.hh
new file mode 100644
index 0000000000..20dfc1a90d
--- /dev/null
+++ b/src/lib/efl/Efl.hh
@@ -0,0 +1,11 @@
+#ifndef EFL_EFL_HH
+#define EFL_EFL_HH
+
+#ifdef EFL_BETA_API_SUPPORT
+
+#include <Efl.eo.hh>
+
+#endif
+#endif
+
+
diff --git a/src/lib/eio/Eio.hh b/src/lib/eio/Eio.hh
new file mode 100644
index 0000000000..78c0f391d8
--- /dev/null
+++ b/src/lib/eio/Eio.hh
@@ -0,0 +1,9 @@
+#ifndef EFL_CXX_EIO_HH
+#define EFL_CXX_EIO_HH
+#ifdef EFL_BETA_API_SUPPORT
+
+#include "Eio.eo.hh"
+
+#endif
+#endif
+
diff --git a/src/lib/elementary/.gitignore b/src/lib/elementary/.gitignore
index 089c32dd72..9076648525 100644
--- a/src/lib/elementary/.gitignore
+++ b/src/lib/elementary/.gitignore
@@ -1,4 +1,3 @@
-/Elementary.hh
 /Elementary_Options.h
 /elm_intro.h
 /*.eo.c
diff --git a/src/lib/elementary/Elementary.hh b/src/lib/elementary/Elementary.hh
new file mode 100644
index 0000000000..215632bb10
--- /dev/null
+++ b/src/lib/elementary/Elementary.hh
@@ -0,0 +1,26 @@
+#ifndef EFL_CXX_ELEMENTARY_HH
+#define EFL_CXX_ELEMENTARY_HH
+#if defined(ELEMENTARY_H) || defined(ELM_WIDGET_H)
+#error "Do not include Elm C API headers before including Elementary.hh"
+#endif
+
+#ifndef EFL_BETA_API_SUPPORT
+#define EFL_BETA_API_SUPPORT
+#endif
+#ifndef EFL_EO_API_SUPPORT
+#define EFL_EO_API_SUPPORT
+#endif
+#ifndef ELM_INTERNAL_API_ARGESFSDFEFC
+#define ELM_INTERNAL_API_ARGESFSDFEFC
+#endif
+
+#include <Efl.hh>
+
+extern "C" {
+#include "Elementary.h"
+#include "elm_widget.h"
+}
+
+#include "Elementary.eo.hh"
+
+#endif
diff --git a/src/lib/eolian_cxx/grammar/class_declaration.hpp b/src/lib/eolian_cxx/grammar/class_declaration.hpp
index 6f23641e4d..bed1a5696f 100644
--- a/src/lib/eolian_cxx/grammar/class_declaration.hpp
+++ b/src/lib/eolian_cxx/grammar/class_declaration.hpp
@@ -15,6 +15,8 @@ namespace efl { namespace eolian { namespace grammar {
 
 struct class_declaration_generator
 {
+   bool type_traits;
+  
    template <typename OutputIterator, typename Context>
    bool generate(OutputIterator sink, attributes::klass_def const& cls, Context const& context) const
    {
@@ -30,11 +32,12 @@ struct class_declaration_generator
      auto close_namespace = *(lit("} ")) << "\n";
      if(!as_generator(close_namespace).generate(sink, cpp_namespaces, context)) return false;
 
-     if(!as_generator
-        (
-         "namespace efl { namespace eo { template<> struct is_eolian_object< "
-         "::" << *(lower_case[string] << "::") << string << "> : ::std::true_type {}; } }\n"
-        ).generate(sink, std::make_tuple(cpp_namespaces, cls.cxx_name), context)) return false;
+     if(type_traits)
+       if(!as_generator
+          (
+           "namespace efl { namespace eo { template<> struct is_eolian_object< "
+           "::" << *(lower_case[string] << "::") << string << "> : ::std::true_type {}; } }\n"
+           ).generate(sink, std::make_tuple(cpp_namespaces, cls.cxx_name), context)) return false;
 
      
      return true;
@@ -49,7 +52,8 @@ template <>
 struct attributes_needed<class_declaration_generator> : std::integral_constant<int, 1> {};
 }
       
-class_declaration_generator const class_declaration = {};
+class_declaration_generator const class_declaration = {true};
+class_declaration_generator const class_forward_declaration = {false};
       
 } } }
 
diff --git a/src/lib/eolian_cxx/grammar/header.hpp b/src/lib/eolian_cxx/grammar/header.hpp
index 96e123593c..63a6095949 100644
--- a/src/lib/eolian_cxx/grammar/header.hpp
+++ b/src/lib/eolian_cxx/grammar/header.hpp
@@ -25,11 +25,12 @@ auto class_header =
        "#include <Eo.hh>\n"
     << *header_include_directive // sequence<string>
     << *class_declaration          // sequence<class> | class
+    << *class_forward_declaration          // sequence<class> | class
     << "\nnamespace eo_cxx {\n"
     << *base_class_definition      // sequence<class> | class
     << "}\n"
     << *class_definition           // sequence<class> | class
-    << *implementation_include_directive
+    // << *implementation_include_directive
   ]
   ;
 
diff --git a/src/lib/eolian_cxx/grammar/implementation_include_directive.hpp b/src/lib/eolian_cxx/grammar/implementation_include_directive.hpp
index dab1e0a7e9..6c2631ab80 100644
--- a/src/lib/eolian_cxx/grammar/implementation_include_directive.hpp
+++ b/src/lib/eolian_cxx/grammar/implementation_include_directive.hpp
@@ -22,6 +22,12 @@ struct implementation_include_directive_generator
      return as_generator("#include \"" << string << ".impl.hh\"\n")
        .generate(sink, std::string(eolian_class_file_get(get_klass(get_klass_name(cls)))), add_lower_case_context(ctx));
    }
+   template <typename OutputIterator, typename Context>
+   bool generate(OutputIterator sink, std::string const& cls, Context const& ctx) const
+   {
+     return as_generator("#include \"" << string << ".impl.hh\"\n")
+       .generate(sink, cls, add_lower_case_context(ctx));
+   }
 };
 
 template <>
diff --git a/src/lib/eolian_cxx/grammar/keyword.hpp b/src/lib/eolian_cxx/grammar/keyword.hpp
index 9359892f9c..b64201eac3 100644
--- a/src/lib/eolian_cxx/grammar/keyword.hpp
+++ b/src/lib/eolian_cxx/grammar/keyword.hpp
@@ -5,7 +5,7 @@ namespace efl { namespace eolian { namespace grammar {
 
 inline std::string escape_keyword(std::string const& name)
 {
-  if(name == "delete" || name == "register")
+  if(name == "delete" || name == "register" || name == "do")
     return "cxx_" + name;
   return name;
 }
diff --git a/src/lib/eolian_cxx/grammar/klass_def.hpp b/src/lib/eolian_cxx/grammar/klass_def.hpp
index 4b9bc48205..c663f289b8 100644
--- a/src/lib/eolian_cxx/grammar/klass_def.hpp
+++ b/src/lib/eolian_cxx/grammar/klass_def.hpp
@@ -315,6 +315,18 @@ struct parameter_def
   std::string param_name;
   std::string c_type;
 
+  friend inline bool operator==(parameter_def const& lhs, parameter_def const& rhs)
+  {
+    return lhs.direction == rhs.direction
+      && lhs.type == rhs.type
+      && lhs.param_name == rhs.param_name
+      && lhs.c_type == rhs.c_type;
+  }
+  friend inline bool operator!=(parameter_def const& lhs, parameter_def const& rhs)
+  {
+    return !(lhs == rhs);
+  }
+  
   parameter_def(parameter_direction direction, type_def type, std::string param_name, std::string c_type)
     : direction(std::move(direction)), type(std::move(type)), param_name(std::move(param_name)), c_type(std::move(c_type)) {}
   parameter_def(Eolian_Function_Parameter const* param)
@@ -384,6 +396,20 @@ struct function_def
   bool is_beta;
   bool is_protected;
 
+  friend inline bool operator==(function_def const& lhs, function_def const& rhs)
+  {
+    return lhs.return_type == rhs.return_type
+      && lhs.name == rhs.name
+      && lhs.parameters == rhs.parameters
+      && lhs.c_name == rhs.c_name
+      && lhs.is_beta == rhs.is_beta
+      && lhs.is_protected == rhs.is_protected;
+  }
+  friend inline bool operator!=(function_def const& lhs, function_def const& rhs)
+  {
+    return !(lhs == rhs);
+  }
+  
   function_def(type_def return_type, std::string name, std::vector<parameter_def> parameters
                , std::string c_name, bool is_beta)
     : return_type(return_type), name(name), parameters(parameters), c_name(c_name), is_beta(is_beta) {}
@@ -504,6 +530,19 @@ struct event_def
   std::string name, c_name;
   bool beta, protect;
 
+  friend inline bool operator==(event_def const& lhs, event_def const& rhs)
+  {
+    return lhs.type == rhs.type
+      && lhs.name == rhs.name
+      && lhs.c_name == rhs.c_name
+      && lhs.beta == rhs.beta
+      && lhs.protect == rhs.protect;
+  }
+  friend inline bool operator!=(event_def const& lhs, event_def const& rhs)
+  {
+    return !(lhs == rhs);
+  }  
+  
   event_def(type_def type, std::string name, std::string c_name, bool beta, bool protect)
     : type(type), name(name), c_name(c_name), beta(beta), protect(protect) {}
   event_def(Eolian_Event const* event)
@@ -558,6 +597,21 @@ struct klass_def
   class_type type;
   std::vector<event_def> events;
 
+  friend inline bool operator==(klass_def const& lhs, klass_def const& rhs)
+  {
+    return lhs.eolian_name == rhs.eolian_name
+      && lhs.cxx_name == rhs.cxx_name
+      && lhs.namespaces == rhs.namespaces
+      && lhs.functions == rhs.functions
+      && lhs.inherits == rhs.inherits
+      && lhs.type == rhs.type
+      && lhs.events == rhs.events;
+  }
+  friend inline bool operator!=(klass_def const& lhs, klass_def const& rhs)
+  {
+    return !(lhs == rhs);
+  }
+
   klass_def(std::string eolian_name, std::string cxx_name
             , std::vector<std::string> namespaces
             , std::vector<function_def> functions
diff --git a/src/lib/evas/Evas.hh b/src/lib/evas/Evas.hh
new file mode 100644
index 0000000000..4bef41958f
--- /dev/null
+++ b/src/lib/evas/Evas.hh
@@ -0,0 +1,9 @@
+#ifndef EFL_EVAS_HH
+#define EFL_EVAS_HH
+#ifdef EFL_BETA_API_SUPPORT
+
+#include "Evas.eo.hh"
+
+#endif
+#endif
+