timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eolian cxx/js: fix test eo file ownership

This commit is contained in:
Daniel Kolesa 2017-09-15 17:10:41 +02:00
parent 78a5ac09f8
commit c559380f7f
4 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/tests/eolian_cxx/complex.eo
View File

@ -20,17 +20,17 @@ class Complex (Efl.Object)
}
incontcontown {
params {
l: own(list<list<int>>);
l: list<list<int>> @owned;
}
}
incontowncontown {
params {
l: own(list<own(list<int>)>);
l: list<list<int> @owned> @owned;
}
}
incontowncont {
params {
l: list<own(list<int>)>;
l: list<list<int> @owned>;
}
}
instringcont {
@ -40,12 +40,12 @@ class Complex (Efl.Object)
}
instringowncont {
params {
l: list<own(string)>;
l: list<string @owned>;
}
}
instringcontown {
params {
l: own(list<string>);
l: list<string> @owned;
}
}
inarray {
@ -55,7 +55,7 @@ class Complex (Efl.Object)
}
inarrayown {
params {
l: own(array<int>);
l: array<int> @owned;
}
}
inhash {
@ -65,7 +65,7 @@ class Complex (Efl.Object)
}
inhashown {
params {
l: own(hash<int, int>);
l: hash<int, int> @owned;
}
}
initerator {
@ -75,7 +75,7 @@ class Complex (Efl.Object)
}
initeratorown {
params {
l: own(iterator<int>);
l: iterator<int> @owned;
}
}
inaccessor {
@ -85,7 +85,7 @@ class Complex (Efl.Object)
}
inaccessorown {
params {
l: own(accessor<int>);
l: accessor<int> @owned;
}
}
// out
@ -101,17 +101,17 @@ class Complex (Efl.Object)
}
outcontcontown {
params {
@out l: own(list<list<int>>);
@out l: list<list<int>> @owned;
}
}
outcontowncontown {
params {
@out l: own(list<own(list<int>)>);
@out l: list<list<int> @owned> @owned;
}
}
outcontowncont {
params {
@out l: list<own(list<int>)>;
@out l: list<list<int> @owned>;
}
}
outstringcont {
@ -121,12 +121,12 @@ class Complex (Efl.Object)
}
outstringowncont {
params {
@out l: list<own(string)>;
@out l: list<string @owned>;
}
}
outstringcontown {
params {
@out l: own(list<string>);
@out l: list<string> @owned;
}
}
outarray {
@ -136,7 +136,7 @@ class Complex (Efl.Object)
}
outarrayown {
params {
@out l: own(array<int>);
@out l: array<int> @owned;
}
}
outhash {
@ -146,7 +146,7 @@ class Complex (Efl.Object)
}
outhashown {
params {
@out l: own(hash<int, int>);
@out l: hash<int, int> @owned;
}
}
outiterator {
@ -156,7 +156,7 @@ class Complex (Efl.Object)
}
outiteratorown {
params {
@out l: own(iterator<int>);
@out l: iterator<int> @owned;
}
}
outaccessor {
@ -166,7 +166,7 @@ class Complex (Efl.Object)
}
outaccessorown {
params {
@out l: own(accessor<int>);
@out l: accessor<int> @owned;
}
}
//

38
src/tests/eolian_cxx/name1_name2_type_generation.eo
View File

