eolian: fix conflicts between eo file names in tests

Fixes T7911.
This commit is contained in:
Daniel Kolesa 2019-05-06 16:46:50 +02:00
parent 4e67aae489
commit 159e955168
13 changed files with 110 additions and 110 deletions

View File

@ -218,18 +218,18 @@ TESTS_EINA_CXX_OBJNAME = tests_eina_cxx_
endif
tests/eina_cxx/$(TESTS_EINA_CXX_OBJNAME)eina_cxx_suite-eina_cxx_test_accessor.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h
tests/eina_cxx/$(TESTS_EINA_CXX_OBJNAME)eina_cxx_suite-eina_cxx_test_ptrarray.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h
tests/eina_cxx/$(TESTS_EINA_CXX_OBJNAME)eina_cxx_suite-eina_cxx_test_ptrlist.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h
tests/eina_cxx/$(TESTS_EINA_CXX_OBJNAME)eina_cxx_suite-eina_cxx_test_iterator.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h
tests/eina_cxx/$(TESTS_EINA_CXX_OBJNAME)eina_cxx_suite-eina_cxx_test_accessor.$(OBJEXT): tests/eina_cxx/eina_simple.eo.hh tests/eina_cxx/eina_simple.eo.h
tests/eina_cxx/$(TESTS_EINA_CXX_OBJNAME)eina_cxx_suite-eina_cxx_test_ptrarray.$(OBJEXT): tests/eina_cxx/eina_simple.eo.hh tests/eina_cxx/eina_simple.eo.h
tests/eina_cxx/$(TESTS_EINA_CXX_OBJNAME)eina_cxx_suite-eina_cxx_test_ptrlist.$(OBJEXT): tests/eina_cxx/eina_simple.eo.hh tests/eina_cxx/eina_simple.eo.h
tests/eina_cxx/$(TESTS_EINA_CXX_OBJNAME)eina_cxx_suite-eina_cxx_test_iterator.$(OBJEXT): tests/eina_cxx/eina_simple.eo.hh tests/eina_cxx/eina_simple.eo.h
tests/eina_cxx/$(TESTS_EINA_CXX_OBJNAME)eina_cxx_suite-simple.$(OBJEXT): tests/eina_cxx/simple.eo.c tests/eina_cxx/simple.eo.h
tests/eina_cxx/$(TESTS_EINA_CXX_OBJNAME)eina_cxx_suite-simple.$(OBJEXT): tests/eina_cxx/eina_simple.eo.c tests/eina_cxx/eina_simple.eo.h
CLEANFILES += \
tests/eina_cxx/simple.eo.c \
tests/eina_cxx/simple.eo.h \
tests/eina_cxx/simple.eo.hh \
tests/eina_cxx/simple.eo.impl.hh
tests/eina_cxx/eina_simple.eo.c \
tests/eina_cxx/eina_simple.eo.h \
tests/eina_cxx/eina_simple.eo.hh \
tests/eina_cxx/eina_simple.eo.impl.hh
tests_eina_cxx_eina_cxx_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DTESTS_WD=\"`pwd`\" \
@ -407,4 +407,4 @@ endif
endif
EXTRA_DIST2 += \
tests/eina_cxx/simple.eo
tests/eina_cxx/eina_simple.eo

View File

@ -81,7 +81,7 @@ tests/eolian/data/class_simple.eo \
tests/eolian/data/complex_type.eo \
tests/eolian/data/consts.eo \
tests/eolian/data/ctor_dtor.eo \
tests/eolian/data/docs.eo \
tests/eolian/data/eo_docs.eo \
tests/eolian/data/enum.eo \
tests/eolian/data/events.eo \
tests/eolian/data/extern.eo \

View File

