diff options
| author | Daniel Kolesa <d.kolesa@samsung.com> | 2019-01-29 20:05:17 +0100 |
|---|---|---|
| committer | Daniel Kolesa <d.kolesa@samsung.com> | 2019-02-28 01:09:02 +0100 |
| commit | 7e2716444d79ddb59835bbf9776879e9ee877995 (patch) | |
| tree | 5cfc984d534a68c9e139ab02f66d18df0e3c742a | |
| parent | 899f6e864c055967c90b813f7495b1f3c66d75c2 (diff) | |
| download | efl-7e2716444d79ddb59835bbf9776879e9ee877995.tar.gz | |
eolian: disallow container nesting and freefuncs for builtins
It is now not possible to put e.g. lists inside hashes, at least
not for public API, as writing freeing logic and stuff for that
is too complex.
It is also now not allowed to override free functions for builtin
types, except mstring and inlist.
| -rw-r--r-- | src/lib/eolian/database_validate.c | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/src/lib/eolian/database_validate.c b/src/lib/eolian/database_validate.c index bb2abe79ab..377efa46ac 100644 --- a/src/lib/eolian/database_validate.c +++ b/src/lib/eolian/database_validate.c @@ -301,6 +301,12 @@ _validate_type(Validate_State *vals, Eolian_Type *tp) { if (!_validate_type(vals, itp)) return EINA_FALSE; + /* containers in containers are too complicated */ + if (itp->base_type && (kwid != KW_future)) + { + _eo_parser_log(&itp->base, "nested containers not allowed"); + return EINA_FALSE; + } if ((kwid >= KW_accessor) && (kwid <= KW_list) && (kwid != KW_future)) { if (!database_type_is_ownable(src, itp, EINA_TRUE)) @@ -313,6 +319,11 @@ _validate_type(Validate_State *vals, Eolian_Type *tp) } itp = itp->next_type; } + if (tp->freefunc) + { + _eo_parser_log(&tp->base, "builtin containers cannot have a custom free function"); + return EINA_FALSE; + } return _validate(&tp->base); } /* builtins */ @@ -321,8 +332,16 @@ _validate_type(Validate_State *vals, Eolian_Type *tp) { if (!eo_lexer_is_type_keyword(id)) return EINA_FALSE;; - if (!tp->freefunc && (id == KW_mstring)) - tp->freefunc = eina_stringshare_add("free"); + if (id == KW_mstring) + { + if (!tp->freefunc) + tp->freefunc = eina_stringshare_add("free"); + } + else if (tp->freefunc) + { + _eo_parser_log(&tp->base, "builtin primitives cannot have a free function"); + return EINA_FALSE; + } return _validate(&tp->base); } /* user defined */ @@ -341,11 +360,20 @@ _validate_type(Validate_State *vals, Eolian_Type *tp) if (!tp->owned) return _validate(&tp->base); - /* builtins are not required to have freefuncs, and + /* most builtins are not allowed to have freefuncs, and * potential ownability has already been validated before */ - if (eolian_type_aliased_base_get(tp)->btype) - return _validate(&tp->base); + switch (eolian_type_aliased_base_get(tp)->btype) + { + case EOLIAN_TYPE_BUILTIN_INVALID: + break; + case EOLIAN_TYPE_BUILTIN_MSTRING: + case EOLIAN_TYPE_BUILTIN_INLIST: + return _validate(&tp->base); + default: + _eo_parser_log(&tp->base, "free function overridden on a bad builtin"); + return EINA_FALSE; + } if (!tp->freefunc) { |