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
7e09a2c2
Commit
7e09a2c2
authored
Dec 27, 2016
by
Andrew Twyman
Committed by
GitHub
Dec 27, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #285 from ronbak/feram-patches
Automated fixes for typos in comments and strings.
parents
7f9bfef5
28529df5
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
8 deletions
+8
-8
README.md
README.md
+1
-1
example/example.yaml
example/example.yaml
+1
-1
intellij-plugin/src/com/dropbox/djinni/ideaplugin/YamlLexer.java
...j-plugin/src/com/dropbox/djinni/ideaplugin/YamlLexer.java
+2
-2
intellij-plugin/src/com/dropbox/djinni/ideaplugin/_DjinniLexer.java
...lugin/src/com/dropbox/djinni/ideaplugin/_DjinniLexer.java
+2
-2
support-lib/proxy_cache_interface.hpp
support-lib/proxy_cache_interface.hpp
+1
-1
test-suite/handwritten-src/cpp/optional.hpp
test-suite/handwritten-src/cpp/optional.hpp
+1
-1
No files found.
README.md
View file @
7e09a2c2
...
@@ -267,7 +267,7 @@ When generating the interface for your project and wish to make it available to
...
@@ -267,7 +267,7 @@ When generating the interface for your project and wish to make it available to
in all of C++/Objective-C/Java you can tell Djinni to generate a special YAML file as part
in all of C++/Objective-C/Java you can tell Djinni to generate a special YAML file as part
of the code generation process. This file then contains all the information Djinni requires
of the code generation process. This file then contains all the information Djinni requires
to include your types in a different project. Instructing Djinni to create these YAML files
to include your types in a different project. Instructing Djinni to create these YAML files
is controlled by the foll
wo
ing arguments:
is controlled by the foll
ow
ing arguments:
-
`--yaml-out`
: The output folder for YAML files (Generator disabled if unspecified).
-
`--yaml-out`
: The output folder for YAML files (Generator disabled if unspecified).
-
`--yaml-out-file`
: If specified all types are merged into a single YAML file instead of generating one file per type (relative to
`--yaml-out`
).
-
`--yaml-out-file`
: If specified all types are merged into a single YAML file instead of generating one file per type (relative to
`--yaml-out`
).
-
`--yaml-prefix`
: The prefix to add to type names stored in YAML files (default:
`""`
).
-
`--yaml-prefix`
: The prefix to add to type names stored in YAML files (default:
`""`
).
...
...
example/example.yaml
View file @
7e09a2c2
...
@@ -30,7 +30,7 @@ objc:
...
@@ -30,7 +30,7 @@ objc:
header
:
'
"MLB/MLBRecord1.h"'
header
:
'
"MLB/MLBRecord1.h"'
# Only used for "record" types: determines the type used when boxing the record is required.
# Only used for "record" types: determines the type used when boxing the record is required.
# Should not contain the pointer asterisk "*", protocols are not supported.
# Should not contain the pointer asterisk "*", protocols are not supported.
# This fi
el
s is the same as "typename" most of the time as records are typically NSObjects and require no special boxing.
# This fi
le
s is the same as "typename" most of the time as records are typically NSObjects and require no special boxing.
# However, some may not, for example NSTimeInterval is boxed to NSNumber.
# However, some may not, for example NSTimeInterval is boxed to NSNumber.
boxed
:
'
MLBRecord1'
boxed
:
'
MLBRecord1'
# Specifies whether the unboxed type is a pointer.
# Specifies whether the unboxed type is a pointer.
...
...
intellij-plugin/src/com/dropbox/djinni/ideaplugin/YamlLexer.java
View file @
7e09a2c2
...
@@ -166,7 +166,7 @@ class YamlLexer implements FlexLexer {
...
@@ -166,7 +166,7 @@ class YamlLexer implements FlexLexer {
/* error messages for the codes above */
/* error messages for the codes above */
private
static
final
String
ZZ_ERROR_MSG
[]
=
{
private
static
final
String
ZZ_ERROR_MSG
[]
=
{
"Unkown internal scanner error"
,
"Unk
n
own internal scanner error"
,
"Error: could not match input"
,
"Error: could not match input"
,
"Error: pushback value was too large"
"Error: pushback value was too large"
};
};
...
@@ -350,7 +350,7 @@ class YamlLexer implements FlexLexer {
...
@@ -350,7 +350,7 @@ class YamlLexer implements FlexLexer {
/**
/**
* Reports an error that occured while scanning.
* Reports an error that occur
r
ed while scanning.
*
*
* In a wellformed scanner (no or only correct usage of
* In a wellformed scanner (no or only correct usage of
* yypushback(int) and a match-all fallback rule) this method
* yypushback(int) and a match-all fallback rule) this method
...
...
intellij-plugin/src/com/dropbox/djinni/ideaplugin/_DjinniLexer.java
View file @
7e09a2c2
...
@@ -243,7 +243,7 @@ public class _DjinniLexer implements FlexLexer {
...
@@ -243,7 +243,7 @@ public class _DjinniLexer implements FlexLexer {
/* error messages for the codes above */
/* error messages for the codes above */
private
static
final
String
ZZ_ERROR_MSG
[]
=
{
private
static
final
String
ZZ_ERROR_MSG
[]
=
{
"Unkown internal scanner error"
,
"Unk
n
own internal scanner error"
,
"Error: could not match input"
,
"Error: could not match input"
,
"Error: pushback value was too large"
"Error: pushback value was too large"
};
};
...
@@ -429,7 +429,7 @@ public class _DjinniLexer implements FlexLexer {
...
@@ -429,7 +429,7 @@ public class _DjinniLexer implements FlexLexer {
/**
/**
* Reports an error that occured while scanning.
* Reports an error that occur
r
ed while scanning.
*
*
* In a wellformed scanner (no or only correct usage of
* In a wellformed scanner (no or only correct usage of
* yypushback(int) and a match-all fallback rule) this method
* yypushback(int) and a match-all fallback rule) this method
...
...
support-lib/proxy_cache_interface.hpp
View file @
7e09a2c2
...
@@ -90,7 +90,7 @@ template <typename T> static inline T * get_unowning(T * ptr) { return ptr; }
...
@@ -90,7 +90,7 @@ template <typename T> static inline T * get_unowning(T * ptr) { return ptr; }
*
*
* The cache contains a map from pair<ImplType, UnowningImplPointer>
* The cache contains a map from pair<ImplType, UnowningImplPointer>
* to WeakProxyPointer, allowing it to answer the question: "given this
* to WeakProxyPointer, allowing it to answer the question: "given this
* impl, do we already have a proxy in exist
a
nce?"
* impl, do we already have a proxy in exist
e
nce?"
*
*
* We use one map for all translated types, rather than a separate one for each type,
* We use one map for all translated types, rather than a separate one for each type,
* to minimize duplication of code and make it so the unordered_map is as contained as
* to minimize duplication of code and make it so the unordered_map is as contained as
...
...
test-suite/handwritten-src/cpp/optional.hpp
View file @
7e09a2c2
...
@@ -553,7 +553,7 @@ public:
...
@@ -553,7 +553,7 @@ public:
template
<
class
T
>
template
<
class
T
>
class
optional
<
T
&&>
class
optional
<
T
&&>
{
{
static_assert
(
sizeof
(
T
)
==
0
,
"optional rvalue referencs disallowed"
);
static_assert
(
sizeof
(
T
)
==
0
,
"optional rvalue referenc
e
s disallowed"
);
};
};
...
...
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