@ -8,7 +8,7 @@
#include "eina_cxx_suite.h"
extern "C" {
#include "simple.eo.h"
#include "eina_simple.eo.h"
}
struct wrapper : efl::eo::concrete
@ -50,10 +50,10 @@ EFL_START_TEST(eina_cxx_eo_accessor_indexing)
efl::eina::list<wrapper> list;
wrapper const w1(efl_new(SIMPLE_CLASS));
wrapper const w2(efl_new(SIMPLE_CLASS));
wrapper const w3(efl_new(SIMPLE_CLASS));
wrapper const w4(efl_new(SIMPLE_CLASS));
wrapper const w1(efl_new(EINA_SIMPLE_CLASS));
wrapper const w2(efl_new(EINA_SIMPLE_CLASS));
wrapper const w3(efl_new(EINA_SIMPLE_CLASS));
wrapper const w4(efl_new(EINA_SIMPLE_CLASS));
list.push_back(w1);
list.push_back(w2);
@ -104,10 +104,10 @@ EFL_START_TEST(eina_cxx_eo_accessor_iterator)
efl::eina::list<wrapper> list;
wrapper const w1(efl_new(SIMPLE_CLASS));
wrapper const w2(efl_new(SIMPLE_CLASS));
wrapper const w3(efl_new(SIMPLE_CLASS));
wrapper const w4(efl_new(SIMPLE_CLASS));
wrapper const w1(efl_new(EINA_SIMPLE_CLASS));
wrapper const w2(efl_new(EINA_SIMPLE_CLASS));
wrapper const w3(efl_new(EINA_SIMPLE_CLASS));
wrapper const w4(efl_new(EINA_SIMPLE_CLASS));
list.push_back(w1);
list.push_back(w2);

View File

@ -8,7 +8,7 @@
#include <algorithm>
#include "eina_cxx_suite.h"
#include "simple.eo.hh"
#include "eina_simple.eo.hh"
EFL_START_TEST(eina_cxx_iterator_equal)
{
@ -37,22 +37,22 @@ EFL_START_TEST(eina_cxx_eo_iterator_equal)
efl::eina::eina_init eina_init;
efl::eo::eo_init eo_init;
efl::eina::list<nonamespace::Simple> list;
efl::eina::list<nonamespace::Eina_Simple> list;
nonamespace::Simple const w1(efl::eo::instantiate);
nonamespace::Simple const w2(efl::eo::instantiate);
nonamespace::Simple const w3(efl::eo::instantiate);
nonamespace::Simple const w4(efl::eo::instantiate);
nonamespace::Eina_Simple const w1(efl::eo::instantiate);
nonamespace::Eina_Simple const w2(efl::eo::instantiate);
nonamespace::Eina_Simple const w3(efl::eo::instantiate);
nonamespace::Eina_Simple const w4(efl::eo::instantiate);
list.push_back(w1);
list.push_back(w2);
list.push_back(w3);
list.push_back(w4);
efl::eina::iterator<nonamespace::Simple> iterator = list.ibegin()
efl::eina::iterator<nonamespace::Eina_Simple> iterator = list.ibegin()
, last_iterator = list.iend();
nonamespace::Simple const result[] = {w1, w2, w3, w4};
nonamespace::Eina_Simple const result[] = {w1, w2, w3, w4};
ck_assert(std::equal(iterator, last_iterator, result));
}

View File

