Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
djinni
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
djinni
Commits
fa3a568e
Commit
fa3a568e
authored
Aug 05, 2016
by
Andrew Twyman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tweak new test case
parent
ebda4a20
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
22 deletions
+22
-22
test-suite/djinni/varnames.djinni
test-suite/djinni/varnames.djinni
+2
-2
test-suite/generated-src/cpp/_varname_interface_.hpp
test-suite/generated-src/cpp/_varname_interface_.hpp
+2
-2
test-suite/generated-src/java/com/dropbox/djinni/test/VarnameInterface.java
...ed-src/java/com/dropbox/djinni/test/VarnameInterface.java
+8
-8
test-suite/generated-src/jni/NativeVarnameInterface.cpp
test-suite/generated-src/jni/NativeVarnameInterface.cpp
+4
-4
test-suite/generated-src/objc/DBVarnameInterface+Private.mm
test-suite/generated-src/objc/DBVarnameInterface+Private.mm
+4
-4
test-suite/generated-src/objc/DBVarnameInterface.h
test-suite/generated-src/objc/DBVarnameInterface.h
+2
-2
No files found.
test-suite/djinni/varnames.djinni
View file @
fa3a568e
...
@@ -6,6 +6,6 @@ _varname_record_ = record {
...
@@ -6,6 +6,6 @@ _varname_record_ = record {
}
}
_varname_interface_ = interface +c {
_varname_interface_ = interface +c {
_rmethod_(
r
: _varname_record_): _varname_record_;
_rmethod_(
_r_arg_
: _varname_record_): _varname_record_;
_imethod_(
i
: _varname_interface_): _varname_interface_;
_imethod_(
_i_arg_
: _varname_interface_): _varname_interface_;
}
}
test-suite/generated-src/cpp/_varname_interface_.hpp
View file @
fa3a568e
...
@@ -13,9 +13,9 @@ class VarnameInterface {
...
@@ -13,9 +13,9 @@ class VarnameInterface {
public:
public:
virtual
~
VarnameInterface
()
{}
virtual
~
VarnameInterface
()
{}
virtual
VarnameRecord
_rmethod_
(
const
VarnameRecord
&
r
)
=
0
;
virtual
VarnameRecord
_rmethod_
(
const
VarnameRecord
&
_r_arg_
)
=
0
;
virtual
std
::
shared_ptr
<
VarnameInterface
>
_imethod_
(
const
std
::
shared_ptr
<
VarnameInterface
>
&
i
)
=
0
;
virtual
std
::
shared_ptr
<
VarnameInterface
>
_imethod_
(
const
std
::
shared_ptr
<
VarnameInterface
>
&
_i_arg_
)
=
0
;
};
};
}
// namespace testsuite
}
// namespace testsuite
test-suite/generated-src/java/com/dropbox/djinni/test/VarnameInterface.java
View file @
fa3a568e
...
@@ -9,10 +9,10 @@ import javax.annotation.Nonnull;
...
@@ -9,10 +9,10 @@ import javax.annotation.Nonnull;
public
abstract
class
VarnameInterface
{
public
abstract
class
VarnameInterface
{
@Nonnull
@Nonnull
public
abstract
VarnameRecord
Rmethod
(
@Nonnull
VarnameRecord
r
);
public
abstract
VarnameRecord
Rmethod
(
@Nonnull
VarnameRecord
RArg
);
@CheckForNull
@CheckForNull
public
abstract
VarnameInterface
Imethod
(
@CheckForNull
VarnameInterface
i
);
public
abstract
VarnameInterface
Imethod
(
@CheckForNull
VarnameInterface
IArg
);
private
static
final
class
CppProxy
extends
VarnameInterface
private
static
final
class
CppProxy
extends
VarnameInterface
{
{
...
@@ -38,19 +38,19 @@ public abstract class VarnameInterface {
...
@@ -38,19 +38,19 @@ public abstract class VarnameInterface {
}
}
@Override
@Override
public
VarnameRecord
Rmethod
(
VarnameRecord
r
)
public
VarnameRecord
Rmethod
(
VarnameRecord
RArg
)
{
{
assert
!
this
.
destroyed
.
get
()
:
"trying to use a destroyed object"
;
assert
!
this
.
destroyed
.
get
()
:
"trying to use a destroyed object"
;
return
native_Rmethod
(
this
.
nativeRef
,
r
);
return
native_Rmethod
(
this
.
nativeRef
,
RArg
);
}
}
private
native
VarnameRecord
native_Rmethod
(
long
_nativeRef
,
VarnameRecord
r
);
private
native
VarnameRecord
native_Rmethod
(
long
_nativeRef
,
VarnameRecord
RArg
);
@Override
@Override
public
VarnameInterface
Imethod
(
VarnameInterface
i
)
public
VarnameInterface
Imethod
(
VarnameInterface
IArg
)
{
{
assert
!
this
.
destroyed
.
get
()
:
"trying to use a destroyed object"
;
assert
!
this
.
destroyed
.
get
()
:
"trying to use a destroyed object"
;
return
native_Imethod
(
this
.
nativeRef
,
i
);
return
native_Imethod
(
this
.
nativeRef
,
IArg
);
}
}
private
native
VarnameInterface
native_Imethod
(
long
_nativeRef
,
VarnameInterface
i
);
private
native
VarnameInterface
native_Imethod
(
long
_nativeRef
,
VarnameInterface
IArg
);
}
}
}
}
test-suite/generated-src/jni/NativeVarnameInterface.cpp
View file @
fa3a568e
...
@@ -19,22 +19,22 @@ CJNIEXPORT void JNICALL Java_com_dropbox_djinni_test_VarnameInterface_00024CppPr
...
@@ -19,22 +19,22 @@ CJNIEXPORT void JNICALL Java_com_dropbox_djinni_test_VarnameInterface_00024CppPr
}
JNI_TRANSLATE_EXCEPTIONS_RETURN
(
jniEnv
,
)
}
JNI_TRANSLATE_EXCEPTIONS_RETURN
(
jniEnv
,
)
}
}
CJNIEXPORT
jobject
JNICALL
Java_com_dropbox_djinni_test_VarnameInterface_00024CppProxy_native_1Rmethod
(
JNIEnv
*
jniEnv
,
jobject
/*this*/
,
jlong
nativeRef
,
jobject
j_
r
)
CJNIEXPORT
jobject
JNICALL
Java_com_dropbox_djinni_test_VarnameInterface_00024CppProxy_native_1Rmethod
(
JNIEnv
*
jniEnv
,
jobject
/*this*/
,
jlong
nativeRef
,
jobject
j_
RArg
)
{
{
try
{
try
{
DJINNI_FUNCTION_PROLOGUE1
(
jniEnv
,
nativeRef
);
DJINNI_FUNCTION_PROLOGUE1
(
jniEnv
,
nativeRef
);
const
auto
&
ref
=
::
djinni
::
objectFromHandleAddress
<::
testsuite
::
VarnameInterface
>
(
nativeRef
);
const
auto
&
ref
=
::
djinni
::
objectFromHandleAddress
<::
testsuite
::
VarnameInterface
>
(
nativeRef
);
auto
r
=
ref
->
_rmethod_
(
::
djinni_generated
::
NativeVarnameRecord
::
toCpp
(
jniEnv
,
j_
r
));
auto
r
=
ref
->
_rmethod_
(
::
djinni_generated
::
NativeVarnameRecord
::
toCpp
(
jniEnv
,
j_
RArg
));
return
::
djinni
::
release
(
::
djinni_generated
::
NativeVarnameRecord
::
fromCpp
(
jniEnv
,
r
));
return
::
djinni
::
release
(
::
djinni_generated
::
NativeVarnameRecord
::
fromCpp
(
jniEnv
,
r
));
}
JNI_TRANSLATE_EXCEPTIONS_RETURN
(
jniEnv
,
0
/* value doesn't matter */
)
}
JNI_TRANSLATE_EXCEPTIONS_RETURN
(
jniEnv
,
0
/* value doesn't matter */
)
}
}
CJNIEXPORT
jobject
JNICALL
Java_com_dropbox_djinni_test_VarnameInterface_00024CppProxy_native_1Imethod
(
JNIEnv
*
jniEnv
,
jobject
/*this*/
,
jlong
nativeRef
,
jobject
j_
i
)
CJNIEXPORT
jobject
JNICALL
Java_com_dropbox_djinni_test_VarnameInterface_00024CppProxy_native_1Imethod
(
JNIEnv
*
jniEnv
,
jobject
/*this*/
,
jlong
nativeRef
,
jobject
j_
IArg
)
{
{
try
{
try
{
DJINNI_FUNCTION_PROLOGUE1
(
jniEnv
,
nativeRef
);
DJINNI_FUNCTION_PROLOGUE1
(
jniEnv
,
nativeRef
);
const
auto
&
ref
=
::
djinni
::
objectFromHandleAddress
<::
testsuite
::
VarnameInterface
>
(
nativeRef
);
const
auto
&
ref
=
::
djinni
::
objectFromHandleAddress
<::
testsuite
::
VarnameInterface
>
(
nativeRef
);
auto
r
=
ref
->
_imethod_
(
::
djinni_generated
::
NativeVarnameInterface
::
toCpp
(
jniEnv
,
j_
i
));
auto
r
=
ref
->
_imethod_
(
::
djinni_generated
::
NativeVarnameInterface
::
toCpp
(
jniEnv
,
j_
IArg
));
return
::
djinni
::
release
(
::
djinni_generated
::
NativeVarnameInterface
::
fromCpp
(
jniEnv
,
r
));
return
::
djinni
::
release
(
::
djinni_generated
::
NativeVarnameInterface
::
fromCpp
(
jniEnv
,
r
));
}
JNI_TRANSLATE_EXCEPTIONS_RETURN
(
jniEnv
,
0
/* value doesn't matter */
)
}
JNI_TRANSLATE_EXCEPTIONS_RETURN
(
jniEnv
,
0
/* value doesn't matter */
)
}
}
...
...
test-suite/generated-src/objc/DBVarnameInterface+Private.mm
View file @
fa3a568e
...
@@ -30,16 +30,16 @@ static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for th
...
@@ -30,16 +30,16 @@ static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for th
return
self
;
return
self
;
}
}
-
(
nonnull
DBVarnameRecord
*
)
Rmethod
:(
nonnull
DBVarnameRecord
*
)
r
{
-
(
nonnull
DBVarnameRecord
*
)
Rmethod
:(
nonnull
DBVarnameRecord
*
)
RArg
{
try
{
try
{
auto
objcpp_result_
=
_cppRefHandle
.
get
()
->
_rmethod_
(
::
djinni_generated
::
VarnameRecord
::
toCpp
(
r
));
auto
objcpp_result_
=
_cppRefHandle
.
get
()
->
_rmethod_
(
::
djinni_generated
::
VarnameRecord
::
toCpp
(
RArg
));
return
::
djinni_generated
::
VarnameRecord
::
fromCpp
(
objcpp_result_
);
return
::
djinni_generated
::
VarnameRecord
::
fromCpp
(
objcpp_result_
);
}
DJINNI_TRANSLATE_EXCEPTIONS
()
}
DJINNI_TRANSLATE_EXCEPTIONS
()
}
}
-
(
nullable
DBVarnameInterface
*
)
Imethod
:(
nullable
DBVarnameInterface
*
)
i
{
-
(
nullable
DBVarnameInterface
*
)
Imethod
:(
nullable
DBVarnameInterface
*
)
IArg
{
try
{
try
{
auto
objcpp_result_
=
_cppRefHandle
.
get
()
->
_imethod_
(
::
djinni_generated
::
VarnameInterface
::
toCpp
(
i
));
auto
objcpp_result_
=
_cppRefHandle
.
get
()
->
_imethod_
(
::
djinni_generated
::
VarnameInterface
::
toCpp
(
IArg
));
return
::
djinni_generated
::
VarnameInterface
::
fromCpp
(
objcpp_result_
);
return
::
djinni_generated
::
VarnameInterface
::
fromCpp
(
objcpp_result_
);
}
DJINNI_TRANSLATE_EXCEPTIONS
()
}
DJINNI_TRANSLATE_EXCEPTIONS
()
}
}
...
...
test-suite/generated-src/objc/DBVarnameInterface.h
View file @
fa3a568e
...
@@ -8,8 +8,8 @@
...
@@ -8,8 +8,8 @@
@interface
DBVarnameInterface
:
NSObject
@interface
DBVarnameInterface
:
NSObject
-
(
nonnull
DBVarnameRecord
*
)
Rmethod
:(
nonnull
DBVarnameRecord
*
)
r
;
-
(
nonnull
DBVarnameRecord
*
)
Rmethod
:(
nonnull
DBVarnameRecord
*
)
RArg
;
-
(
nullable
DBVarnameInterface
*
)
Imethod
:(
nullable
DBVarnameInterface
*
)
i
;
-
(
nullable
DBVarnameInterface
*
)
Imethod
:(
nullable
DBVarnameInterface
*
)
IArg
;
@end
@end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment