From 3478b204acef735bec58a2475db4de5c0c48e004 Mon Sep 17 00:00:00 2001 From: Edouard Tisserant Date: Fri, 20 May 2016 18:04:40 +0200 Subject: [PATCH] Fixed blacklist_retreive --- src/gen_cpp_Engine.ysl2 | 6 ++++++ src/pEp.yml2 | 6 +++--- src/types_java.ysl2 | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/gen_cpp_Engine.ysl2 b/src/gen_cpp_Engine.ysl2 index 1b42614..ff5f45c 100644 --- a/src/gen_cpp_Engine.ysl2 +++ b/src/gen_cpp_Engine.ysl2 @@ -11,6 +11,7 @@ tstylesheet { || #include #include + #include #include "org_pEp_jniadapter_«@name».h" #include "throw_pEp_exception.hh" #include "jniutils.hh" @@ -83,6 +84,11 @@ tstylesheet { with "sig", "'(J)V'"; } + when "$rettype = 'stringlist'" apply "parm[returns|creates]", mode=return{ + with "name", "'result'"; + with "retname", "$retname"; + } + otherwise error | # not implemented: return type "«$rettype»" } } diff --git a/src/pEp.yml2 b/src/pEp.yml2 index 81d12ec..ed0f4c5 100644 --- a/src/pEp.yml2 +++ b/src/pEp.yml2 @@ -100,9 +100,9 @@ namespace pEp { returns Color color ); - // method blacklist_retrive( - // creates stringlist blacklist - // ); + method blacklist_retrieve( + returns stringlist blacklist + ); basic string trustwords(identity ident); basic identity myself(identity ident); diff --git a/src/types_java.ysl2 b/src/types_java.ysl2 index a1ee923..ade2075 100644 --- a/src/types_java.ysl2 +++ b/src/types_java.ysl2 @@ -23,7 +23,7 @@ function "toJavaDeclare" { param "type"; choose { - when "$type='stringlist'" error | # cannot declare "stringlist" + when "$type='stringlist'" > Vector when "$type='string'" error | # cannot declare "string" when "$type='message'" > Message when "$type='identity'" > _Identity