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
047a3afe
Commit
047a3afe
authored
Nov 07, 2014
by
Stephen Poletto
Committed by
Jacob Potter
Nov 07, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Wrap C++ -> ObjC call paths in autoreleasepool
parent
cd05b91d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
21 deletions
+27
-21
example/generated-src/objc/TXSTextboxListenerObjcProxy.mm
example/generated-src/objc/TXSTextboxListenerObjcProxy.mm
+4
-2
src/source/ObjcGenerator.scala
src/source/ObjcGenerator.scala
+15
-13
test-suite/generated-src/objc/DBClientInterfaceObjcProxy.mm
test-suite/generated-src/objc/DBClientInterfaceObjcProxy.mm
+8
-6
No files found.
example/generated-src/objc/TXSTextboxListenerObjcProxy.mm
View file @
047a3afe
...
@@ -27,7 +27,9 @@ namespace djinni_generated
...
@@ -27,7 +27,9 @@ namespace djinni_generated
void
TextboxListenerObjcProxy
::
update
(
const
::
textsort
::
ItemList
&
items
)
void
TextboxListenerObjcProxy
::
update
(
const
::
textsort
::
ItemList
&
items
)
{
{
TXSItemList
*
cpp_items
=
[[
TXSItemList
alloc
]
initWithCppItemList
:
items
];
@autoreleasepool
{
[
objcRef
update
:
cpp_items
];
TXSItemList
*
cpp_items
=
[[
TXSItemList
alloc
]
initWithCppItemList
:
items
];
[
objcRef
update
:
cpp_items
];
}
}
}
}
}
src/source/ObjcGenerator.scala
View file @
047a3afe
...
@@ -351,20 +351,22 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
...
@@ -351,20 +351,22 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
val
ret
=
m
.
ret
.
fold
(
"void"
)(
toCppType
(
_
))
val
ret
=
m
.
ret
.
fold
(
"void"
)(
toCppType
(
_
))
val
params
=
m
.
params
.
map
(
p
=>
"const "
+
toCppType
(
p
.
ty
,
spec
.
cppNamespace
)
+
" & "
+
idCpp
.
local
(
p
.
ident
))
val
params
=
m
.
params
.
map
(
p
=>
"const "
+
toCppType
(
p
.
ty
,
spec
.
cppNamespace
)
+
" & "
+
idCpp
.
local
(
p
.
ident
))
w
.
wl
(
s
"$ret $objcExtSelf::${idCpp.method(m.ident)} ${params.mkString("
(
", "
,
", "
)
")}"
).
braced
{
w
.
wl
(
s
"$ret $objcExtSelf::${idCpp.method(m.ident)} ${params.mkString("
(
", "
,
", "
)
")}"
).
braced
{
m
.
params
.
foreach
(
p
=>
w
.
w
(
"@autoreleasepool"
).
braced
{
translateCppTypeToObjc
(
idCpp
.
local
(
"cpp_"
+
p
.
ident
.
name
),
idCpp
.
local
(
p
.
ident
),
p
.
ty
,
true
,
w
))
m
.
params
.
foreach
(
p
=>
m
.
ret
.
fold
()(
r
=>
w
.
w
(
toObjcTypeDef
(
r
)
+
"objcRet = "
))
translateCppTypeToObjc
(
idCpp
.
local
(
"cpp_"
+
p
.
ident
.
name
),
idCpp
.
local
(
p
.
ident
),
p
.
ty
,
true
,
w
))
w
.
w
(
"[objcRef "
+
idObjc
.
method
(
m
.
ident
))
m
.
ret
.
fold
()(
r
=>
w
.
w
(
toObjcTypeDef
(
r
)
+
"objcRet = "
))
val
skipFirst
=
SkipFirst
()
w
.
w
(
"[objcRef "
+
idObjc
.
method
(
m
.
ident
))
for
(
p
<-
m
.
params
)
{
val
skipFirst
=
SkipFirst
()
skipFirst
{
w
.
w
(
" "
+
idObjc
.
local
(
p
.
ident
))
}
for
(
p
<-
m
.
params
)
{
w
.
w
(
":"
+
idCpp
.
local
(
"cpp_"
+
p
.
ident
.
name
))
skipFirst
{
w
.
w
(
" "
+
idObjc
.
local
(
p
.
ident
))
}
w
.
w
(
":"
+
idCpp
.
local
(
"cpp_"
+
p
.
ident
.
name
))
}
w
.
wl
(
"];"
)
m
.
ret
.
fold
()(
r
=>
{
translateObjcTypeToCpp
(
"cppRet"
,
"objcRet"
,
r
,
w
)
w
.
wl
(
"return cppRet;"
)
})
}
}
w
.
wl
(
"];"
)
m
.
ret
.
fold
()(
r
=>
{
translateObjcTypeToCpp
(
"cppRet"
,
"objcRet"
,
r
,
w
)
w
.
wl
(
"return cppRet;"
)
})
}
}
}
}
}
}
...
...
test-suite/generated-src/objc/DBClientInterfaceObjcProxy.mm
View file @
047a3afe
...
@@ -27,11 +27,13 @@ namespace djinni_generated
...
@@ -27,11 +27,13 @@ namespace djinni_generated
ClientReturnedRecord
ClientInterfaceObjcProxy
::
get_record
(
const
std
::
string
&
utf8string
)
ClientReturnedRecord
ClientInterfaceObjcProxy
::
get_record
(
const
std
::
string
&
utf8string
)
{
{
NSString
*
cpp_utf8string
=
[[
NSString
alloc
]
initWithBytes
:
utf8string
.
data
()
@autoreleasepool
{
length:
utf8string
.
length
()
NSString
*
cpp_utf8string
=
[[
NSString
alloc
]
initWithBytes
:
utf8string
.
data
()
encoding:
NSUTF8StringEncoding
];
length:
utf8string
.
length
()
DBClientReturnedRecord
*
objcRet
=
[
objcRef
getRecord
:
cpp_utf8string
];
encoding:
NSUTF8StringEncoding
];
ClientReturnedRecord
cppRet
=
std
::
move
([
objcRet
cppClientReturnedRecord
]);
DBClientReturnedRecord
*
objcRet
=
[
objcRef
getRecord
:
cpp_utf8string
];
return
cppRet
;
ClientReturnedRecord
cppRet
=
std
::
move
([
objcRet
cppClientReturnedRecord
]);
return
cppRet
;
}
}
}
}
}
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