summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-11-10 15:19:50 -0200
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-11-10 15:20:36 -0200
commit45e1ccf312225efad21a616602aedb3f9f0188bf (patch)
treec6c798f5bcf6a0b8f97f6dafd5e1d6ab9e88e4cb
parenta94351a789ae7c11efb72c1b9f35cd7fae4d7fa2 (diff)
downloadefl-45e1ccf312225efad21a616602aedb3f9f0188bf.tar.gz
eolian-cxx: Remove EOLIAN_TYPE_POINTER enumeration
-rw-r--r--src/lib/eolian_cxx/grammar/klass_def.hpp6
-rw-r--r--src/tests/eolian_cxx/complex.c20
-rw-r--r--src/tests/eolian_cxx/complex.eo22
-rw-r--r--src/tests/eolian_cxx/generic.eo2
4 files changed, 3 insertions, 47 deletions
diff --git a/src/lib/eolian_cxx/grammar/klass_def.hpp b/src/lib/eolian_cxx/grammar/klass_def.hpp
index b2125e4cf6..ee03b652b7 100644
--- a/src/lib/eolian_cxx/grammar/klass_def.hpp
+++ b/src/lib/eolian_cxx/grammar/klass_def.hpp
@@ -262,10 +262,6 @@ inline void type_def::set(Eolian_Type const* eolian_type)
original_type = {regular_type_def{ ::eolian_type_name_get(eolian_type), {qualifiers(eolian_type), {}}, namespaces}};
}
break;
- case EOLIAN_TYPE_POINTER:
- {
- throw std::runtime_error("");
- }
case EOLIAN_TYPE_CLASS:
{
Eolian_Class const* klass = eolian_type_class_get(eolian_type);
@@ -286,7 +282,7 @@ inline void type_def::set(Eolian_Type const* eolian_type)
}
break;
default:
- std::abort();
+ throw std::runtime_error("Type not supported");
break;
}
}
diff --git a/src/tests/eolian_cxx/complex.c b/src/tests/eolian_cxx/complex.c
index dc437348b2..76db444a74 100644
--- a/src/tests/eolian_cxx/complex.c
+++ b/src/tests/eolian_cxx/complex.c
@@ -22,21 +22,6 @@ _complex_inclasscont(Eo *obj EINA_UNUSED, Complex_Data *pd EINA_UNUSED, Eina_Lis
}
EOLIAN static void
-_complex_inptrptrcont(Eo *obj EINA_UNUSED, Complex_Data *pd EINA_UNUSED, Eina_List *l EINA_UNUSED)
-{
-}
-
-EOLIAN static void
-_complex_inptrcontown(Eo *obj EINA_UNUSED, Complex_Data *pd EINA_UNUSED, Eina_List *l EINA_UNUSED)
-{
-}
-
-EOLIAN static void
-_complex_inptrptrcontown(Eo *obj EINA_UNUSED, Complex_Data *pd EINA_UNUSED, Eina_List *l EINA_UNUSED)
-{
-}
-
-EOLIAN static void
_complex_incontcont(Eo *obj EINA_UNUSED, Complex_Data *pd EINA_UNUSED, Eina_List *l EINA_UNUSED)
{
}
@@ -112,11 +97,6 @@ _complex_inaccessorown(Eo *obj EINA_UNUSED, Complex_Data *pd EINA_UNUSED, Eina_A
}
EOLIAN static void
-_complex_outptrcont(Eo *obj EINA_UNUSED, Complex_Data *pd EINA_UNUSED, Eina_List **l EINA_UNUSED)
-{
-}
-
-EOLIAN static void
_complex_outclasscont(Eo *obj EINA_UNUSED, Complex_Data *pd EINA_UNUSED, Eina_List **l EINA_UNUSED)
{
}
diff --git a/src/tests/eolian_cxx/complex.eo b/src/tests/eolian_cxx/complex.eo
index 8fe7f1cbf9..b9fa6acc44 100644
--- a/src/tests/eolian_cxx/complex.eo
+++ b/src/tests/eolian_cxx/complex.eo
@@ -5,7 +5,7 @@ class Complex (Efl.Object)
// container test
inptrcont {
params {
- l: list<int*>;
+ l: list<int>;
}
}
inclasscont {
@@ -13,21 +13,6 @@ class Complex (Efl.Object)
l: list<Efl.Object>;
}
}
- inptrptrcont {
- params {
- l: list<int**>;
- }
- }
- inptrcontown {
- params {
- l: own(list<int*>);
- }
- }
- inptrptrcontown {
- params {
- l: own(list<int**>);
- }
- }
incontcont {
params {
l: list<list<int>>;
@@ -104,11 +89,6 @@ class Complex (Efl.Object)
}
}
// out
- outptrcont {
- params {
- @out l: list<int*>;
- }
- }
outclasscont {
params {
@out l: list<Efl.Object>;
diff --git a/src/tests/eolian_cxx/generic.eo b/src/tests/eolian_cxx/generic.eo
index 50561f0aea..92bd3e8904 100644
--- a/src/tests/eolian_cxx/generic.eo
+++ b/src/tests/eolian_cxx/generic.eo
@@ -2,7 +2,7 @@
struct Generic.Event
{
field1: int;
- field2: list<int*>;
+ field2: list<int>;
}
class Generic (Efl.Object)