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
decd1770
Commit
decd1770
authored
Jun 24, 2015
by
j4cbo
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #106 from mrdomino/cast-handle
Cast handle
parents
783f9e6e
4a835724
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
src/source/ObjcppGenerator.scala
src/source/ObjcppGenerator.scala
+1
-1
test-suite/generated-src/objc/DBClientInterface+Private.mm
test-suite/generated-src/objc/DBClientInterface+Private.mm
+4
-4
test-suite/generated-src/objc/DBToken+Private.mm
test-suite/generated-src/objc/DBToken+Private.mm
+1
-1
No files found.
src/source/ObjcppGenerator.scala
View file @
decd1770
...
...
@@ -178,7 +178,7 @@ class ObjcppGenerator(spec: Spec) extends Generator(spec) {
w
.
wl
(
s
"$ret ${idCpp.method(m.ident)}${params.mkString("
(
", "
,
", "
)
")} override"
).
braced
{
w
.
w
(
"@autoreleasepool"
).
braced
{
val
ret
=
m
.
ret
.
fold
(
""
)(
_
=>
"auto r = "
)
val
call
=
"[Handle::get() "
+
idObjc
.
method
(
m
.
ident
)
val
call
=
s
"[(id<$self>)Handle::get() ${idObjc.method(m.ident)}"
writeAlignedObjcCall
(
w
,
ret
+
call
,
m
.
params
,
"]"
,
p
=>
(
idObjc
.
field
(
p
.
ident
),
s
"(${objcppMarshal.fromCpp(p.ty, idCpp.local(p.ident))})"
))
w
.
wl
(
";"
)
m
.
ret
.
fold
()(
r
=>
{
w
.
wl
(
s
"return ${objcppMarshal.toCpp(r, "
r
")};"
)
})
...
...
test-suite/generated-src/objc/DBClientInterface+Private.mm
View file @
decd1770
...
...
@@ -20,16 +20,16 @@ public:
::
ClientReturnedRecord
get_record
(
int64_t
record_id
,
const
std
::
string
&
utf8string
,
const
std
::
experimental
::
optional
<
std
::
string
>
&
misc
)
override
{
@autoreleasepool
{
auto
r
=
[
Handle
:
:
get
()
getRecord
:(
::
djinni
::
I64
::
fromCpp
(
record_id
))
utf8string:
(
::
djinni
::
String
::
fromCpp
(
utf8string
))
misc:
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
String
>::
fromCpp
(
misc
))];
auto
r
=
[
(
id
<
DBClientInterface
>
)
Handle
:
:
get
()
getRecord
:(
::
djinni
::
I64
::
fromCpp
(
record_id
))
utf8string:
(
::
djinni
::
String
::
fromCpp
(
utf8string
))
misc:
(
::
djinni
::
Optional
<
std
::
experimental
::
optional
,
::
djinni
::
String
>::
fromCpp
(
misc
))];
return
::
djinni_generated
::
ClientReturnedRecord
::
toCpp
(
r
);
}
}
std
::
string
return_str
()
override
{
@autoreleasepool
{
auto
r
=
[
Handle
:
:
get
()
returnStr
];
auto
r
=
[
(
id
<
DBClientInterface
>
)
Handle
:
:
get
()
returnStr
];
return
::
djinni
::
String
::
toCpp
(
r
);
}
}
...
...
test-suite/generated-src/objc/DBToken+Private.mm
View file @
decd1770
...
...
@@ -50,7 +50,7 @@ public:
std
::
string
whoami
()
override
{
@autoreleasepool
{
auto
r
=
[
Handle
:
:
get
()
whoami
];
auto
r
=
[
(
id
<
DBToken
>
)
Handle
:
:
get
()
whoami
];
return
::
djinni
::
String
::
toCpp
(
r
);
}
}
...
...
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