summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2017-09-15 17:52:55 +0200
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2017-09-15 17:52:55 +0200
commit9da5cf20aade822deed38d09be8e9c73b9705f98 (patch)
treea656650772296fcd85fb178a8749851486c885c9 /src/lib
parent60d6aeeb2d9203471660bb7253d1cd4de5d9d795 (diff)
eolian: remove old ownership system
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/eolian/Eolian.h10
-rw-r--r--src/lib/eolian/database_type_api.c7
-rw-r--r--src/lib/eolian/eo_lexer.h2
-rw-r--r--src/lib/eolian/eo_parser.c13
-rw-r--r--src/lib/eolian/eolian_database.h1
5 files changed, 1 insertions, 32 deletions
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index 06299b8..fdf14b9 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -1838,16 +1838,6 @@ EAPI size_t eolian_type_array_size_get(const Eolian_Type *tp);
1838/* 1838/*
1839 * @brief Get whether the given type is owned. 1839 * @brief Get whether the given type is owned.
1840 * 1840 *
1841 * @param[in] tp the type.
1842 * @return EINA_TRUE when the type is marked owned, EINA_FALSE otherwise.
1843 *
1844 * @ingroup Eolian
1845 */
1846EAPI Eina_Bool eolian_type_is_own(const Eolian_Type *tp);
1847
1848/*
1849 * @brief Get whether the given type is owned.
1850 *
1851 * This is true when a parameter, return or whatever is marked as @owned. 1841 * This is true when a parameter, return or whatever is marked as @owned.
1852 * 1842 *
1853 * @param[in] tp the type. 1843 * @param[in] tp the type.
diff --git a/src/lib/eolian/database_type_api.c b/src/lib/eolian/database_type_api.c
index 2f6a86f..8d83a8f 100644
--- a/src/lib/eolian/database_type_api.c
+++ b/src/lib/eolian/database_type_api.c
@@ -327,13 +327,6 @@ eolian_type_array_size_get(const Eolian_Type *tp)
327} 327}
328 328
329EAPI Eina_Bool 329EAPI Eina_Bool
330eolian_type_is_own(const Eolian_Type *tp)
331{
332 EINA_SAFETY_ON_NULL_RETURN_VAL(tp, EINA_FALSE);
333 return tp->is_own;
334}
335
336EAPI Eina_Bool
337eolian_type_is_owned(const Eolian_Type *tp) 330eolian_type_is_owned(const Eolian_Type *tp)
338{ 331{
339 EINA_SAFETY_ON_NULL_RETURN_VAL(tp, EINA_FALSE); 332 EINA_SAFETY_ON_NULL_RETURN_VAL(tp, EINA_FALSE);
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index 8d7cb21..2e7d0e5 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -27,7 +27,7 @@ enum Tokens
27 KW(abstract), KW(constructor), KW(constructors), KW(data), \ 27 KW(abstract), KW(constructor), KW(constructors), KW(data), \
28 KW(destructor), KW(eo), KW(eo_prefix), KW(event_prefix), KW(events), KW(free), \ 28 KW(destructor), KW(eo), KW(eo_prefix), KW(event_prefix), KW(events), KW(free), \
29 KW(get), KW(implements), KW(import), KW(interface), KW(keys), KW(legacy), \ 29 KW(get), KW(implements), KW(import), KW(interface), KW(keys), KW(legacy), \
30 KW(legacy_prefix), KW(methods), KW(mixin), KW(own), KW(params), KW(ptr), \ 30 KW(legacy_prefix), KW(methods), KW(mixin), KW(params), KW(ptr), \
31 KW(set), KW(type), KW(values), KW(var), KWAT(auto), KWAT(beta), \ 31 KW(set), KW(type), KW(values), KW(var), KWAT(auto), KWAT(beta), \
32 KWAT(class), KWAT(const), KWAT(empty), KWAT(extern), \ 32 KWAT(class), KWAT(const), KWAT(empty), KWAT(extern), \
33 KWAT(free), KWAT(hot), KWAT(in), KWAT(inout), KWAT(nonull), KWAT(nullable), \ 33 KWAT(free), KWAT(hot), KWAT(in), KWAT(inout), KWAT(nonull), KWAT(nullable), \
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index 4126323..a523d88 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -720,19 +720,6 @@ parse_type_void(Eo_Lexer *ls, Eina_Bool allow_ref, Eina_Bool allow_sarray)
720 check_match(ls, ')', '(', pline, pcol); 720 check_match(ls, ')', '(', pline, pcol);
721 return def; 721 return def;
722 } 722 }
723 case KW_own:
724 {
725 int pline, pcolumn;
726 eo_lexer_get(ls);
727 pline = ls->line_number;
728 pcolumn = ls->column;
729 check_next(ls, '(');
730 def = parse_type_void(ls, allow_ref, EINA_FALSE);
731 FILL_BASE(def->base, ls, line, col);
732 def->is_own = EINA_TRUE;
733 check_match(ls, ')', '(', pline, pcolumn);
734 return def;
735 }
736 case KW_free: 723 case KW_free:
737 { 724 {
738 int pline, pcolumn; 725 int pline, pcolumn;
diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index 47367f4..d0118d0 100644
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -164,7 +164,6 @@ struct _Eolian_Type
164 Eina_Stringshare *freefunc; 164 Eina_Stringshare *freefunc;
165 size_t static_size; 165 size_t static_size;
166 Eina_Bool is_const :1; 166 Eina_Bool is_const :1;
167 Eina_Bool is_own :1;
168 Eina_Bool is_ptr :1; 167 Eina_Bool is_ptr :1;
169 Eina_Bool owned :1; 168 Eina_Bool owned :1;
170}; 169};