Commit 7e09a2c2 authored by Andrew Twyman's avatar Andrew Twyman Committed by GitHub

Merge pull request #285 from ronbak/feram-patches

Automated fixes for typos in comments and strings.
parents 7f9bfef5 28529df5
......@@ -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
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
is controlled by the follwoing arguments:
is controlled by the following arguments:
- `--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-prefix`: The prefix to add to type names stored in YAML files (default: `""`).
......
......@@ -30,7 +30,7 @@ objc:
header: '"MLB/MLBRecord1.h"'
# 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.
# This fiels is the same as "typename" most of the time as records are typically NSObjects and require no special boxing.
# This files 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.
boxed: 'MLBRecord1'
# Specifies whether the unboxed type is a pointer.
......
......@@ -166,7 +166,7 @@ class YamlLexer implements FlexLexer {
/* error messages for the codes above */
private static final String ZZ_ERROR_MSG[] = {
"Unkown internal scanner error",
"Unknown internal scanner error",
"Error: could not match input",
"Error: pushback value was too large"
};
......@@ -350,7 +350,7 @@ class YamlLexer implements FlexLexer {
/**
* Reports an error that occured while scanning.
* Reports an error that occurred while scanning.
*
* In a wellformed scanner (no or only correct usage of
* yypushback(int) and a match-all fallback rule) this method
......
......@@ -243,7 +243,7 @@ public class _DjinniLexer implements FlexLexer {
/* error messages for the codes above */
private static final String ZZ_ERROR_MSG[] = {
"Unkown internal scanner error",
"Unknown internal scanner error",
"Error: could not match input",
"Error: pushback value was too large"
};
......@@ -429,7 +429,7 @@ public class _DjinniLexer implements FlexLexer {
/**
* Reports an error that occured while scanning.
* Reports an error that occurred while scanning.
*
* In a wellformed scanner (no or only correct usage of
* yypushback(int) and a match-all fallback rule) this method
......
......@@ -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>
* to WeakProxyPointer, allowing it to answer the question: "given this
* impl, do we already have a proxy in existance?"
* impl, do we already have a proxy in existence?"
*
* 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
......
......@@ -553,7 +553,7 @@ public:
template <class T>
class optional<T&&>
{
static_assert( sizeof(T) == 0, "optional rvalue referencs disallowed" );
static_assert( sizeof(T) == 0, "optional rvalue references disallowed" );
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment