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
c51780fe
Commit
c51780fe
authored
May 22, 2015
by
Andrew Twyman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Flesh out test suite with basic test for all primitive types, in both languages.
parent
5a0a374b
Changes
28
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
28 changed files
with
416 additions
and
137 deletions
+416
-137
README.md
README.md
+1
-1
example/generated-src/objc/TXSItemList.mm
example/generated-src/objc/TXSItemList.mm
+0
-1
test-suite/README.md
test-suite/README.md
+4
-0
test-suite/djinni/all.djinni
test-suite/djinni/all.djinni
+1
-1
test-suite/djinni/primtypes.djinni
test-suite/djinni/primtypes.djinni
+5
-1
test-suite/djinni/test.djinni
test-suite/djinni/test.djinni
+1
-1
test-suite/generated-src/cpp/assorted_primitives.cpp
test-suite/generated-src/cpp/assorted_primitives.cpp
+24
-0
test-suite/generated-src/cpp/assorted_primitives.hpp
test-suite/generated-src/cpp/assorted_primitives.hpp
+52
-0
test-suite/generated-src/cpp/test_helpers.hpp
test-suite/generated-src/cpp/test_helpers.hpp
+2
-2
test-suite/generated-src/java/com/dropbox/djinni/test/AssortedPrimitives.java
...-src/java/com/dropbox/djinni/test/AssortedPrimitives.java
+46
-8
test-suite/generated-src/java/com/dropbox/djinni/test/TestHelpers.java
...nerated-src/java/com/dropbox/djinni/test/TestHelpers.java
+1
-1
test-suite/generated-src/jni/NativeAssortedPrimitives.cpp
test-suite/generated-src/jni/NativeAssortedPrimitives.cpp
+20
-12
test-suite/generated-src/jni/NativeAssortedPrimitives.hpp
test-suite/generated-src/jni/NativeAssortedPrimitives.hpp
+14
-10
test-suite/generated-src/jni/NativeTestHelpers.cpp
test-suite/generated-src/jni/NativeTestHelpers.cpp
+4
-4
test-suite/generated-src/objc/DBAssortedIntegers+Private.mm
test-suite/generated-src/objc/DBAssortedIntegers+Private.mm
+0
-35
test-suite/generated-src/objc/DBAssortedPrimitives+Private.h
test-suite/generated-src/objc/DBAssortedPrimitives+Private.h
+24
-0
test-suite/generated-src/objc/DBAssortedPrimitives+Private.mm
...-suite/generated-src/objc/DBAssortedPrimitives+Private.mm
+43
-0
test-suite/generated-src/objc/DBAssortedPrimitives.h
test-suite/generated-src/objc/DBAssortedPrimitives.h
+44
-0
test-suite/generated-src/objc/DBAssortedPrimitives.mm
test-suite/generated-src/objc/DBAssortedPrimitives.mm
+32
-16
test-suite/generated-src/objc/DBTestHelpers+Private.mm
test-suite/generated-src/objc/DBTestHelpers+Private.mm
+4
-4
test-suite/generated-src/objc/DBTestHelpers.h
test-suite/generated-src/objc/DBTestHelpers.h
+2
-2
test-suite/handwritten-src/cpp/test_helpers.cpp
test-suite/handwritten-src/cpp/test_helpers.cpp
+2
-2
test-suite/handwritten-src/java/com/dropbox/djinni/test/AllTests.java
...andwritten-src/java/com/dropbox/djinni/test/AllTests.java
+1
-1
test-suite/handwritten-src/java/com/dropbox/djinni/test/ClientInterfaceImpl.java
...src/java/com/dropbox/djinni/test/ClientInterfaceImpl.java
+0
-2
test-suite/handwritten-src/java/com/dropbox/djinni/test/IntegerTest.java
...written-src/java/com/dropbox/djinni/test/IntegerTest.java
+0
-13
test-suite/handwritten-src/java/com/dropbox/djinni/test/PrimitivesTest.java
...tten-src/java/com/dropbox/djinni/test/PrimitivesTest.java
+13
-0
test-suite/handwritten-src/objc/tests/DBPrimitivesTests.m
test-suite/handwritten-src/objc/tests/DBPrimitivesTests.m
+50
-0
test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
+26
-20
No files found.
README.md
View file @
c51780fe
...
@@ -263,7 +263,7 @@ and Objective-C `NSInteger` are not used because their length varies by architec
...
@@ -263,7 +263,7 @@ and Objective-C `NSInteger` are not used because their length varies by architec
integers are not included because they are not available in Java.
integers are not included because they are not available in Java.
## Test Suite
## Test Suite
Run
`make
`
in the
`test-suite`
directory to invoke the test suite
.
Run
`make
test`
to invoke the test suite, found in the test-suite subdirectory
.
## Authors
## Authors
-
Kannan Goundan
-
Kannan Goundan
...
...
example/generated-src/objc/TXSItemList.mm
View file @
c51780fe
...
@@ -14,5 +14,4 @@
...
@@ -14,5 +14,4 @@
return
self
;
return
self
;
}
}
@end
@end
test-suite/README.md
View file @
c51780fe
...
@@ -11,3 +11,7 @@ like to be generated. After input files are changed, run ./run_djinni.sh to rege
...
@@ -11,3 +11,7 @@ like to be generated. After input files are changed, run ./run_djinni.sh to rege
Testing
Testing
-------
-------
Run 'make java' or 'make objc' to test the given environment.
Run 'make java' or 'make objc' to test the given environment.
You may need to have Xcode open for the simulator portion of the objc
tests to complete successfully. Try opening the app if you see a
failure connecting to the simulator.
\ No newline at end of file
test-suite/djinni/all.djinni
View file @
c51780fe
...
@@ -8,6 +8,6 @@
...
@@ -8,6 +8,6 @@
@import "enum.djinni"
@import "enum.djinni"
@import "token.djinni"
@import "token.djinni"
@import "test.djinni"
@import "test.djinni"
@import "
int
types.djinni"
@import "
prim
types.djinni"
@import "constants.djinni"
@import "constants.djinni"
@import "date.djinni"
@import "date.djinni"
test-suite/djinni/
int
types.djinni
→
test-suite/djinni/
prim
types.djinni
View file @
c51780fe
assorted_integers = record {
assorted_primitives = record {
b: bool;
eight: i8;
eight: i8;
sixteen: i16;
sixteen: i16;
thirtytwo: i32;
thirtytwo: i32;
sixtyfour: i64;
sixtyfour: i64;
fsixtyfour: f64;
o_b: optional<bool>;
o_eight: optional<i8>;
o_eight: optional<i8>;
o_sixteen: optional<i16>;
o_sixteen: optional<i16>;
o_thirtytwo: optional<i32>;
o_thirtytwo: optional<i32>;
o_sixtyfour: optional<i64>;
o_sixtyfour: optional<i64>;
o_fsixtyfour: optional<f64>;
} deriving (eq)
} deriving (eq)
test-suite/djinni/test.djinni
View file @
c51780fe
...
@@ -30,7 +30,7 @@ test_helpers = interface +c {
...
@@ -30,7 +30,7 @@ test_helpers = interface +c {
static return_none(): optional<i32>;
static return_none(): optional<i32>;
# Ensures that we generate integer translation code
# Ensures that we generate integer translation code
static assorted_
integers_id(i: assorted_integers): assorted_integer
s;
static assorted_
primitives_id(i: assorted_primitives): assorted_primitive
s;
static id_binary(b: binary): binary;
static id_binary(b: binary): binary;
}
}
test-suite/generated-src/cpp/assorted_
integer
s.cpp
→
test-suite/generated-src/cpp/assorted_
primitive
s.cpp
View file @
c51780fe
// AUTOGENERATED FILE - DO NOT MODIFY!
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from
int
types.djinni
// This file generated by Djinni from
prim
types.djinni
#include "assorted_
integer
s.hpp" // my header
#include "assorted_
primitive
s.hpp" // my header
bool
operator
==
(
const
AssortedIntegers
&
lhs
,
const
AssortedIntegers
&
rhs
)
{
bool
operator
==
(
const
AssortedPrimitives
&
lhs
,
const
AssortedPrimitives
&
rhs
)
{
return
lhs
.
eight
==
rhs
.
eight
&&
return
lhs
.
b
==
rhs
.
b
&&
lhs
.
eight
==
rhs
.
eight
&&
lhs
.
sixteen
==
rhs
.
sixteen
&&
lhs
.
sixteen
==
rhs
.
sixteen
&&
lhs
.
thirtytwo
==
rhs
.
thirtytwo
&&
lhs
.
thirtytwo
==
rhs
.
thirtytwo
&&
lhs
.
sixtyfour
==
rhs
.
sixtyfour
&&
lhs
.
sixtyfour
==
rhs
.
sixtyfour
&&
lhs
.
fsixtyfour
==
rhs
.
fsixtyfour
&&
lhs
.
o_b
==
rhs
.
o_b
&&
lhs
.
o_eight
==
rhs
.
o_eight
&&
lhs
.
o_eight
==
rhs
.
o_eight
&&
lhs
.
o_sixteen
==
rhs
.
o_sixteen
&&
lhs
.
o_sixteen
==
rhs
.
o_sixteen
&&
lhs
.
o_thirtytwo
==
rhs
.
o_thirtytwo
&&
lhs
.
o_thirtytwo
==
rhs
.
o_thirtytwo
&&
lhs
.
o_sixtyfour
==
rhs
.
o_sixtyfour
;
lhs
.
o_sixtyfour
==
rhs
.
o_sixtyfour
&&
lhs
.
o_fsixtyfour
==
rhs
.
o_fsixtyfour
;
}
}
bool
operator
!=
(
const
Assorted
Integers
&
lhs
,
const
AssortedInteger
s
&
rhs
)
{
bool
operator
!=
(
const
Assorted
Primitives
&
lhs
,
const
AssortedPrimitive
s
&
rhs
)
{
return
!
(
lhs
==
rhs
);
return
!
(
lhs
==
rhs
);
}
}
test-suite/generated-src/cpp/assorted_
integer
s.hpp
→
test-suite/generated-src/cpp/assorted_
primitive
s.hpp
View file @
c51780fe
// AUTOGENERATED FILE - DO NOT MODIFY!
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from
int
types.djinni
// This file generated by Djinni from
prim
types.djinni
#pragma once
#pragma once
...
@@ -7,34 +7,46 @@
...
@@ -7,34 +7,46 @@
#include <experimental/optional>
#include <experimental/optional>
#include <utility>
#include <utility>
struct
AssortedIntegers
final
{
struct
AssortedPrimitives
final
{
bool
b
;
int8_t
eight
;
int8_t
eight
;
int16_t
sixteen
;
int16_t
sixteen
;
int32_t
thirtytwo
;
int32_t
thirtytwo
;
int64_t
sixtyfour
;
int64_t
sixtyfour
;
double
fsixtyfour
;
std
::
experimental
::
optional
<
bool
>
o_b
;
std
::
experimental
::
optional
<
int8_t
>
o_eight
;
std
::
experimental
::
optional
<
int8_t
>
o_eight
;
std
::
experimental
::
optional
<
int16_t
>
o_sixteen
;
std
::
experimental
::
optional
<
int16_t
>
o_sixteen
;
std
::
experimental
::
optional
<
int32_t
>
o_thirtytwo
;
std
::
experimental
::
optional
<
int32_t
>
o_thirtytwo
;
std
::
experimental
::
optional
<
int64_t
>
o_sixtyfour
;
std
::
experimental
::
optional
<
int64_t
>
o_sixtyfour
;
std
::
experimental
::
optional
<
double
>
o_fsixtyfour
;
friend
bool
operator
==
(
const
Assorted
Integers
&
lhs
,
const
AssortedInteger
s
&
rhs
);
friend
bool
operator
==
(
const
Assorted
Primitives
&
lhs
,
const
AssortedPrimitive
s
&
rhs
);
friend
bool
operator
!=
(
const
Assorted
Integers
&
lhs
,
const
AssortedInteger
s
&
rhs
);
friend
bool
operator
!=
(
const
Assorted
Primitives
&
lhs
,
const
AssortedPrimitive
s
&
rhs
);
AssortedIntegers
(
int8_t
eight
,
AssortedPrimitives
(
bool
b
,
int8_t
eight
,
int16_t
sixteen
,
int16_t
sixteen
,
int32_t
thirtytwo
,
int32_t
thirtytwo
,
int64_t
sixtyfour
,
int64_t
sixtyfour
,
double
fsixtyfour
,
std
::
experimental
::
optional
<
bool
>
o_b
,
std
::
experimental
::
optional
<
int8_t
>
o_eight
,
std
::
experimental
::
optional
<
int8_t
>
o_eight
,
std
::
experimental
::
optional
<
int16_t
>
o_sixteen
,
std
::
experimental
::
optional
<
int16_t
>
o_sixteen
,
std
::
experimental
::
optional
<
int32_t
>
o_thirtytwo
,
std
::
experimental
::
optional
<
int32_t
>
o_thirtytwo
,
std
::
experimental
::
optional
<
int64_t
>
o_sixtyfour
)
std
::
experimental
::
optional
<
int64_t
>
o_sixtyfour
,
:
eight
(
std
::
move
(
eight
))
std
::
experimental
::
optional
<
double
>
o_fsixtyfour
)
:
b
(
std
::
move
(
b
))
,
eight
(
std
::
move
(
eight
))
,
sixteen
(
std
::
move
(
sixteen
))
,
sixteen
(
std
::
move
(
sixteen
))
,
thirtytwo
(
std
::
move
(
thirtytwo
))
,
thirtytwo
(
std
::
move
(
thirtytwo
))
,
sixtyfour
(
std
::
move
(
sixtyfour
))
,
sixtyfour
(
std
::
move
(
sixtyfour
))
,
fsixtyfour
(
std
::
move
(
fsixtyfour
))
,
o_b
(
std
::
move
(
o_b
))
,
o_eight
(
std
::
move
(
o_eight
))
,
o_eight
(
std
::
move
(
o_eight
))
,
o_sixteen
(
std
::
move
(
o_sixteen
))
,
o_sixteen
(
std
::
move
(
o_sixteen
))
,
o_thirtytwo
(
std
::
move
(
o_thirtytwo
))
,
o_thirtytwo
(
std
::
move
(
o_thirtytwo
))
,
o_sixtyfour
(
std
::
move
(
o_sixtyfour
))
,
o_sixtyfour
(
std
::
move
(
o_sixtyfour
))
,
o_fsixtyfour
(
std
::
move
(
o_fsixtyfour
))
{}
{}
};
};
test-suite/generated-src/cpp/test_helpers.hpp
View file @
c51780fe
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
#pragma once
#pragma once
#include "assorted_
integer
s.hpp"
#include "assorted_
primitive
s.hpp"
#include "color.hpp"
#include "color.hpp"
#include "map_list_record.hpp"
#include "map_list_record.hpp"
#include "nested_collection.hpp"
#include "nested_collection.hpp"
...
@@ -68,7 +68,7 @@ public:
...
@@ -68,7 +68,7 @@ public:
static
std
::
experimental
::
optional
<
int32_t
>
return_none
();
static
std
::
experimental
::
optional
<
int32_t
>
return_none
();
/** Ensures that we generate integer translation code */
/** Ensures that we generate integer translation code */
static
Assorted
Integers
assorted_integers_id
(
const
AssortedInteger
s
&
i
);
static
Assorted
Primitives
assorted_primitives_id
(
const
AssortedPrimitive
s
&
i
);
static
std
::
vector
<
uint8_t
>
id_binary
(
const
std
::
vector
<
uint8_t
>
&
b
);
static
std
::
vector
<
uint8_t
>
id_binary
(
const
std
::
vector
<
uint8_t
>
&
b
);
};
};
test-suite/generated-src/java/com/dropbox/djinni/test/Assorted
Integer
s.java
→
test-suite/generated-src/java/com/dropbox/djinni/test/Assorted
Primitive
s.java
View file @
c51780fe
// AUTOGENERATED FILE - DO NOT MODIFY!
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from
int
types.djinni
// This file generated by Djinni from
prim
types.djinni
package
com.dropbox.djinni.test
;
package
com.dropbox.djinni.test
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
import
javax.annotation.Nonnull
;
public
final
class
Assorted
Integer
s
{
public
final
class
Assorted
Primitive
s
{
/*package*/
final
boolean
mB
;
/*package*/
final
byte
mEight
;
/*package*/
final
byte
mEight
;
/*package*/
final
short
mSixteen
;
/*package*/
final
short
mSixteen
;
...
@@ -17,6 +19,10 @@ public final class AssortedIntegers {
...
@@ -17,6 +19,10 @@ public final class AssortedIntegers {
/*package*/
final
long
mSixtyfour
;
/*package*/
final
long
mSixtyfour
;
/*package*/
final
double
mFsixtyfour
;
/*package*/
final
Boolean
mOB
;
/*package*/
final
Byte
mOEight
;
/*package*/
final
Byte
mOEight
;
/*package*/
final
Short
mOSixteen
;
/*package*/
final
Short
mOSixteen
;
...
@@ -25,23 +31,37 @@ public final class AssortedIntegers {
...
@@ -25,23 +31,37 @@ public final class AssortedIntegers {
/*package*/
final
Long
mOSixtyfour
;
/*package*/
final
Long
mOSixtyfour
;
public
AssortedIntegers
(
/*package*/
final
Double
mOFsixtyfour
;
public
AssortedPrimitives
(
boolean
b
,
byte
eight
,
byte
eight
,
short
sixteen
,
short
sixteen
,
int
thirtytwo
,
int
thirtytwo
,
long
sixtyfour
,
long
sixtyfour
,
double
fsixtyfour
,
@CheckForNull
Boolean
oB
,
@CheckForNull
Byte
oEight
,
@CheckForNull
Byte
oEight
,
@CheckForNull
Short
oSixteen
,
@CheckForNull
Short
oSixteen
,
@CheckForNull
Integer
oThirtytwo
,
@CheckForNull
Integer
oThirtytwo
,
@CheckForNull
Long
oSixtyfour
)
{
@CheckForNull
Long
oSixtyfour
,
@CheckForNull
Double
oFsixtyfour
)
{
this
.
mB
=
b
;
this
.
mEight
=
eight
;
this
.
mEight
=
eight
;
this
.
mSixteen
=
sixteen
;
this
.
mSixteen
=
sixteen
;
this
.
mThirtytwo
=
thirtytwo
;
this
.
mThirtytwo
=
thirtytwo
;
this
.
mSixtyfour
=
sixtyfour
;
this
.
mSixtyfour
=
sixtyfour
;
this
.
mFsixtyfour
=
fsixtyfour
;
this
.
mOB
=
oB
;
this
.
mOEight
=
oEight
;
this
.
mOEight
=
oEight
;
this
.
mOSixteen
=
oSixteen
;
this
.
mOSixteen
=
oSixteen
;
this
.
mOThirtytwo
=
oThirtytwo
;
this
.
mOThirtytwo
=
oThirtytwo
;
this
.
mOSixtyfour
=
oSixtyfour
;
this
.
mOSixtyfour
=
oSixtyfour
;
this
.
mOFsixtyfour
=
oFsixtyfour
;
}
public
boolean
getB
()
{
return
mB
;
}
}
public
byte
getEight
()
{
public
byte
getEight
()
{
...
@@ -60,6 +80,15 @@ public final class AssortedIntegers {
...
@@ -60,6 +80,15 @@ public final class AssortedIntegers {
return
mSixtyfour
;
return
mSixtyfour
;
}
}
public
double
getFsixtyfour
()
{
return
mFsixtyfour
;
}
@CheckForNull
public
Boolean
getOB
()
{
return
mOB
;
}
@CheckForNull
@CheckForNull
public
Byte
getOEight
()
{
public
Byte
getOEight
()
{
return
mOEight
;
return
mOEight
;
...
@@ -80,19 +109,28 @@ public final class AssortedIntegers {
...
@@ -80,19 +109,28 @@ public final class AssortedIntegers {
return
mOSixtyfour
;
return
mOSixtyfour
;
}
}
@CheckForNull
public
Double
getOFsixtyfour
()
{
return
mOFsixtyfour
;
}
@Override
@Override
public
boolean
equals
(
@CheckForNull
Object
obj
)
{
public
boolean
equals
(
@CheckForNull
Object
obj
)
{
if
(!(
obj
instanceof
Assorted
Integer
s
))
{
if
(!(
obj
instanceof
Assorted
Primitive
s
))
{
return
false
;
return
false
;
}
}
AssortedIntegers
other
=
(
AssortedIntegers
)
obj
;
AssortedPrimitives
other
=
(
AssortedPrimitives
)
obj
;
return
this
.
mEight
==
other
.
mEight
&&
return
this
.
mB
==
other
.
mB
&&
this
.
mEight
==
other
.
mEight
&&
this
.
mSixteen
==
other
.
mSixteen
&&
this
.
mSixteen
==
other
.
mSixteen
&&
this
.
mThirtytwo
==
other
.
mThirtytwo
&&
this
.
mThirtytwo
==
other
.
mThirtytwo
&&
this
.
mSixtyfour
==
other
.
mSixtyfour
&&
this
.
mSixtyfour
==
other
.
mSixtyfour
&&
this
.
mFsixtyfour
==
other
.
mFsixtyfour
&&
((
this
.
mOB
==
null
&&
other
.
mOB
==
null
)
||
(
this
.
mOB
!=
null
&&
this
.
mOB
.
equals
(
other
.
mOB
)))
&&
((
this
.
mOEight
==
null
&&
other
.
mOEight
==
null
)
||
(
this
.
mOEight
!=
null
&&
this
.
mOEight
.
equals
(
other
.
mOEight
)))
&&
((
this
.
mOEight
==
null
&&
other
.
mOEight
==
null
)
||
(
this
.
mOEight
!=
null
&&
this
.
mOEight
.
equals
(
other
.
mOEight
)))
&&
((
this
.
mOSixteen
==
null
&&
other
.
mOSixteen
==
null
)
||
(
this
.
mOSixteen
!=
null
&&
this
.
mOSixteen
.
equals
(
other
.
mOSixteen
)))
&&
((
this
.
mOSixteen
==
null
&&
other
.
mOSixteen
==
null
)
||
(
this
.
mOSixteen
!=
null
&&
this
.
mOSixteen
.
equals
(
other
.
mOSixteen
)))
&&
((
this
.
mOThirtytwo
==
null
&&
other
.
mOThirtytwo
==
null
)
||
(
this
.
mOThirtytwo
!=
null
&&
this
.
mOThirtytwo
.
equals
(
other
.
mOThirtytwo
)))
&&
((
this
.
mOThirtytwo
==
null
&&
other
.
mOThirtytwo
==
null
)
||
(
this
.
mOThirtytwo
!=
null
&&
this
.
mOThirtytwo
.
equals
(
other
.
mOThirtytwo
)))
&&
((
this
.
mOSixtyfour
==
null
&&
other
.
mOSixtyfour
==
null
)
||
(
this
.
mOSixtyfour
!=
null
&&
this
.
mOSixtyfour
.
equals
(
other
.
mOSixtyfour
)));
((
this
.
mOSixtyfour
==
null
&&
other
.
mOSixtyfour
==
null
)
||
(
this
.
mOSixtyfour
!=
null
&&
this
.
mOSixtyfour
.
equals
(
other
.
mOSixtyfour
)))
&&
((
this
.
mOFsixtyfour
==
null
&&
other
.
mOFsixtyfour
==
null
)
||
(
this
.
mOFsixtyfour
!=
null
&&
this
.
mOFsixtyfour
.
equals
(
other
.
mOFsixtyfour
)));
}
}
}
}
test-suite/generated-src/java/com/dropbox/djinni/test/TestHelpers.java
View file @
c51780fe
...
@@ -64,7 +64,7 @@ public abstract class TestHelpers {
...
@@ -64,7 +64,7 @@ public abstract class TestHelpers {
/** Ensures that we generate integer translation code */
/** Ensures that we generate integer translation code */
@Nonnull
@Nonnull
public
static
native
Assorted
Integers
assortedIntegersId
(
AssortedInteger
s
i
);
public
static
native
Assorted
Primitives
assortedPrimitivesId
(
AssortedPrimitive
s
i
);
@Nonnull
@Nonnull
public
static
native
byte
[]
idBinary
(
byte
[]
b
);
public
static
native
byte
[]
idBinary
(
byte
[]
b
);
...
...
test-suite/generated-src/jni/NativeAssorted
Integer
s.cpp
→
test-suite/generated-src/jni/NativeAssorted
Primitive
s.cpp
View file @
c51780fe
// AUTOGENERATED FILE - DO NOT MODIFY!
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from
int
types.djinni
// This file generated by Djinni from
prim
types.djinni
#include "NativeAssorted
Integer
s.hpp" // my header
#include "NativeAssorted
Primitive
s.hpp" // my header
#include "Marshal.hpp"
#include "Marshal.hpp"
namespace
djinni_generated
{
namespace
djinni_generated
{
NativeAssorted
Integers
::
NativeAssortedInteger
s
()
=
default
;
NativeAssorted
Primitives
::
NativeAssortedPrimitive
s
()
=
default
;
NativeAssorted
Integers
::~
NativeAssortedInteger
s
()
=
default
;
NativeAssorted
Primitives
::~
NativeAssortedPrimitive
s
()
=
default
;
auto
NativeAssorted
Integer
s
::
fromCpp
(
JNIEnv
*
jniEnv
,
const
CppType
&
c
)
->
::
djinni
::
LocalRef
<
JniType
>
{
auto
NativeAssorted
Primitive
s
::
fromCpp
(
JNIEnv
*
jniEnv
,
const
CppType
&
c
)
->
::
djinni
::
LocalRef
<
JniType
>
{
const
auto
&
data
=
::
djinni
::
JniClass
<
NativeAssorted
Integer
s
>::
get
();
const
auto
&
data
=
::
djinni
::
JniClass
<
NativeAssorted
Primitive
s
>::
get
();
auto
r
=
::
djinni
::
LocalRef
<
JniType
>
{
jniEnv
->
NewObject
(
data
.
clazz
.
get
(),
data
.
jconstructor
,
auto
r
=
::
djinni
::
LocalRef
<
JniType
>
{
jniEnv
->
NewObject
(
data
.
clazz
.
get
(),
data
.
jconstructor
,
::
djinni
::
Bool
::
fromCpp
(
jniEnv
,
c
.
b
),
::
djinni
::
I8
::
fromCpp
(
jniEnv
,
c
.
eight
),
::
djinni
::
I8
::
fromCpp
(
jniEnv
,
c
.
eight
),
::
djinni
::
I16
::
fromCpp
(
jniEnv
,
c
.
sixteen
),
::
djinni
::
I16
::
fromCpp
(
jniEnv
,
c
.
sixteen
),
::
djinni
::
I32
::
fromCpp
(
jniEnv
,
c
.
thirtytwo
),
::
djinni
::
I32
::
fromCpp
(
jniEnv
,
c
.
thirtytwo
),
::
djinni
::
I64
::
fromCpp
(
jniEnv
,
c
.
sixtyfour
),
::
djinni
::
I64
::
fromCpp
(
jniEnv
,
c
.
sixtyfour
),
::
djinni
::
F64
::
fromCpp
(
jniEnv
,
c
.
fsixtyfour
),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
Bool
>::
fromCpp
(
jniEnv
,
c
.
o_b
).
get
(),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I8
>::
fromCpp
(
jniEnv
,
c
.
o_eight
).
get
(),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I8
>::
fromCpp
(
jniEnv
,
c
.
o_eight
).
get
(),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I16
>::
fromCpp
(
jniEnv
,
c
.
o_sixteen
).
get
(),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I16
>::
fromCpp
(
jniEnv
,
c
.
o_sixteen
).
get
(),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I32
>::
fromCpp
(
jniEnv
,
c
.
o_thirtytwo
).
get
(),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I32
>::
fromCpp
(
jniEnv
,
c
.
o_thirtytwo
).
get
(),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I64
>::
fromCpp
(
jniEnv
,
c
.
o_sixtyfour
).
get
())};
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I64
>::
fromCpp
(
jniEnv
,
c
.
o_sixtyfour
).
get
(),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
F64
>::
fromCpp
(
jniEnv
,
c
.
o_fsixtyfour
).
get
())};
::
djinni
::
jniExceptionCheck
(
jniEnv
);
::
djinni
::
jniExceptionCheck
(
jniEnv
);
return
r
;
return
r
;
}
}
auto
NativeAssorted
Integer
s
::
toCpp
(
JNIEnv
*
jniEnv
,
JniType
j
)
->
CppType
{
auto
NativeAssorted
Primitive
s
::
toCpp
(
JNIEnv
*
jniEnv
,
JniType
j
)
->
CppType
{
::
djinni
::
JniLocalScope
jscope
(
jniEnv
,
9
);
::
djinni
::
JniLocalScope
jscope
(
jniEnv
,
13
);
assert
(
j
!=
nullptr
);
assert
(
j
!=
nullptr
);
const
auto
&
data
=
::
djinni
::
JniClass
<
NativeAssortedIntegers
>::
get
();
const
auto
&
data
=
::
djinni
::
JniClass
<
NativeAssortedPrimitives
>::
get
();
return
{
::
djinni
::
I8
::
toCpp
(
jniEnv
,
jniEnv
->
GetByteField
(
j
,
data
.
field_mEight
)),
return
{
::
djinni
::
Bool
::
toCpp
(
jniEnv
,
jniEnv
->
GetBooleanField
(
j
,
data
.
field_mB
)),
::
djinni
::
I8
::
toCpp
(
jniEnv
,
jniEnv
->
GetByteField
(
j
,
data
.
field_mEight
)),
::
djinni
::
I16
::
toCpp
(
jniEnv
,
jniEnv
->
GetShortField
(
j
,
data
.
field_mSixteen
)),
::
djinni
::
I16
::
toCpp
(
jniEnv
,
jniEnv
->
GetShortField
(
j
,
data
.
field_mSixteen
)),
::
djinni
::
I32
::
toCpp
(
jniEnv
,
jniEnv
->
GetIntField
(
j
,
data
.
field_mThirtytwo
)),
::
djinni
::
I32
::
toCpp
(
jniEnv
,
jniEnv
->
GetIntField
(
j
,
data
.
field_mThirtytwo
)),
::
djinni
::
I64
::
toCpp
(
jniEnv
,
jniEnv
->
GetLongField
(
j
,
data
.
field_mSixtyfour
)),
::
djinni
::
I64
::
toCpp
(
jniEnv
,
jniEnv
->
GetLongField
(
j
,
data
.
field_mSixtyfour
)),
::
djinni
::
F64
::
toCpp
(
jniEnv
,
jniEnv
->
GetDoubleField
(
j
,
data
.
field_mFsixtyfour
)),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
Bool
>::
toCpp
(
jniEnv
,
jniEnv
->
GetObjectField
(
j
,
data
.
field_mOB
)),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I8
>::
toCpp
(
jniEnv
,
jniEnv
->
GetObjectField
(
j
,
data
.
field_mOEight
)),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I8
>::
toCpp
(
jniEnv
,
jniEnv
->
GetObjectField
(
j
,
data
.
field_mOEight
)),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I16
>::
toCpp
(
jniEnv
,
jniEnv
->
GetObjectField
(
j
,
data
.
field_mOSixteen
)),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I16
>::
toCpp
(
jniEnv
,
jniEnv
->
GetObjectField
(
j
,
data
.
field_mOSixteen
)),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I32
>::
toCpp
(
jniEnv
,
jniEnv
->
GetObjectField
(
j
,
data
.
field_mOThirtytwo
)),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I32
>::
toCpp
(
jniEnv
,
jniEnv
->
GetObjectField
(
j
,
data
.
field_mOThirtytwo
)),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I64
>::
toCpp
(
jniEnv
,
jniEnv
->
GetObjectField
(
j
,
data
.
field_mOSixtyfour
))};
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I64
>::
toCpp
(
jniEnv
,
jniEnv
->
GetObjectField
(
j
,
data
.
field_mOSixtyfour
)),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
F64
>::
toCpp
(
jniEnv
,
jniEnv
->
GetObjectField
(
j
,
data
.
field_mOFsixtyfour
))};
}
}
}
// namespace djinni_generated
}
// namespace djinni_generated
test-suite/generated-src/jni/NativeAssorted
Integer
s.hpp
→
test-suite/generated-src/jni/NativeAssorted
Primitive
s.hpp
View file @
c51780fe
// AUTOGENERATED FILE - DO NOT MODIFY!
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from
int
types.djinni
// This file generated by Djinni from
prim
types.djinni
#pragma once
#pragma once
#include "assorted_
integer
s.hpp"
#include "assorted_
primitive
s.hpp"
#include "djinni_support.hpp"
#include "djinni_support.hpp"
namespace
djinni_generated
{
namespace
djinni_generated
{
class
NativeAssorted
Integer
s
final
{
class
NativeAssorted
Primitive
s
final
{
public:
public:
using
CppType
=
::
Assorted
Integer
s
;
using
CppType
=
::
Assorted
Primitive
s
;
using
JniType
=
jobject
;
using
JniType
=
jobject
;
using
Boxed
=
NativeAssorted
Integer
s
;
using
Boxed
=
NativeAssorted
Primitive
s
;
~
NativeAssorted
Integer
s
();
~
NativeAssorted
Primitive
s
();
static
CppType
toCpp
(
JNIEnv
*
jniEnv
,
JniType
j
);
static
CppType
toCpp
(
JNIEnv
*
jniEnv
,
JniType
j
);
static
::
djinni
::
LocalRef
<
JniType
>
fromCpp
(
JNIEnv
*
jniEnv
,
const
CppType
&
c
);
static
::
djinni
::
LocalRef
<
JniType
>
fromCpp
(
JNIEnv
*
jniEnv
,
const
CppType
&
c
);
private:
private:
NativeAssorted
Integer
s
();
NativeAssorted
Primitive
s
();
friend
::
djinni
::
JniClass
<
NativeAssorted
Integer
s
>
;
friend
::
djinni
::
JniClass
<
NativeAssorted
Primitive
s
>
;
const
::
djinni
::
GlobalRef
<
jclass
>
clazz
{
::
djinni
::
jniFindClass
(
"com/dropbox/djinni/test/AssortedIntegers"
)
};
const
::
djinni
::
GlobalRef
<
jclass
>
clazz
{
::
djinni
::
jniFindClass
(
"com/dropbox/djinni/test/AssortedPrimitives"
)
};
const
jmethodID
jconstructor
{
::
djinni
::
jniGetMethodID
(
clazz
.
get
(),
"<init>"
,
"(BSIJLjava/lang/Byte;Ljava/lang/Short;Ljava/lang/Integer;Ljava/lang/Long;)V"
)
};
const
jmethodID
jconstructor
{
::
djinni
::
jniGetMethodID
(
clazz
.
get
(),
"<init>"
,
"(ZBSIJDLjava/lang/Boolean;Ljava/lang/Byte;Ljava/lang/Short;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Double;)V"
)
};
const
jfieldID
field_mB
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mB"
,
"Z"
)
};
const
jfieldID
field_mEight
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mEight"
,
"B"
)
};
const
jfieldID
field_mEight
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mEight"
,
"B"
)
};
const
jfieldID
field_mSixteen
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mSixteen"
,
"S"
)
};
const
jfieldID
field_mSixteen
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mSixteen"
,
"S"
)
};
const
jfieldID
field_mThirtytwo
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mThirtytwo"
,
"I"
)
};
const
jfieldID
field_mThirtytwo
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mThirtytwo"
,
"I"
)
};
const
jfieldID
field_mSixtyfour
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mSixtyfour"
,
"J"
)
};
const
jfieldID
field_mSixtyfour
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mSixtyfour"
,
"J"
)
};
const
jfieldID
field_mFsixtyfour
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mFsixtyfour"
,
"D"
)
};
const
jfieldID
field_mOB
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mOB"
,
"Ljava/lang/Boolean;"
)
};
const
jfieldID
field_mOEight
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mOEight"
,
"Ljava/lang/Byte;"
)
};
const
jfieldID
field_mOEight
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mOEight"
,
"Ljava/lang/Byte;"
)
};
const
jfieldID
field_mOSixteen
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mOSixteen"
,
"Ljava/lang/Short;"
)
};
const
jfieldID
field_mOSixteen
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mOSixteen"
,
"Ljava/lang/Short;"
)
};
const
jfieldID
field_mOThirtytwo
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mOThirtytwo"
,
"Ljava/lang/Integer;"
)
};
const
jfieldID
field_mOThirtytwo
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mOThirtytwo"
,
"Ljava/lang/Integer;"
)
};
const
jfieldID
field_mOSixtyfour
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mOSixtyfour"
,
"Ljava/lang/Long;"
)
};
const
jfieldID
field_mOSixtyfour
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mOSixtyfour"
,
"Ljava/lang/Long;"
)
};
const
jfieldID
field_mOFsixtyfour
{
::
djinni
::
jniGetFieldID
(
clazz
.
get
(),
"mOFsixtyfour"
,
"Ljava/lang/Double;"
)
};
};
};
}
// namespace djinni_generated
}
// namespace djinni_generated
test-suite/generated-src/jni/NativeTestHelpers.cpp
View file @
c51780fe
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
#include "NativeTestHelpers.hpp" // my header
#include "NativeTestHelpers.hpp" // my header
#include "Marshal.hpp"
#include "Marshal.hpp"
#include "NativeAssorted
Integer
s.hpp"
#include "NativeAssorted
Primitive
s.hpp"
#include "NativeClientInterface.hpp"
#include "NativeClientInterface.hpp"
#include "NativeColor.hpp"
#include "NativeColor.hpp"
#include "NativeMapListRecord.hpp"
#include "NativeMapListRecord.hpp"
...
@@ -220,12 +220,12 @@ CJNIEXPORT jobject JNICALL Java_com_dropbox_djinni_test_TestHelpers_returnNone(J
...
@@ -220,12 +220,12 @@ CJNIEXPORT jobject JNICALL Java_com_dropbox_djinni_test_TestHelpers_returnNone(J
}
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_TestHelpers_assorted
Integer
sId
(
JNIEnv
*
jniEnv
,
jobject
/*this*/
,
jobject
j_i
)
CJNIEXPORT
jobject
JNICALL
Java_com_dropbox_djinni_test_TestHelpers_assorted
Primitive
sId
(
JNIEnv
*
jniEnv
,
jobject
/*this*/
,
jobject
j_i
)
{
{
try
{
try
{
DJINNI_FUNCTION_PROLOGUE0
(
jniEnv
);
DJINNI_FUNCTION_PROLOGUE0
(
jniEnv
);
auto
r
=
::
TestHelpers
::
assorted_
integers_id
(
::
djinni_generated
::
NativeAssortedInteger
s
::
toCpp
(
jniEnv
,
j_i
));
auto
r
=
::
TestHelpers
::
assorted_
primitives_id
(
::
djinni_generated
::
NativeAssortedPrimitive
s
::
toCpp
(
jniEnv
,
j_i
));
return
::
djinni_generated
::
NativeAssorted
Integer
s
::
fromCpp
(
jniEnv
,
r
).
release
();
return
::
djinni_generated
::
NativeAssorted
Primitive
s
::
fromCpp
(
jniEnv
,
r
).
release
();
}
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/DBAssortedIntegers+Private.mm
deleted
100644 → 0
View file @
5a0a374b
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from inttypes.djinni
#import "DBAssortedIntegers+Private.h"
#import "DJIMarshal+Private.h"
#include <cassert>
namespace
djinni_generated
{
auto
AssortedIntegers
::
toCpp
(
ObjcType
obj
)
->
CppType
{
assert
(
obj
);
return
{
::
djinni
::
I8
::
toCpp
(
obj
.
eight
),
::
djinni
::
I16
::
toCpp
(
obj
.
sixteen
),
::
djinni
::
I32
::
toCpp
(
obj
.
thirtytwo
),
::
djinni
::
I64
::
toCpp
(
obj
.
sixtyfour
),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I8
>::
toCpp
(
obj
.
oEight
),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I16
>::
toCpp
(
obj
.
oSixteen
),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I32
>::
toCpp
(
obj
.
oThirtytwo
),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I64
>::
toCpp
(
obj
.
oSixtyfour
)};
}
auto
AssortedIntegers
::
fromCpp
(
const
CppType
&
cpp
)
->
ObjcType
{
return
[[
DBAssortedIntegers
alloc
]
initWithEight
:(
::
djinni
:
:
I8
::
fromCpp
(
cpp
.
eight
))
sixteen:
(
::
djinni
::
I16
::
fromCpp
(
cpp
.
sixteen
))
thirtytwo:
(
::
djinni
::
I32
::
fromCpp
(
cpp
.
thirtytwo
))
sixtyfour:
(
::
djinni
::
I64
::
fromCpp
(
cpp
.
sixtyfour
))
oEight:
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I8
>::
fromCpp
(
cpp
.
o_eight
))
oSixteen:
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I16
>::
fromCpp
(
cpp
.
o_sixteen
))
oThirtytwo:
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I32
>::
fromCpp
(
cpp
.
o_thirtytwo
))
oSixtyfour:
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I64
>::
fromCpp
(
cpp
.
o_sixtyfour
))];
}
}
// namespace djinni_generated
test-suite/generated-src/objc/DBAssorted
Integer
s+Private.h
→
test-suite/generated-src/objc/DBAssorted
Primitive
s+Private.h
View file @
c51780fe
// AUTOGENERATED FILE - DO NOT MODIFY!
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from
int
types.djinni
// This file generated by Djinni from
prim
types.djinni
#import "DBAssorted
Integer
s.h"
#import "DBAssorted
Primitive
s.h"
#include "assorted_
integer
s.hpp"
#include "assorted_
primitive
s.hpp"
static_assert
(
__has_feature
(
objc_arc
),
"Djinni requires ARC to be enabled for this file"
);
static_assert
(
__has_feature
(
objc_arc
),
"Djinni requires ARC to be enabled for this file"
);
@
class
DBAssorted
Integer
s
;
@
class
DBAssorted
Primitive
s
;
namespace
djinni_generated
{
namespace
djinni_generated
{
struct
Assorted
Integer
s
struct
Assorted
Primitive
s
{
{
using
CppType
=
::
Assorted
Integer
s
;
using
CppType
=
::
Assorted
Primitive
s
;
using
ObjcType
=
DBAssorted
Integer
s
*
;
using
ObjcType
=
DBAssorted
Primitive
s
*
;
using
Boxed
=
Assorted
Integer
s
;
using
Boxed
=
Assorted
Primitive
s
;
static
CppType
toCpp
(
ObjcType
objc
);
static
CppType
toCpp
(
ObjcType
objc
);
static
ObjcType
fromCpp
(
const
CppType
&
cpp
);
static
ObjcType
fromCpp
(
const
CppType
&
cpp
);
...
...
test-suite/generated-src/objc/DBAssortedPrimitives+Private.mm
0 → 100644
View file @
c51780fe
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from primtypes.djinni
#import "DBAssortedPrimitives+Private.h"
#import "DJIMarshal+Private.h"
#include <cassert>
namespace
djinni_generated
{
auto
AssortedPrimitives
::
toCpp
(
ObjcType
obj
)
->
CppType
{
assert
(
obj
);
return
{
::
djinni
::
Bool
::
toCpp
(
obj
.
b
),
::
djinni
::
I8
::
toCpp
(
obj
.
eight
),
::
djinni
::
I16
::
toCpp
(
obj
.
sixteen
),
::
djinni
::
I32
::
toCpp
(
obj
.
thirtytwo
),
::
djinni
::
I64
::
toCpp
(
obj
.
sixtyfour
),
::
djinni
::
F64
::
toCpp
(
obj
.
fsixtyfour
),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
Bool
>::
toCpp
(
obj
.
oB
),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I8
>::
toCpp
(
obj
.
oEight
),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I16
>::
toCpp
(
obj
.
oSixteen
),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I32
>::
toCpp
(
obj
.
oThirtytwo
),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I64
>::
toCpp
(
obj
.
oSixtyfour
),
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
F64
>::
toCpp
(
obj
.
oFsixtyfour
)};
}
auto
AssortedPrimitives
::
fromCpp
(
const
CppType
&
cpp
)
->
ObjcType
{
return
[[
DBAssortedPrimitives
alloc
]
initWithB
:(
::
djinni
:
:
Bool
::
fromCpp
(
cpp
.
b
))
eight:
(
::
djinni
::
I8
::
fromCpp
(
cpp
.
eight
))
sixteen:
(
::
djinni
::
I16
::
fromCpp
(
cpp
.
sixteen
))
thirtytwo:
(
::
djinni
::
I32
::
fromCpp
(
cpp
.
thirtytwo
))
sixtyfour:
(
::
djinni
::
I64
::
fromCpp
(
cpp
.
sixtyfour
))
fsixtyfour:
(
::
djinni
::
F64
::
fromCpp
(
cpp
.
fsixtyfour
))
oB:
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
Bool
>::
fromCpp
(
cpp
.
o_b
))
oEight:
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I8
>::
fromCpp
(
cpp
.
o_eight
))
oSixteen:
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I16
>::
fromCpp
(
cpp
.
o_sixteen
))
oThirtytwo:
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I32
>::
fromCpp
(
cpp
.
o_thirtytwo
))
oSixtyfour:
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
I64
>::
fromCpp
(
cpp
.
o_sixtyfour
))
oFsixtyfour:
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
F64
>::
fromCpp
(
cpp
.
o_fsixtyfour
))];
}
}
// namespace djinni_generated
test-suite/generated-src/objc/DBAssorted
Integer
s.h
→
test-suite/generated-src/objc/DBAssorted
Primitive
s.h
View file @
c51780fe
// AUTOGENERATED FILE - DO NOT MODIFY!
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from
int
types.djinni
// This file generated by Djinni from
prim
types.djinni
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@interface
DBAssortedIntegers
:
NSObject
@interface
DBAssortedPrimitives
:
NSObject
-
(
nonnull
id
)
initWithEight
:(
int8_t
)
eight
-
(
nonnull
id
)
initWithB
:(
BOOL
)
b
eight
:(
int8_t
)
eight
sixteen
:(
int16_t
)
sixteen
sixteen
:(
int16_t
)
sixteen
thirtytwo
:(
int32_t
)
thirtytwo
thirtytwo
:(
int32_t
)
thirtytwo
sixtyfour
:(
int64_t
)
sixtyfour
sixtyfour
:(
int64_t
)
sixtyfour
fsixtyfour
:(
double
)
fsixtyfour
oB
:(
nullable
NSNumber
*
)
oB
oEight
:(
nullable
NSNumber
*
)
oEight
oEight
:(
nullable
NSNumber
*
)
oEight
oSixteen
:(
nullable
NSNumber
*
)
oSixteen
oSixteen
:(
nullable
NSNumber
*
)
oSixteen
oThirtytwo
:(
nullable
NSNumber
*
)
oThirtytwo
oThirtytwo
:(
nullable
NSNumber
*
)
oThirtytwo
oSixtyfour
:(
nullable
NSNumber
*
)
oSixtyfour
;
oSixtyfour
:(
nullable
NSNumber
*
)
oSixtyfour
oFsixtyfour
:(
nullable
NSNumber
*
)
oFsixtyfour
;
@property
(
nonatomic
,
readonly
)
BOOL
b
;
@property
(
nonatomic
,
readonly
)
int8_t
eight
;
@property
(
nonatomic
,
readonly
)
int8_t
eight
;
...
@@ -21,6 +27,10 @@
...
@@ -21,6 +27,10 @@
@property
(
nonatomic
,
readonly
)
int64_t
sixtyfour
;
@property
(
nonatomic
,
readonly
)
int64_t
sixtyfour
;
@property
(
nonatomic
,
readonly
)
double
fsixtyfour
;
@property
(
nonatomic
,
readonly
,
nullable
)
NSNumber
*
oB
;
@property
(
nonatomic
,
readonly
,
nullable
)
NSNumber
*
oEight
;
@property
(
nonatomic
,
readonly
,
nullable
)
NSNumber
*
oEight
;
@property
(
nonatomic
,
readonly
,
nullable
)
NSNumber
*
oSixteen
;
@property
(
nonatomic
,
readonly
,
nullable
)
NSNumber
*
oSixteen
;
...
@@ -29,4 +39,6 @@
...
@@ -29,4 +39,6 @@
@property
(
nonatomic
,
readonly
,
nullable
)
NSNumber
*
oSixtyfour
;
@property
(
nonatomic
,
readonly
,
nullable
)
NSNumber
*
oSixtyfour
;
@property
(
nonatomic
,
readonly
,
nullable
)
NSNumber
*
oFsixtyfour
;
@end
@end
test-suite/generated-src/objc/DBAssorted
Integer
s.mm
→
test-suite/generated-src/objc/DBAssorted
Primitive
s.mm
View file @
c51780fe
// AUTOGENERATED FILE - DO NOT MODIFY!
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from
int
types.djinni
// This file generated by Djinni from
prim
types.djinni
#import "DBAssorted
Integer
s.h"
#import "DBAssorted
Primitive
s.h"
@implementation
DBAssorted
Integer
s
@implementation
DBAssorted
Primitive
s
-
(
id
)
initWithEight
:(
int8_t
)
eight
-
(
id
)
initWithB
:(
BOOL
)
b
eight
:(
int8_t
)
eight
sixteen
:(
int16_t
)
sixteen
sixteen
:(
int16_t
)
sixteen
thirtytwo
:(
int32_t
)
thirtytwo
thirtytwo
:(
int32_t
)
thirtytwo
sixtyfour
:(
int64_t
)
sixtyfour
sixtyfour
:(
int64_t
)
sixtyfour
fsixtyfour
:(
double
)
fsixtyfour
oB
:(
nullable
NSNumber
*
)
oB
oEight
:(
nullable
NSNumber
*
)
oEight
oEight
:(
nullable
NSNumber
*
)
oEight
oSixteen
:(
nullable
NSNumber
*
)
oSixteen
oSixteen
:(
nullable
NSNumber
*
)
oSixteen
oThirtytwo
:(
nullable
NSNumber
*
)
oThirtytwo
oThirtytwo
:(
nullable
NSNumber
*
)
oThirtytwo
oSixtyfour
:(
nullable
NSNumber
*
)
oSixtyfour
oSixtyfour
:(
nullable
NSNumber
*
)
oSixtyfour
oFsixtyfour
:(
nullable
NSNumber
*
)
oFsixtyfour
{
{
if
(
self
=
[
super
init
])
{
if
(
self
=
[
super
init
])
{
_b
=
b
;
_eight
=
eight
;
_eight
=
eight
;
_sixteen
=
sixteen
;
_sixteen
=
sixteen
;
_thirtytwo
=
thirtytwo
;
_thirtytwo
=
thirtytwo
;
_sixtyfour
=
sixtyfour
;
_sixtyfour
=
sixtyfour
;
_fsixtyfour
=
fsixtyfour
;
_oB
=
oB
;
_oEight
=
oEight
;
_oEight
=
oEight
;
_oSixteen
=
oSixteen
;
_oSixteen
=
oSixteen
;
_oThirtytwo
=
oThirtytwo
;
_oThirtytwo
=
oThirtytwo
;
_oSixtyfour
=
oSixtyfour
;
_oSixtyfour
=
oSixtyfour
;
_oFsixtyfour
=
oFsixtyfour
;
}
}
return
self
;
return
self
;
}
}
-
(
BOOL
)
isEqual
:(
id
)
other
-
(
BOOL
)
isEqual
:(
id
)
other
{
{
if
(
!
[
other
isKindOfClass
:[
DBAssorted
Integer
s
class
]])
{
if
(
!
[
other
isKindOfClass
:[
DBAssorted
Primitive
s
class
]])
{
return
NO
;
return
NO
;
}
}
DBAssortedIntegers
*
typedOther
=
(
DBAssortedIntegers
*
)
other
;
DBAssortedPrimitives
*
typedOther
=
(
DBAssortedPrimitives
*
)
other
;
return
self
.
eight
==
typedOther
.
eight
&&
return
self
.
b
==
typedOther
.
b
&&
self
.
eight
==
typedOther
.
eight
&&
self
.
sixteen
==
typedOther
.
sixteen
&&
self
.
sixteen
==
typedOther
.
sixteen
&&
self
.
thirtytwo
==
typedOther
.
thirtytwo
&&
self
.
thirtytwo
==
typedOther
.
thirtytwo
&&
self
.
sixtyfour
==
typedOther
.
sixtyfour
&&
self
.
sixtyfour
==
typedOther
.
sixtyfour
&&
self
.
fsixtyfour
==
typedOther
.
fsixtyfour
&&
((
self
.
oB
==
nil
&&
typedOther
.
oB
==
nil
)
||
(
self
.
oB
!=
nil
&&
[
self
.
oB
isEqual
:
typedOther
.
oB
]))
&&
((
self
.
oEight
==
nil
&&
typedOther
.
oEight
==
nil
)
||
(
self
.
oEight
!=
nil
&&
[
self
.
oEight
isEqual
:
typedOther
.
oEight
]))
&&
((
self
.
oEight
==
nil
&&
typedOther
.
oEight
==
nil
)
||
(
self
.
oEight
!=
nil
&&
[
self
.
oEight
isEqual
:
typedOther
.
oEight
]))
&&
((
self
.
oSixteen
==
nil
&&
typedOther
.
oSixteen
==
nil
)
||
(
self
.
oSixteen
!=
nil
&&
[
self
.
oSixteen
isEqual
:
typedOther
.
oSixteen
]))
&&
((
self
.
oSixteen
==
nil
&&
typedOther
.
oSixteen
==
nil
)
||
(
self
.
oSixteen
!=
nil
&&
[
self
.
oSixteen
isEqual
:
typedOther
.
oSixteen
]))
&&
((
self
.
oThirtytwo
==
nil
&&
typedOther
.
oThirtytwo
==
nil
)
||
(
self
.
oThirtytwo
!=
nil
&&
[
self
.
oThirtytwo
isEqual
:
typedOther
.
oThirtytwo
]))
&&
((
self
.
oThirtytwo
==
nil
&&
typedOther
.
oThirtytwo
==
nil
)
||
(
self
.
oThirtytwo
!=
nil
&&
[
self
.
oThirtytwo
isEqual
:
typedOther
.
oThirtytwo
]))
&&
((
self
.
oSixtyfour
==
nil
&&
typedOther
.
oSixtyfour
==
nil
)
||
(
self
.
oSixtyfour
!=
nil
&&
[
self
.
oSixtyfour
isEqual
:
typedOther
.
oSixtyfour
]));
((
self
.
oSixtyfour
==
nil
&&
typedOther
.
oSixtyfour
==
nil
)
||
(
self
.
oSixtyfour
!=
nil
&&
[
self
.
oSixtyfour
isEqual
:
typedOther
.
oSixtyfour
]))
&&
((
self
.
oFsixtyfour
==
nil
&&
typedOther
.
oFsixtyfour
==
nil
)
||
(
self
.
oFsixtyfour
!=
nil
&&
[
self
.
oFsixtyfour
isEqual
:
typedOther
.
oFsixtyfour
]));
}
}
-
(
NSUInteger
)
hash
-
(
NSUInteger
)
hash
{
{
return
NSStringFromClass
([
self
class
]).
hash
^
return
NSStringFromClass
([
self
class
]).
hash
^
(
NSUInteger
)
self
.
b
^
(
NSUInteger
)
self
.
eight
^
(
NSUInteger
)
self
.
eight
^
(
NSUInteger
)
self
.
sixteen
^
(
NSUInteger
)
self
.
sixteen
^
(
NSUInteger
)
self
.
thirtytwo
^
(
NSUInteger
)
self
.
thirtytwo
^
(
NSUInteger
)
self
.
sixtyfour
^
(
NSUInteger
)
self
.
sixtyfour
^
(
NSUInteger
)
self
.
fsixtyfour
^
self
.
oB
.
hash
^
self
.
oEight
.
hash
^
self
.
oEight
.
hash
^
self
.
oSixteen
.
hash
^
self
.
oSixteen
.
hash
^
self
.
oThirtytwo
.
hash
^
self
.
oThirtytwo
.
hash
^
self
.
oSixtyfour
.
hash
;
self
.
oSixtyfour
.
hash
^
self
.
oFsixtyfour
.
hash
;
}
}
@end
@end
test-suite/generated-src/objc/DBTestHelpers+Private.mm
View file @
c51780fe
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
#import "DBTestHelpers+Private.h"
#import "DBTestHelpers+Private.h"
#import "DBTestHelpers.h"
#import "DBTestHelpers.h"
#import "DBAssorted
Integer
s+Private.h"
#import "DBAssorted
Primitive
s+Private.h"
#import "DBClientInterface+Private.h"
#import "DBClientInterface+Private.h"
#import "DBMapListRecord+Private.h"
#import "DBMapListRecord+Private.h"
#import "DBNestedCollection+Private.h"
#import "DBNestedCollection+Private.h"
...
@@ -186,10 +186,10 @@ static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for th
...
@@ -186,10 +186,10 @@ static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for th
}
DJINNI_TRANSLATE_EXCEPTIONS
()
}
DJINNI_TRANSLATE_EXCEPTIONS
()
}
}
+
(
nonnull
DBAssorted
Integers
*
)
assortedIntegersId
:(
nonnull
DBAssortedInteger
s
*
)
i
{
+
(
nonnull
DBAssorted
Primitives
*
)
assortedPrimitivesId
:(
nonnull
DBAssortedPrimitive
s
*
)
i
{
try
{
try
{
auto
r
=
::
TestHelpers
::
assorted_
integers_id
(
::
djinni_generated
::
AssortedInteger
s
::
toCpp
(
i
));
auto
r
=
::
TestHelpers
::
assorted_
primitives_id
(
::
djinni_generated
::
AssortedPrimitive
s
::
toCpp
(
i
));
return
::
djinni_generated
::
Assorted
Integer
s
::
fromCpp
(
r
);
return
::
djinni_generated
::
Assorted
Primitive
s
::
fromCpp
(
r
);
}
DJINNI_TRANSLATE_EXCEPTIONS
()
}
DJINNI_TRANSLATE_EXCEPTIONS
()
}
}
...
...
test-suite/generated-src/objc/DBTestHelpers.h
View file @
c51780fe
// AUTOGENERATED FILE - DO NOT MODIFY!
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from test.djinni
// This file generated by Djinni from test.djinni
#import "DBAssorted
Integer
s.h"
#import "DBAssorted
Primitive
s.h"
#import "DBColor.h"
#import "DBColor.h"
#import "DBMapListRecord.h"
#import "DBMapListRecord.h"
#import "DBNestedCollection.h"
#import "DBNestedCollection.h"
...
@@ -60,7 +60,7 @@
...
@@ -60,7 +60,7 @@
+
(
nullable
NSNumber
*
)
returnNone
;
+
(
nullable
NSNumber
*
)
returnNone
;
/** Ensures that we generate integer translation code */
/** Ensures that we generate integer translation code */
+
(
nonnull
DBAssorted
Integers
*
)
assortedIntegersId
:(
nonnull
DBAssortedInteger
s
*
)
i
;
+
(
nonnull
DBAssorted
Primitives
*
)
assortedPrimitivesId
:(
nonnull
DBAssortedPrimitive
s
*
)
i
;
+
(
nonnull
NSData
*
)
idBinary
:(
nonnull
NSData
*
)
b
;
+
(
nonnull
NSData
*
)
idBinary
:(
nonnull
NSData
*
)
b
;
...
...
test-suite/handwritten-src/cpp/test_helpers.cpp
View file @
c51780fe
...
@@ -135,8 +135,8 @@ void TestHelpers::check_enum_map(const std::unordered_map<color, std::string> &
...
@@ -135,8 +135,8 @@ void TestHelpers::check_enum_map(const std::unordered_map<color, std::string> &
void
TestHelpers
::
check_enum
(
color
)
{}
// stub
void
TestHelpers
::
check_enum
(
color
)
{}
// stub
Assorted
Integers
TestHelpers
::
assorted_integers_id
(
const
AssortedIntegers
&
i
)
{
Assorted
Primitives
TestHelpers
::
assorted_primitives_id
(
const
AssortedPrimitives
&
p
)
{
return
i
;
return
p
;
}
}
std
::
vector
<
uint8_t
>
TestHelpers
::
id_binary
(
const
std
::
vector
<
uint8_t
>
&
v
)
{
std
::
vector
<
uint8_t
>
TestHelpers
::
id_binary
(
const
std
::
vector
<
uint8_t
>
&
v
)
{
...
...
test-suite/handwritten-src/java/com/dropbox/djinni/test/AllTests.java
View file @
c51780fe
...
@@ -15,7 +15,7 @@ public class AllTests extends TestSuite {
...
@@ -15,7 +15,7 @@ public class AllTests extends TestSuite {
mySuite
.
addTestSuite
(
CppExceptionTest
.
class
);
mySuite
.
addTestSuite
(
CppExceptionTest
.
class
);
mySuite
.
addTestSuite
(
ClientInterfaceTest
.
class
);
mySuite
.
addTestSuite
(
ClientInterfaceTest
.
class
);
mySuite
.
addTestSuite
(
EnumTest
.
class
);
mySuite
.
addTestSuite
(
EnumTest
.
class
);
mySuite
.
addTestSuite
(
Integer
Test
.
class
);
mySuite
.
addTestSuite
(
Primitives
Test
.
class
);
mySuite
.
addTestSuite
(
TokenTest
.
class
);
mySuite
.
addTestSuite
(
TokenTest
.
class
);
return
mySuite
;
return
mySuite
;
}
}
...
...
test-suite/handwritten-src/java/com/dropbox/djinni/test/ClientInterfaceImpl.java
View file @
c51780fe
package
com.dropbox.djinni.test
;
package
com.dropbox.djinni.test
;
import
static
junit
.
framework
.
Assert
.
assertTrue
;
public
class
ClientInterfaceImpl
extends
ClientInterface
{
public
class
ClientInterfaceImpl
extends
ClientInterface
{
@Override
@Override
public
ClientReturnedRecord
getRecord
(
long
id
,
String
utf8string
,
String
misc
)
{
public
ClientReturnedRecord
getRecord
(
long
id
,
String
utf8string
,
String
misc
)
{
...
...
test-suite/handwritten-src/java/com/dropbox/djinni/test/IntegerTest.java
deleted
100644 → 0
View file @
5a0a374b
package
com.dropbox.djinni.test
;
import
junit.framework.TestCase
;
public
class
IntegerTest
extends
TestCase
{
public
void
testIntegers
()
{
AssortedIntegers
i
=
new
AssortedIntegers
((
byte
)
123
,
(
short
)
20000
,
1000000000
,
1234567890123456789L
,
(
byte
)
123
,
(
short
)
20000
,
1000000000
,
1234567890123456789L
);
assertEquals
(
i
,
TestHelpers
.
assortedIntegersId
(
i
));
}
}
test-suite/handwritten-src/java/com/dropbox/djinni/test/PrimitivesTest.java
0 → 100644
View file @
c51780fe
package
com.dropbox.djinni.test
;
import
junit.framework.TestCase
;
public
class
PrimitivesTest
extends
TestCase
{
public
void
testPrimitives
()
{
AssortedPrimitives
p
=
new
AssortedPrimitives
(
true
,
(
byte
)
123
,
(
short
)
20000
,
1000000000
,
1234567890123456789L
,
1.23d
,
true
,
(
byte
)
123
,
(
short
)
20000
,
1000000000
,
1234567890123456789L
,
1.23d
);
assertEquals
(
p
,
TestHelpers
.
assortedPrimitivesId
(
p
));
}
}
test-suite/handwritten-src/objc/tests/DBPrimitivesTests.m
0 → 100644
View file @
c51780fe
#import <Foundation/Foundation.h>
#import <XCTest/XCTest.h>
#import "DBAssortedPrimitives.h"
#import "DBTestHelpers.h"
@interface
DBPrimitivesTests
:
XCTestCase
@end
@implementation
DBPrimitivesTests
-
(
void
)
setUp
{
[
super
setUp
];
}
-
(
void
)
tearDown
{
[
super
tearDown
];
}
-
(
void
)
testPrimitives
{
DBAssortedPrimitives
*
p
=
[[
DBAssortedPrimitives
alloc
]
initWithB:
YES
eight:
(
int8_t
)
123
sixteen:
(
int16_t
)
20000
thirtytwo:
(
int32_t
)
1000000000
sixtyfour:
(
int64_t
)
1234567890123456789L
fsixtyfour:
1
.
23L
oB:
[
NSNumber
numberWithBool
:
YES
]
oEight:
[
NSNumber
numberWithChar
:
123
]
oSixteen:
[
NSNumber
numberWithShort
:
20000
]
oThirtytwo:
[
NSNumber
numberWithInt
:
1000000000
]
oSixtyfour:
[
NSNumber
numberWithLongLong
:
1234567890123456789L
]
oFsixtyfour:
[
NSNumber
numberWithDouble
:
123L
]];
XCTAssertEqualObjects
(
p
,
[
DBTestHelpers
assortedPrimitivesId
:
p
]);
}
-
(
void
)
testObjcToCppConverter
{
}
-
(
void
)
testCppToObjcConverter
{
}
@end
test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
View file @
c51780fe
This diff is collapsed.
Click to expand it.
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