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
f9173eb2
Commit
f9173eb2
authored
May 05, 2015
by
Jacob Potter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix objc-extended records
parent
d5dd5294
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
14 additions
and
11 deletions
+14
-11
example/generated-src/objc/TXSItemList.mm
example/generated-src/objc/TXSItemList.mm
+0
-0
example/generated-src/objc/TXSSortItems.h
example/generated-src/objc/TXSSortItems.h
+1
-1
example/generated-src/objc/TXSTextboxListener.h
example/generated-src/objc/TXSTextboxListener.h
+1
-1
src/source/ObjcGenerator.scala
src/source/ObjcGenerator.scala
+2
-1
test-suite/generated-src/objc/DBClientInterface.h
test-suite/generated-src/objc/DBClientInterface.h
+1
-1
test-suite/generated-src/objc/DBConstants.h
test-suite/generated-src/objc/DBConstants.h
+1
-1
test-suite/generated-src/objc/DBConstants.mm
test-suite/generated-src/objc/DBConstants.mm
+1
-0
test-suite/generated-src/objc/DBRecordWithNestedDerivings.h
test-suite/generated-src/objc/DBRecordWithNestedDerivings.h
+1
-1
test-suite/generated-src/objc/DBRecordWithNestedDerivings.mm
test-suite/generated-src/objc/DBRecordWithNestedDerivings.mm
+1
-0
test-suite/generated-src/objc/DBTestHelpers.h
test-suite/generated-src/objc/DBTestHelpers.h
+5
-5
No files found.
example/generated-src/objc/TXSItemList.m
→
example/generated-src/objc/TXSItemList.m
m
View file @
f9173eb2
File moved
example/generated-src/objc/TXSSortItems.h
View file @
f9173eb2
// AUTOGENERATED FILE - DO NOT MODIFY!
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from example.djinni
// This file generated by Djinni from example.djinni
#import "TXSItemList.h"
#import "TXSSortOrder.h"
#import "TXSSortOrder.h"
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@class
TXSItemList
;
@class
TXSSortItems
;
@class
TXSSortItems
;
@protocol
TXSTextboxListener
;
@protocol
TXSTextboxListener
;
...
...
example/generated-src/objc/TXSTextboxListener.h
View file @
f9173eb2
// AUTOGENERATED FILE - DO NOT MODIFY!
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from example.djinni
// This file generated by Djinni from example.djinni
#import "TXSItemList.h"
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@class
TXSItemList
;
@protocol
TXSTextboxListener
@protocol
TXSTextboxListener
...
...
src/source/ObjcGenerator.scala
View file @
f9173eb2
...
@@ -57,7 +57,8 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
...
@@ -57,7 +57,8 @@ class ObjcGenerator(spec: Spec) extends Generator(spec) {
case
DRecord
=>
case
DRecord
=>
val
r
=
d
.
body
.
asInstanceOf
[
Record
]
val
r
=
d
.
body
.
asInstanceOf
[
Record
]
val
prefix
=
if
(
r
.
ext
.
objc
)
"../"
else
""
val
prefix
=
if
(
r
.
ext
.
objc
)
"../"
else
""
header
.
add
(
"#import "
+
q
(
spec
.
objcIncludePrefix
+
prefix
+
headerName
(
d
.
name
)))
header
.
add
(
"@class "
+
marshal
.
typename
(
tm
)
+
";"
)
body
.
add
(
"#import "
+
q
(
spec
.
objcIncludePrefix
+
prefix
+
headerName
(
d
.
name
)))
}
}
case
p
:
MParam
=>
case
p
:
MParam
=>
}
}
...
...
test-suite/generated-src/objc/DBClientInterface.h
View file @
f9173eb2
// AUTOGENERATED FILE - DO NOT MODIFY!
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from client_interface.djinni
// This file generated by Djinni from client_interface.djinni
#import "DBClientReturnedRecord.h"
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@class
DBClientReturnedRecord
;
@protocol
DBClientInterface
@protocol
DBClientInterface
...
...
test-suite/generated-src/objc/DBConstants.h
View file @
f9173eb2
// AUTOGENERATED FILE - DO NOT MODIFY!
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from constants.djinni
// This file generated by Djinni from constants.djinni
#import "DBConstants.h"
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@class
DBConstants
;
@interface
DBConstants
:
NSObject
@interface
DBConstants
:
NSObject
-
(
id
)
initWithConstants
:(
DBConstants
*
)
constants
;
-
(
id
)
initWithConstants
:(
DBConstants
*
)
constants
;
...
...
test-suite/generated-src/objc/DBConstants.mm
View file @
f9173eb2
// AUTOGENERATED FILE - DO NOT MODIFY!
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from constants.djinni
// This file generated by Djinni from constants.djinni
#import "DBConstants.h"
#import "DBConstants.h"
#import "DBConstants.h"
#pragma clang diagnostic push
#pragma clang diagnostic push
...
...
test-suite/generated-src/objc/DBRecordWithNestedDerivings.h
View file @
f9173eb2
// AUTOGENERATED FILE - DO NOT MODIFY!
// AUTOGENERATED FILE - DO NOT MODIFY!
// This file generated by Djinni from derivings.djinni
// This file generated by Djinni from derivings.djinni
#import "DBRecordWithDerivings.h"
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@class
DBRecordWithDerivings
;
@interface
DBRecordWithNestedDerivings
:
NSObject
@interface
DBRecordWithNestedDerivings
:
NSObject
-
(
id
)
initWithRecordWithNestedDerivings
:(
DBRecordWithNestedDerivings
*
)
recordWithNestedDerivings
;
-
(
id
)
initWithRecordWithNestedDerivings
:(
DBRecordWithNestedDerivings
*
)
recordWithNestedDerivings
;
...
...
test-suite/generated-src/objc/DBRecordWithNestedDerivings.mm
View file @
f9173eb2
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
// This file generated by Djinni from derivings.djinni
// This file generated by Djinni from derivings.djinni
#import "DBRecordWithNestedDerivings.h"
#import "DBRecordWithNestedDerivings.h"
#import "DBRecordWithDerivings.h"
@implementation
DBRecordWithNestedDerivings
@implementation
DBRecordWithNestedDerivings
...
...
test-suite/generated-src/objc/DBTestHelpers.h
View file @
f9173eb2
// 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 "DBAssortedIntegers.h"
#import "DBColor.h"
#import "DBColor.h"
#import "DBMapListRecord.h"
#import "DBNestedCollection.h"
#import "DBPrimitiveList.h"
#import "DBSetRecord.h"
#import <Foundation/Foundation.h>
#import <Foundation/Foundation.h>
@class
DBAssortedIntegers
;
@class
DBMapListRecord
;
@class
DBNestedCollection
;
@class
DBPrimitiveList
;
@class
DBSetRecord
;
@class
DBToken
;
@class
DBToken
;
@protocol
DBClientInterface
;
@protocol
DBClientInterface
;
...
...
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