@ -9,7 +9,7 @@
#include "eina_cxx_suite.h"
extern "C" {
#include "simple.eo.h"
#include "eina_simple.eo.h"
}
struct wrapper : efl::eo::concrete
@ -33,9 +33,9 @@ EFL_START_TEST(eina_cxx_ptrarray_push_back)
int result[] = {5, 10, 15};
int rresult[] = {15, 10, 5};
wrapper const w1(efl_new(SIMPLE_CLASS));
wrapper const w2(efl_new(SIMPLE_CLASS));
wrapper const w3(efl_new(SIMPLE_CLASS));
wrapper const w1(efl_new(EINA_SIMPLE_CLASS));
wrapper const w2(efl_new(EINA_SIMPLE_CLASS));
wrapper const w3(efl_new(EINA_SIMPLE_CLASS));
{
efl::eina::ptr_array<int> array;
@ -109,9 +109,9 @@ EFL_START_TEST(eina_cxx_ptrarray_pop_back)
ck_assert(std::equal(array.rbegin(), array.rend(), rresult));
}
{
wrapper const w1(efl_new(SIMPLE_CLASS));
wrapper const w2(efl_new(SIMPLE_CLASS));
wrapper const w3(efl_new(SIMPLE_CLASS));
wrapper const w1(efl_new(EINA_SIMPLE_CLASS));
wrapper const w2(efl_new(EINA_SIMPLE_CLASS));
wrapper const w3(efl_new(EINA_SIMPLE_CLASS));
efl::eina::array<wrapper> array;
@ -204,11 +204,11 @@ EFL_START_TEST(eina_cxx_ptrarray_insert)
ck_assert(std::equal(array.begin(), array.end(), array4.begin()));
}
{
wrapper const w0(efl_new(SIMPLE_CLASS));
wrapper const w1(efl_new(SIMPLE_CLASS));
wrapper const w2(efl_new(SIMPLE_CLASS));
wrapper const w3(efl_new(SIMPLE_CLASS));
wrapper const w4(efl_new(SIMPLE_CLASS));
wrapper const w0(efl_new(EINA_SIMPLE_CLASS));
wrapper const w1(efl_new(EINA_SIMPLE_CLASS));
wrapper const w2(efl_new(EINA_SIMPLE_CLASS));
wrapper const w3(efl_new(EINA_SIMPLE_CLASS));
wrapper const w4(efl_new(EINA_SIMPLE_CLASS));
efl::eina::array<wrapper> array;
ck_assert(std::distance(array.begin(), array.end()) == 0u);
@ -284,7 +284,7 @@ EFL_START_TEST(eina_cxx_ptrarray_constructors)
efl::eina::eina_init eina_init;
efl::eo::eo_init eo_init;
wrapper const w1(efl_new(SIMPLE_CLASS));
wrapper const w1(efl_new(EINA_SIMPLE_CLASS));
{
efl::eina::ptr_array<int> array1;
@ -363,12 +363,12 @@ EFL_START_TEST(eina_cxx_ptrarray_erase)
ck_assert(array1.back() == 25);
}
{
wrapper const w1(efl_new(SIMPLE_CLASS));
wrapper const w2(efl_new(SIMPLE_CLASS));
wrapper const w3(efl_new(SIMPLE_CLASS));
wrapper const w4(efl_new(SIMPLE_CLASS));
wrapper const w5(efl_new(SIMPLE_CLASS));
wrapper const w6(efl_new(SIMPLE_CLASS));
wrapper const w1(efl_new(EINA_SIMPLE_CLASS));
wrapper const w2(efl_new(EINA_SIMPLE_CLASS));
wrapper const w3(efl_new(EINA_SIMPLE_CLASS));
wrapper const w4(efl_new(EINA_SIMPLE_CLASS));
wrapper const w5(efl_new(EINA_SIMPLE_CLASS));
wrapper const w6(efl_new(EINA_SIMPLE_CLASS));
efl::eina::array<wrapper> array1;
@ -444,12 +444,12 @@ EFL_START_TEST(eina_cxx_ptrarray_range)
}
{
wrapper const w1(efl_new(SIMPLE_CLASS));
wrapper const w2(efl_new(SIMPLE_CLASS));
wrapper const w3(efl_new(SIMPLE_CLASS));
wrapper const w4(efl_new(SIMPLE_CLASS));
wrapper const w5(efl_new(SIMPLE_CLASS));
wrapper const w6(efl_new(SIMPLE_CLASS));
wrapper const w1(efl_new(EINA_SIMPLE_CLASS));
wrapper const w2(efl_new(EINA_SIMPLE_CLASS));
wrapper const w3(efl_new(EINA_SIMPLE_CLASS));
wrapper const w4(efl_new(EINA_SIMPLE_CLASS));
wrapper const w5(efl_new(EINA_SIMPLE_CLASS));
wrapper const w6(efl_new(EINA_SIMPLE_CLASS));
efl::eina::array<wrapper> array;
array.push_back(w1);

View File

@ -11,7 +11,7 @@
#include "eina_cxx_suite.h"
extern "C" {
#include "simple.eo.h"
#include "eina_simple.eo.h"
}
struct wrapper : efl::eo::concrete
@ -35,9 +35,9 @@ EFL_START_TEST(eina_cxx_ptrlist_push_back)
int result[] = {5, 10, 15};
int rresult[] = {15, 10, 5};
wrapper const w1(efl_new(SIMPLE_CLASS));
wrapper const w2(efl_new(SIMPLE_CLASS));
wrapper const w3(efl_new(SIMPLE_CLASS));
wrapper const w1(efl_new(EINA_SIMPLE_CLASS));
wrapper const w2(efl_new(EINA_SIMPLE_CLASS));
wrapper const w3(efl_new(EINA_SIMPLE_CLASS));
{
efl::eina::ptr_list<int> list;
@ -84,9 +84,9 @@ EFL_START_TEST(eina_cxx_ptrlist_pop_back)
int result[] = {5, 10};
int rresult[] = {10, 5};
wrapper const w1(efl_new(SIMPLE_CLASS));
wrapper const w2(efl_new(SIMPLE_CLASS));
wrapper const w3(efl_new(SIMPLE_CLASS));
wrapper const w1(efl_new(EINA_SIMPLE_CLASS));
wrapper const w2(efl_new(EINA_SIMPLE_CLASS));
wrapper const w3(efl_new(EINA_SIMPLE_CLASS));
{
efl::eina::ptr_list<int> list;
@ -150,9 +150,9 @@ EFL_START_TEST(eina_cxx_ptrlist_push_front)
ck_assert(std::equal(list.rbegin(), list.rend(), rresult));
}
{
wrapper const w1(efl_new(SIMPLE_CLASS));
wrapper const w2(efl_new(SIMPLE_CLASS));
wrapper const w3(efl_new(SIMPLE_CLASS));
wrapper const w1(efl_new(EINA_SIMPLE_CLASS));
wrapper const w2(efl_new(EINA_SIMPLE_CLASS));
wrapper const w3(efl_new(EINA_SIMPLE_CLASS));
efl::eina::list<wrapper> list;
@ -178,9 +178,9 @@ EFL_START_TEST(eina_cxx_ptrlist_pop_front)
int result[] = {10, 5};
int rresult[] = {5, 10};
wrapper const w1(efl_new(SIMPLE_CLASS));
wrapper const w2(efl_new(SIMPLE_CLASS));
wrapper const w3(efl_new(SIMPLE_CLASS));
wrapper const w1(efl_new(EINA_SIMPLE_CLASS));
wrapper const w2(efl_new(EINA_SIMPLE_CLASS));
wrapper const w3(efl_new(EINA_SIMPLE_CLASS));
{
efl::eina::ptr_list<int> list;
@ -280,11 +280,11 @@ EFL_START_TEST(eina_cxx_ptrlist_insert)
ck_assert(std::equal(list.begin(), list.end(), list4.begin()));
}
{
wrapper const w0(efl_new(SIMPLE_CLASS));
wrapper const w1(efl_new(SIMPLE_CLASS));
wrapper const w2(efl_new(SIMPLE_CLASS));
wrapper const w3(efl_new(SIMPLE_CLASS));
wrapper const w4(efl_new(SIMPLE_CLASS));
wrapper const w0(efl_new(EINA_SIMPLE_CLASS));
wrapper const w1(efl_new(EINA_SIMPLE_CLASS));
wrapper const w2(efl_new(EINA_SIMPLE_CLASS));
wrapper const w3(efl_new(EINA_SIMPLE_CLASS));
wrapper const w4(efl_new(EINA_SIMPLE_CLASS));
efl::eina::list<wrapper> list;
@ -373,11 +373,11 @@ EFL_START_TEST(eina_cxx_ptrlist_constructors)
ck_assert(list2 == list4);
}
{
wrapper const w0(efl_new(SIMPLE_CLASS));
wrapper const w1(efl_new(SIMPLE_CLASS));
wrapper const w2(efl_new(SIMPLE_CLASS));
wrapper const w3(efl_new(SIMPLE_CLASS));
wrapper const w4(efl_new(SIMPLE_CLASS));
wrapper const w0(efl_new(EINA_SIMPLE_CLASS));
wrapper const w1(efl_new(EINA_SIMPLE_CLASS));
wrapper const w2(efl_new(EINA_SIMPLE_CLASS));
wrapper const w3(efl_new(EINA_SIMPLE_CLASS));
wrapper const w4(efl_new(EINA_SIMPLE_CLASS));
efl::eina::list<wrapper> list1;
ck_assert(list1.empty());

View File

@ -1,4 +1,4 @@
class Simple extends Efl.Object
class Eina_Simple extends Efl.Object
{
data: null;
implements {

View File

@ -20,7 +20,7 @@ eina_cxx_suite_src = [
pub_eo_files = [
'simple.eo'
'eina_simple.eo'
]
foreach eo_file : pub_eo_files

View File

@ -8,14 +8,14 @@
#include <stdlib.h>
#include "simple.eo.h"
#include "eina_simple.eo.h"
#define MY_CLASS SIMPLE_CLASS
#define MY_CLASS EINA_SIMPLE_CLASS
static Eo *_simple_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
static Eo *_eina_simple_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
{
return efl_constructor(efl_super(obj, MY_CLASS));
}
#include "simple.eo.c"
#include "eina_simple.eo.c"

View File

@ -1,15 +1,15 @@
#ifndef _EOLIAN_DOCS_EO_H_
#define _EOLIAN_DOCS_EO_H_
#ifndef _DOCS_EO_CLASS_TYPE
#define _DOCS_EO_CLASS_TYPE
#ifndef _EO_DOCS_EO_CLASS_TYPE
#define _EO_DOCS_EO_CLASS_TYPE
typedef Eo Docs;
typedef Eo Eo_Docs;
#endif
#ifndef _DOCS_EO_TYPES
#define _DOCS_EO_TYPES
#ifndef _EO_DOCS_EO_TYPES
#define _EO_DOCS_EO_TYPES
/**
* @brief This is struct Foo. It does stuff.
@ -74,16 +74,16 @@ typedef struct _Opaque Opaque;
* @brief Docs for class.
*
* More docs for class. Testing references now. @ref Foo @ref Bar @ref Alias
* @ref pants @ref docs_meth @ref docs_prop_get @ref docs_prop_get
* @ref docs_prop_set @ref Foo.field1 @ref BAR_FOO @ref Docs
* @ref pants @ref eo_docs_meth @ref eo_docs_prop_get @ref eo_docs_prop_get
* @ref eo_docs_prop_set @ref Foo.field1 @ref BAR_FOO @ref Eo_Docs
*
* @since 1.18
*
* @ingroup Docs
* @ingroup Eo_Docs
*/
#define DOCS_CLASS docs_class_get()
#define EO_DOCS_CLASS eo_docs_class_get()
EWAPI const Efl_Class *docs_class_get(void);
EWAPI const Efl_Class *eo_docs_class_get(void);
/**
* @brief Method documentation.
@ -97,9 +97,9 @@ EWAPI const Efl_Class *docs_class_get(void);
*
* @since 1.18
*
* @ingroup Docs
* @ingroup Eo_Docs
*/
EOAPI int docs_meth(Eo *obj, int a, float *b, long *c);
EOAPI int eo_docs_meth(Eo *obj, int a, float *b, long *c);
/**
* @brief Property common documentation.
@ -111,9 +111,9 @@ EOAPI int docs_meth(Eo *obj, int a, float *b, long *c);
*
* @since 1.18
*
* @ingroup Docs
* @ingroup Eo_Docs
*/
EOAPI void docs_prop_set(Eo *obj, int val);
EOAPI void eo_docs_prop_set(Eo *obj, int val);
/**
* @brief Property common documentation.
@ -126,18 +126,18 @@ EOAPI void docs_prop_set(Eo *obj, int val);
*
* @since 1.18
*
* @ingroup Docs
* @ingroup Eo_Docs
*/
EOAPI int docs_prop_get(const Eo *obj);
EOAPI int eo_docs_prop_get(const Eo *obj);
EWAPI extern const Efl_Event_Description _DOCS_EVENT_CLICKED;
EWAPI extern const Efl_Event_Description _EO_DOCS_EVENT_CLICKED;
/** Event docs.
*
* @since 1.18
*
* @ingroup Docs
* @ingroup Eo_Docs
*/
#define DOCS_EVENT_CLICKED (&(_DOCS_EVENT_CLICKED))
#define EO_DOCS_EVENT_CLICKED (&(_EO_DOCS_EVENT_CLICKED))
#endif

View File

@ -35,7 +35,7 @@ var pants: int = 150; [[Docs for var.]]
struct Opaque; [[Opaque struct docs. See @Foo for another struct.]]
class Docs {
class Eo_Docs {
[[Docs for class.
More docs for class. Testing references now.
@ -49,7 +49,7 @@ class Docs {
@.prop.set
@Foo.field1
@Bar.foo
@Docs
@Eo_Docs
@since 1.18
]]

View File

@ -183,7 +183,7 @@ EFL_START_TEST(eolian_docs)
snprintf(output_filepath, PATH_MAX, "%s/eolian_docs",
eina_environment_tmp_get());
_remove_ref(output_filepath, "eo.h");
fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/docs.eo", "-gh", output_filepath));
fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/eo_docs.eo", "-gh", output_filepath));
fail_if(!_files_compare(TESTS_SRC_DIR"/data/docs_ref.h", output_filepath, "eo.h"));
}
EFL_END_TEST

View File

@ -1100,7 +1100,7 @@ EFL_START_TEST(eolian_docs)
fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data"));
fail_if(!(unit = eolian_state_file_parse(eos, "docs.eo")));
fail_if(!(unit = eolian_state_file_parse(eos, "eo_docs.eo")));
fail_if(!(tdl = eolian_unit_struct_by_name_get(unit, "Foo")));
fail_if(!(doc = eolian_typedecl_documentation_get(tdl)));
@ -1127,7 +1127,7 @@ EFL_START_TEST(eolian_docs)
free(dpar);
const char *tdoc = "Note: This is $something, see @pants, "
"@Docs.meth, \\@ref foo and @[Things.Stuffs.foo,bar].";
"@Eo_Docs.meth, \\@ref foo and @[Things.Stuffs.foo,bar].";
Eolian_Doc_Token tok;
eolian_doc_token_init(&tok);
@ -1166,7 +1166,7 @@ EFL_START_TEST(eolian_docs)
tdoc = eolian_documentation_tokenize(tdoc, &tok);
fail_if(eolian_doc_token_type_get(&tok) != EOLIAN_DOC_TOKEN_REF);
txt = eolian_doc_token_text_get(&tok);
fail_if(strcmp(txt, "Docs.meth"));
fail_if(strcmp(txt, "Eo_Docs.meth"));
fail_if(eolian_doc_token_ref_resolve(&tok, eos, NULL, NULL) != EOLIAN_OBJECT_FUNCTION);
free(txt);
tdoc = eolian_documentation_tokenize(tdoc, &tok);
@ -1247,14 +1247,14 @@ EFL_START_TEST(eolian_docs)
"Opaque struct docs. See @Foo for another struct."));
fail_if(eolian_documentation_description_get(doc));
fail_if(!(class = eolian_unit_class_by_name_get(unit, "Docs")));
fail_if(!(class = eolian_unit_class_by_name_get(unit, "Eo_Docs")));
fail_if(!(doc = eolian_class_documentation_get(class)));
fail_if(strcmp(eolian_documentation_summary_get(doc),
"Docs for class."));
fail_if(strcmp(eolian_documentation_description_get(doc),
"More docs for class. Testing references now. "
"@Foo @Bar @Alias @pants @Docs.meth @Docs.prop "
"@Docs.prop.get @Docs.prop.set @Foo.field1 @Bar.foo @Docs"));
"@Foo @Bar @Alias @pants @Eo_Docs.meth @Eo_Docs.prop "
"@Eo_Docs.prop.get @Eo_Docs.prop.set @Foo.field1 @Bar.foo @Eo_Docs"));
fail_if(!(fid = eolian_class_function_by_name_get(class, "meth", EOLIAN_METHOD)));
const Eolian_Implement *fimp = eolian_function_implement_get(fid);