eolian-cxx: Rewrite to accomodate new features of the C++ binding

1 files changed, 49 insertions, 38 deletions

diff --git a/src/Makefile_Eolian_Cxx.am b/src/Makefile_Eolian_Cxx.am
index 57dc265b97..981cca5bb2 100644
--- a/src/Makefile_Eolian_Cxx.am
+++ b/src/Makefile_Eolian_Cxx.am
@@ -6,40 +6,53 @@ installed_eoliancxxmainheadersdir = $(includedir)/eolian-cxx-@VMAJ@/
 dist_installed_eoliancxxmainheaders_DATA = \
 lib/eolian_cxx/Eolian_Cxx.hh
 
-installed_eoliancxxheadersdir = $(includedir)/eolian-cxx-@VMAJ@/
-dist_installed_eoliancxxheaders_DATA = \
-lib/eolian_cxx/eo_generate.hh \
-lib/eolian_cxx/eo_types.hh \
-lib/eolian_cxx/eo_validate.hh
-
 installed_eoliancxxgrammarheadersdir = $(includedir)/eolian-cxx-@VMAJ@/grammar/
 dist_installed_eoliancxxgrammarheaders_DATA = \
-lib/eolian_cxx/grammar/comment.hh \
-lib/eolian_cxx/grammar/eo_class_scope_guard_generator.hh \
-lib/eolian_cxx/grammar/eo_class_constructors_generator.hh \
-lib/eolian_cxx/grammar/eo_class_events_generator.hh \
-lib/eolian_cxx/grammar/eo_class_functions_generator.hh \
-lib/eolian_cxx/grammar/namespace_generator.hh \
-lib/eolian_cxx/grammar/eo_class_generator.hh \
-lib/eolian_cxx/grammar/eo_header_generator.hh \
-lib/eolian_cxx/grammar/inheritance_base_generator.hh \
-lib/eolian_cxx/grammar/parameters_generator.hh \
-lib/eolian_cxx/grammar/type_generator.hh \
-lib/eolian_cxx/grammar/tab.hh
+lib/eolian_cxx/grammar/address_of.hpp \
+lib/eolian_cxx/grammar/alternative.hpp \
+lib/eolian_cxx/grammar/attribute_conditional.hpp \
+lib/eolian_cxx/grammar/attribute_reorder.hpp \
+lib/eolian_cxx/grammar/attribute_replace.hpp \
+lib/eolian_cxx/grammar/attributes.hpp \
+lib/eolian_cxx/grammar/base_class_definition.hpp \
+lib/eolian_cxx/grammar/case.hpp \
+lib/eolian_cxx/grammar/class_declaration.hpp \
+lib/eolian_cxx/grammar/class_definition.hpp \
+lib/eolian_cxx/grammar/class_implementation.hpp \
+lib/eolian_cxx/grammar/container.hpp \
+lib/eolian_cxx/grammar/context.hpp \
+lib/eolian_cxx/grammar/converting_argument.hpp \
+lib/eolian_cxx/grammar/c_type.hpp \
+lib/eolian_cxx/grammar/eps.hpp \
+lib/eolian_cxx/grammar/function_declaration.hpp \
+lib/eolian_cxx/grammar/function_definition.hpp \
+lib/eolian_cxx/grammar/generator.hpp \
+lib/eolian_cxx/grammar/header_guards.hpp \
+lib/eolian_cxx/grammar/header.hpp \
+lib/eolian_cxx/grammar/header_include_directive.hpp \
+lib/eolian_cxx/grammar/implementation_include_directive.hpp \
+lib/eolian_cxx/grammar/impl_header.hpp \
+lib/eolian_cxx/grammar/indentation.hpp \
+lib/eolian_cxx/grammar/keyword.hpp \
+lib/eolian_cxx/grammar/klass_def.hpp \
+lib/eolian_cxx/grammar/kleene.hpp \
+lib/eolian_cxx/grammar/list.hpp \
+lib/eolian_cxx/grammar/meta.hpp \
+lib/eolian_cxx/grammar/namespace.hpp \
+lib/eolian_cxx/grammar/parameter.hpp \
+lib/eolian_cxx/grammar/qualifier_def.hpp \
+lib/eolian_cxx/grammar/sequence.hpp \
+lib/eolian_cxx/grammar/string.hpp \
+lib/eolian_cxx/grammar/type.hpp \
+lib/eolian_cxx/grammar/type_impl.hpp \
+lib/eolian_cxx/grammar/type_traits.hpp \
+lib/eolian_cxx/grammar/variant.hpp
 
 ### Binary
 
 bin_PROGRAMS += bin/eolian_cxx/eolian_cxx
 
 bin_eolian_cxx_eolian_cxx_SOURCES = \
-    bin/eolian_cxx/convert_comments.cc \
-    bin/eolian_cxx/convert_comments.hh \
-    bin/eolian_cxx/convert.cc \
-    bin/eolian_cxx/convert.hh \
-    bin/eolian_cxx/eolian_wrappers.hh \
-    bin/eolian_cxx/safe_strings.hh \
-    bin/eolian_cxx/type_lookup.hh \
-    bin/eolian_cxx/type_lookup_table.cc \
     bin/eolian_cxx/eolian_cxx.cc
 
 bin_eolian_cxx_eolian_cxx_CXXFLAGS = -I$(top_builddir)/src/lib/efl \
@@ -63,32 +76,29 @@ TESTS += tests/eolian_cxx/eolian_cxx_suite
 tests_eolian_cxx_eolian_cxx_suite_SOURCES = \
 tests/eolian_cxx/eolian_cxx_suite.cc \
 tests/eolian_cxx/eolian_cxx_test_parse.cc \
