Skip to content
This repository has been archived by the owner on Mar 26, 2020. It is now read-only.

Minor Fixes #285

Merged
merged 6 commits into from
Dec 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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: `""`).
Expand Down
2 changes: 1 addition & 1 deletion example/example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ private static int zzUnpackTrans(String packed, int offset, int [] result) {

/* 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"
};
Expand Down Expand Up @@ -350,7 +350,7 @@ public final int yylength() {


/**
* 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ private static int zzUnpackTrans(String packed, int offset, int [] result) {

/* 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"
};
Expand Down Expand Up @@ -429,7 +429,7 @@ public final int yylength() {


/**
* 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
Expand Down
2 changes: 1 addition & 1 deletion support-lib/proxy_cache_interface.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-suite/handwritten-src/cpp/optional.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ class optional<T&>
template <class T>
class optional<T&&>
{
static_assert( sizeof(T) == 0, "optional rvalue referencs disallowed" );
static_assert( sizeof(T) == 0, "optional rvalue references disallowed" );
};


Expand Down