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
7b270670
Commit
7b270670
authored
Jul 27, 2015
by
j4cbo
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #117 from mknejp/feature/convenience-init
Generate convenience initializers for Objective-C records
parents
708d6218
449ed7e9
Changes
48
Hide whitespace changes
Inline
Side-by-side
Showing
48 changed files
with
479 additions
and
125 deletions
+479
-125
example/generated-src/objc/TXSItemList.h
example/generated-src/objc/TXSItemList.h
+2
-1
example/generated-src/objc/TXSItemList.mm
example/generated-src/objc/TXSItemList.mm
+6
-1
src/source/ObjcGenerator.scala
src/source/ObjcGenerator.scala
+29
-18
test-suite/djinni/test.djinni
test-suite/djinni/test.djinni
+4
-0
test-suite/generated-src/cpp/empty_record.hpp
test-suite/generated-src/cpp/empty_record.hpp
+9
-0
test-suite/generated-src/java/com/dropbox/djinni/test/EmptyRecord.java
...nerated-src/java/com/dropbox/djinni/test/EmptyRecord.java
+15
-0
test-suite/generated-src/jni/NativeEmptyRecord.cpp
test-suite/generated-src/jni/NativeEmptyRecord.cpp
+27
-0
test-suite/generated-src/jni/NativeEmptyRecord.hpp
test-suite/generated-src/jni/NativeEmptyRecord.hpp
+31
-0
test-suite/generated-src/objc/DBAssortedPrimitives.h
test-suite/generated-src/objc/DBAssortedPrimitives.h
+28
-14
test-suite/generated-src/objc/DBAssortedPrimitives.mm
test-suite/generated-src/objc/DBAssortedPrimitives.mm
+45
-14
test-suite/generated-src/objc/DBClientReturnedRecord.h
test-suite/generated-src/objc/DBClientReturnedRecord.h
+6
-3
test-suite/generated-src/objc/DBClientReturnedRecord.mm
test-suite/generated-src/objc/DBClientReturnedRecord.mm
+12
-3
test-suite/generated-src/objc/DBConstants.h
test-suite/generated-src/objc/DBConstants.h
+4
-2
test-suite/generated-src/objc/DBConstants.mm
test-suite/generated-src/objc/DBConstants.mm
+9
-2
test-suite/generated-src/objc/DBDateRecord.h
test-suite/generated-src/objc/DBDateRecord.h
+2
-1
test-suite/generated-src/objc/DBDateRecord.mm
test-suite/generated-src/objc/DBDateRecord.mm
+6
-1
test-suite/generated-src/objc/DBEmptyRecord+Private.h
test-suite/generated-src/objc/DBEmptyRecord+Private.h
+24
-0
test-suite/generated-src/objc/DBEmptyRecord+Private.mm
test-suite/generated-src/objc/DBEmptyRecord+Private.mm
+22
-0
test-suite/generated-src/objc/DBEmptyRecord.h
test-suite/generated-src/objc/DBEmptyRecord.h
+10
-0
test-suite/generated-src/objc/DBEmptyRecord.mm
test-suite/generated-src/objc/DBEmptyRecord.mm
+21
-0
test-suite/generated-src/objc/DBExternRecordWithDerivings.h
test-suite/generated-src/objc/DBExternRecordWithDerivings.h
+4
-2
test-suite/generated-src/objc/DBExternRecordWithDerivings.mm
test-suite/generated-src/objc/DBExternRecordWithDerivings.mm
+9
-2
test-suite/generated-src/objc/DBMapDateRecord.h
test-suite/generated-src/objc/DBMapDateRecord.h
+2
-1
test-suite/generated-src/objc/DBMapDateRecord.mm
test-suite/generated-src/objc/DBMapDateRecord.mm
+6
-1
test-suite/generated-src/objc/DBMapListRecord.h
test-suite/generated-src/objc/DBMapListRecord.h
+2
-1
test-suite/generated-src/objc/DBMapListRecord.mm
test-suite/generated-src/objc/DBMapListRecord.mm
+6
-1
test-suite/generated-src/objc/DBMapRecord.h
test-suite/generated-src/objc/DBMapRecord.h
+4
-2
test-suite/generated-src/objc/DBMapRecord.mm
test-suite/generated-src/objc/DBMapRecord.mm
+9
-2
test-suite/generated-src/objc/DBNestedCollection.h
test-suite/generated-src/objc/DBNestedCollection.h
+2
-1
test-suite/generated-src/objc/DBNestedCollection.mm
test-suite/generated-src/objc/DBNestedCollection.mm
+6
-1
test-suite/generated-src/objc/DBPrimitiveList.h
test-suite/generated-src/objc/DBPrimitiveList.h
+2
-1
test-suite/generated-src/objc/DBPrimitiveList.mm
test-suite/generated-src/objc/DBPrimitiveList.mm
+6
-1
test-suite/generated-src/objc/DBRecordWithDerivings.h
test-suite/generated-src/objc/DBRecordWithDerivings.h
+4
-2
test-suite/generated-src/objc/DBRecordWithDerivings.mm
test-suite/generated-src/objc/DBRecordWithDerivings.mm
+9
-2
test-suite/generated-src/objc/DBRecordWithDurationAndDerivings.h
...ite/generated-src/objc/DBRecordWithDurationAndDerivings.h
+2
-1
test-suite/generated-src/objc/DBRecordWithDurationAndDerivings.mm
...te/generated-src/objc/DBRecordWithDurationAndDerivings.mm
+6
-1
test-suite/generated-src/objc/DBRecordWithNestedDerivings.h
test-suite/generated-src/objc/DBRecordWithNestedDerivings.h
+4
-2
test-suite/generated-src/objc/DBRecordWithNestedDerivings.mm
test-suite/generated-src/objc/DBRecordWithNestedDerivings.mm
+9
-2
test-suite/generated-src/objc/DBSetRecord.h
test-suite/generated-src/objc/DBSetRecord.h
+4
-2
test-suite/generated-src/objc/DBSetRecord.mm
test-suite/generated-src/objc/DBSetRecord.mm
+9
-2
test-suite/generated-src/outFileList.txt
test-suite/generated-src/outFileList.txt
+8
-0
test-suite/handwritten-src/objc/tests/DBMapRecordTests.mm
test-suite/handwritten-src/objc/tests/DBMapRecordTests.mm
+3
-3
test-suite/handwritten-src/objc/tests/DBNestedCollectionTests.mm
...ite/handwritten-src/objc/tests/DBNestedCollectionTests.mm
+1
-1
test-suite/handwritten-src/objc/tests/DBPrimitiveListTests.mm
...-suite/handwritten-src/objc/tests/DBPrimitiveListTests.mm
+1
-5
test-suite/handwritten-src/objc/tests/DBPrimitivesTests.m
test-suite/handwritten-src/objc/tests/DBPrimitivesTests.m
+20
-15
test-suite/handwritten-src/objc/tests/DBRecordWithDerivingsObjcTests.mm
...dwritten-src/objc/tests/DBRecordWithDerivingsObjcTests.mm
+7
-7
test-suite/handwritten-src/objc/tests/DBSetRecordTests.mm
test-suite/handwritten-src/objc/tests/DBSetRecordTests.mm
+2
-2
test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
+20
-2
No files found.
example/generated-src/objc/TXSItemList.h
View file @
7b270670
...
@@ -4,7 +4,8 @@
...
@@ -4,7 +4,8 @@
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@interface
TXSItemList
:
NSObject
@interface
TXSItemList
:
NSObject
-
(
nonnull
id
)
initWithItems
:(
nonnull
NSArray
*
)
items
;
-
(
nonnull
instancetype
)
initWithItems
:(
nonnull
NSArray
*
)
items
;
+
(
nonnull
instancetype
)
itemListWithItems
:(
nonnull
NSArray
*
)
items
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSArray
*
items
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSArray
*
items
;
...
...
example/generated-src/objc/TXSItemList.mm
View file @
7b270670
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
@implementation
TXSItemList
@implementation
TXSItemList
-
(
id
)
initWithItems
:(
nonnull
NSArray
*
)
items
-
(
nonnull
instancetype
)
initWithItems
:(
nonnull
NSArray
*
)
items
{
{
if
(
self
=
[
super
init
])
{
if
(
self
=
[
super
init
])
{
_items
=
items
;
_items
=
items
;
...
@@ -14,4 +14,9 @@
...
@@ -14,4 +14,9 @@
return
self
;
return
self
;
}
}
+
(
nonnull
instancetype
)
itemListWithItems
:(
nonnull
NSArray
*
)
items
{
return
[[
self
alloc
]
initWithItems
:
items
];
}
@end
@end
src/source/ObjcGenerator.scala
View file @
7b270670
...
@@ -191,19 +191,21 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
...
@@ -191,19 +191,21 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
case
_
=>
false
case
_
=>
false
}
}
val
firstInitializerArg
=
if
(
r
.
fields
.
isEmpty
)
""
else
IdentStyle
.
camelUpper
(
"with_"
+
r
.
fields
.
head
.
ident
.
name
)
writeObjcFile
(
marshal
.
headerName
(
objcName
),
origin
,
refs
.
header
,
w
=>
{
writeObjcFile
(
marshal
.
headerName
(
objcName
),
origin
,
refs
.
header
,
w
=>
{
writeDoc
(
w
,
doc
)
writeDoc
(
w
,
doc
)
w
.
wl
(
s
"@interface $self : NSObject"
)
w
.
wl
(
s
"@interface $self : NSObject"
)
if
(!
r
.
fields
.
isEmpty
)
{
def
writeInitializer
(
sign
:
String
,
prefix
:
String
)
{
val
head
=
r
.
fields
.
head
val
decl
=
s
"$sign (nonnull instancetype)$prefix$firstInitializerArg"
val
skipFirst
=
SkipFirst
()
val
first
=
if
(
r
.
fields
.
isEmpty
)
""
else
IdentStyle
.
camelUpper
(
"with_"
+
r
.
fields
.
head
.
ident
.
name
)
val
decl
=
s
"- (nonnull id)init$first"
writeAlignedObjcCall
(
w
,
decl
,
r
.
fields
,
""
,
f
=>
(
idObjc
.
field
(
f
.
ident
),
s
"(${marshal.paramType(f.ty)})${idObjc.local(f.ident)}"
))
writeAlignedObjcCall
(
w
,
decl
,
r
.
fields
,
""
,
f
=>
(
idObjc
.
field
(
f
.
ident
),
s
"(${marshal.paramType(f.ty)})${idObjc.local(f.ident)}"
))
w
.
wl
(
";"
)
w
.
wl
(
";"
)
}
}
writeInitializer
(
"-"
,
"init"
)
if
(!
r
.
ext
.
objc
)
writeInitializer
(
"+"
,
IdentStyle
.
camelLower
(
objcName
))
for
(
f
<-
r
.
fields
)
{
for
(
f
<-
r
.
fields
)
{
w
.
wl
w
.
wl
writeDoc
(
w
,
f
.
doc
)
writeDoc
(
w
,
f
.
doc
)
...
@@ -234,22 +236,31 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
...
@@ -234,22 +236,31 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
w
.
wl
(
s
"@implementation $self"
)
w
.
wl
(
s
"@implementation $self"
)
w
.
wl
w
.
wl
// Constructor from all fields (not copying)
// Constructor from all fields (not copying)
if
(!
r
.
fields
.
isEmpty
)
{
val
init
=
s
"- (nonnull instancetype)init$firstInitializerArg"
val
head
=
r
.
fields
.
head
writeAlignedObjcCall
(
w
,
init
,
r
.
fields
,
""
,
f
=>
(
idObjc
.
field
(
f
.
ident
),
s
"(${marshal.paramType(f.ty)})${idObjc.local(f.ident)}"
))
val
skipFirst
=
SkipFirst
()
w
.
wl
val
decl
=
s
"- (id)${idObjc.method("
init_with_
" + head.ident.name)}"
w
.
braced
{
w
.
w
(
"if (self = [super init])"
).
braced
{
for
(
f
<-
r
.
fields
)
{
if
(
checkMutable
(
f
.
ty
.
resolved
))
w
.
wl
(
s
"_${idObjc.field(f.ident)} = [${idObjc.local(f.ident)} copy];"
)
else
w
.
wl
(
s
"_${idObjc.field(f.ident)} = ${idObjc.local(f.ident)};"
)
}
}
w
.
wl
(
"return self;"
)
}
w
.
wl
// Convenience initializer
if
(!
r
.
ext
.
objc
)
{
val
decl
=
s
"+ (nonnull instancetype)${IdentStyle.camelLower(objcName)}$firstInitializerArg"
writeAlignedObjcCall
(
w
,
decl
,
r
.
fields
,
""
,
f
=>
(
idObjc
.
field
(
f
.
ident
),
s
"(${marshal.paramType(f.ty)})${idObjc.local(f.ident)}"
))
writeAlignedObjcCall
(
w
,
decl
,
r
.
fields
,
""
,
f
=>
(
idObjc
.
field
(
f
.
ident
),
s
"(${marshal.paramType(f.ty)})${idObjc.local(f.ident)}"
))
w
.
wl
w
.
wl
w
.
braced
{
w
.
braced
{
w
.
w
(
"if (self = [super init])"
).
braced
{
val
call
=
s
"return [[self alloc] init$firstInitializerArg"
for
(
f
<-
r
.
fields
)
{
writeAlignedObjcCall
(
w
,
call
,
r
.
fields
,
""
,
f
=>
(
idObjc
.
field
(
f
.
ident
),
s
"${idObjc.local(f.ident)}"
))
if
(
checkMutable
(
f
.
ty
.
resolved
))
w
.
wl
(
"];"
)
w
.
wl
(
s
"_${idObjc.field(f.ident)} = [${idObjc.local(f.ident)} copy];"
)
else
w
.
wl
(
s
"_${idObjc.field(f.ident)} = ${idObjc.local(f.ident)};"
)
}
}
w
.
wl
(
"return self;"
)
}
}
w
.
wl
w
.
wl
}
}
...
...
test-suite/djinni/test.djinni
View file @
7b270670
...
@@ -34,3 +34,7 @@ test_helpers = interface +c {
...
@@ -34,3 +34,7 @@ test_helpers = interface +c {
static id_binary(b: binary): binary;
static id_binary(b: binary): binary;
}
}
empty_record = record {
}
test-suite/generated-src/cpp/empty_record.hpp
0 → 100644
View file @
7b270670
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from test.djinni
#pragma once
#include <utility>
struct
EmptyRecord
final
{
};
test-suite/generated-src/java/com/dropbox/djinni/test/EmptyRecord.java
0 → 100644
View file @
7b270670
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from test.djinni
package
com.dropbox.djinni.test
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
final
class
EmptyRecord
{
public
EmptyRecord
(
)
{
}
}
test-suite/generated-src/jni/NativeEmptyRecord.cpp
0 → 100644
View file @
7b270670
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from test.djinni
#include "NativeEmptyRecord.hpp" // my header
namespace
djinni_generated
{
NativeEmptyRecord
::
NativeEmptyRecord
()
=
default
;
NativeEmptyRecord
::~
NativeEmptyRecord
()
=
default
;
auto
NativeEmptyRecord
::
fromCpp
(
JNIEnv
*
jniEnv
,
const
CppType
&
c
)
->
::
djinni
::
LocalRef
<
JniType
>
{
(
void
)
c
;
// Suppress warnings in release builds for empty records
const
auto
&
data
=
::
djinni
::
JniClass
<
NativeEmptyRecord
>::
get
();
auto
r
=
::
djinni
::
LocalRef
<
JniType
>
{
jniEnv
->
NewObject
(
data
.
clazz
.
get
(),
data
.
jconstructor
)};
::
djinni
::
jniExceptionCheck
(
jniEnv
);
return
r
;
}
auto
NativeEmptyRecord
::
toCpp
(
JNIEnv
*
jniEnv
,
JniType
j
)
->
CppType
{
::
djinni
::
JniLocalScope
jscope
(
jniEnv
,
1
);
assert
(
j
!=
nullptr
);
(
void
)
j
;
// Suppress warnings in release builds for empty records
return
{};
}
}
// namespace djinni_generated
test-suite/generated-src/jni/NativeEmptyRecord.hpp
0 → 100644
View file @
7b270670
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from test.djinni
#pragma once
#include "djinni_support.hpp"
#include "empty_record.hpp"
namespace
djinni_generated
{
class
NativeEmptyRecord
final
{
public:
using
CppType
=
::
EmptyRecord
;
using
JniType
=
jobject
;
using
Boxed
=
NativeEmptyRecord
;
~
NativeEmptyRecord
();
static
CppType
toCpp
(
JNIEnv
*
jniEnv
,
JniType
j
);
static
::
djinni
::
LocalRef
<
JniType
>
fromCpp
(
JNIEnv
*
jniEnv
,
const
CppType
&
c
);
private:
NativeEmptyRecord
();
friend
::
djinni
::
JniClass
<
NativeEmptyRecord
>
;
const
::
djinni
::
GlobalRef
<
jclass
>
clazz
{
::
djinni
::
jniFindClass
(
"com/dropbox/djinni/test/EmptyRecord"
)
};
const
jmethodID
jconstructor
{
::
djinni
::
jniGetMethodID
(
clazz
.
get
(),
"<init>"
,
"()V"
)
};
};
}
// namespace djinni_generated
test-suite/generated-src/objc/DBAssortedPrimitives.h
View file @
7b270670
...
@@ -4,20 +4,34 @@
...
@@ -4,20 +4,34 @@
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@interface
DBAssortedPrimitives
:
NSObject
@interface
DBAssortedPrimitives
:
NSObject
-
(
nonnull
id
)
initWithB
:(
BOOL
)
b
-
(
nonnull
instancetype
)
initWithB
:(
BOOL
)
b
eight
:(
int8_t
)
eight
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
fthirtytwo
:(
float
)
fthirtytwo
fthirtytwo
:(
float
)
fthirtytwo
fsixtyfour
:(
double
)
fsixtyfour
fsixtyfour
:(
double
)
fsixtyfour
oB
:(
nullable
NSNumber
*
)
oB
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
oFthirtytwo
:(
nullable
NSNumber
*
)
oFthirtytwo
oFthirtytwo
:(
nullable
NSNumber
*
)
oFthirtytwo
oFsixtyfour
:(
nullable
NSNumber
*
)
oFsixtyfour
;
oFsixtyfour
:(
nullable
NSNumber
*
)
oFsixtyfour
;
+
(
nonnull
instancetype
)
assortedPrimitivesWithB
:(
BOOL
)
b
eight
:(
int8_t
)
eight
sixteen
:(
int16_t
)
sixteen
thirtytwo
:(
int32_t
)
thirtytwo
sixtyfour
:(
int64_t
)
sixtyfour
fthirtytwo
:(
float
)
fthirtytwo
fsixtyfour
:(
double
)
fsixtyfour
oB
:(
nullable
NSNumber
*
)
oB
oEight
:(
nullable
NSNumber
*
)
oEight
oSixteen
:(
nullable
NSNumber
*
)
oSixteen
oThirtytwo
:(
nullable
NSNumber
*
)
oThirtytwo
oSixtyfour
:(
nullable
NSNumber
*
)
oSixtyfour
oFthirtytwo
:(
nullable
NSNumber
*
)
oFthirtytwo
oFsixtyfour
:(
nullable
NSNumber
*
)
oFsixtyfour
;
@property
(
nonatomic
,
readonly
)
BOOL
b
;
@property
(
nonatomic
,
readonly
)
BOOL
b
;
...
...
test-suite/generated-src/objc/DBAssortedPrimitives.mm
View file @
7b270670
...
@@ -6,20 +6,20 @@
...
@@ -6,20 +6,20 @@
@implementation
DBAssortedPrimitives
@implementation
DBAssortedPrimitives
-
(
id
)
initWithB
:(
BOOL
)
b
-
(
nonnull
instancetype
)
initWithB
:(
BOOL
)
b
eight
:(
int8_t
)
eight
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
fthirtytwo
:(
float
)
fthirtytwo
fthirtytwo
:(
float
)
fthirtytwo
fsixtyfour
:(
double
)
fsixtyfour
fsixtyfour
:(
double
)
fsixtyfour
oB
:(
nullable
NSNumber
*
)
oB
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
oFthirtytwo
:(
nullable
NSNumber
*
)
oFthirtytwo
oFthirtytwo
:(
nullable
NSNumber
*
)
oFthirtytwo
oFsixtyfour
:(
nullable
NSNumber
*
)
oFsixtyfour
oFsixtyfour
:(
nullable
NSNumber
*
)
oFsixtyfour
{
{
if
(
self
=
[
super
init
])
{
if
(
self
=
[
super
init
])
{
_b
=
b
;
_b
=
b
;
...
@@ -40,6 +40,37 @@
...
@@ -40,6 +40,37 @@
return
self
;
return
self
;
}
}
+
(
nonnull
instancetype
)
assortedPrimitivesWithB
:(
BOOL
)
b
eight
:(
int8_t
)
eight
sixteen
:(
int16_t
)
sixteen
thirtytwo
:(
int32_t
)
thirtytwo
sixtyfour
:(
int64_t
)
sixtyfour
fthirtytwo
:(
float
)
fthirtytwo
fsixtyfour
:(
double
)
fsixtyfour
oB
:(
nullable
NSNumber
*
)
oB
oEight
:(
nullable
NSNumber
*
)
oEight
oSixteen
:(
nullable
NSNumber
*
)
oSixteen
oThirtytwo
:(
nullable
NSNumber
*
)
oThirtytwo
oSixtyfour
:(
nullable
NSNumber
*
)
oSixtyfour
oFthirtytwo
:(
nullable
NSNumber
*
)
oFthirtytwo
oFsixtyfour
:(
nullable
NSNumber
*
)
oFsixtyfour
{
return
[[
self
alloc
]
initWithB
:
b
eight:
eight
sixteen:
sixteen
thirtytwo:
thirtytwo
sixtyfour:
sixtyfour
fthirtytwo:
fthirtytwo
fsixtyfour:
fsixtyfour
oB:
oB
oEight:
oEight
oSixteen:
oSixteen
oThirtytwo:
oThirtytwo
oSixtyfour:
oSixtyfour
oFthirtytwo:
oFthirtytwo
oFsixtyfour:
oFsixtyfour
];
}
-
(
BOOL
)
isEqual
:(
id
)
other
-
(
BOOL
)
isEqual
:(
id
)
other
{
{
if
(
!
[
other
isKindOfClass
:[
DBAssortedPrimitives
class
]])
{
if
(
!
[
other
isKindOfClass
:[
DBAssortedPrimitives
class
]])
{
...
...
test-suite/generated-src/objc/DBClientReturnedRecord.h
View file @
7b270670
...
@@ -4,9 +4,12 @@
...
@@ -4,9 +4,12 @@
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@interface
DBClientReturnedRecord
:
NSObject
@interface
DBClientReturnedRecord
:
NSObject
-
(
nonnull
id
)
initWithRecordId
:(
int64_t
)
recordId
-
(
nonnull
instancetype
)
initWithRecordId
:(
int64_t
)
recordId
content
:(
nonnull
NSString
*
)
content
content
:(
nonnull
NSString
*
)
content
misc
:(
nullable
NSString
*
)
misc
;
misc
:(
nullable
NSString
*
)
misc
;
+
(
nonnull
instancetype
)
clientReturnedRecordWithRecordId
:(
int64_t
)
recordId
content
:(
nonnull
NSString
*
)
content
misc
:(
nullable
NSString
*
)
misc
;
@property
(
nonatomic
,
readonly
)
int64_t
recordId
;
@property
(
nonatomic
,
readonly
)
int64_t
recordId
;
...
...
test-suite/generated-src/objc/DBClientReturnedRecord.mm
View file @
7b270670
...
@@ -6,9 +6,9 @@
...
@@ -6,9 +6,9 @@
@implementation
DBClientReturnedRecord
@implementation
DBClientReturnedRecord
-
(
id
)
initWithRecordId
:(
int64_t
)
recordId
-
(
nonnull
instancetype
)
initWithRecordId
:(
int64_t
)
recordId
content
:(
nonnull
NSString
*
)
content
content
:(
nonnull
NSString
*
)
content
misc
:(
nullable
NSString
*
)
misc
misc
:(
nullable
NSString
*
)
misc
{
{
if
(
self
=
[
super
init
])
{
if
(
self
=
[
super
init
])
{
_recordId
=
recordId
;
_recordId
=
recordId
;
...
@@ -18,4 +18,13 @@
...
@@ -18,4 +18,13 @@
return
self
;
return
self
;
}
}
+
(
nonnull
instancetype
)
clientReturnedRecordWithRecordId
:(
int64_t
)
recordId
content
:(
nonnull
NSString
*
)
content
misc
:(
nullable
NSString
*
)
misc
{
return
[[
self
alloc
]
initWithRecordId
:
recordId
content:
content
misc:
misc
];
}
@end
@end
test-suite/generated-src/objc/DBConstants.h
View file @
7b270670
...
@@ -5,8 +5,10 @@
...
@@ -5,8 +5,10 @@
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@interface
DBConstants
:
NSObject
@interface
DBConstants
:
NSObject
-
(
nonnull
id
)
initWithSomeInteger
:(
int32_t
)
someInteger
-
(
nonnull
instancetype
)
initWithSomeInteger
:(
int32_t
)
someInteger
someString
:(
nonnull
NSString
*
)
someString
;
someString
:(
nonnull
NSString
*
)
someString
;
+
(
nonnull
instancetype
)
constantsWithSomeInteger
:(
int32_t
)
someInteger
someString
:(
nonnull
NSString
*
)
someString
;
@property
(
nonatomic
,
readonly
)
int32_t
someInteger
;
@property
(
nonatomic
,
readonly
)
int32_t
someInteger
;
...
...
test-suite/generated-src/objc/DBConstants.mm
View file @
7b270670
...
@@ -31,8 +31,8 @@ DBConstants * __nonnull const DBConstantsObjectConstant = [[DBConstants alloc] i
...
@@ -31,8 +31,8 @@ DBConstants * __nonnull const DBConstantsObjectConstant = [[DBConstants alloc] i
@implementation
DBConstants
@implementation
DBConstants
-
(
id
)
initWithSomeInteger
:(
int32_t
)
someInteger
-
(
nonnull
instancetype
)
initWithSomeInteger
:(
int32_t
)
someInteger
someString
:(
nonnull
NSString
*
)
someString
someString
:(
nonnull
NSString
*
)
someString
{
{
if
(
self
=
[
super
init
])
{
if
(
self
=
[
super
init
])
{
_someInteger
=
someInteger
;
_someInteger
=
someInteger
;
...
@@ -41,4 +41,11 @@ DBConstants * __nonnull const DBConstantsObjectConstant = [[DBConstants alloc] i
...
@@ -41,4 +41,11 @@ DBConstants * __nonnull const DBConstantsObjectConstant = [[DBConstants alloc] i
return
self
;
return
self
;
}
}
+
(
nonnull
instancetype
)
constantsWithSomeInteger
:(
int32_t
)
someInteger
someString
:(
nonnull
NSString
*
)
someString
{
return
[[
self
alloc
]
initWithSomeInteger
:
someInteger
someString:
someString
];
}
@end
@end
test-suite/generated-src/objc/DBDateRecord.h
View file @
7b270670
...
@@ -4,7 +4,8 @@
...
@@ -4,7 +4,8 @@
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@interface
DBDateRecord
:
NSObject
@interface
DBDateRecord
:
NSObject
-
(
nonnull
id
)
initWithCreatedAt
:(
nonnull
NSDate
*
)
createdAt
;
-
(
nonnull
instancetype
)
initWithCreatedAt
:(
nonnull
NSDate
*
)
createdAt
;
+
(
nonnull
instancetype
)
dateRecordWithCreatedAt
:(
nonnull
NSDate
*
)
createdAt
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSDate
*
createdAt
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSDate
*
createdAt
;
...
...
test-suite/generated-src/objc/DBDateRecord.mm
View file @
7b270670
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
@implementation
DBDateRecord
@implementation
DBDateRecord
-
(
id
)
initWithCreatedAt
:(
nonnull
NSDate
*
)
createdAt
-
(
nonnull
instancetype
)
initWithCreatedAt
:(
nonnull
NSDate
*
)
createdAt
{
{
if
(
self
=
[
super
init
])
{
if
(
self
=
[
super
init
])
{
_createdAt
=
createdAt
;
_createdAt
=
createdAt
;
...
@@ -14,6 +14,11 @@
...
@@ -14,6 +14,11 @@
return
self
;
return
self
;
}
}
+
(
nonnull
instancetype
)
dateRecordWithCreatedAt
:(
nonnull
NSDate
*
)
createdAt
{
return
[[
self
alloc
]
initWithCreatedAt
:
createdAt
];
}
-
(
BOOL
)
isEqual
:(
id
)
other
-
(
BOOL
)
isEqual
:(
id
)
other
{
{
if
(
!
[
other
isKindOfClass
:[
DBDateRecord
class
]])
{
if
(
!
[
other
isKindOfClass
:[
DBDateRecord
class
]])
{
...
...
test-suite/generated-src/objc/DBEmptyRecord+Private.h
0 → 100644
View file @
7b270670
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from test.djinni
#import "DBEmptyRecord.h"
#include "empty_record.hpp"
static_assert
(
__has_feature
(
objc_arc
),
"Djinni requires ARC to be enabled for this file"
);
@
class
DBEmptyRecord
;
namespace
djinni_generated
{
struct
EmptyRecord
{
using
CppType
=
::
EmptyRecord
;
using
ObjcType
=
DBEmptyRecord
*
;
using
Boxed
=
EmptyRecord
;
static
CppType
toCpp
(
ObjcType
objc
);
static
ObjcType
fromCpp
(
const
CppType
&
cpp
);
};
}
// namespace djinni_generated
test-suite/generated-src/objc/DBEmptyRecord+Private.mm
0 → 100644
View file @
7b270670
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from test.djinni
#import "DBEmptyRecord+Private.h"
#include <cassert>
namespace
djinni_generated
{
auto
EmptyRecord
::
toCpp
(
ObjcType
obj
)
->
CppType
{
assert
(
obj
);
(
void
)
obj
;
// Suppress warnings in relase builds for empty records
return
{};
}
auto
EmptyRecord
::
fromCpp
(
const
CppType
&
cpp
)
->
ObjcType
{
(
void
)
cpp
;
// Suppress warnings in relase builds for empty records
return
[[
DBEmptyRecord
alloc
]
init
];
}
}
// namespace djinni_generated
test-suite/generated-src/objc/DBEmptyRecord.h
0 → 100644
View file @
7b270670
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from test.djinni
#import <Foundation/Foundation.h>
@interface
DBEmptyRecord
:
NSObject
-
(
nonnull
instancetype
)
init
;
+
(
nonnull
instancetype
)
emptyRecord
;
@end
test-suite/generated-src/objc/DBEmptyRecord.mm
0 → 100644
View file @
7b270670
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from test.djinni
#import "DBEmptyRecord.h"
@implementation
DBEmptyRecord
-
(
nonnull
instancetype
)
init
{
if
(
self
=
[
super
init
])
{
}
return
self
;
}
+
(
nonnull
instancetype
)
emptyRecord
{
return
[[
self
alloc
]
init
];
}
@end
test-suite/generated-src/objc/DBExternRecordWithDerivings.h
View file @
7b270670
...
@@ -7,8 +7,10 @@
...
@@ -7,8 +7,10 @@
/** This file tests YAML dumped by Djinni can be parsed back in */
/** This file tests YAML dumped by Djinni can be parsed back in */
@interface
DBExternRecordWithDerivings
:
NSObject
@interface
DBExternRecordWithDerivings
:
NSObject
-
(
nonnull
id
)
initWithMember
:(
nonnull
DBRecordWithDerivings
*
)
member
-
(
nonnull
instancetype
)
initWithMember
:(
nonnull
DBRecordWithDerivings
*
)
member
e
:(
DBColor
)
e
;
e
:(
DBColor
)
e
;
+
(
nonnull
instancetype
)
externRecordWithDerivingsWithMember
:(
nonnull
DBRecordWithDerivings
*
)
member
e
:(
DBColor
)
e
;
@property
(
nonatomic
,
readonly
,
nonnull
)
DBRecordWithDerivings
*
member
;
@property
(
nonatomic
,
readonly
,
nonnull
)
DBRecordWithDerivings
*
member
;
...
...
test-suite/generated-src/objc/DBExternRecordWithDerivings.mm
View file @
7b270670
...
@@ -6,8 +6,8 @@
...
@@ -6,8 +6,8 @@
@implementation
DBExternRecordWithDerivings
@implementation
DBExternRecordWithDerivings
-
(
id
)
initWithMember
:(
nonnull
DBRecordWithDerivings
*
)
member
-
(
nonnull
instancetype
)
initWithMember
:(
nonnull
DBRecordWithDerivings
*
)
member
e
:(
DBColor
)
e
e
:(
DBColor
)
e
{
{
if
(
self
=
[
super
init
])
{
if
(
self
=
[
super
init
])
{
_member
=
member
;
_member
=
member
;
...
@@ -16,6 +16,13 @@
...
@@ -16,6 +16,13 @@
return
self
;
return
self
;
}
}
+
(
nonnull
instancetype
)
externRecordWithDerivingsWithMember
:(
nonnull
DBRecordWithDerivings
*
)
member
e
:(
DBColor
)
e
{
return
[[
self
alloc
]
initWithMember
:
member
e:
e
];
}
-
(
BOOL
)
isEqual
:(
id
)
other
-
(
BOOL
)
isEqual
:(
id
)
other
{
{
if
(
!
[
other
isKindOfClass
:[
DBExternRecordWithDerivings
class
]])
{
if
(
!
[
other
isKindOfClass
:[
DBExternRecordWithDerivings
class
]])
{
...
...
test-suite/generated-src/objc/DBMapDateRecord.h
View file @
7b270670
...
@@ -4,7 +4,8 @@
...
@@ -4,7 +4,8 @@
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@interface
DBMapDateRecord
:
NSObject
@interface
DBMapDateRecord
:
NSObject
-
(
nonnull
id
)
initWithDatesById
:(
nonnull
NSDictionary
*
)
datesById
;
-
(
nonnull
instancetype
)
initWithDatesById
:(
nonnull
NSDictionary
*
)
datesById
;
+
(
nonnull
instancetype
)
mapDateRecordWithDatesById
:(
nonnull
NSDictionary
*
)
datesById
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSDictionary
*
datesById
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSDictionary
*
datesById
;
...
...
test-suite/generated-src/objc/DBMapDateRecord.mm
View file @
7b270670
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
@implementation
DBMapDateRecord
@implementation
DBMapDateRecord
-
(
id
)
initWithDatesById
:(
nonnull
NSDictionary
*
)
datesById
-
(
nonnull
instancetype
)
initWithDatesById
:(
nonnull
NSDictionary
*
)
datesById
{
{
if
(
self
=
[
super
init
])
{
if
(
self
=
[
super
init
])
{
_datesById
=
datesById
;
_datesById
=
datesById
;
...
@@ -14,4 +14,9 @@
...
@@ -14,4 +14,9 @@
return
self
;
return
self
;
}
}
+
(
nonnull
instancetype
)
mapDateRecordWithDatesById
:(
nonnull
NSDictionary
*
)
datesById
{
return
[[
self
alloc
]
initWithDatesById
:
datesById
];
}
@end
@end
test-suite/generated-src/objc/DBMapListRecord.h
View file @
7b270670
...
@@ -4,7 +4,8 @@
...
@@ -4,7 +4,8 @@
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@interface
DBMapListRecord
:
NSObject
@interface
DBMapListRecord
:
NSObject
-
(
nonnull
id
)
initWithMapList
:(
nonnull
NSArray
*
)
mapList
;
-
(
nonnull
instancetype
)
initWithMapList
:(
nonnull
NSArray
*
)
mapList
;
+
(
nonnull
instancetype
)
mapListRecordWithMapList
:(
nonnull
NSArray
*
)
mapList
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSArray
*
mapList
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSArray
*
mapList
;
...
...
test-suite/generated-src/objc/DBMapListRecord.mm
View file @
7b270670
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
@implementation
DBMapListRecord
@implementation
DBMapListRecord
-
(
id
)
initWithMapList
:(
nonnull
NSArray
*
)
mapList
-
(
nonnull
instancetype
)
initWithMapList
:(
nonnull
NSArray
*
)
mapList
{
{
if
(
self
=
[
super
init
])
{
if
(
self
=
[
super
init
])
{
_mapList
=
mapList
;
_mapList
=
mapList
;
...
@@ -14,4 +14,9 @@
...
@@ -14,4 +14,9 @@
return
self
;
return
self
;
}
}
+
(
nonnull
instancetype
)
mapListRecordWithMapList
:(
nonnull
NSArray
*
)
mapList
{
return
[[
self
alloc
]
initWithMapList
:
mapList
];
}
@end
@end
test-suite/generated-src/objc/DBMapRecord.h
View file @
7b270670
...
@@ -4,8 +4,10 @@
...
@@ -4,8 +4,10 @@
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@interface
DBMapRecord
:
NSObject
@interface
DBMapRecord
:
NSObject
-
(
nonnull
id
)
initWithMap
:(
nonnull
NSDictionary
*
)
map
-
(
nonnull
instancetype
)
initWithMap
:(
nonnull
NSDictionary
*
)
map
imap
:(
nonnull
NSDictionary
*
)
imap
;
imap
:(
nonnull
NSDictionary
*
)
imap
;
+
(
nonnull
instancetype
)
mapRecordWithMap
:(
nonnull
NSDictionary
*
)
map
imap
:(
nonnull
NSDictionary
*
)
imap
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSDictionary
*
map
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSDictionary
*
map
;
...
...
test-suite/generated-src/objc/DBMapRecord.mm
View file @
7b270670
...
@@ -6,8 +6,8 @@
...
@@ -6,8 +6,8 @@
@implementation
DBMapRecord
@implementation
DBMapRecord
-
(
id
)
initWithMap
:(
nonnull
NSDictionary
*
)
map
-
(
nonnull
instancetype
)
initWithMap
:(
nonnull
NSDictionary
*
)
map
imap
:(
nonnull
NSDictionary
*
)
imap
imap
:(
nonnull
NSDictionary
*
)
imap
{
{
if
(
self
=
[
super
init
])
{
if
(
self
=
[
super
init
])
{
_map
=
map
;
_map
=
map
;
...
@@ -16,4 +16,11 @@
...
@@ -16,4 +16,11 @@
return
self
;
return
self
;
}
}
+
(
nonnull
instancetype
)
mapRecordWithMap
:(
nonnull
NSDictionary
*
)
map
imap
:(
nonnull
NSDictionary
*
)
imap
{
return
[[
self
alloc
]
initWithMap
:
map
imap:
imap
];
}
@end
@end
test-suite/generated-src/objc/DBNestedCollection.h
View file @
7b270670
...
@@ -4,7 +4,8 @@
...
@@ -4,7 +4,8 @@
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@interface
DBNestedCollection
:
NSObject
@interface
DBNestedCollection
:
NSObject
-
(
nonnull
id
)
initWithSetList
:(
nonnull
NSArray
*
)
setList
;
-
(
nonnull
instancetype
)
initWithSetList
:(
nonnull
NSArray
*
)
setList
;
+
(
nonnull
instancetype
)
nestedCollectionWithSetList
:(
nonnull
NSArray
*
)
setList
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSArray
*
setList
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSArray
*
setList
;
...
...
test-suite/generated-src/objc/DBNestedCollection.mm
View file @
7b270670
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
@implementation
DBNestedCollection
@implementation
DBNestedCollection
-
(
id
)
initWithSetList
:(
nonnull
NSArray
*
)
setList
-
(
nonnull
instancetype
)
initWithSetList
:(
nonnull
NSArray
*
)
setList
{
{
if
(
self
=
[
super
init
])
{
if
(
self
=
[
super
init
])
{
_setList
=
setList
;
_setList
=
setList
;
...
@@ -14,4 +14,9 @@
...
@@ -14,4 +14,9 @@
return
self
;
return
self
;
}
}
+
(
nonnull
instancetype
)
nestedCollectionWithSetList
:(
nonnull
NSArray
*
)
setList
{
return
[[
self
alloc
]
initWithSetList
:
setList
];
}
@end
@end
test-suite/generated-src/objc/DBPrimitiveList.h
View file @
7b270670
...
@@ -4,7 +4,8 @@
...
@@ -4,7 +4,8 @@
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@interface
DBPrimitiveList
:
NSObject
@interface
DBPrimitiveList
:
NSObject
-
(
nonnull
id
)
initWithList
:(
nonnull
NSArray
*
)
list
;
-
(
nonnull
instancetype
)
initWithList
:(
nonnull
NSArray
*
)
list
;
+
(
nonnull
instancetype
)
primitiveListWithList
:(
nonnull
NSArray
*
)
list
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSArray
*
list
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSArray
*
list
;
...
...
test-suite/generated-src/objc/DBPrimitiveList.mm
View file @
7b270670
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
@implementation
DBPrimitiveList
@implementation
DBPrimitiveList
-
(
id
)
initWithList
:(
nonnull
NSArray
*
)
list
-
(
nonnull
instancetype
)
initWithList
:(
nonnull
NSArray
*
)
list
{
{
if
(
self
=
[
super
init
])
{
if
(
self
=
[
super
init
])
{
_list
=
list
;
_list
=
list
;
...
@@ -14,4 +14,9 @@
...
@@ -14,4 +14,9 @@
return
self
;
return
self
;
}
}
+
(
nonnull
instancetype
)
primitiveListWithList
:(
nonnull
NSArray
*
)
list
{
return
[[
self
alloc
]
initWithList
:
list
];
}
@end
@end
test-suite/generated-src/objc/DBRecordWithDerivings.h
View file @
7b270670
...
@@ -4,8 +4,10 @@
...
@@ -4,8 +4,10 @@
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@interface
DBRecordWithDerivings
:
NSObject
@interface
DBRecordWithDerivings
:
NSObject
-
(
nonnull
id
)
initWithKey1
:(
int32_t
)
key1
-
(
nonnull
instancetype
)
initWithKey1
:(
int32_t
)
key1
key2
:(
nonnull
NSString
*
)
key2
;
key2
:(
nonnull
NSString
*
)
key2
;
+
(
nonnull
instancetype
)
recordWithDerivingsWithKey1
:(
int32_t
)
key1
key2
:(
nonnull
NSString
*
)
key2
;
@property
(
nonatomic
,
readonly
)
int32_t
key1
;
@property
(
nonatomic
,
readonly
)
int32_t
key1
;
...
...
test-suite/generated-src/objc/DBRecordWithDerivings.mm
View file @
7b270670
...
@@ -6,8 +6,8 @@
...
@@ -6,8 +6,8 @@
@implementation
DBRecordWithDerivings
@implementation
DBRecordWithDerivings
-
(
id
)
initWithKey1
:(
int32_t
)
key1
-
(
nonnull
instancetype
)
initWithKey1
:(
int32_t
)
key1
key2
:(
nonnull
NSString
*
)
key2
key2
:(
nonnull
NSString
*
)
key2
{
{
if
(
self
=
[
super
init
])
{
if
(
self
=
[
super
init
])
{
_key1
=
key1
;
_key1
=
key1
;
...
@@ -16,6 +16,13 @@
...
@@ -16,6 +16,13 @@
return
self
;
return
self
;
}
}
+
(
nonnull
instancetype
)
recordWithDerivingsWithKey1
:(
int32_t
)
key1
key2
:(
nonnull
NSString
*
)
key2
{
return
[[
self
alloc
]
initWithKey1
:
key1
key2:
key2
];
}
-
(
BOOL
)
isEqual
:(
id
)
other
-
(
BOOL
)
isEqual
:(
id
)
other
{
{
if
(
!
[
other
isKindOfClass
:[
DBRecordWithDerivings
class
]])
{
if
(
!
[
other
isKindOfClass
:[
DBRecordWithDerivings
class
]])
{
...
...
test-suite/generated-src/objc/DBRecordWithDurationAndDerivings.h
View file @
7b270670
...
@@ -4,7 +4,8 @@
...
@@ -4,7 +4,8 @@
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@interface
DBRecordWithDurationAndDerivings
:
NSObject
@interface
DBRecordWithDurationAndDerivings
:
NSObject
-
(
nonnull
id
)
initWithDt
:(
NSTimeInterval
)
dt
;
-
(
nonnull
instancetype
)
initWithDt
:(
NSTimeInterval
)
dt
;
+
(
nonnull
instancetype
)
recordWithDurationAndDerivingsWithDt
:(
NSTimeInterval
)
dt
;
@property
(
nonatomic
,
readonly
)
NSTimeInterval
dt
;
@property
(
nonatomic
,
readonly
)
NSTimeInterval
dt
;
...
...
test-suite/generated-src/objc/DBRecordWithDurationAndDerivings.mm
View file @
7b270670
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
@implementation
DBRecordWithDurationAndDerivings
@implementation
DBRecordWithDurationAndDerivings
-
(
id
)
initWithDt
:(
NSTimeInterval
)
dt
-
(
nonnull
instancetype
)
initWithDt
:(
NSTimeInterval
)
dt
{
{
if
(
self
=
[
super
init
])
{
if
(
self
=
[
super
init
])
{
_dt
=
dt
;
_dt
=
dt
;
...
@@ -14,6 +14,11 @@
...
@@ -14,6 +14,11 @@
return
self
;
return
self
;
}
}
+
(
nonnull
instancetype
)
recordWithDurationAndDerivingsWithDt
:(
NSTimeInterval
)
dt
{
return
[[
self
alloc
]
initWithDt
:
dt
];
}
-
(
BOOL
)
isEqual
:(
id
)
other
-
(
BOOL
)
isEqual
:(
id
)
other
{
{
if
(
!
[
other
isKindOfClass
:[
DBRecordWithDurationAndDerivings
class
]])
{
if
(
!
[
other
isKindOfClass
:[
DBRecordWithDurationAndDerivings
class
]])
{
...
...
test-suite/generated-src/objc/DBRecordWithNestedDerivings.h
View file @
7b270670
...
@@ -5,8 +5,10 @@
...
@@ -5,8 +5,10 @@
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@interface
DBRecordWithNestedDerivings
:
NSObject
@interface
DBRecordWithNestedDerivings
:
NSObject
-
(
nonnull
id
)
initWithKey
:(
int32_t
)
key
-
(
nonnull
instancetype
)
initWithKey
:(
int32_t
)
key
rec
:(
nonnull
DBRecordWithDerivings
*
)
rec
;
rec
:(
nonnull
DBRecordWithDerivings
*
)
rec
;
+
(
nonnull
instancetype
)
recordWithNestedDerivingsWithKey
:(
int32_t
)
key
rec
:(
nonnull
DBRecordWithDerivings
*
)
rec
;
@property
(
nonatomic
,
readonly
)
int32_t
key
;
@property
(
nonatomic
,
readonly
)
int32_t
key
;
...
...
test-suite/generated-src/objc/DBRecordWithNestedDerivings.mm
View file @
7b270670
...
@@ -6,8 +6,8 @@
...
@@ -6,8 +6,8 @@
@implementation
DBRecordWithNestedDerivings
@implementation
DBRecordWithNestedDerivings
-
(
id
)
initWithKey
:(
int32_t
)
key
-
(
nonnull
instancetype
)
initWithKey
:(
int32_t
)
key
rec
:(
nonnull
DBRecordWithDerivings
*
)
rec
rec
:(
nonnull
DBRecordWithDerivings
*
)
rec
{
{
if
(
self
=
[
super
init
])
{
if
(
self
=
[
super
init
])
{
_key
=
key
;
_key
=
key
;
...
@@ -16,6 +16,13 @@
...
@@ -16,6 +16,13 @@
return
self
;
return
self
;
}
}
+
(
nonnull
instancetype
)
recordWithNestedDerivingsWithKey
:(
int32_t
)
key
rec
:(
nonnull
DBRecordWithDerivings
*
)
rec
{
return
[[
self
alloc
]
initWithKey
:
key
rec:
rec
];
}
-
(
BOOL
)
isEqual
:(
id
)
other
-
(
BOOL
)
isEqual
:(
id
)
other
{
{
if
(
!
[
other
isKindOfClass
:[
DBRecordWithNestedDerivings
class
]])
{
if
(
!
[
other
isKindOfClass
:[
DBRecordWithNestedDerivings
class
]])
{
...
...
test-suite/generated-src/objc/DBSetRecord.h
View file @
7b270670
...
@@ -4,8 +4,10 @@
...
@@ -4,8 +4,10 @@
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@interface
DBSetRecord
:
NSObject
@interface
DBSetRecord
:
NSObject
-
(
nonnull
id
)
initWithSet
:(
nonnull
NSSet
*
)
set
-
(
nonnull
instancetype
)
initWithSet
:(
nonnull
NSSet
*
)
set
iset
:(
nonnull
NSSet
*
)
iset
;
iset
:(
nonnull
NSSet
*
)
iset
;
+
(
nonnull
instancetype
)
setRecordWithSet
:(
nonnull
NSSet
*
)
set
iset
:(
nonnull
NSSet
*
)
iset
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSSet
*
set
;
@property
(
nonatomic
,
readonly
,
nonnull
)
NSSet
*
set
;
...
...
test-suite/generated-src/objc/DBSetRecord.mm
View file @
7b270670
...
@@ -6,8 +6,8 @@
...
@@ -6,8 +6,8 @@
@implementation
DBSetRecord
@implementation
DBSetRecord
-
(
id
)
initWithSet
:(
nonnull
NSSet
*
)
set
-
(
nonnull
instancetype
)
initWithSet
:(
nonnull
NSSet
*
)
set
iset
:(
nonnull
NSSet
*
)
iset
iset
:(
nonnull
NSSet
*
)
iset
{
{
if
(
self
=
[
super
init
])
{
if
(
self
=
[
super
init
])
{
_set
=
set
;
_set
=
set
;
...
@@ -16,4 +16,11 @@
...
@@ -16,4 +16,11 @@
return
self
;
return
self
;
}
}
+
(
nonnull
instancetype
)
setRecordWithSet
:(
nonnull
NSSet
*
)
set
iset
:(
nonnull
NSSet
*
)
iset
{
return
[[
self
alloc
]
initWithSet
:
set
iset:
iset
];
}
@end
@end
test-suite/generated-src/outFileList.txt
View file @
7b270670
...
@@ -11,6 +11,7 @@ djinni-output-temp/cpp/constants_interface.cpp
...
@@ -11,6 +11,7 @@ djinni-output-temp/cpp/constants_interface.cpp
djinni-output-temp/cpp/assorted_primitives.hpp
djinni-output-temp/cpp/assorted_primitives.hpp
djinni-output-temp/cpp/assorted_primitives.cpp
djinni-output-temp/cpp/assorted_primitives.cpp
djinni-output-temp/cpp/test_helpers.hpp
djinni-output-temp/cpp/test_helpers.hpp
djinni-output-temp/cpp/empty_record.hpp
djinni-output-temp/cpp/token.hpp
djinni-output-temp/cpp/token.hpp
djinni-output-temp/cpp/color.hpp
djinni-output-temp/cpp/color.hpp
djinni-output-temp/cpp/client_returned_record.hpp
djinni-output-temp/cpp/client_returned_record.hpp
...
@@ -33,6 +34,7 @@ djinni-output-temp/java/Constants.java
...
@@ -33,6 +34,7 @@ djinni-output-temp/java/Constants.java
djinni-output-temp/java/ConstantsInterface.java
djinni-output-temp/java/ConstantsInterface.java
djinni-output-temp/java/AssortedPrimitives.java
djinni-output-temp/java/AssortedPrimitives.java
djinni-output-temp/java/TestHelpers.java
djinni-output-temp/java/TestHelpers.java
djinni-output-temp/java/EmptyRecord.java
djinni-output-temp/java/Token.java
djinni-output-temp/java/Token.java
djinni-output-temp/java/Color.java
djinni-output-temp/java/Color.java
djinni-output-temp/java/ClientReturnedRecord.java
djinni-output-temp/java/ClientReturnedRecord.java
...
@@ -61,6 +63,8 @@ djinni-output-temp/jni/NativeAssortedPrimitives.hpp
...
@@ -61,6 +63,8 @@ djinni-output-temp/jni/NativeAssortedPrimitives.hpp
djinni-output-temp/jni/NativeAssortedPrimitives.cpp
djinni-output-temp/jni/NativeAssortedPrimitives.cpp
djinni-output-temp/jni/NativeTestHelpers.hpp
djinni-output-temp/jni/NativeTestHelpers.hpp
djinni-output-temp/jni/NativeTestHelpers.cpp
djinni-output-temp/jni/NativeTestHelpers.cpp
djinni-output-temp/jni/NativeEmptyRecord.hpp
djinni-output-temp/jni/NativeEmptyRecord.cpp
djinni-output-temp/jni/NativeToken.hpp
djinni-output-temp/jni/NativeToken.hpp
djinni-output-temp/jni/NativeToken.cpp
djinni-output-temp/jni/NativeToken.cpp
djinni-output-temp/jni/NativeColor.hpp
djinni-output-temp/jni/NativeColor.hpp
...
@@ -98,6 +102,8 @@ djinni-output-temp/objc/DBConstantsInterface.mm
...
@@ -98,6 +102,8 @@ djinni-output-temp/objc/DBConstantsInterface.mm
djinni-output-temp/objc/DBAssortedPrimitives.h
djinni-output-temp/objc/DBAssortedPrimitives.h
djinni-output-temp/objc/DBAssortedPrimitives.mm
djinni-output-temp/objc/DBAssortedPrimitives.mm
djinni-output-temp/objc/DBTestHelpers.h
djinni-output-temp/objc/DBTestHelpers.h
djinni-output-temp/objc/DBEmptyRecord.h
djinni-output-temp/objc/DBEmptyRecord.mm
djinni-output-temp/objc/DBToken.h
djinni-output-temp/objc/DBToken.h
djinni-output-temp/objc/DBColor.h
djinni-output-temp/objc/DBColor.h
djinni-output-temp/objc/DBClientReturnedRecord.h
djinni-output-temp/objc/DBClientReturnedRecord.h
...
@@ -134,6 +140,8 @@ djinni-output-temp/objc/DBAssortedPrimitives+Private.h
...
@@ -134,6 +140,8 @@ djinni-output-temp/objc/DBAssortedPrimitives+Private.h
djinni-output-temp/objc/DBAssortedPrimitives+Private.mm
djinni-output-temp/objc/DBAssortedPrimitives+Private.mm
djinni-output-temp/objc/DBTestHelpers+Private.h
djinni-output-temp/objc/DBTestHelpers+Private.h
djinni-output-temp/objc/DBTestHelpers+Private.mm
djinni-output-temp/objc/DBTestHelpers+Private.mm
djinni-output-temp/objc/DBEmptyRecord+Private.h
djinni-output-temp/objc/DBEmptyRecord+Private.mm
djinni-output-temp/objc/DBToken+Private.h
djinni-output-temp/objc/DBToken+Private.h
djinni-output-temp/objc/DBToken+Private.mm
djinni-output-temp/objc/DBToken+Private.mm
djinni-output-temp/objc/DBClientReturnedRecord+Private.h
djinni-output-temp/objc/DBClientReturnedRecord+Private.h
...
...
test-suite/handwritten-src/objc/tests/DBMapRecordTests.mm
View file @
7b270670
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
-
(
void
)
testObjcToCpp
-
(
void
)
testObjcToCpp
{
{
DBMapRecord
*
objcMapRecord
=
[
[
DBMapRecord
alloc
]
init
WithMap
:[
self
getObjcMap
]
imap
:[
NSDictionary
dictionary
]];
DBMapRecord
*
objcMapRecord
=
[
DBMapRecord
mapRecord
WithMap
:[
self
getObjcMap
]
imap
:[
NSDictionary
dictionary
]];
MapRecord
cppMapRecord
=
djinni_generated
::
MapRecord
::
toCpp
(
objcMapRecord
);
MapRecord
cppMapRecord
=
djinni_generated
::
MapRecord
::
toCpp
(
objcMapRecord
);
[
self
checkCppMap
:
cppMapRecord
.
map
];
[
self
checkCppMap
:
cppMapRecord
.
map
];
}
}
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
-
(
void
)
testObjcToCppEmpty
-
(
void
)
testObjcToCppEmpty
{
{
DBMapRecord
*
objcMapRecord
=
[
[
DBMapRecord
alloc
]
init
WithMap
:[
NSDictionary
dictionary
]
imap
:[
NSDictionary
dictionary
]];
DBMapRecord
*
objcMapRecord
=
[
DBMapRecord
mapRecord
WithMap
:[
NSDictionary
dictionary
]
imap
:[
NSDictionary
dictionary
]];
MapRecord
cppMapRecord
=
djinni_generated
::
MapRecord
::
toCpp
(
objcMapRecord
);
MapRecord
cppMapRecord
=
djinni_generated
::
MapRecord
::
toCpp
(
objcMapRecord
);
auto
&
cppMap
=
cppMapRecord
.
map
;
auto
&
cppMap
=
cppMapRecord
.
map
;
XCTAssertEqual
(
cppMap
.
size
(),
(
size_t
)
0
,
@"Count 0 expected, actual: %zd"
,
cppMap
.
size
());
XCTAssertEqual
(
cppMap
.
size
(),
(
size_t
)
0
,
@"Count 0 expected, actual: %zd"
,
cppMap
.
size
());
...
@@ -64,7 +64,7 @@
...
@@ -64,7 +64,7 @@
-
(
void
)
testObjcMapListToCpp
-
(
void
)
testObjcMapListToCpp
{
{
NSArray
*
objcMapList
=
@[
[
self
getObjcMap
]
];
NSArray
*
objcMapList
=
@[
[
self
getObjcMap
]
];
DBMapListRecord
*
objcMapListRecord
=
[
[
DBMapListRecord
alloc
]
init
WithMapList
:
objcMapList
];
DBMapListRecord
*
objcMapListRecord
=
[
DBMapListRecord
mapListRecord
WithMapList
:
objcMapList
];
auto
cppMapListRecord
=
djinni_generated
::
MapListRecord
::
toCpp
(
objcMapListRecord
);
auto
cppMapListRecord
=
djinni_generated
::
MapListRecord
::
toCpp
(
objcMapListRecord
);
auto
&
cppMapList
=
cppMapListRecord
.
map_list
;
auto
&
cppMapList
=
cppMapListRecord
.
map_list
;
XCTAssertEqual
(
cppMapList
.
size
(),
(
size_t
)
1
,
@"List with 1 map expected, actual no: %zd"
,
cppMapList
.
size
());
XCTAssertEqual
(
cppMapList
.
size
(),
(
size_t
)
1
,
@"List with 1 map expected, actual no: %zd"
,
cppMapList
.
size
());
...
...
test-suite/handwritten-src/objc/tests/DBNestedCollectionTests.mm
View file @
7b270670
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
#include "nested_collection.hpp"
#include "nested_collection.hpp"
static
NestedCollection
cppNestedCollection
{
{
{
u8"String1"
,
u8"String2"
},
{
u8"StringA"
,
u8"StringB"
}
}
};
static
NestedCollection
cppNestedCollection
{
{
{
u8"String1"
,
u8"String2"
},
{
u8"StringA"
,
u8"StringB"
}
}
};
static
DBNestedCollection
*
objcNestedCollection
=
[
[
DBNestedCollection
alloc
]
init
WithSetList
:@[
static
DBNestedCollection
*
objcNestedCollection
=
[
DBNestedCollection
nestedCollection
WithSetList
:@[
[
NSSet
setWithArray
:@[
@"String1"
,
@"String2"
]],
[
NSSet
setWithArray
:@[
@"String1"
,
@"String2"
]],
[
NSSet
setWithArray
:@[
@"StringA"
,
@"StringB"
]],
[
NSSet
setWithArray
:@[
@"StringA"
,
@"StringB"
]],
]];
]];
...
...
test-suite/handwritten-src/objc/tests/DBPrimitiveListTests.mm
View file @
7b270670
...
@@ -4,11 +4,7 @@
...
@@ -4,11 +4,7 @@
#import <XCTest/XCTest.h>
#import <XCTest/XCTest.h>
static
PrimitiveList
cppPrimitiveList
{
{
1
,
2
,
3
}
};
static
PrimitiveList
cppPrimitiveList
{
{
1
,
2
,
3
}
};
static
DBPrimitiveList
*
objcPrimitiveList
=
[[
DBPrimitiveList
alloc
]
initWithList
:
static
DBPrimitiveList
*
objcPrimitiveList
=
[
DBPrimitiveList
primitiveListWithList
:@[
@1
,
@2
,
@3
]];
[[
NSArray
alloc
]
initWithObjects
:[
NSNumber
numberWithLongLong
:
1
],
[
NSNumber
numberWithLongLong
:
2
],
[
NSNumber
numberWithLongLong
:
3
],
nil
]];
@interface
DBPrimitiveListTests
:
XCTestCase
@interface
DBPrimitiveListTests
:
XCTestCase
...
...
test-suite/handwritten-src/objc/tests/DBPrimitivesTests.m
View file @
7b270670
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
#import "DBAssortedPrimitives.h"
#import "DBAssortedPrimitives.h"
#import "DBTestHelpers.h"
#import "DBTestHelpers.h"
#import "DBEmptyRecord.h"
@interface
DBPrimitivesTests
:
XCTestCase
@interface
DBPrimitivesTests
:
XCTestCase
...
@@ -23,24 +24,28 @@
...
@@ -23,24 +24,28 @@
-
(
void
)
testPrimitives
-
(
void
)
testPrimitives
{
{
DBAssortedPrimitives
*
p
=
[[
DBAssortedPrimitives
alloc
]
DBAssortedPrimitives
*
p
=
[
DBAssortedPrimitives
assortedPrimitivesWithB
:
YES
initWithB:
YES
eight:
(
int8_t
)
123
eight:
(
int8_t
)
123
sixteen:
(
int16_t
)
20000
sixteen:
(
int16_t
)
20000
thirtytwo:
(
int32_t
)
1000000000
thirtytwo:
(
int32_t
)
1000000000
sixtyfour:
(
int64_t
)
1234567890123456789L
sixtyfour:
(
int64_t
)
1234567890123456789L
fthirtytwo:
(
float
)
1
.
23
fthirtytwo:
(
float
)
1
.
23
fsixtyfour:
1
.
23
fsixtyfour:
1
.
23
oB:
[
NSNumber
numberWithBool
:
YES
]
oB:
[
NSNumber
numberWithBool
:
YES
]
oEight:
[
NSNumber
numberWithChar
:
123
]
oEight:
[
NSNumber
numberWithChar
:
123
]
oSixteen:
[
NSNumber
numberWithShort
:
20000
]
oSixteen:
[
NSNumber
numberWithShort
:
20000
]
oThirtytwo:
[
NSNumber
numberWithInt
:
1000000000
]
oThirtytwo:
[
NSNumber
numberWithInt
:
1000000000
]
oSixtyfour:
[
NSNumber
numberWithLongLong
:
1234567890123456789L
]
oSixtyfour:
[
NSNumber
numberWithLongLong
:
1234567890123456789L
]
oFthirtytwo:
[
NSNumber
numberWithFloat
:(
float
)
123
]
oFthirtytwo:
[
NSNumber
numberWithFloat
:(
float
)
123
]
oFsixtyfour:
[
NSNumber
numberWithDouble
:
123
]];
oFsixtyfour:
[
NSNumber
numberWithDouble
:
123
]];
XCTAssertEqualObjects
(
p
,
[
DBTestHelpers
assortedPrimitivesId
:
p
]);
XCTAssertEqualObjects
(
p
,
[
DBTestHelpers
assortedPrimitivesId
:
p
]);
}
}
-
(
void
)
testEmptyRecord
{
(
void
)[
DBEmptyRecord
emptyRecord
];
}
-
(
void
)
testObjcToCppConverter
-
(
void
)
testObjcToCppConverter
{
{
}
}
...
...
test-suite/handwritten-src/objc/tests/DBRecordWithDerivingsObjcTests.mm
View file @
7b270670
...
@@ -3,14 +3,14 @@
...
@@ -3,14 +3,14 @@
#import <XCTest/XCTest.h>
#import <XCTest/XCTest.h>
static
DBRecordWithDerivings
*
record1
=
[
[
DBRecordWithDerivings
alloc
]
init
WithKey1
:
1
key2
:
@"String1"
];
static
DBRecordWithDerivings
*
record1
=
[
DBRecordWithDerivings
recordWithDerivings
WithKey1
:
1
key2
:
@"String1"
];
static
DBRecordWithDerivings
*
record1A
=
[
[
DBRecordWithDerivings
alloc
]
init
WithKey1
:
1
key2
:
@"String1"
];
static
DBRecordWithDerivings
*
record1A
=
[
DBRecordWithDerivings
recordWithDerivings
WithKey1
:
1
key2
:
@"String1"
];
static
DBRecordWithDerivings
*
record2
=
[
[
DBRecordWithDerivings
alloc
]
init
WithKey1
:
1
key2
:
@"String2"
];
static
DBRecordWithDerivings
*
record2
=
[
DBRecordWithDerivings
recordWithDerivings
WithKey1
:
1
key2
:
@"String2"
];
static
DBRecordWithDerivings
*
record3
=
[
[
DBRecordWithDerivings
alloc
]
init
WithKey1
:
2
key2
:
@"String1"
];
static
DBRecordWithDerivings
*
record3
=
[
DBRecordWithDerivings
recordWithDerivings
WithKey1
:
2
key2
:
@"String1"
];
static
DBRecordWithNestedDerivings
*
nestedRecord1
=
[
[
DBRecordWithNestedDerivings
alloc
]
init
WithKey
:
1
rec
:
record1
];
static
DBRecordWithNestedDerivings
*
nestedRecord1
=
[
DBRecordWithNestedDerivings
recordWithNestedDerivings
WithKey
:
1
rec
:
record1
];
static
DBRecordWithNestedDerivings
*
nestedRecord1A
=
[
[
DBRecordWithNestedDerivings
alloc
]
init
WithKey
:
1
rec
:
record1A
];
static
DBRecordWithNestedDerivings
*
nestedRecord1A
=
[
DBRecordWithNestedDerivings
recordWithNestedDerivings
WithKey
:
1
rec
:
record1A
];
static
DBRecordWithNestedDerivings
*
nestedRecord2
=
[
[
DBRecordWithNestedDerivings
alloc
]
init
WithKey
:
1
rec
:
record2
];
static
DBRecordWithNestedDerivings
*
nestedRecord2
=
[
DBRecordWithNestedDerivings
recordWithNestedDerivings
WithKey
:
1
rec
:
record2
];
@interface
DBRecordWithDerivingsObjcTests
:
XCTestCase
@interface
DBRecordWithDerivingsObjcTests
:
XCTestCase
...
...
test-suite/handwritten-src/objc/tests/DBSetRecordTests.mm
View file @
7b270670
...
@@ -16,8 +16,8 @@
...
@@ -16,8 +16,8 @@
-
(
DBSetRecord
*
)
getObjcSetRecord
-
(
DBSetRecord
*
)
getObjcSetRecord
{
{
NSSet
*
set
=
[
[
NSSet
alloc
]
ini
tWithObjects
:
@"StringA"
,
@"StringB"
,
@"StringC"
,
nil
];
NSSet
*
set
=
[
NSSet
se
tWithObjects
:
@"StringA"
,
@"StringB"
,
@"StringC"
,
nil
];
DBSetRecord
*
objcSetRecord
=
[
[
DBSetRecord
alloc
]
init
WithSet
:
set
iset
:[
NSSet
set
]];
DBSetRecord
*
objcSetRecord
=
[
DBSetRecord
setRecord
WithSet
:
set
iset
:[
NSSet
set
]];
return
objcSetRecord
;
return
objcSetRecord
;
}
}
...
...
test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
View file @
7b270670
...
@@ -58,6 +58,8 @@
...
@@ -58,6 +58,8 @@
B52DA56B1B103F75005CE75F
/* DBAssortedPrimitives+Private.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
B52DA5671B103F6D005CE75F
/* DBAssortedPrimitives+Private.mm */
;
};
B52DA56B1B103F75005CE75F
/* DBAssortedPrimitives+Private.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
B52DA5671B103F6D005CE75F
/* DBAssortedPrimitives+Private.mm */
;
};
B52DA56E1B103FC5005CE75F
/* assorted_primitives.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
B52DA56C1B103FBE005CE75F
/* assorted_primitives.cpp */
;
};
B52DA56E1B103FC5005CE75F
/* assorted_primitives.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
B52DA56C1B103FBE005CE75F
/* assorted_primitives.cpp */
;
};
B52DA5701B104025005CE75F
/* DBPrimitivesTests.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
B52DA56F1B104025005CE75F
/* DBPrimitivesTests.m */
;
};
B52DA5701B104025005CE75F
/* DBPrimitivesTests.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
B52DA56F1B104025005CE75F
/* DBPrimitivesTests.m */
;
};
CFAED8751B54291900E3B8A3
/* DBEmptyRecord.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFAED8721B54291900E3B8A3
/* DBEmptyRecord.mm */
;
};
CFAED8761B54291900E3B8A3
/* DBEmptyRecord+Private.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFAED8741B54291900E3B8A3
/* DBEmptyRecord+Private.mm */
;
};
CFC5D9D01B15105100BF2DF8
/* extern_record_with_derivings.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5D9CE1B15105100BF2DF8
/* extern_record_with_derivings.cpp */
;
};
CFC5D9D01B15105100BF2DF8
/* extern_record_with_derivings.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5D9CE1B15105100BF2DF8
/* extern_record_with_derivings.cpp */
;
};
CFC5D9D11B15105100BF2DF8
/* extern_record_with_derivings.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5D9CE1B15105100BF2DF8
/* extern_record_with_derivings.cpp */
;
};
CFC5D9D11B15105100BF2DF8
/* extern_record_with_derivings.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5D9CE1B15105100BF2DF8
/* extern_record_with_derivings.cpp */
;
};
CFC5D9D61B15106400BF2DF8
/* DBExternRecordWithDerivings.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5D9D31B15106400BF2DF8
/* DBExternRecordWithDerivings.mm */
;
};
CFC5D9D61B15106400BF2DF8
/* DBExternRecordWithDerivings.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5D9D31B15106400BF2DF8
/* DBExternRecordWithDerivings.mm */
;
};
...
@@ -68,7 +70,6 @@
...
@@ -68,7 +70,6 @@
CFC5D9E91B1513E800BF2DF8
/* DBExternInterface1+Private.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5D9E41B1513E800BF2DF8
/* DBExternInterface1+Private.mm */
;
};
CFC5D9E91B1513E800BF2DF8
/* DBExternInterface1+Private.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5D9E41B1513E800BF2DF8
/* DBExternInterface1+Private.mm */
;
};
CFC5D9EA1B1513E800BF2DF8
/* DBExternInterface2+Private.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5D9E71B1513E800BF2DF8
/* DBExternInterface2+Private.mm */
;
};
CFC5D9EA1B1513E800BF2DF8
/* DBExternInterface2+Private.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5D9E71B1513E800BF2DF8
/* DBExternInterface2+Private.mm */
;
};
CFC5D9EB1B1513E800BF2DF8
/* DBExternInterface2+Private.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5D9E71B1513E800BF2DF8
/* DBExternInterface2+Private.mm */
;
};
CFC5D9EB1B1513E800BF2DF8
/* DBExternInterface2+Private.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5D9E71B1513E800BF2DF8
/* DBExternInterface2+Private.mm */
;
};
CFEFA65D1B25D1BD008EE2D0
/* DBDateRecordTests.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFEFA65B1B25CFEA008EE2D0
/* DBDateRecordTests.mm */
;
};
CFC5D9F31B15276900BF2DF8
/* DBDurationTests.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5D9F11B15276900BF2DF8
/* DBDurationTests.m */
;
};
CFC5D9F31B15276900BF2DF8
/* DBDurationTests.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5D9F11B15276900BF2DF8
/* DBDurationTests.m */
;
};
CFC5D9FC1B152E4300BF2DF8
/* TranslateDuration.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5D9FB1B152E4300BF2DF8
/* TranslateDuration.cpp */
;
};
CFC5D9FC1B152E4300BF2DF8
/* TranslateDuration.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5D9FB1B152E4300BF2DF8
/* TranslateDuration.cpp */
;
};
CFC5D9FD1B152E4300BF2DF8
/* TranslateDuration.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5D9FB1B152E4300BF2DF8
/* TranslateDuration.cpp */
;
};
CFC5D9FD1B152E4300BF2DF8
/* TranslateDuration.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5D9FB1B152E4300BF2DF8
/* TranslateDuration.cpp */
;
};
...
@@ -80,6 +81,8 @@
...
@@ -80,6 +81,8 @@
CFC5DA0B1B1532F600BF2DF8
/* DBRecordWithDurationAndDerivings+Private.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5DA071B1532F600BF2DF8
/* DBRecordWithDurationAndDerivings+Private.mm */
;
};
CFC5DA0B1B1532F600BF2DF8
/* DBRecordWithDurationAndDerivings+Private.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5DA071B1532F600BF2DF8
/* DBRecordWithDurationAndDerivings+Private.mm */
;
};
CFC5DA0E1B15330000BF2DF8
/* record_with_duration_and_derivings.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5DA0C1B15330000BF2DF8
/* record_with_duration_and_derivings.cpp */
;
};
CFC5DA0E1B15330000BF2DF8
/* record_with_duration_and_derivings.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5DA0C1B15330000BF2DF8
/* record_with_duration_and_derivings.cpp */
;
};
CFC5DA0F1B15330000BF2DF8
/* record_with_duration_and_derivings.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5DA0C1B15330000BF2DF8
/* record_with_duration_and_derivings.cpp */
;
};
CFC5DA0F1B15330000BF2DF8
/* record_with_duration_and_derivings.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFC5DA0C1B15330000BF2DF8
/* record_with_duration_and_derivings.cpp */
;
};
CFEFA65D1B25D1BD008EE2D0
/* DBDateRecordTests.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFEFA65B1B25CFEA008EE2D0
/* DBDateRecordTests.mm */
;
};
CFF89B931B5D2CC7007F6EC2
/* date_record.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFF89B921B5D2CC7007F6EC2
/* date_record.cpp */
;
};
CFFD588B1B019E79001E10B6
/* DBClientInterface+Private.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFFD58871B019E79001E10B6
/* DBClientInterface+Private.mm */
;
};
CFFD588B1B019E79001E10B6
/* DBClientInterface+Private.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFFD58871B019E79001E10B6
/* DBClientInterface+Private.mm */
;
};
CFFD588D1B019E79001E10B6
/* DBCppException+Private.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFFD58881B019E79001E10B6
/* DBCppException+Private.mm */
;
};
CFFD588D1B019E79001E10B6
/* DBCppException+Private.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFFD58881B019E79001E10B6
/* DBCppException+Private.mm */
;
};
CFFD588E1B019E79001E10B6
/* DBCppException+Private.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFFD58881B019E79001E10B6
/* DBCppException+Private.mm */
;
};
CFFD588E1B019E79001E10B6
/* DBCppException+Private.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
CFFD58881B019E79001E10B6
/* DBCppException+Private.mm */
;
};
...
@@ -226,6 +229,11 @@
...
@@ -226,6 +229,11 @@
B52DA56C1B103FBE005CE75F
/* assorted_primitives.cpp */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.cpp.cpp
;
path
=
assorted_primitives.cpp
;
sourceTree
=
"<group>"
;
};
B52DA56C1B103FBE005CE75F
/* assorted_primitives.cpp */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.cpp.cpp
;
path
=
assorted_primitives.cpp
;
sourceTree
=
"<group>"
;
};
B52DA56D1B103FBE005CE75F
/* assorted_primitives.hpp */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.cpp.h
;
path
=
assorted_primitives.hpp
;
sourceTree
=
"<group>"
;
};
B52DA56D1B103FBE005CE75F
/* assorted_primitives.hpp */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.cpp.h
;
path
=
assorted_primitives.hpp
;
sourceTree
=
"<group>"
;
};
B52DA56F1B104025005CE75F
/* DBPrimitivesTests.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
DBPrimitivesTests.m
;
sourceTree
=
"<group>"
;
};
B52DA56F1B104025005CE75F
/* DBPrimitivesTests.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
DBPrimitivesTests.m
;
sourceTree
=
"<group>"
;
};
CFAED8711B54291900E3B8A3
/* DBEmptyRecord.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
DBEmptyRecord.h
;
sourceTree
=
"<group>"
;
};
CFAED8721B54291900E3B8A3
/* DBEmptyRecord.mm */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.objcpp
;
path
=
DBEmptyRecord.mm
;
sourceTree
=
"<group>"
;
};
CFAED8731B54291900E3B8A3
/* DBEmptyRecord+Private.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
"DBEmptyRecord+Private.h"
;
sourceTree
=
"<group>"
;
};
CFAED8741B54291900E3B8A3
/* DBEmptyRecord+Private.mm */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.objcpp
;
path
=
"DBEmptyRecord+Private.mm"
;
sourceTree
=
"<group>"
;
};
CFAED8771B54292600E3B8A3
/* empty_record.hpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.h
;
path
=
empty_record.hpp
;
sourceTree
=
"<group>"
;
};
CFC5D9CE1B15105100BF2DF8
/* extern_record_with_derivings.cpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.cpp
;
path
=
extern_record_with_derivings.cpp
;
sourceTree
=
"<group>"
;
};
CFC5D9CE1B15105100BF2DF8
/* extern_record_with_derivings.cpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.cpp
;
path
=
extern_record_with_derivings.cpp
;
sourceTree
=
"<group>"
;
};
CFC5D9CF1B15105100BF2DF8
/* extern_record_with_derivings.hpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.h
;
path
=
extern_record_with_derivings.hpp
;
sourceTree
=
"<group>"
;
};
CFC5D9CF1B15105100BF2DF8
/* extern_record_with_derivings.hpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.h
;
path
=
extern_record_with_derivings.hpp
;
sourceTree
=
"<group>"
;
};
CFC5D9D21B15106400BF2DF8
/* DBExternRecordWithDerivings.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
DBExternRecordWithDerivings.h
;
sourceTree
=
"<group>"
;
};
CFC5D9D21B15106400BF2DF8
/* DBExternRecordWithDerivings.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
DBExternRecordWithDerivings.h
;
sourceTree
=
"<group>"
;
};
...
@@ -240,7 +248,6 @@
...
@@ -240,7 +248,6 @@
CFC5D9E51B1513E800BF2DF8
/* DBExternInterface2.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
DBExternInterface2.h
;
sourceTree
=
"<group>"
;
};
CFC5D9E51B1513E800BF2DF8
/* DBExternInterface2.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
DBExternInterface2.h
;
sourceTree
=
"<group>"
;
};
CFC5D9E61B1513E800BF2DF8
/* DBExternInterface2+Private.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
"DBExternInterface2+Private.h"
;
sourceTree
=
"<group>"
;
};
CFC5D9E61B1513E800BF2DF8
/* DBExternInterface2+Private.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
"DBExternInterface2+Private.h"
;
sourceTree
=
"<group>"
;
};
CFC5D9E71B1513E800BF2DF8
/* DBExternInterface2+Private.mm */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.objcpp
;
path
=
"DBExternInterface2+Private.mm"
;
sourceTree
=
"<group>"
;
};
CFC5D9E71B1513E800BF2DF8
/* DBExternInterface2+Private.mm */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.objcpp
;
path
=
"DBExternInterface2+Private.mm"
;
sourceTree
=
"<group>"
;
};
CFEFA65B1B25CFEA008EE2D0
/* DBDateRecordTests.mm */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.objcpp
;
path
=
DBDateRecordTests.mm
;
sourceTree
=
"<group>"
;
};
CFC5D9F11B15276900BF2DF8
/* DBDurationTests.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
DBDurationTests.m
;
sourceTree
=
"<group>"
;
};
CFC5D9F11B15276900BF2DF8
/* DBDurationTests.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
DBDurationTests.m
;
sourceTree
=
"<group>"
;
};
CFC5D9FA1B152D4400BF2DF8
/* Duration-objc.hpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.h
;
path
=
"Duration-objc.hpp"
;
sourceTree
=
"<group>"
;
};
CFC5D9FA1B152D4400BF2DF8
/* Duration-objc.hpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.h
;
path
=
"Duration-objc.hpp"
;
sourceTree
=
"<group>"
;
};
CFC5D9FB1B152E4300BF2DF8
/* TranslateDuration.cpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.cpp
;
path
=
TranslateDuration.cpp
;
sourceTree
=
"<group>"
;
};
CFC5D9FB1B152E4300BF2DF8
/* TranslateDuration.cpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.cpp
;
path
=
TranslateDuration.cpp
;
sourceTree
=
"<group>"
;
};
...
@@ -255,6 +262,8 @@
...
@@ -255,6 +262,8 @@
CFC5DA0C1B15330000BF2DF8
/* record_with_duration_and_derivings.cpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.cpp
;
path
=
record_with_duration_and_derivings.cpp
;
sourceTree
=
"<group>"
;
};
CFC5DA0C1B15330000BF2DF8
/* record_with_duration_and_derivings.cpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.cpp
;
path
=
record_with_duration_and_derivings.cpp
;
sourceTree
=
"<group>"
;
};
CFC5DA0D1B15330000BF2DF8
/* record_with_duration_and_derivings.hpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.h
;
path
=
record_with_duration_and_derivings.hpp
;
sourceTree
=
"<group>"
;
};
CFC5DA0D1B15330000BF2DF8
/* record_with_duration_and_derivings.hpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.h
;
path
=
record_with_duration_and_derivings.hpp
;
sourceTree
=
"<group>"
;
};
CFC5DA101B15B5FB00BF2DF8
/* Duration-jni.hpp */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.cpp.h
;
path
=
"Duration-jni.hpp"
;
sourceTree
=
"<group>"
;
};
CFC5DA101B15B5FB00BF2DF8
/* Duration-jni.hpp */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.cpp.h
;
path
=
"Duration-jni.hpp"
;
sourceTree
=
"<group>"
;
};
CFEFA65B1B25CFEA008EE2D0
/* DBDateRecordTests.mm */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.objcpp
;
path
=
DBDateRecordTests.mm
;
sourceTree
=
"<group>"
;
};
CFF89B921B5D2CC7007F6EC2
/* date_record.cpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.cpp
;
path
=
date_record.cpp
;
sourceTree
=
"<group>"
;
};
CFFD58871B019E79001E10B6
/* DBClientInterface+Private.mm */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.objcpp
;
path
=
"DBClientInterface+Private.mm"
;
sourceTree
=
"<group>"
;
};
CFFD58871B019E79001E10B6
/* DBClientInterface+Private.mm */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.objcpp
;
path
=
"DBClientInterface+Private.mm"
;
sourceTree
=
"<group>"
;
};
CFFD58881B019E79001E10B6
/* DBCppException+Private.mm */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.objcpp
;
path
=
"DBCppException+Private.mm"
;
sourceTree
=
"<group>"
;
};
CFFD58881B019E79001E10B6
/* DBCppException+Private.mm */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.objcpp
;
path
=
"DBCppException+Private.mm"
;
sourceTree
=
"<group>"
;
};
CFFD58891B019E79001E10B6
/* DBTestHelpers+Private.mm */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.objcpp
;
path
=
"DBTestHelpers+Private.mm"
;
sourceTree
=
"<group>"
;
};
CFFD58891B019E79001E10B6
/* DBTestHelpers+Private.mm */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.objcpp
;
path
=
"DBTestHelpers+Private.mm"
;
sourceTree
=
"<group>"
;
};
...
@@ -425,6 +434,10 @@
...
@@ -425,6 +434,10 @@
CFC5D9D31B15106400BF2DF8
/* DBExternRecordWithDerivings.mm */
,
CFC5D9D31B15106400BF2DF8
/* DBExternRecordWithDerivings.mm */
,
CFC5D9D41B15106400BF2DF8
/* DBExternRecordWithDerivings+Private.h */
,
CFC5D9D41B15106400BF2DF8
/* DBExternRecordWithDerivings+Private.h */
,
CFC5D9D51B15106400BF2DF8
/* DBExternRecordWithDerivings+Private.mm */
,
CFC5D9D51B15106400BF2DF8
/* DBExternRecordWithDerivings+Private.mm */
,
CFAED8711B54291900E3B8A3
/* DBEmptyRecord.h */
,
CFAED8721B54291900E3B8A3
/* DBEmptyRecord.mm */
,
CFAED8731B54291900E3B8A3
/* DBEmptyRecord+Private.h */
,
CFAED8741B54291900E3B8A3
/* DBEmptyRecord+Private.mm */
,
A242492F1AF192E0003BF8F0
/* DBMapDateRecord.h */
,
A242492F1AF192E0003BF8F0
/* DBMapDateRecord.h */
,
A248501E1AF96EBC00AFE907
/* DBMapDateRecord.mm */
,
A248501E1AF96EBC00AFE907
/* DBMapDateRecord.mm */
,
A242492E1AF192E0003BF8F0
/* DBMapDateRecord+Private.h */
,
A242492E1AF192E0003BF8F0
/* DBMapDateRecord+Private.h */
,
...
@@ -488,7 +501,9 @@
...
@@ -488,7 +501,9 @@
A24249631AF192FC003BF8F0
/* constants.cpp */
,
A24249631AF192FC003BF8F0
/* constants.cpp */
,
A24249641AF192FC003BF8F0
/* constants.hpp */
,
A24249641AF192FC003BF8F0
/* constants.hpp */
,
A24249651AF192FC003BF8F0
/* cpp_exception.hpp */
,
A24249651AF192FC003BF8F0
/* cpp_exception.hpp */
,
CFF89B921B5D2CC7007F6EC2
/* date_record.cpp */
,
A24249661AF192FC003BF8F0
/* date_record.hpp */
,
A24249661AF192FC003BF8F0
/* date_record.hpp */
,
CFAED8771B54292600E3B8A3
/* empty_record.hpp */
,
CFC5D9E01B1513D800BF2DF8
/* extern_interface_1.hpp */
,
CFC5D9E01B1513D800BF2DF8
/* extern_interface_1.hpp */
,
CFC5D9E11B1513D800BF2DF8
/* extern_interface_2.hpp */
,
CFC5D9E11B1513D800BF2DF8
/* extern_interface_2.hpp */
,
CFC5D9CE1B15105100BF2DF8
/* extern_record_with_derivings.cpp */
,
CFC5D9CE1B15105100BF2DF8
/* extern_record_with_derivings.cpp */
,
...
@@ -597,6 +612,7 @@
...
@@ -597,6 +612,7 @@
A238CA981AF84B7100CDDCE5
/* DBMapRecord+Private.mm in Sources */
,
A238CA981AF84B7100CDDCE5
/* DBMapRecord+Private.mm in Sources */
,
CFC5D9E81B1513E800BF2DF8
/* DBExternInterface1+Private.mm in Sources */
,
CFC5D9E81B1513E800BF2DF8
/* DBExternInterface1+Private.mm in Sources */
,
A24850311AF96EBC00AFE907
/* DBSetRecord.mm in Sources */
,
A24850311AF96EBC00AFE907
/* DBSetRecord.mm in Sources */
,
CFAED8761B54291900E3B8A3
/* DBEmptyRecord+Private.mm in Sources */
,
6536CD6F19A6C82200DD7715
/* DJIWeakPtrWrapper.mm in Sources */
,
6536CD6F19A6C82200DD7715
/* DJIWeakPtrWrapper.mm in Sources */
,
A24850271AF96EBC00AFE907
/* DBClientReturnedRecord.mm in Sources */
,
A24850271AF96EBC00AFE907
/* DBClientReturnedRecord.mm in Sources */
,
CFC5D9D61B15106400BF2DF8
/* DBExternRecordWithDerivings.mm in Sources */
,
CFC5D9D61B15106400BF2DF8
/* DBExternRecordWithDerivings.mm in Sources */
,
...
@@ -611,6 +627,7 @@
...
@@ -611,6 +627,7 @@
6536CD7819A6C98800DD7715
/* cpp_exception_impl.cpp in Sources */
,
6536CD7819A6C98800DD7715
/* cpp_exception_impl.cpp in Sources */
,
A248502C1AF96EBC00AFE907
/* DBMapRecord.mm in Sources */
,
A248502C1AF96EBC00AFE907
/* DBMapRecord.mm in Sources */
,
6536CD7419A6C96C00DD7715
/* DBClientInterfaceImpl.mm in Sources */
,
6536CD7419A6C96C00DD7715
/* DBClientInterfaceImpl.mm in Sources */
,
CFF89B931B5D2CC7007F6EC2
/* date_record.cpp in Sources */
,
A24850301AF96EBC00AFE907
/* DBRecordWithNestedDerivings.mm in Sources */
,
A24850301AF96EBC00AFE907
/* DBRecordWithNestedDerivings.mm in Sources */
,
CFFD58B11B041BD9001E10B6
/* DBConstantsInterface.mm in Sources */
,
CFFD58B11B041BD9001E10B6
/* DBConstantsInterface.mm in Sources */
,
B52DA56E1B103FC5005CE75F
/* assorted_primitives.cpp in Sources */
,
B52DA56E1B103FC5005CE75F
/* assorted_primitives.cpp in Sources */
,
...
@@ -622,6 +639,7 @@
...
@@ -622,6 +639,7 @@
B52DA5691B103F72005CE75F
/* DBAssortedPrimitives.mm in Sources */
,
B52DA5691B103F72005CE75F
/* DBAssortedPrimitives.mm in Sources */
,
A24850281AF96EBC00AFE907
/* DBConstants.mm in Sources */
,
A24850281AF96EBC00AFE907
/* DBConstants.mm in Sources */
,
CFFD58B71B041BFD001E10B6
/* constants_interface.cpp in Sources */
,
CFFD58B71B041BFD001E10B6
/* constants_interface.cpp in Sources */
,
CFAED8751B54291900E3B8A3
/* DBEmptyRecord.mm in Sources */
,
A238CA9A1AF84B7100CDDCE5
/* DBNestedCollection+Private.mm in Sources */
,
A238CA9A1AF84B7100CDDCE5
/* DBNestedCollection+Private.mm in Sources */
,
CFFD58911B019E79001E10B6
/* DBToken+Private.mm in Sources */
,
CFFD58911B019E79001E10B6
/* DBToken+Private.mm in Sources */
,
A2CB54B419BA6E6000A9E600
/* DJIError.mm in Sources */
,
A2CB54B419BA6E6000A9E600
/* DJIError.mm in Sources */
,
...
...
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