diff options
| author | Wouter van Oortmerssen <wvo@google.com> | 2015-09-28 09:42:45 -0700 |
|---|---|---|
| committer | Wouter van Oortmerssen <wvo@google.com> | 2015-09-28 09:48:41 -0700 |
| commit | 2abe24b9ddd22fd095d96f002fb8c16b4edc36d2 (patch) | |
| tree | 57f9d87f141ec104ff36ab05997929ded95c8a19 /docs | |
| parent | a35c32e30fda51c02386a5aa393ad44d266f2392 (diff) | |
| download | flatbuffers-2abe24b9ddd22fd095d96f002fb8c16b4edc36d2.tar.gz | |
Made .proto parsing understand nested declarations.
Bug: 24401812
Change-Id: I196a03b8c5ef0bcd3c26178239c764e40ca1950d
Tested: on Linux.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/md__compiler.html | 2 | ||||
| -rwxr-xr-x | docs/source/Compiler.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/md__compiler.html b/docs/html/md__compiler.html index 6ae87ed3..9ab104fe 100644 --- a/docs/html/md__compiler.html +++ b/docs/html/md__compiler.html @@ -84,7 +84,7 @@ $(document).ready(function(){initNavTree('md__compiler.html','');}); <li><code>--gen-mutable</code> : Generate additional non-const accessors for mutating FlatBuffers in-place.</li> <li><code>--gen-onefile</code> : Generate single output file (useful for C#)</li> <li><code>--raw-binary</code> : Allow binaries without a file_indentifier to be read. This may crash flatc given a mismatched schema.</li> -<li><code>--proto</code>: Expect input files to be .proto files (protocol buffers). Output the corresponding .fbs file. Currently supports: <code>package</code>, <code>message</code>, <code>enum</code>. Does not support, but will skip without error: <code>import</code>, <code>option</code>. Does not support, will generate error: <code>service</code>, <code>extend</code>, <code>extensions</code>, <code>oneof</code>, <code>group</code>, custom options, nested declarations.</li> +<li><code>--proto</code>: Expect input files to be .proto files (protocol buffers). Output the corresponding .fbs file. Currently supports: <code>package</code>, <code>message</code>, <code>enum</code>, nested declarations. Does not support, but will skip without error: <code>import</code>, <code>option</code>. Does not support, will generate error: <code>service</code>, <code>extend</code>, <code>extensions</code>, <code>oneof</code>, <code>group</code>, custom options.</li> <li><code>--schema</code>: Serialize schemas instead of JSON (use with -b). This will output a binary version of the specified schema that itself corresponds to the reflection/reflection.fbs schema. Loading this binary file is the basis for reflection functionality. </li> </ul> </div></div><!-- contents --> diff --git a/docs/source/Compiler.md b/docs/source/Compiler.md index e4663e17..ebcdd70d 100755 --- a/docs/source/Compiler.md +++ b/docs/source/Compiler.md @@ -71,10 +71,10 @@ be generated for each file processed: - `--proto`: Expect input files to be .proto files (protocol buffers). Output the corresponding .fbs file. - Currently supports: `package`, `message`, `enum`. + Currently supports: `package`, `message`, `enum`, nested declarations. Does not support, but will skip without error: `import`, `option`. Does not support, will generate error: `service`, `extend`, `extensions`, - `oneof`, `group`, custom options, nested declarations. + `oneof`, `group`, custom options. - `--schema`: Serialize schemas instead of JSON (use with -b). This will output a binary version of the specified schema that itself corresponds |