@ -10,12 +10,12 @@ class Name1.Name2.Type_Generation (Efl.Object)
}
inrefintown {
params {
@in v: own(ptr(int));
@in v: ptr(int) @owned;
}
}
inrefintownfree {
params {
@in v: free(own(ptr(int)), free);
@in v: free(ptr(int), free) @owned;
}
}
// in void ptr
@ -36,12 +36,12 @@ class Name1.Name2.Type_Generation (Efl.Object)
}
inintptrown {
params {
@in v: own(ptr(int));
@in v: ptr(int) @owned;
}
}
inintptrownfree {
params {
@in v: free(own(ptr(int)), free);
@in v: free(ptr(int), free) @owned;
}
}
instring {
@ -56,12 +56,12 @@ class Name1.Name2.Type_Generation (Efl.Object)
}
instringown {
params {
@in v: own(string);
@in v: string @owned;
}
}
instringptrown {
params {
@in v: own(ptr(string));
@in v: ptr(string) @owned;
}
}
instringshare {
@ -71,7 +71,7 @@ class Name1.Name2.Type_Generation (Efl.Object)
}
instringshareown {
params {
@in v: own(stringshare);
@in v: stringshare @owned;
}
}
// return
@ -88,11 +88,11 @@ class Name1.Name2.Type_Generation (Efl.Object)
return: ptr(int);
}
returnintptrown {
return: own(ptr(int));
return: ptr(int) @owned;
}
returnintptrownfree {
params {
@in v: free(own(ptr(int)), free);
@in v: free(ptr(int), free) @owned;
}
}
returnstring {
@ -102,16 +102,16 @@ class Name1.Name2.Type_Generation (Efl.Object)
return: ptr(string);
}
returnstringown {
return: own(string);
return: string @owned;
}
returnstringownptr {
return: own(ptr(string));
return: ptr(string) @owned;
}
returnstringshare {
return: stringshare;
}
returnstringshareown {
return: own(stringshare);
return: stringshare @owned;
}
// out
outvoidptr {
@ -131,12 +131,12 @@ class Name1.Name2.Type_Generation (Efl.Object)
}
outintptrown {
params {
@out v: own(ptr(int));
@out v: ptr(int) @owned;
}
}
outintptrownfree {
params {
@out v: free(own(ptr(int)), free);
@out v: free(ptr(int), free) @owned;
}
}
outstringshare {
@ -146,7 +146,7 @@ class Name1.Name2.Type_Generation (Efl.Object)
}
outstringshareown {
params {
@out v: own(stringshare);
@out v: stringshare @owned;
}
}
// classname
@ -182,12 +182,12 @@ class Name1.Name2.Type_Generation (Efl.Object)
}
optionalinintptrown {
params {
@in v: own(ptr(int)) @optional;
@in v: ptr(int) @owned @optional;
}
}
optionalinintptrownfree {
params {
@in v: free(own(ptr(int)), free) @optional;
@in v: free(ptr(int), free) @owned @optional;
}
}
optionaloutvoidptr {
@ -207,12 +207,12 @@ class Name1.Name2.Type_Generation (Efl.Object)
}
optionaloutintptrown {
params {
@out v: own(ptr(int)) @optional;
@out v: ptr(int) @owned @optional;
}
}
optionaloutintptrownfree {
params {
@out v: free(own(ptr(int)), free) @optional;
@out v: free(ptr(int), free) @owned @optional;
}
}
optionalinclassname {

4
src/tests/eolian_js/constructor_method_class.eo
View File

@ -41,10 +41,10 @@ class Constructor_Method_Class (Efl.Object)
}
classoutmethod1 {
params { @in one: int; @in two: double; }
return: free(own(Constructor_Method_Class), eo_unref) @warn_unused;
return: free(Constructor_Method_Class, eo_unref) @owned @warn_unused;
}
classoutmethod2 {
params { @in one: int; @in two: double; @out out_class: own(Constructor_Method_Class); }
params { @in one: int; @in two: double; @out out_class: Constructor_Method_Class @owned; }
}
}
implements {

4
src/tests/eolian_js/test_object.eo
View File

@ -104,7 +104,7 @@ class Test.Object (Efl.Object) {
}
method_array_with_42_check {
[[ tests parameters ]]
return: free(own(array<int>), eina_array_free) @warn_unused;
return: array<int> @owned @warn_unused;
}
method_array_in_array_out_check {
[[ tests parameters ]]
@ -157,7 +157,7 @@ class Test.Object (Efl.Object) {
}
method_list_with_42_check {
[[ tests parameters ]]
return: free(own(list<int>), eina_list_free) @warn_unused;
return: list<int> @owned @warn_unused;
}
method_list_in_list_out_check {
[[ tests parameters ]]