Browse Source

CodeGen - convert gone

JNI-106
heck 5 years ago
parent
commit
99e7f7ef90
  1. 7
      src/gen_cpp_Engine.ysl2
  2. 20
      src/gen_java_Engine.ysl2

7
src/gen_cpp_Engine.ysl2

@ -298,14 +298,7 @@ tstylesheet {
} }
function "mangle" { function "mangle" {
const "convert", "1";
choose {
when "$convert"
> «concat('Java_foundation_pEp_jniadapter_', ../@name, '__1', str:replace(@name, '_', '_1'))» > «concat('Java_foundation_pEp_jniadapter_', ../@name, '__1', str:replace(@name, '_', '_1'))»
otherwise
> «concat('Java_foundation_pEp_jniadapter_', ../@name, '_', str:replace(@name, '_', '_1'))»
}
} }
template "parm", mode=sig { template "parm", mode=sig {

20
src/gen_java_Engine.ysl2

@ -176,12 +176,10 @@ tstylesheet {
} }
template "method", mode=plain { template "method", mode=plain {
const "convert", "1";
const "singlereturn", "count(parm/creates|parm/returns|parm/inout[../int]) = 1"; const "singlereturn", "count(parm/creates|parm/returns|parm/inout[../int]) = 1";
const "multireturn", "count(parm/creates|parm/returns|parm/inout[../int]) > 1"; const "multireturn", "count(parm/creates|parm/returns|parm/inout[../int]) > 1";
if "$multireturn" { if "$multireturn" {
if "$convert"
|| ||
private class _«@name»_Return { private class _«@name»_Return {
`` apply "parm[creates|returns|inout[../int]]", 1, mode=intermediate with "public", 1; `` apply "parm[creates|returns|inout[../int]]", 1, mode=intermediate with "public", 1;
@ -190,22 +188,17 @@ tstylesheet {
|| ||
} }
if "$convert"
|| ||
private native `call "returnInter"` _«@name»( private native `call "returnInter"` _«@name»(
`` apply "parm[in|inout]", 2, mode=intermediate `` apply "parm[in|inout]", 2, mode=intermediate
) throws pEpException; ) throws pEpException;
|| public `call "returnJava"` «@name»(
||
public `if "not($convert)" > native ``call "returnJava"` «@name»(
`` apply "parm[in|inout]", 2, mode=java `` apply "parm[in|inout]", 2, mode=java
) throws pEpException`if "not($convert)" > ;` ) throws pEpException
{
|| ||
if "$convert" {
| {
apply "parm", mode=convertIn; apply "parm", mode=convertIn;
if "$singlereturn" choose { if "$singlereturn" choose {
@ -262,18 +255,13 @@ tstylesheet {
} }
|| ||
} }
||
||
}
template "method", mode=java_interface { template "method", mode=java_interface {
const "convert", "count(parm/stringlist|parm/stringpairlist|parm/string|parm/identity|parm/identitylist) > 0";
const "singlereturn", "count(parm/creates|parm/returns|parm/inout[../int]) = 1"; const "singlereturn", "count(parm/creates|parm/returns|parm/inout[../int]) = 1";
const "multireturn", "count(parm/creates|parm/returns|parm/inout[../int]) > 1"; const "multireturn", "count(parm/creates|parm/returns|parm/inout[../int]) > 1";
|| ||
public `if "not($convert)" > native ``call "returnJava"` «@name»( public `call "returnJava"` «@name»(
`` apply "parm[in|inout]", 2, mode=java `` apply "parm[in|inout]", 2, mode=java
) throws pEpException; ) throws pEpException;

Loading…
Cancel
Save