-tests/eolian_cxx/callback.c \
 tests/eolian_cxx/a.c \
 tests/eolian_cxx/b.c \
 tests/eolian_cxx/c.c \
 tests/eolian_cxx/d.c \
 tests/eolian_cxx/eolian_cxx_test_binding.cc \
-tests/eolian_cxx/eolian_cxx_test_callback.cc \
 tests/eolian_cxx/eolian_cxx_test_address_of.cc \
 tests/eolian_cxx/eolian_cxx_test_wrapper.cc \
 tests/eolian_cxx/simple.c \
 tests/eolian_cxx/name_name.c \
 tests/eolian_cxx/name_name_cxx.cc \
 tests/eolian_cxx/generic.c \
+tests/eolian_cxx/name1_name2_type_generation.c \
 tests/eolian_cxx/eolian_cxx_test_inheritance.cc \
 tests/eolian_cxx/eolian_cxx_test_generate.cc \
 tests/eolian_cxx/complex.c \
 tests/eolian_cxx/complex_cxx.cc \
 tests/eolian_cxx/eolian_cxx_suite.h
 
-tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-eolian_cxx_test_wrapper.$(OBJEXT): tests/eolian_cxx/callback.eo.hh tests/eolian_cxx/callback.eo.h
-tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-eolian_cxx_test_callback.$(OBJEXT): tests/eolian_cxx/callback.eo.hh tests/eolian_cxx/callback.eo.h
+tests/eolian_cxx/name1_name2_type_generation.$(OBJEXT): tests/eolian_cxx/name1_name2_type_generation.eo.h tests/eolian_cxx/name1_name2_type_generation.eo.c
 tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-eolian_cxx_test_inheritance.$(OBJEXT): tests/eolian_cxx/simple.eo.hh tests/eolian_cxx/simple.eo.h
-tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-eolian_cxx_test_binding.$(OBJEXT): tests/eolian_cxx/generic.eo.hh tests/eolian_cxx/generic.eo.h
+tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-eolian_cxx_test_binding.$(OBJEXT): tests/eolian_cxx/generic.eo.hh tests/eolian_cxx/generic.eo.h tests/eolian_cxx/name1_name2_type_generation.eo.hh tests/eolian_cxx/name1_name2_type_generation.eo.h tests/eolian_cxx/name1_name2_type_generation.eo.c
 tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-eolian_cxx_test_address_of.$(OBJEXT): tests/eolian_cxx/a.eo.hh tests/eolian_cxx/b.eo.hh tests/eolian_cxx/c.eo.hh tests/eolian_cxx/d.eo.hh tests/eolian_cxx/a.eo.h tests/eolian_cxx/b.eo.h tests/eolian_cxx/c.eo.h tests/eolian_cxx/d.eo.h
 
-tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-callback.$(OBJEXT): tests/eolian_cxx/callback.eo.c tests/eolian_cxx/callback.eo.h
 tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-simple.$(OBJEXT): tests/eolian_cxx/simple.eo.c tests/eolian_cxx/simple.eo.h
 tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-generic.$(OBJEXT): tests/eolian_cxx/generic.eo.c tests/eolian_cxx/generic.eo.h
 tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-a.$(OBJEXT): tests/eolian_cxx/a.eo.c tests/eolian_cxx/a.eo.h
@@ -103,10 +113,6 @@ tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-complex.$(OBJEXT): tests/eoli
 tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-complex_cxx.$(OBJEXT): tests/eolian_cxx/complex.eo.h tests/eolian_cxx/complex.eo.hh
 
 CLEANFILES += \
-tests/eolian_cxx/callback.eo.hh \
-tests/eolian_cxx/callback.eo.c \
-tests/eolian_cxx/callback.eo.h \
-tests/eolian_cxx/callback.eo.impl.hh \
 tests/eolian_cxx/simple.eo.c \
 tests/eolian_cxx/simple.eo.h \
 tests/eolian_cxx/simple.eo.hh \
@@ -134,7 +140,11 @@ tests/eolian_cxx/ns_name_other.eo.impl.hh \
 tests/eolian_cxx/complex.eo.hh \
 tests/eolian_cxx/complex.eo.c \
 tests/eolian_cxx/complex.eo.h \
-tests/eolian_cxx/complex.eo.impl.hh
+tests/eolian_cxx/complex.eo.impl.hh \
+tests/eolian_cxx/name1_name2_type_generation.eo.hh \
+tests/eolian_cxx/name1_name2_type_generation.eo.impl.hh \
+tests/eolian_cxx/name1_name2_type_generation.eo.h \
+tests/eolian_cxx/name1_name2_type_generation.eo.c
 
 
 tests_eolian_cxx_eolian_cxx_suite_CXXFLAGS = \
@@ -159,7 +169,7 @@ tests_eolian_cxx_eolian_cxx_suite_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@
 
 endif
 
-EXTRA_DIST += tests/eolian_cxx/callback.eo \
+EXTRA_DIST += \
 tests/eolian_cxx/simple.eo \
 tests/eolian_cxx/generic.eo \
 tests/eolian_cxx/a.eo \
@@ -169,6 +179,7 @@ tests/eolian_cxx/d.eo \
 tests/eolian_cxx/name_name.eo \
 tests/eolian_cxx/ns_name.eo \
 tests/eolian_cxx/ns_name_other.eo \
+tests/eolian_cxx/name1_name2_type_generation.eo \
 tests/eolian_cxx/complex.eo
 
 include Makefile_Eolian_Cxx_Helper.am