summaryrefslogtreecommitdiff
path: root/src/lib/eolian
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2019-09-16 15:27:04 +0200
committerDaniel Kolesa <d.kolesa@samsung.com>2019-09-16 15:37:04 +0200
commitd9594dbc9d9e2bf6e8e58a570f60c2206df45fb3 (patch)
tree3fa9c28b3c1ff63c65090c0a100d37c7ac80dc2b /src/lib/eolian
parent2d3c99d30bf00219b1062c60217503bbcdcb3a4a (diff)
eolian: drop @ctor_param and the associated APIs
This has been unused for a while, and has been just lingering around the code, so drop it so it doesn't make it into a release.
Diffstat (limited to 'src/lib/eolian')
-rw-r--r--src/lib/eolian/Eolian.h10
-rw-r--r--src/lib/eolian/database_constructor_api.c7
-rw-r--r--src/lib/eolian/eo_lexer.h2
-rw-r--r--src/lib/eolian/eo_parser.c12
-rw-r--r--src/lib/eolian/eolian_database.h1
5 files changed, 3 insertions, 29 deletions
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index c0ec4d6a56..0cb7384772 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -2233,16 +2233,6 @@ EAPI const Eolian_Function *eolian_constructor_function_get(const Eolian_Constru
2233EAPI Eina_Bool eolian_constructor_is_optional(const Eolian_Constructor *ctor); 2233EAPI Eina_Bool eolian_constructor_is_optional(const Eolian_Constructor *ctor);
2234 2234
2235/* 2235/*
2236 * @brief Checks if a constructor is tagged as a constructor parameter.
2237 *
2238 * @param[in] ctor the handle of the constructor
2239 * @return EINA_TRUE if a constructor parameter, EINA_FALSE if not (or if input is NULL).
2240 *
2241 * @ingroup Eolian
2242 */
2243EAPI Eina_Bool eolian_constructor_is_ctor_param(const Eolian_Constructor *ctor);
2244
2245/*
2246 * @brief Get an iterator to the constructing functions defined in a class. 2236 * @brief Get an iterator to the constructing functions defined in a class.
2247 * 2237 *
2248 * @param[in] klass the class. 2238 * @param[in] klass the class.
diff --git a/src/lib/eolian/database_constructor_api.c b/src/lib/eolian/database_constructor_api.c
index 63b935cc6c..bedf9ab7da 100644
--- a/src/lib/eolian/database_constructor_api.c
+++ b/src/lib/eolian/database_constructor_api.c
@@ -29,10 +29,3 @@ eolian_constructor_is_optional(const Eolian_Constructor *ctor)
29 EINA_SAFETY_ON_NULL_RETURN_VAL(ctor, EINA_FALSE); 29 EINA_SAFETY_ON_NULL_RETURN_VAL(ctor, EINA_FALSE);
30 return ctor->is_optional; 30 return ctor->is_optional;
31} 31}
32
33EAPI Eina_Bool
34eolian_constructor_is_ctor_param(const Eolian_Constructor *ctor)
35{
36 EINA_SAFETY_ON_NULL_RETURN_VAL(ctor, EINA_FALSE);
37 return ctor->is_ctor_param;
38}
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index e95258d420..876f1c70bc 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -67,7 +67,7 @@ enum Tokens
67 KW(function), \ 67 KW(function), \
68 KW(__undefined_type), \ 68 KW(__undefined_type), \
69 \ 69 \
70 KW(true), KW(false), KW(null), KWAT(ctor_param) 70 KW(true), KW(false), KW(null)
71 71
72/* "regular" keyword and @ prefixed keyword */ 72/* "regular" keyword and @ prefixed keyword */
73#define KW(x) KW_##x 73#define KW(x) KW_##x
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index 1631082081..f7843b51c5 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -1810,16 +1810,12 @@ parse_constructor(Eo_Lexer *ls)
1810 ls->klass->base.name, 1810 ls->klass->base.name,
1811 ls->t.value.s); 1811 ls->t.value.s);
1812 eo_lexer_get(ls); 1812 eo_lexer_get(ls);
1813 while (ls->t.kw == KW_at_optional || ls->t.kw == KW_at_ctor_param) 1813 while (ls->t.kw == KW_at_optional)
1814 { 1814 {
1815 if (ls->t.kw == KW_at_optional) 1815 if (ls->t.kw == KW_at_optional)
1816 { 1816 {
1817 ctor->is_optional = EINA_TRUE; 1817 ctor->is_optional = EINA_TRUE;
1818 } 1818 }
1819 if (ls->t.kw == KW_at_ctor_param)
1820 {
1821 ctor->is_ctor_param = EINA_TRUE;
1822 }
1823 eo_lexer_get(ls); 1819 eo_lexer_get(ls);
1824 } 1820 }
1825 check_next(ls, ';'); 1821 check_next(ls, ';');
@@ -1841,16 +1837,12 @@ parse_constructor(Eo_Lexer *ls)
1841 if (ls->t.token != '.') break; 1837 if (ls->t.token != '.') break;
1842 eo_lexer_get(ls); 1838 eo_lexer_get(ls);
1843 } 1839 }
1844 while (ls->t.kw == KW_at_optional || ls->t.kw == KW_at_ctor_param) 1840 while (ls->t.kw == KW_at_optional)
1845 { 1841 {
1846 if (ls->t.kw == KW_at_optional) 1842 if (ls->t.kw == KW_at_optional)
1847 { 1843 {
1848 ctor->is_optional = EINA_TRUE; 1844 ctor->is_optional = EINA_TRUE;
1849 } 1845 }
1850 if (ls->t.kw == KW_at_ctor_param)
1851 {
1852 ctor->is_ctor_param = EINA_TRUE;
1853 }
1854 eo_lexer_get(ls); 1846 eo_lexer_get(ls);
1855 } 1847 }
1856 check_next(ls, ';'); 1848 check_next(ls, ';');
diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index 1821642c55..ab49424cad 100644
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -329,7 +329,6 @@ struct _Eolian_Constructor
329 Eolian_Object base; 329 Eolian_Object base;
330 const Eolian_Class *klass; 330 const Eolian_Class *klass;
331 Eina_Bool is_optional: 1; 331 Eina_Bool is_optional: 1;
332 Eina_Bool is_ctor_param : 1;
333}; 332};
334 333
335struct _Eolian_Event 334struct _Eolian_Event