Eolian/Tests: Clean makefile + add return comment tests.
This commit is contained in:
parent
dd587ba43b
commit
0dda45961f
|
@ -76,9 +76,6 @@ TESTS += tests/eolian/eolian_suite
|
||||||
tests_eolian_eolian_suite_LDADD = @CHECK_LIBS@ @USE_EOLIAN_LIBS@
|
tests_eolian_eolian_suite_LDADD = @CHECK_LIBS@ @USE_EOLIAN_LIBS@
|
||||||
tests_eolian_eolian_suite_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@
|
tests_eolian_eolian_suite_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@
|
||||||
|
|
||||||
eoliandatafilesdir = $(datadir)/eolian/data
|
|
||||||
eoliandatafiles_DATA = tests/eolian/data/class_simple.eo
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
|
|
|
@ -1748,7 +1748,7 @@ _eof_trans:
|
||||||
#line 680 "lib/eolian/eo_lexer.rl"
|
#line 680 "lib/eolian/eo_lexer.rl"
|
||||||
{
|
{
|
||||||
if (!toknz->tmp.meth) ABORT(toknz, "No method!!!");
|
if (!toknz->tmp.meth) ABORT(toknz, "No method!!!");
|
||||||
if (toknz->tmp.meth->ret != NULL) ABORT(toknz, "No ret!!!");
|
if (toknz->tmp.meth->ret == NULL) ABORT(toknz, "No ret!!!");
|
||||||
if (toknz->tmp.meth->ret->comment != NULL)
|
if (toknz->tmp.meth->ret->comment != NULL)
|
||||||
ABORT(toknz, "method '%s' return type has already a comment", toknz->tmp.meth->name);
|
ABORT(toknz, "method '%s' return type has already a comment", toknz->tmp.meth->name);
|
||||||
toknz->tmp.meth->ret->comment = _eo_tokenizer_token_get(toknz, ( toknz->p)-2);
|
toknz->tmp.meth->ret->comment = _eo_tokenizer_token_get(toknz, ( toknz->p)-2);
|
||||||
|
@ -3210,7 +3210,7 @@ _eof_trans:
|
||||||
#line 680 "lib/eolian/eo_lexer.rl"
|
#line 680 "lib/eolian/eo_lexer.rl"
|
||||||
{
|
{
|
||||||
if (!toknz->tmp.meth) ABORT(toknz, "No method!!!");
|
if (!toknz->tmp.meth) ABORT(toknz, "No method!!!");
|
||||||
if (toknz->tmp.meth->ret != NULL) ABORT(toknz, "No ret!!!");
|
if (toknz->tmp.meth->ret == NULL) ABORT(toknz, "No ret!!!");
|
||||||
if (toknz->tmp.meth->ret->comment != NULL)
|
if (toknz->tmp.meth->ret->comment != NULL)
|
||||||
ABORT(toknz, "method '%s' return type has already a comment", toknz->tmp.meth->name);
|
ABORT(toknz, "method '%s' return type has already a comment", toknz->tmp.meth->name);
|
||||||
toknz->tmp.meth->ret->comment = _eo_tokenizer_token_get(toknz, ( toknz->p)-2);
|
toknz->tmp.meth->ret->comment = _eo_tokenizer_token_get(toknz, ( toknz->p)-2);
|
||||||
|
|
|
@ -679,7 +679,7 @@ _eo_tokenizer_implement_get(Eo_Tokenizer *toknz, char *p)
|
||||||
|
|
||||||
action end_method_rettype_comment {
|
action end_method_rettype_comment {
|
||||||
if (!toknz->tmp.meth) ABORT(toknz, "No method!!!");
|
if (!toknz->tmp.meth) ABORT(toknz, "No method!!!");
|
||||||
if (toknz->tmp.meth->ret != NULL) ABORT(toknz, "No ret!!!");
|
if (toknz->tmp.meth->ret == NULL) ABORT(toknz, "No ret!!!");
|
||||||
if (toknz->tmp.meth->ret->comment != NULL)
|
if (toknz->tmp.meth->ret->comment != NULL)
|
||||||
ABORT(toknz, "method '%s' return type has already a comment", toknz->tmp.meth->name);
|
ABORT(toknz, "method '%s' return type has already a comment", toknz->tmp.meth->name);
|
||||||
toknz->tmp.meth->ret->comment = _eo_tokenizer_token_get(toknz, fpc-2);
|
toknz->tmp.meth->ret->comment = _eo_tokenizer_token_get(toknz, fpc-2);
|
||||||
|
|
|
@ -8,7 +8,7 @@ class Simple {
|
||||||
set {
|
set {
|
||||||
/*@
|
/*@
|
||||||
comment a::set */
|
comment a::set */
|
||||||
return Eina_Bool (EINA_TRUE);
|
return Eina_Bool (EINA_TRUE); /*@ comment for property set return */
|
||||||
}
|
}
|
||||||
get {
|
get {
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@ class Simple {
|
||||||
@inout char *b;
|
@inout char *b;
|
||||||
@out double c;
|
@out double c;
|
||||||
}
|
}
|
||||||
return char *(NULL);
|
return char *(NULL); /*@ comment for method return */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -78,15 +78,21 @@ START_TEST(eolian_simple_parsing)
|
||||||
fail_if(strcmp(string, "comment a::set"));
|
fail_if(strcmp(string, "comment a::set"));
|
||||||
string = eolian_function_description_get(fid, EOLIAN_COMMENT_GET);
|
string = eolian_function_description_get(fid, EOLIAN_COMMENT_GET);
|
||||||
fail_if(string);
|
fail_if(string);
|
||||||
/* Function return */
|
/* Set return */
|
||||||
string = eolian_function_return_type_get(fid, EOLIAN_PROP_SET);
|
string = eolian_function_return_type_get(fid, EOLIAN_PROP_SET);
|
||||||
fail_if(!string);
|
fail_if(!string);
|
||||||
fail_if(strcmp(string, "Eina_Bool"));
|
fail_if(strcmp(string, "Eina_Bool"));
|
||||||
string = eolian_function_return_dflt_value_get(fid, EOLIAN_PROP_SET);
|
string = eolian_function_return_dflt_value_get(fid, EOLIAN_PROP_SET);
|
||||||
fail_if(!string);
|
fail_if(!string);
|
||||||
fail_if(strcmp(string, "EINA_TRUE"));
|
fail_if(strcmp(string, "EINA_TRUE"));
|
||||||
|
string = eolian_function_return_comment_get(fid, EOLIAN_PROP_SET);
|
||||||
|
fail_if(!string);
|
||||||
|
fail_if(strcmp(string, "comment for property set return"));
|
||||||
|
/* Get return */
|
||||||
string = eolian_function_return_type_get(fid, EOLIAN_PROP_GET);
|
string = eolian_function_return_type_get(fid, EOLIAN_PROP_GET);
|
||||||
fail_if(string);
|
fail_if(string);
|
||||||
|
string = eolian_function_return_comment_get(fid, EOLIAN_PROP_GET);
|
||||||
|
fail_if(string);
|
||||||
|
|
||||||
/* Function parameters */
|
/* Function parameters */
|
||||||
fail_if(eolian_property_keys_list_get(fid) != NULL);
|
fail_if(eolian_property_keys_list_get(fid) != NULL);
|
||||||
|
@ -110,6 +116,9 @@ START_TEST(eolian_simple_parsing)
|
||||||
string = eolian_function_return_dflt_value_get(fid, EOLIAN_METHOD);
|
string = eolian_function_return_dflt_value_get(fid, EOLIAN_METHOD);
|
||||||
fail_if(!string);
|
fail_if(!string);
|
||||||
fail_if(strcmp(string, "NULL"));
|
fail_if(strcmp(string, "NULL"));
|
||||||
|
string = eolian_function_return_comment_get(fid, EOLIAN_METHOD);
|
||||||
|
fail_if(!string);
|
||||||
|
fail_if(strcmp(string, "comment for method return"));
|
||||||
|
|
||||||
/* Function parameters */
|
/* Function parameters */
|
||||||
fail_if(!(list = eolian_parameters_list_get(fid)));
|
fail_if(!(list = eolian_parameters_list_get(fid)));
|
||||||
|
|
Loading…
Reference in New Issue