eolian: add mstring

This is a new type representing a mutable string (no const).
Regular strings cannot be made mutable with @owned because
they might be hidden behind typedefs.
This commit is contained in:
Daniel Kolesa 2017-09-22 17:10:42 +02:00
parent fdd27cadf8
commit f36e5bd543
21 changed files with 27 additions and 31 deletions

View File

@ -383,7 +383,7 @@ class Efl.Net.Dialer.Http (Efl.Loop_User, Efl.Net.Dialer, Efl.Io.Sizer) {
params {
epochtime: int64; [[UNIX Epoch time - seconds since 1/1/1970]]
}
return: string @owned @warn_unused; [[Newly allocated null-terminated string on success or NULL on errors]]
return: mstring @owned @warn_unused; [[Newly allocated null-terminated string on success or NULL on errors]]
}
}

View File

@ -59,7 +59,7 @@ mixin Efl.Access.Action ()
params {
@in id: int; [[ID for widget]]
}
return: string @owned @warn_unused; [[Should be freed by the user.]]
return: mstring @owned @warn_unused; [[Should be freed by the user.]]
}
}
}

View File

@ -632,7 +632,7 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Only the text is returned, any format that may exist will not be part
of the return value. You must free the string when done with \@ref free.
]]
return: string @owned @warn_unused; [[Character]]
return: mstring @owned @warn_unused; [[Character]]
}
}
@property selection {

View File

@ -70,7 +70,7 @@ interface Elm.Interface.Atspi.Text ()
end_offset: ptr(int); [[Offset indicating end of string according to given granularity. -1 in case of error.]]
}
values {
string: string @owned; [[Newly allocated UTF-8 encoded string. Must be free by a user.]]
string: mstring @owned; [[Newly allocated UTF-8 encoded string. Must be free by a user.]]
}
}
@property text @protected {
@ -82,7 +82,7 @@ interface Elm.Interface.Atspi.Text ()
end_offset: int; [[End offset of text.]]
}
values {
text: string @owned; [[UTF-8 encoded text.]]
text: mstring @owned; [[UTF-8 encoded text.]]
}
}
@property caret_offset @protected {
@ -108,7 +108,7 @@ interface Elm.Interface.Atspi.Text ()
end_offset: ptr(int); [[Position in text to which given attribute is set.]]
}
values {
value: string @owned; [[Value of text attribute. Should be free()]]
value: mstring @owned; [[Value of text attribute. Should be free()]]
}
}
@property attributes @protected {

View File

@ -339,8 +339,8 @@ class Elm.Web (Elm.Widget)
The string returned must be freed by the user when it's done
with it.
]]
/* FIXME: const doesn't belong here */
return: const(string) @owned @warn_unused; [[A newly allocated string, or
/* FIXME: owned const string? */
return: string @owned @warn_unused; [[A newly allocated string, or
$null if nothing is selected
or an error occurred.]]
}

View File

@ -146,12 +146,7 @@ database_type_to_str(const Eolian_Type *tp, Eina_Strbuf *buf, const char *name,
}
int kw = eo_lexer_keyword_str_to_id(tp->name);
if (kw && eo_lexer_is_type_keyword(kw))
{
/* FIXME: deal with aliased strings? */
if ((kw == KW_string) && !tp->owned)
eina_strbuf_append(buf, "const ");
eina_strbuf_append(buf, eo_lexer_get_c_type(kw));
}
eina_strbuf_append(buf, eo_lexer_get_c_type(kw));
else
eina_strbuf_append(buf, tp->name);
}

View File

@ -75,7 +75,7 @@ static const char * const ctypes[] =
"Eina_Accessor", "Eina_Array", "Eina_Iterator", "Eina_Hash", "Eina_List",
"Efl_Future",
"Eina_Value", "char *", "Eina_Stringshare *",
"Eina_Value", "char *", "const char *", "Eina_Stringshare *",
"void *",

View File

@ -54,7 +54,8 @@ enum Tokens
\
KW(accessor), KW(array), KW(iterator), KW(hash), KW(list), \
KW(future), \
KW(generic_value), KW(string), KW(stringshare), \
KW(generic_value), \
KW(mstring), KW(string), KW(stringshare), \
\
KW(void_ptr), \
KW(__builtin_free_cb), \

View File

@ -159,7 +159,7 @@ Efl.Text.Font, Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor, Efl.Text.Annota
@since 1.18
]]
legacy: null;
return: string @owned; [[The text in the given range]]
return: mstring @owned; [[The text in the given range]]
params {
@in cur1: const(ptr(Efl.Text.Cursor.Cursor)); [[Start of range]]
@in cur2: const(ptr(Efl.Text.Cursor.Cursor)); [[End of range]]

View File

@ -12,7 +12,7 @@ class Complex_Type {
}
foo {
params {
buf: string @owned;
buf: mstring @owned;
}
return: list<stringshare> @owned; [[comment for method return]]
}

View File

@ -16,7 +16,7 @@ class Decl {
params {
idx: int;
}
return: string @owned;
return: mstring @owned;
}
}
}

View File

@ -39,7 +39,7 @@ class Enum {
params {
idx: int;
}
return: string @owned;
return: mstring @owned;
}
}
}

View File

@ -22,7 +22,7 @@ class Extern {
params {
idx: int;
}
return: string @owned;
return: mstring @owned;
}
}
}

View File

@ -24,7 +24,7 @@ class Free_Func {
params {
idx: int;
}
return: string @owned;
return: mstring @owned;
}
}
}

View File

@ -19,7 +19,7 @@ class Function_As_Argument {
a: int;
b: double;
}
return: string @owned;
return: mstring @owned;
}
}
}

View File

@ -16,7 +16,7 @@ function SimpleFunc {
function ComplexFunc {
params {
@in c: string;
@out d: string @owned;
@out d: mstring @owned;
}
return: double;
};

View File

@ -23,7 +23,7 @@ class Struct {
params {
idx: int;
}
return: string @owned;
return: mstring @owned;
}
bar {
return: ptr(Named);

View File

@ -33,7 +33,7 @@ class Typedef {
params {
idx: int;
}
return: string @owned;
return: mstring @owned;
}
}
}

View File

@ -16,7 +16,7 @@ class Var {
params {
idx: int;
}
return: string @owned;
return: mstring @owned;
}
}
}

View File

@ -40,7 +40,7 @@ class Complex (Efl.Object)
}
instringowncont {
params {
l: list<string @owned>;
l: list<mstring @owned>;
}
}
instringcontown {
@ -121,7 +121,7 @@ class Complex (Efl.Object)
}
outstringowncont {
params {
@out l: list<string @owned>;
@out l: list<mstring @owned>;
}
}
outstringcontown {

View File

@ -56,7 +56,7 @@ class Name1.Name2.Type_Generation (Efl.Object)
}
instringown {
params {
@in v: string @owned;
@in v: mstring @owned;
}
}
instringptrown {
@ -102,7 +102,7 @@ class Name1.Name2.Type_Generation (Efl.Object)
return: ptr(string);
}
returnstringown {
return: string @owned;
return: mstring @owned;
}
returnstringownptr {
return: ptr(string) @owned;