From 5ea2b49f58462728a895bc61ba290f16bed220d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=87=A1?= <wufan@wufandeMacBook-Pro-2.local>
Date: Fri, 1 Jul 2016 11:17:03 +0800
Subject: [PATCH] Fix some error
---
CMakeLists.txt | 9 -
docs/html/md__compiler.html | 114 ------
docs/source/Compiler.md | 3 -
include/flatbuffers/idl.h | 11 -
.../google/flatbuffers/FlatBufferBuilder.java | 32 --
samples/monster_generated.h | 12 -
src/flatc.cpp | 64 ----
src/idl_gen_cpp.cpp | 344 ------------------
src/idl_gen_grpc.cpp | 2 +-
src/idl_parser.cpp | 27 --
tests/generate_code.sh | 5 -
tests/monster_test.bfbs | Bin 2744 -> 3152 bytes
tests/monster_test_generated.h | 25 --
13 files changed, 1 insertion(+), 647 deletions(-)
delete mode 100644 docs/html/md__compiler.html
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32a5e214..c2dd9508 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,14 +105,6 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
"${CMAKE_CXX_FLAGS} -std=c++0x")
endif(CYGWIN)
set(CMAKE_CXX_FLAGS
-<<<<<<< HEAD
- "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -pedantic -Werror -Wextra -Werror=shadow")
-elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
- set(CMAKE_CXX_FLAGS
- "${CMAKE_CXX_FLAGS} -std=c++0x -stdlib=libc++ -Wall -pedantic -Werror -Wextra")
- set(CMAKE_EXE_LINKER_FLAGS
- "${CMAKE_EXE_LINKER_FLAGS} -lc++abi")
-=======
"${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Werror=shadow")
if (GCC_VERSION VERSION_GREATER 4.4)
set(CMAKE_CXX_FLAGS
@@ -137,7 +129,6 @@ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -fsigned-char")
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
endif()
if(FLATBUFFERS_CODE_COVERAGE)
diff --git a/docs/html/md__compiler.html b/docs/html/md__compiler.html
deleted file mode 100644
index 1b3cd1db..00000000
--- a/docs/html/md__compiler.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!-- HTML header for doxygen 1.8.6-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.8.7"/>
-<title>FlatBuffers: Using the schema compiler</title>
-<link href="tabs.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="jquery.js"></script>
-<script type="text/javascript" src="dynsections.js"></script>
-<link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
-<script type="text/javascript" src="navtree.js"></script>
-<script type="text/javascript">
- $(document).ready(initResizable);
- $(window).load(resizeHeight);
-</script>
-<link href="style.css" rel="stylesheet" type="text/css" />
-<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,400italic,500,500italic,700,700italic|Roboto+Mono:400,700" rel="stylesheet">
-</head>
-<body>
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-<div id="titlearea" style="height: 110px;">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
- <td id="commonprojectlogo">
- <img alt="Logo" src="fpl_logo_small.png"/>
- </td>
- <td style="padding-left: 0.5em;">
- <div id="projectname">FlatBuffers
- </div>
- <div style="font-size:12px;">
- An open source project by <a href="https://developers.google.com/games/#Tools">FPL</a>.
- </div>
- </td>
- </tr>
- </tbody>
-</table>
-</div>
-<!-- end header part -->
-<!-- Generated by Doxygen 1.8.7 -->
-</div><!-- top -->
-<div id="side-nav" class="ui-resizable side-nav-resizable">
- <div id="nav-tree">
- <div id="nav-tree-contents">
- <div id="nav-sync" class="sync"></div>
- </div>
- </div>
- <div id="splitbar" style="-moz-user-select:none;"
- class="ui-resizable-handle">
- </div>
-</div>
-<script type="text/javascript">
-$(document).ready(function(){initNavTree('md__compiler.html','');});
-</script>
-<div id="doc-content">
-<div class="header">
- <div class="headertitle">
-<div class="title">Using the schema compiler </div> </div>
-</div><!--header-->
-<div class="contents">
-<div class="textblock"><p>Usage: </p><pre class="fragment">flatc [ GENERATOR OPTIONS ] [ -o PATH ] [ -I PATH ] [ -S ] FILES...
- [ -- FILES...]
-</pre><p>The files are read and parsed in order, and can contain either schemas or data (see below). Data files are processed according to the definitions of the most recent schema specified.</p>
-<p><code>--</code> indicates that the following files are binary files in FlatBuffer format conforming to the schema indicated before it.</p>
-<p>Depending on the flags passed, additional files may be generated for each file processed:</p>
-<p>For any schema input files, one or more generators can be specified:</p>
-<ul>
-<li><code>--cpp</code>, <code>-c</code> : Generate a C++ header for all definitions in this file (as <code>filename_generated.h</code>).</li>
-<li><code>--java</code>, <code>-j</code> : Generate Java code.</li>
-<li><code>--csharp</code>, <code>-n</code> : Generate C# code.</li>
-<li><code>--go</code>, <code>-g</code> : Generate Go code.</li>
-<li><code>--python</code>, <code>-p</code>: Generate Python code.</li>
-<li><code>--javascript</code>, <code>-s</code>: Generate JavaScript code.</li>
-<li><code>--php</code>: Generate PHP code.</li>
-</ul>
-<p>For any data input files:</p>
-<ul>
-<li><code>--binary</code>, <code>-b</code> : If data is contained in this file, generate a <code>filename.bin</code> containing the binary flatbuffer (or a different extension if one is specified in the schema).</li>
-<li><code>--json</code>, <code>-t</code> : If data is contained in this file, generate a <code>filename.json</code> representing the data in the flatbuffer.</li>
-</ul>
-<p>Additional options:</p>
-<ul>
-<li><code>-o PATH</code> : Output all generated files to PATH (either absolute, or relative to the current directory). If omitted, PATH will be the current directory. PATH should end in your systems path separator, e.g. <code>/</code> or <code>\</code>.</li>
-<li><code>-I PATH</code> : when encountering <code>include</code> statements, attempt to load the files from this path. Paths will be tried in the order given, and if all fail (or none are specified) it will try to load relative to the path of the schema file being parsed.</li>
-<li><code>-M</code> : Print make rules for generated files.</li>
-<li><code>--strict-json</code> : Require & generate strict JSON (field names are enclosed in quotes, no trailing commas in tables/vectors). By default, no quotes are required/generated, and trailing commas are allowed.</li>
-<li><code>--defaults-json</code> : Output fields whose value is equal to the default value when writing JSON text.</li>
-<li><code>--no-prefix</code> : Don't prefix enum values in generated C++ by their enum type.</li>
-<li><code>--scoped-enums</code> : Use C++11 style scoped and strongly typed enums in generated C++. This also implies <code>--no-prefix</code>.</li>
-<li><code>--gen-includes</code> : (deprecated), this is the default behavior. If the original behavior is required (no include statements) use <code>--no-includes.</code></li>
-<li><code>--no-includes</code> : Don't generate include statements for included schemas the generated file depends on (C++).</li>
-<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>, nested declarations, <code>import</code> (use <code>-I</code> for paths), <code>extend</code>, <code>oneof</code>, <code>group</code>. Does not support, but will skip without error: <code>option</code>, <code>service</code>, <code>extensions</code>, and most everything else.</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>
-<p>NOTE: short-form options for generators are deprecated, use the long form whenever possible. </p>
-</div></div><!-- contents -->
-</div><!-- doc-content -->
-<!-- Google Analytics -->
-<script>
- (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
- })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
- ga('create', 'UA-49880327-7', 'auto');
- ga('send', 'pageview');
-</script>
-</body>
-</html>
diff --git a/docs/source/Compiler.md b/docs/source/Compiler.md
index 5f1427d0..ad584c73 100755
--- a/docs/source/Compiler.md
+++ b/docs/source/Compiler.md
@@ -33,11 +33,8 @@ For any schema input files, one or more generators can be specified:
- `--php`: Generate PHP code.
-<<<<<<< HEAD
-=======
- `--grpc`: Generate RPC stub code for GRPC.
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
For any data input files:
- `--binary`, `-b` : If data is contained in this file, generate a
diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index 1b45425b..b22bc08a 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -550,18 +550,7 @@ private:
IDLOptions opts;
private:
-<<<<<<< HEAD
- const char *source_, *cursor_;
- int line_; // the current line being parsed
- int token_;
- std::string files_being_parsed_;
- bool proto_mode_;
- bool strict_json_;
- std::string attribute_;
- std::vector<std::string> doc_comment_;
-=======
const char *source_;
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
std::string file_being_parsed_;
diff --git a/java/com/google/flatbuffers/FlatBufferBuilder.java b/java/com/google/flatbuffers/FlatBufferBuilder.java
index 3bbd5d32..c2186fa7 100644
--- a/java/com/google/flatbuffers/FlatBufferBuilder.java
+++ b/java/com/google/flatbuffers/FlatBufferBuilder.java
@@ -36,21 +36,6 @@ import java.nio.charset.Charset;
* "Use in Java/C#" in the main FlatBuffers documentation.
*/
public class FlatBufferBuilder {
-<<<<<<< HEAD
- ByteBuffer bb; // Where we construct the FlatBuffer.
- int space; // Remaining space in the ByteBuffer.
- static final Charset utf8charset = Charset.forName("UTF-8");
- int minalign = 1; // Minimum alignment encountered so far.
- int[] vtable = null; // The vtable for the current table.
- int vtable_in_use = 0; // The amount of fields we're actually using.
- boolean nested = false; // Whether we are currently serializing a table.
- boolean finished = false; // Whether the buffer is finished.
- int object_start; // Starting offset of the current struct/table.
- int[] vtables = new int[16]; // List of offsets of all vtables.
- int num_vtables = 0; // Number of entries in `vtables` in use.
- int vector_num_elems = 0; // For the current vector being built.
- boolean force_defaults = false; // False omits default values from the serialized data
-=======
/// @cond FLATBUFFERS_INTERNAL
ByteBuffer bb; // Where we construct the FlatBuffer.
int space; // Remaining space in the ByteBuffer.
@@ -68,7 +53,6 @@ public class FlatBufferBuilder {
CharsetEncoder encoder = utf8charset.newEncoder();
ByteBuffer dst;
/// @endcond
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
/**
* Start with a buffer of size `initial_size`, then grow as required.
@@ -440,16 +424,6 @@ public class FlatBufferBuilder {
" finished by FlatBufferBuilder.finish().");
}
- /**
- * Should not be accessing the final buffer before it is finished.
- */
- public void finished() {
- if (!finished)
- throw new AssertionError(
- "FlatBuffers: you can only access the serialized buffer after it has been" +
- " finished by FlatBufferBuilder.finish().");
- }
-
/**
* Should not be creating any other object, string or vector
* while an object is being constructed.
@@ -751,11 +725,6 @@ public class FlatBufferBuilder {
return this;
}
-<<<<<<< HEAD
- // Get the ByteBuffer representing the FlatBuffer. Only call this after you've
- // called finish(). The actual data starts at the ByteBuffer's current position,
- // not necessarily at 0.
-=======
/**
* Get the ByteBuffer representing the FlatBuffer. Only call this after you've
* called `finish()`. The actual data starts at the ByteBuffer's current position,
@@ -763,7 +732,6 @@ public class FlatBufferBuilder {
*
* @return The {@link ByteBuffer} representing the FlatBuffer
*/
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
public ByteBuffer dataBuffer() {
finished();
return bb;
diff --git a/samples/monster_generated.h b/samples/monster_generated.h
index 93bf73fd..1a16126a 100644
--- a/samples/monster_generated.h
+++ b/samples/monster_generated.h
@@ -72,12 +72,9 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
VT_NAME = 10,
VT_INVENTORY = 14,
VT_COLOR = 16,
-<<<<<<< HEAD
-=======
VT_WEAPONS = 18,
VT_EQUIPPED_TYPE = 20,
VT_EQUIPPED = 22
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
};
const Vec3 *pos() const { return GetStruct<const Vec3 *>(VT_POS); }
Vec3 *mutable_pos() { return GetStruct<Vec3 *>(VT_POS); }
@@ -91,15 +88,12 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
flatbuffers::Vector<uint8_t> *mutable_inventory() { return GetPointer<flatbuffers::Vector<uint8_t> *>(VT_INVENTORY); }
Color color() const { return static_cast<Color>(GetField<int8_t>(VT_COLOR, 2)); }
bool mutate_color(Color _color) { return SetField(VT_COLOR, static_cast<int8_t>(_color)); }
-<<<<<<< HEAD
-=======
const flatbuffers::Vector<flatbuffers::Offset<Weapon>> *weapons() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<Weapon>> *>(VT_WEAPONS); }
flatbuffers::Vector<flatbuffers::Offset<Weapon>> *mutable_weapons() { return GetPointer<flatbuffers::Vector<flatbuffers::Offset<Weapon>> *>(VT_WEAPONS); }
Equipment equipped_type() const { return static_cast<Equipment>(GetField<uint8_t>(VT_EQUIPPED_TYPE, 0)); }
bool mutate_equipped_type(Equipment _equipped_type) { return SetField(VT_EQUIPPED_TYPE, static_cast<uint8_t>(_equipped_type)); }
const void *equipped() const { return GetPointer<const void *>(VT_EQUIPPED); }
void *mutable_equipped() { return GetPointer<void *>(VT_EQUIPPED); }
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyField<Vec3>(verifier, VT_POS) &&
@@ -110,15 +104,12 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
VerifyField<flatbuffers::uoffset_t>(verifier, VT_INVENTORY) &&
verifier.Verify(inventory()) &&
VerifyField<int8_t>(verifier, VT_COLOR) &&
-<<<<<<< HEAD
-=======
VerifyField<flatbuffers::uoffset_t>(verifier, VT_WEAPONS) &&
verifier.Verify(weapons()) &&
verifier.VerifyVectorOfTables(weapons()) &&
VerifyField<uint8_t>(verifier, VT_EQUIPPED_TYPE) &&
VerifyField<flatbuffers::uoffset_t>(verifier, VT_EQUIPPED) &&
VerifyEquipment(verifier, equipped(), equipped_type()) &&
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
verifier.EndTable();
}
};
@@ -132,12 +123,9 @@ struct MonsterBuilder {
void add_name(flatbuffers::Offset<flatbuffers::String> name) { fbb_.AddOffset(Monster::VT_NAME, name); }
void add_inventory(flatbuffers::Offset<flatbuffers::Vector<uint8_t>> inventory) { fbb_.AddOffset(Monster::VT_INVENTORY, inventory); }
void add_color(Color color) { fbb_.AddElement<int8_t>(Monster::VT_COLOR, static_cast<int8_t>(color), 2); }
-<<<<<<< HEAD
-=======
void add_weapons(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<Weapon>>> weapons) { fbb_.AddOffset(Monster::VT_WEAPONS, weapons); }
void add_equipped_type(Equipment equipped_type) { fbb_.AddElement<uint8_t>(Monster::VT_EQUIPPED_TYPE, static_cast<uint8_t>(equipped_type), 0); }
void add_equipped(flatbuffers::Offset<void> equipped) { fbb_.AddOffset(Monster::VT_EQUIPPED, equipped); }
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
MonsterBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
MonsterBuilder &operator=(const MonsterBuilder &);
flatbuffers::Offset<Monster> Finish() {
diff --git a/src/flatc.cpp b/src/flatc.cpp
index 6a8d8912..c7ba29e8 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -29,12 +29,7 @@ static void Error(const std::string &err, bool usage = false,
struct Generator {
bool (*generate)(const flatbuffers::Parser &parser,
const std::string &path,
-<<<<<<< HEAD
- const std::string &file_name,
- const flatbuffers::GeneratorOptions &opts);
-=======
const std::string &file_name);
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
const char *generator_opt_short;
const char *generator_opt_long;
const char *lang_name;
@@ -48,41 +43,6 @@ struct Generator {
const Generator generators[] = {
{ flatbuffers::GenerateBinary, "-b", "--binary", "binary",
-<<<<<<< HEAD
- flatbuffers::GeneratorOptions::kMAX,
- "Generate wire format binaries for any data definitions",
- flatbuffers::BinaryMakeRule },
- { flatbuffers::GenerateTextFile, "-t", "--json", "text",
- flatbuffers::GeneratorOptions::kMAX,
- "Generate text output for any data definitions",
- flatbuffers::TextMakeRule },
- { flatbuffers::GenerateCPP, "-c", "--cpp", "C++",
- flatbuffers::GeneratorOptions::kMAX,
- "Generate C++ headers for tables/structs",
- flatbuffers::CPPMakeRule },
- { flatbuffers::GenerateGo, "-g", "--go", "Go",
- flatbuffers::GeneratorOptions::kGo,
- "Generate Go files for tables/structs",
- flatbuffers::GeneralMakeRule },
- { flatbuffers::GenerateGeneral, "-j", "--java", "Java",
- flatbuffers::GeneratorOptions::kJava,
- "Generate Java classes for tables/structs",
- flatbuffers::GeneralMakeRule },
- { flatbuffers::GenerateJS, "-s", "--js", "JavaScript",
- flatbuffers::GeneratorOptions::kMAX,
- "Generate JavaScript code for tables/structs",
- flatbuffers::JSMakeRule },
- { flatbuffers::GenerateGeneral, "-n", "--csharp", "C#",
- flatbuffers::GeneratorOptions::kCSharp,
- "Generate C# classes for tables/structs",
- flatbuffers::GeneralMakeRule },
- { flatbuffers::GeneratePython, "-p", "--python", "Python",
- flatbuffers::GeneratorOptions::kMAX,
- "Generate Python files for tables/structs",
- flatbuffers::GeneralMakeRule },
- { flatbuffers::GeneratePhp, nullptr, "--php", "PHP",
- flatbuffers::GeneratorOptions::kMAX,
-=======
flatbuffers::IDLOptions::kMAX,
"Generate wire format binaries for any data definitions",
flatbuffers::BinaryMakeRule },
@@ -116,7 +76,6 @@ const Generator generators[] = {
flatbuffers::GeneralMakeRule },
{ flatbuffers::GeneratePhp, nullptr, "--php", "PHP",
flatbuffers::IDLOptions::kMAX,
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
"Generate PHP files for tables/structs",
flatbuffers::GeneralMakeRule },
{ flatbuffers::GenerateGRPC, nullptr, "--grpc", "GRPC",
@@ -270,11 +229,7 @@ int main(int argc, const char *argv[]) {
}
// Now process the files:
-<<<<<<< HEAD
- parser = new flatbuffers::Parser(opts.strict_json, proto_mode);
-=======
parser = new flatbuffers::Parser(opts);
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
for (auto file_it = filenames.begin();
file_it != filenames.end();
++file_it) {
@@ -310,23 +265,16 @@ int main(int argc, const char *argv[]) {
}
}
} else {
-<<<<<<< HEAD
-=======
// Check if file contains 0 bytes.
if (contents.length() != strlen(contents.c_str())) {
Error("input file appears to be binary: " + *file_it, true);
}
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
if (flatbuffers::GetExtension(*file_it) == "fbs") {
// If we're processing multiple schemas, make sure to start each
// one from scratch. If it depends on previous schemas it must do
// so explicitly using an include.
delete parser;
-<<<<<<< HEAD
- parser = new flatbuffers::Parser(opts.strict_json, proto_mode);
-=======
parser = new flatbuffers::Parser(opts);
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
}
auto local_include_directory = flatbuffers::StripFileName(*file_it);
include_directories.push_back(local_include_directory.c_str());
@@ -350,11 +298,7 @@ int main(int argc, const char *argv[]) {
if (generator_enabled[i]) {
if (!print_make_rules) {
flatbuffers::EnsureDirExists(output_path);
-<<<<<<< HEAD
- if (!generators[i].generate(*parser, output_path, filebase, opts)) {
-=======
if (!generators[i].generate(*parser, output_path, filebase)) {
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
Error(std::string("Unable to generate ") +
generators[i].lang_name +
" for " +
@@ -362,11 +306,7 @@ int main(int argc, const char *argv[]) {
}
} else {
std::string make_rule = generators[i].make_rule(
-<<<<<<< HEAD
- *parser, output_path, *file_it, opts);
-=======
*parser, output_path, *file_it);
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
if (!make_rule.empty())
printf("%s\n", flatbuffers::WordWrap(
make_rule, 80, " ", " \\").c_str());
@@ -374,15 +314,11 @@ int main(int argc, const char *argv[]) {
}
}
-<<<<<<< HEAD
- if (proto_mode) GenerateFBS(*parser, output_path, filebase, opts);
-=======
if (opts.proto_mode) GenerateFBS(*parser, output_path, filebase);
// We do not want to generate code for the definitions in this file
// in any files coming up next.
parser->MarkGenerated();
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
}
delete parser;
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index c8337af7..c690240d 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -208,40 +208,6 @@ class CppGenerator : public BaseGenerator {
// This tracks the current namespace so we can insert namespace declarations.
const Namespace *cur_name_space_ = nullptr;
-<<<<<<< HEAD
-// Return a C++ type from the table in idl.h
-static std::string GenTypeBasic(const Parser &parser, const Type &type,
- bool user_facing_type) {
- static const char *ctypename[] = {
- #define FLATBUFFERS_TD(ENUM, IDLTYPE, CTYPE, JTYPE, GTYPE, NTYPE, PTYPE) \
- #CTYPE,
- FLATBUFFERS_GEN_TYPES(FLATBUFFERS_TD)
- #undef FLATBUFFERS_TD
- };
- if (user_facing_type) {
- if (type.enum_def) return WrapInNameSpace(parser, *type.enum_def);
- if (type.base_type == BASE_TYPE_BOOL) return "bool";
- }
- return ctypename[type.base_type];
-}
-
-static std::string GenTypeWire(const Parser &parser, const Type &type,
- const char *postfix, bool user_facing_type);
-
-// Return a C++ pointer type, specialized to the actual struct/table types,
-// and vector element types.
-static std::string GenTypePointer(const Parser &parser, const Type &type) {
- switch (type.base_type) {
- case BASE_TYPE_STRING:
- return "flatbuffers::String";
- case BASE_TYPE_VECTOR:
- return "flatbuffers::Vector<" +
- GenTypeWire(parser, type.VectorType(), "", false) + ">";
- case BASE_TYPE_STRUCT: {
- return WrapInNameSpace(parser, *type.struct_def);
- }
- case BASE_TYPE_UNION:
-=======
const Namespace *CurrentNameSpace() { return cur_name_space_; }
// Translates a qualified name in flatbuffer text format to the same name in
@@ -283,25 +249,12 @@ static std::string GenTypePointer(const Parser &parser, const Type &type) {
return WrapInNameSpace(*type.struct_def);
}
case BASE_TYPE_UNION:
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
// fall through
default:
return "void";
}
}
-<<<<<<< HEAD
-// Return a C++ type for any type (scalar/pointer) specifically for
-// building a flatbuffer.
-static std::string GenTypeWire(const Parser &parser, const Type &type,
- const char *postfix, bool user_facing_type) {
- return IsScalar(type.base_type)
- ? GenTypeBasic(parser, type, user_facing_type) + postfix
- : IsStruct(type)
- ? "const " + GenTypePointer(parser, type) + " *"
- : "flatbuffers::Offset<" + GenTypePointer(parser, type) + ">" + postfix;
-}
-=======
// Return a C++ type for any type (scalar/pointer) specifically for
// building a flatbuffer.
std::string GenTypeWire(const Type &type,
@@ -313,7 +266,6 @@ static std::string GenTypeWire(const Parser &parser, const Type &type,
: "flatbuffers::Offset<" + GenTypePointer(type) +
">" + postfix;
}
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
// Return a C++ type for any type (scalar/pointer) that reflects its
// serialized size.
@@ -324,17 +276,6 @@ static std::string GenTypeWire(const Parser &parser, const Type &type,
: "flatbuffers::uoffset_t";
}
-<<<<<<< HEAD
-// Return a C++ type for any type (scalar/pointer) specifically for
-// using a flatbuffer.
-static std::string GenTypeGet(const Parser &parser, const Type &type,
- const char *afterbasic, const char *beforeptr,
- const char *afterptr, bool user_facing_type) {
- return IsScalar(type.base_type)
- ? GenTypeBasic(parser, type, user_facing_type) + afterbasic
- : beforeptr + GenTypePointer(parser, type) + afterptr;
-}
-=======
// Return a C++ type for any type (scalar/pointer) specifically for
// using a flatbuffer.
std::string GenTypeGet(const Type &type,
@@ -344,7 +285,6 @@ static std::string GenTypeGet(const Parser &parser, const Type &type,
? GenTypeBasic(type, user_facing_type) + afterbasic
: beforeptr + GenTypePointer(type) + afterptr;
}
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
static std::string GenEnumDecl(const EnumDef &enum_def,
const IDLOptions &opts) {
@@ -387,20 +327,6 @@ static std::string GenTypeGet(const Parser &parser, const Type &type,
EnumVal *minv = nullptr, *maxv = nullptr;
for (auto it = enum_def.vals.vec.begin(); it != enum_def.vals.vec.end();
++it) {
-<<<<<<< HEAD
- while (val++ != (*it)->value) code += "\"\", ";
- code += "\"" + (*it)->name + "\", ";
- }
- code += "nullptr };\n return names;\n}\n\n";
- code += "inline const char *EnumName" + enum_def.name;
- code += "(" + enum_def.name + " e) { return EnumNames" + enum_def.name;
- code += "()[static_cast<int>(e)";
- if (enum_def.vals.vec.front()->value) {
- code += " - static_cast<int>(";
- code += GetEnumVal(enum_def, *enum_def.vals.vec.front(), opts) +")";
- }
- code += "]; }\n\n";
-=======
auto &ev = **it;
GenComment(ev.doc_comment, code_ptr, nullptr, " ");
code += " " + GenEnumVal(enum_def, ev.name, parser_.opts) + " = ";
@@ -464,7 +390,6 @@ static std::string GenTypeGet(const Parser &parser, const Type &type,
if (enum_def.is_union) {
code += EnumSignature(enum_def) + ";\n\n";
}
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
}
void GenEnumPost(EnumDef &enum_def, std::string *code_ptr_post) {
@@ -490,90 +415,6 @@ static std::string GenTypeGet(const Parser &parser, const Type &type,
code_post += " default: return false;\n }\n}\n\n";
}
-<<<<<<< HEAD
-// Generates a value with optionally a cast applied if the field has a
-// different underlying type from its interface type (currently only the
-// case for enums. "from" specify the direction, true meaning from the
-// underlying type to the interface type.
-std::string GenUnderlyingCast(const Parser &parser, const FieldDef &field,
- bool from, const std::string &val) {
- return (field.value.type.enum_def && IsScalar(field.value.type.base_type)) ||
- field.value.type.base_type == BASE_TYPE_BOOL
- ? "static_cast<" + GenTypeBasic(parser, field.value.type, from) + ">(" +
- val + ")"
- : val;
-}
-
-std::string GenFieldOffsetName(const FieldDef &field) {
- std::string uname = field.name;
- std::transform(uname.begin(), uname.end(), uname.begin(), ::toupper);
- return "VT_" + uname;
-}
-
-// Generate an accessor struct, builder structs & function for a table.
-static void GenTable(const Parser &parser, StructDef &struct_def,
- const GeneratorOptions &opts, std::string *code_ptr) {
- if (struct_def.generated) return;
- std::string &code = *code_ptr;
-
- // Generate an accessor struct, with methods of the form:
- // type name() const { return GetField<type>(offset, defaultval); }
- GenComment(struct_def.doc_comment, code_ptr, nullptr);
- code += "struct " + struct_def.name;
- code += " FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table";
- code += " {\n";
- // Generate field id constants.
- code += " enum {\n";
- for (auto it = struct_def.fields.vec.begin();
- it != struct_def.fields.vec.end();
- ++it) {
- auto &field = **it;
- if (!field.deprecated) { // Deprecated fields won't be accessible.
- code += " " + GenFieldOffsetName(field) + " = ";
- code += NumToString(field.value.offset) + ",\n";
- }
- }
- code += " };\n";
- // Generate the accessors.
- for (auto it = struct_def.fields.vec.begin();
- it != struct_def.fields.vec.end();
- ++it) {
- auto &field = **it;
- if (!field.deprecated) { // Deprecated fields won't be accessible.
- auto is_scalar = IsScalar(field.value.type.base_type);
- GenComment(field.doc_comment, code_ptr, nullptr, " ");
- code += " " + GenTypeGet(parser, field.value.type, " ", "const ", " *",
- true);
- code += field.name + "() const { return ";
- // Call a different accessor for pointers, that indirects.
- auto accessor = is_scalar
- ? "GetField<"
- : (IsStruct(field.value.type) ? "GetStruct<" : "GetPointer<");
- auto offsetstr = GenFieldOffsetName(field);
- auto call =
- accessor +
- GenTypeGet(parser, field.value.type, "", "const ", " *", false) +
- ">(" + offsetstr;
- // Default value as second arg for non-pointer types.
- if (IsScalar(field.value.type.base_type))
- call += ", " + field.value.constant;
- call += ")";
- code += GenUnderlyingCast(parser, field, true, call);
- code += "; }\n";
- if (opts.mutable_buffer) {
- if (is_scalar) {
- code += " bool mutate_" + field.name + "(";
- code += GenTypeBasic(parser, field.value.type, true);
- code += " _" + field.name + ") { return SetField(" + offsetstr + ", ";
- code += GenUnderlyingCast(parser, field, false, "_" + field.name);
- code += "); }\n";
- } else {
- auto type = GenTypeGet(parser, field.value.type, " ", "", " *", true);
- code += " " + type + "mutable_" + field.name + "() { return ";
- code += GenUnderlyingCast(parser, field, true,
- accessor + type + ">(" + offsetstr + ")");
- code += "; }\n";
-=======
// Generates a value with optionally a cast applied if the field has a
// different underlying type from its interface type (currently only the
// case for enums. "from" specify the direction, true meaning from the
@@ -646,7 +487,6 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
}
code += " " + GenFieldOffsetName(field) + " = ";
code += NumToString(field.value.offset);
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
}
}
code += "\n };\n";
@@ -732,42 +572,6 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
}
}
}
-<<<<<<< HEAD
- }
- // Generate a verifier function that can check a buffer from an untrusted
- // source will never cause reads outside the buffer.
- code += " bool Verify(flatbuffers::Verifier &verifier) const {\n";
- code += " return VerifyTableStart(verifier)";
- std::string prefix = " &&\n ";
- for (auto it = struct_def.fields.vec.begin();
- it != struct_def.fields.vec.end();
- ++it) {
- auto &field = **it;
- if (!field.deprecated) {
- code += prefix + "VerifyField";
- if (field.required) code += "Required";
- code += "<" + GenTypeSize(parser, field.value.type);
- code += ">(verifier, " + GenFieldOffsetName(field) + ")";
- switch (field.value.type.base_type) {
- case BASE_TYPE_UNION:
- code += prefix + "Verify" + field.value.type.enum_def->name;
- code += "(verifier, " + field.name + "(), " + field.name + "_type())";
- break;
- case BASE_TYPE_STRUCT:
- if (!field.value.type.struct_def->fixed) {
- code += prefix + "verifier.VerifyTable(" + field.name;
- code += "())";
- }
- break;
- case BASE_TYPE_STRING:
- code += prefix + "verifier.Verify(" + field.name + "())";
- break;
- case BASE_TYPE_VECTOR:
- code += prefix + "verifier.Verify(" + field.name + "())";
- switch (field.value.type.element) {
- case BASE_TYPE_STRING: {
- code += prefix + "verifier.VerifyVectorOfStrings(" + field.name;
-=======
// Generate a verifier function that can check a buffer from an untrusted
// source will never cause reads outside the buffer.
code += " bool Verify(flatbuffers::Verifier &verifier) const {\n";
@@ -790,7 +594,6 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
case BASE_TYPE_STRUCT:
if (!field.value.type.struct_def->fixed) {
code += prefix + "verifier.VerifyTable(" + field.name;
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
code += "())";
}
break;
@@ -853,32 +656,6 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
code += ", " + GenDefaultConstant(field);
code += "); }\n";
}
-<<<<<<< HEAD
- code += "(" + struct_def.name + "::" + GenFieldOffsetName(field) + ", ";
- code += GenUnderlyingCast(parser, field, false, field.name);
- if (IsScalar(field.value.type.base_type))
- code += ", " + field.value.constant;
- code += "); }\n";
- }
- }
- code += " " + struct_def.name;
- code += "Builder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) ";
- code += "{ start_ = fbb_.StartTable(); }\n";
- code += " " + struct_def.name + "Builder &operator=(const ";
- code += struct_def.name + "Builder &);\n";
- code += " flatbuffers::Offset<" + struct_def.name;
- code += "> Finish() {\n auto o = flatbuffers::Offset<" + struct_def.name;
- code += ">(fbb_.EndTable(start_, ";
- code += NumToString(struct_def.fields.vec.size()) + "));\n";
- for (auto it = struct_def.fields.vec.begin();
- it != struct_def.fields.vec.end();
- ++it) {
- auto &field = **it;
- if (!field.deprecated && field.required) {
- code += " fbb_.Required(o, ";
- code += struct_def.name + "::" + GenFieldOffsetName(field);
- code += "); // " + field.name + "\n";
-=======
}
code += " " + struct_def.name;
code += "Builder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) ";
@@ -897,7 +674,6 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
code += struct_def.name + "::" + GenFieldOffsetName(field);
code += "); // " + field.name + "\n";
}
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
}
code += " return o;\n }\n};\n\n";
@@ -928,13 +704,6 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
} else {
code += GenDefaultConstant(field);
}
-<<<<<<< HEAD
- } else if (field.value.type.base_type == BASE_TYPE_BOOL) {
- code += field.value.constant == "0" ? "false" : "true";
- } else {
- code += field.value.constant;
-=======
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
}
}
code += ") {\n " + struct_def.name + "Builder builder_(_fbb);\n";
@@ -952,118 +721,6 @@ static void GenTable(const Parser &parser, StructDef &struct_def,
code += " return builder_.Finish();\n}\n\n";
}
-<<<<<<< HEAD
-static void GenPadding(const FieldDef &field,
- const std::function<void (int bits)> &f) {
- if (field.padding) {
- for (int i = 0; i < 4; i++)
- if (static_cast<int>(field.padding) & (1 << i))
- f((1 << i) * 8);
- assert(!(field.padding & ~0xF));
- }
-}
-
-// Generate an accessor struct with constructor for a flatbuffers struct.
-static void GenStruct(const Parser &parser, StructDef &struct_def,
- const GeneratorOptions &opts, std::string *code_ptr) {
- if (struct_def.generated) return;
- std::string &code = *code_ptr;
-
- // Generate an accessor struct, with private variables of the form:
- // type name_;
- // Generates manual padding and alignment.
- // Variables are private because they contain little endian data on all
- // platforms.
- GenComment(struct_def.doc_comment, code_ptr, nullptr);
- code += "MANUALLY_ALIGNED_STRUCT(" + NumToString(struct_def.minalign) + ") ";
- code += struct_def.name + " FLATBUFFERS_FINAL_CLASS {\n private:\n";
- int padding_id = 0;
- for (auto it = struct_def.fields.vec.begin();
- it != struct_def.fields.vec.end();
- ++it) {
- auto &field = **it;
- code += " " + GenTypeGet(parser, field.value.type, " ", "", " ", false);
- code += field.name + "_;\n";
- GenPadding(field, [&code, &padding_id](int bits) {
- code += " int" + NumToString(bits) +
- "_t __padding" + NumToString(padding_id++) + ";\n";
- });
- }
-
- // Generate a constructor that takes all fields as arguments.
- code += "\n public:\n " + struct_def.name + "(";
- for (auto it = struct_def.fields.vec.begin();
- it != struct_def.fields.vec.end();
- ++it) {
- auto &field = **it;
- if (it != struct_def.fields.vec.begin()) code += ", ";
- code += GenTypeGet(parser, field.value.type, " ", "const ", " &", true);
- code += "_" + field.name;
- }
- code += ")\n : ";
- padding_id = 0;
- for (auto it = struct_def.fields.vec.begin();
- it != struct_def.fields.vec.end();
- ++it) {
- auto &field = **it;
- if (it != struct_def.fields.vec.begin()) code += ", ";
- code += field.name + "_(";
- if (IsScalar(field.value.type.base_type)) {
- code += "flatbuffers::EndianScalar(";
- code += GenUnderlyingCast(parser, field, false, "_" + field.name);
- code += "))";
- } else {
- code += "_" + field.name + ")";
- }
- GenPadding(field, [&code, &padding_id](int bits) {
- (void)bits;
- code += ", __padding" + NumToString(padding_id++) + "(0)";
- });
- }
- code += " {";
- padding_id = 0;
- for (auto it = struct_def.fields.vec.begin();
- it != struct_def.fields.vec.end();
- ++it) {
- auto &field = **it;
- GenPadding(field, [&code, &padding_id](int bits) {
- (void)bits;
- code += " (void)__padding" + NumToString(padding_id++) + ";";
- });
- }
- code += " }\n\n";
-
- // Generate accessor methods of the form:
- // type name() const { return flatbuffers::EndianScalar(name_); }
- for (auto it = struct_def.fields.vec.begin();
- it != struct_def.fields.vec.end();
- ++it) {
- auto &field = **it;
- GenComment(field.doc_comment, code_ptr, nullptr, " ");
- auto is_scalar = IsScalar(field.value.type.base_type);
- code += " " + GenTypeGet(parser, field.value.type, " ", "const ", " &",
- true);
- code += field.name + "() const { return ";
- code += GenUnderlyingCast(parser, field, true,
- is_scalar
- ? "flatbuffers::EndianScalar(" + field.name + "_)"
- : field.name + "_");
- code += "; }\n";
- if (opts.mutable_buffer) {
- if (is_scalar) {
- code += " void mutate_" + field.name + "(";
- code += GenTypeBasic(parser, field.value.type, true);
- code += " _" + field.name + ") { flatbuffers::WriteScalar(&";
- code += field.name + "_, ";
- code += GenUnderlyingCast(parser, field, false, "_" + field.name);
- code += "); }\n";
- } else {
- code += " ";
- code += GenTypeGet(parser, field.value.type, "", "", " &", true);
- code += "mutable_" + field.name + "() { return " + field.name;
- code += "_; }\n";
- }
-=======
static void GenPadding(const FieldDef &field, std::string &code,
int &padding_id,
const std::function<void(int bits, std::string &code,
@@ -1073,7 +730,6 @@ static void GenStruct(const Parser &parser, StructDef &struct_def,
if (static_cast<int>(field.padding) & (1 << i))
f((1 << i) * 8, code, padding_id);
assert(!(field.padding & ~0xF));
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
}
}
diff --git a/src/idl_gen_grpc.cpp b/src/idl_gen_grpc.cpp
index 0dcc316d..2bf0e911 100644
--- a/src/idl_gen_grpc.cpp
+++ b/src/idl_gen_grpc.cpp
@@ -112,7 +112,7 @@ class FlatBufPrinter : public grpc_cpp_generator::Printer {
// Current indentation.
str_->insert(str_->end(), indent_ * 2, ' ');
// See if this contains more than one line.
- auto lf = strchr(s, '\n');
+ const char * lf = strchr(s, '\n');
if (lf) {
(*str_) += std::string(s, lf + 1);
s = lf + 1;
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index 36a63c6d..b758e959 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -1167,11 +1167,7 @@ CheckedError Parser::ParseEnum(bool is_union, EnumDef **dest) {
EXPECT(kTokenIdentifier);
auto &enum_def = *new EnumDef();
enum_def.name = enum_name;
-<<<<<<< HEAD
- enum_def.file = files_being_parsed_;
-=======
enum_def.file = file_being_parsed_;
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
enum_def.doc_comment = enum_comment;
enum_def.is_union = is_union;
enum_def.defined_namespace = namespaces_.back();
@@ -1268,11 +1264,7 @@ CheckedError Parser::StartStruct(const std::string &name, StructDef **dest) {
if (!struct_def.predecl) return Error("datatype already exists: " + name);
struct_def.predecl = false;
struct_def.name = name;
-<<<<<<< HEAD
- struct_def.file = files_being_parsed_;
-=======
struct_def.file = file_being_parsed_;
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
// Move this struct to the back of the vector just in case it was predeclared,
// to preserve declaration order.
*remove(structs_.vec.begin(), structs_.vec.end(), &struct_def) = &struct_def;
@@ -1787,16 +1779,12 @@ CheckedError Parser::SkipJsonString() {
bool Parser::Parse(const char *source, const char **include_paths,
const char *source_filename) {
-<<<<<<< HEAD
- files_being_parsed_ = source_filename ? source_filename : "";
-=======
return !DoParse(source, include_paths, source_filename).Check();
}
CheckedError Parser::DoParse(const char *source, const char **include_paths,
const char *source_filename) {
file_being_parsed_ = source_filename ? source_filename : "";
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
if (source_filename &&
included_files_.find(source_filename) == included_files_.end()) {
included_files_[source_filename] = true;
@@ -1937,23 +1925,8 @@ CheckedError Parser::DoParse(const char *source, const char **include_paths,
return Error("only tables can be union elements: " + val.name);
}
}
-<<<<<<< HEAD
- } catch (const std::string &msg) {
- error_ = source_filename ? AbsolutePath(source_filename) : "";
- #ifdef _WIN32
- error_ += "(" + NumToString(line_) + ")"; // MSVC alike
- #else
- if (source_filename) error_ += ":";
- error_ += NumToString(line_) + ":0"; // gcc alike
- #endif
- error_ += ": error: " + msg;
- return false;
- }
- return true;
-=======
}
return NoError();
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
}
std::set<std::string> Parser::GetIncludedFilesRecursive(
diff --git a/tests/generate_code.sh b/tests/generate_code.sh
index eca73aa4..3436d858 100644
--- a/tests/generate_code.sh
+++ b/tests/generate_code.sh
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-../flatc --cpp --java --csharp --go --binary --python --js --php --gen-mutable --no-includes monster_test.fbs monsterdata_test.json
-../flatc --binary --schema monster_test.fbs
-=======
#!/bin/bash
#
# Copyright 2015 Google Inc. All rights reserved.
@@ -22,4 +18,3 @@
../flatc --cpp --java --csharp --go --binary --python --js --php --gen-mutable -o namespace_test namespace_test/namespace_test1.fbs namespace_test/namespace_test2.fbs
../flatc --binary --schema monster_test.fbs
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
diff --git a/tests/monster_test.bfbs b/tests/monster_test.bfbs
index e5f51face696a1ee9b3aa64b70bba83df1c4645a..e131ac8c2ee97914bfc1c02ce683ac4f5ecb43d6 100644
GIT binary patch
literal 3152
zcmaJ@PiS0a5T8vp$!`8^(i+<}jS@>KMMTmx1d$wKY+41Af{8J=bd$VwSKhu|cHf4^
zlXxg1QaniT&_fSB6e;4N^b|@dB1NPG3F4^)Pab;c#b|5o^Y@$CZ}(Y(AIzKYd-I$5
zX6Bo3-WwK?=`+*wU>F(6N>WnND+4l!mEb8d3Yr9+1}(LTbb){0Bl0fhTPcww=6<)x
zF8D%Pq#bhV3@3mCB{82pH>Z10Rw@U0W?-8;bzv{AbR>GgxE=u!`)07A`dgTP4O#$E
zzWGNKfx)`Sk5Lq<pV*%|ZXCvBcH?ZW<Sox!$dxL-H?}-m4r-xSg``_!?S&6;UE{n4
z-w{%CP=CRzh4V$~F635x?}K7km<j47NV=hug#V^bpC;jrI)piM<o0^{G>Vu5(%iYZ
z88BIa&y1CRkAONrZ<YNrJ!1^#LE|9W{d7-bZKv%!(BnI#y*X%i+OK<j@moV4kAt?)
zRy{9h_)J~KOgqkBOm*M)yfw@+kg*N~@!8psXF(@GNVA-&mP_vhtA2gWQyY9ws~L^l
za)K9W^P?NK=%ww;8TW7KFXnua%ZSnCgFeOc_afGxK`BIHo`By#K-a+^fEPf6ogl1t
zAs+`Hgn_G=PeHE$egjVY3i=7_Pe4nc3f9+wOM#yT9|iZp?}Cz`9jveZ8AZdWeCA;o
zbPyDx9&*)cZlj#9h1Fv4;TX>3Z=O%4ZwL4z@`mD>Tezk8{3(%3kYU-gjq@3j*Y(_K
z(?)8Fyora+TMc{`JM)$#RZ6Qicor|nMAJ@i@yNqRFQ=y{<$2T3Jb33{wr>SIi;8lw
z&{8axm2%my;gwu^qOr7H0sgRzHSq@;_(HB$s85V9=Y#c=IlRl8{qAk>L%8+MejHzm
z;WrJRmPb+ayu7wAzJ6+~Y5xbqr$&Jvlvnq~*JAiR!*`tr{yBN2iFfhF{b#(#fdlLQ
z68s>l+xZ{IJO7DaG<^Ct_yIY-FW&i2{6)j39)b_Zv3>E*f8uW%zH8)h6!ptd#j{7y
zFP;|<in#lRYkM2GjEppKXkm);N|kT}^IMRE^`o36#Jo>lQtSxUv`d=-$Xm<%xp1YP
z&uep(P4q0(bn+T>dbI|vU$C~kz$?-Akk-BQ<GRQ;a6K}lwprKi{2O;AWb<T!eS`Xk
zUDZiKpIzAH{23j)U(h*fI(_57r{$31S^uui$I(rCaX-2sVPBzrTzgpqK7}Z0pXZ6z
zpz(sqFXlU6%NLk;;dT?poVXk=hZ_|S>o&a;)+(<cFP*SP9OI;p8}w(j(ZeT9M|<`I
z*zZ7RbaB#tF<AG4uw31M$0_yQdLnb4MNaqycG0jG(lf@4k>FQ{y^?F^L%v${f;FGV
zB9AS$Hl7P{)<06Zzl)K)QZ1INMJ*Ez?j+u2u}^$&b|vm_dnXd@>TfHb0luyfOJMQ#
z(RbIcG`SRFP`?clzGLpzKpd>gLPg|T)9;A)yJz(i@WthQQ?>2Eb1mfpwj<eV*zvVy
zTHi3%L#14kd;i#dV6Pp(ocW<m=8AUa!(0fa-$Kgh=Lyhvz|w!_jegl#*8_q-GMk+{
z;PjCg>T=I@eB3@ac{;0SN(pyw4a;rISLURMjqjLVpRadO65N+q@(~dIUG!G*buo(t
z@JSHmw?UUd7eLhSXxvTbJMTRe@0)GCFJEDv)bne_NE|*#(y93rt>-P^+BKH{;#fcH
zX0LY_+~tcAGru2$tgqk~0`?M!z~zc^7Vk~d@A(}(E@K=&H)MCgY4aF}djI#IMmg_@
zt4n5zIdH?}-sP0J=V;w!_7>g%cN;AS1DYrMdu9DJY&Oq`c6dId1>_J+Ykdja{Nep}
z-*rlD(4U0f6ssZnzXH0~$Ui%SWzF#JNj>I^zECHp_tZLv^+f3yfS0X|o6pRn(;?dZ
ZvtkN#{13eqV_b)o{C-fc>2D+E{{r&+C1U^p
literal 2744
zcmaJ@O^91n6h4{!|4fqBF&(9pAVVodhITp(B1P&*>kl>sCr-hIoi~#g6G`3+$xCQl
zhzl39Dy{}sBBc~@DXzK@aUs%05f??Il;TRda5-qLjo)|fyP1auFPxm0d%tt;ch0%z
zzIRka)-SAYKw%VRQ4*4of|O+e{{+7x&qH2-oP!kRL{iWR=-1LBUt~qfkT-K8_wYZC
zHR2yYc4NRnU%XUP|6J?(9=tE;9%<}Sz#K-5x(qoAA?{^wtoma-Z$UW!aDOs^f>(~5
zaxK6UwpO0I84=K$jw5)gyMth(-R*VUy0hJJFSmo%d2iUoN)9#&>~HM3_bGS|oeM&d
zi@rAq+`i-{lL_OX)GpP|L&+BA$eH=6LXwbI{Epv;CjS=XEQEe<{h_?$^!+RBI0vfJ
zLBH#rp=&vDjWH1yjfZ=@+IL+Kt7WZ|!I6jM&As1p8(KkD5*5=N6SD|m9`le3eZTv<
zx6>ImT(#x=8-{1r?3sf#nVCKKL{6d2rqdDG2j1p@`$u#34E}!&GM~cP5{!2tKjZ(m
z&~?afkaPH7fNVi{zJ37q6UaR}gT4X%0FP&(uR=GVKZkw{AwC1lO>kJ0RgIJ}FlPa3
z?)3Z4*l%w8erJFw@&0BFigR~?KO!qr{Gkxvat5v8+Uk|2H#+TL?#Z88vs?<gBBy5J
z2NC@8BgJRefPY$+XX1xvR;K>nHTX;u_yu$fD@FcMK7$DUn!%^{fPYF(PVqM0D1W$-
zZwx;7J@AL+#7w;9PyFv8|9#*O$?=(Z%b)mTe`&m#<FG5s(oDSNPkhbb)0@DT<T=H&
zcNjP8#X=D`GPt=9fh$UNio+G7IJesi#&|A1*8NL367nUm^KwkFRs5%4`t%@fquFtS
z?P0TtM#dPS|6rZC51Rrq&i$D~_Ll3pUHX1M^o>VJflpqZRa~?_;rR-9sqlbZH-1aB
zc@Z|eo#=ZBVrv@O41#{!dk@`|!A;7ZVPApMd>?jMsi+-$m7EyIDi8(5n!5_v5{|xH
z2R?&nZ478B#Y4%mo_7sRZUdK=!-`{WY%Z?^<DQHE?-(poDf>?*lN8K|W4!cj2l?!T
zcic5&qj%a#<SU7{1+lcD|F$=By}<8}!99h0gtm;cn5e)v-!C>6W<U_Nj+nWTO%3U<
z*>AgEqr<Yu8tXFmZ+pIv(xH7U7RN5pe0WZmA<7-Ycm6KwGzSFZV~!hK3<q=C>WO^D
zeUcSD9R+Y_KI|aR7-npK_Ur;Q^WSwmULW!j@(7jm^jz4R*t{Eh{y^@S^%C<!Z1f(b
zpN+r?p!8kBwJpdA$R6S#e;cEz$<QPCE8{bD3m9@FhPJp~WrPcR#2jQRntRUkJ#L4|
z{{c_tqK)LFl)uc^jPDpT!MssdA>_L0?wo;Ae@Nf-z4s%YZ$LhR&^{UV5pBtvXPbt<
zm_77NkAO>ry%X($73~3@6?<+(&)!Yo;~LRHAJgw?Aipzy3%7x>Ib+;B=pR7%E{4iK
z#Ci;oFkh@I*LiL;+MTvPC4V0{n^R)0Lg-uaMKCzX9lx8n&k}^V|N9Q%I(vp4z#GHV
zg&8u#)`c@w2<yUO>dx<t96Im6c|oUz{`i$;zU5#xtsnicc9c5u1*N|0(3TH-)SQ2=
znqkgAvuR=^|82-m%w@cyc&<eUZKAn#z&WK6gt<)?!H|2AE1B!iZ$euSp4GR#;Q*gD
GI{pD>UDHnh
diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
index 5038edd1..50fbc28c 100644
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -138,11 +138,7 @@ namespace Example {
struct TestSimpleTableWithEnum FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
enum {
-<<<<<<< HEAD
- VT_COLOR = 4,
-=======
VT_COLOR = 4
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
};
Color color() const { return static_cast<Color>(GetField<int8_t>(VT_COLOR, 2)); }
bool mutate_color(Color _color) { return SetField(VT_COLOR, static_cast<int8_t>(_color)); }
@@ -176,11 +172,7 @@ struct Stat FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
enum {
VT_ID = 4,
VT_VAL = 6,
-<<<<<<< HEAD
- VT_COUNT = 8,
-=======
VT_COUNT = 8
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
};
const flatbuffers::String *id() const { return GetPointer<const flatbuffers::String *>(VT_ID); }
flatbuffers::String *mutable_id() { return GetPointer<flatbuffers::String *>(VT_ID); }
@@ -250,13 +242,10 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
VT_TESTHASHS64_FNV1A = 48,
VT_TESTHASHU64_FNV1A = 50,
VT_TESTARRAYOFBOOLS = 52,
-<<<<<<< HEAD
-=======
VT_TESTF = 54,
VT_TESTF2 = 56,
VT_TESTF3 = 58,
VT_TESTARRAYOFSTRING2 = 60
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
};
const Vec3 *pos() const { return GetStruct<const Vec3 *>(VT_POS); }
Vec3 *mutable_pos() { return GetStruct<Vec3 *>(VT_POS); }
@@ -291,11 +280,7 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
const MyGame::Example::Monster *testnestedflatbuffer_nested_root() const { return flatbuffers::GetRoot<MyGame::Example::Monster>(testnestedflatbuffer()->Data()); }
const Stat *testempty() const { return GetPointer<const Stat *>(VT_TESTEMPTY); }
Stat *mutable_testempty() { return GetPointer<Stat *>(VT_TESTEMPTY); }
-<<<<<<< HEAD
- bool testbool() const { return static_cast<bool>(GetField<uint8_t>(VT_TESTBOOL, 0)); }
-=======
bool testbool() const { return GetField<uint8_t>(VT_TESTBOOL, 0) != 0; }
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
bool mutate_testbool(bool _testbool) { return SetField(VT_TESTBOOL, static_cast<uint8_t>(_testbool)); }
int32_t testhashs32_fnv1() const { return GetField<int32_t>(VT_TESTHASHS32_FNV1, 0); }
bool mutate_testhashs32_fnv1(int32_t _testhashs32_fnv1) { return SetField(VT_TESTHASHS32_FNV1, _testhashs32_fnv1); }
@@ -315,8 +300,6 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool mutate_testhashu64_fnv1a(uint64_t _testhashu64_fnv1a) { return SetField(VT_TESTHASHU64_FNV1A, _testhashu64_fnv1a); }
const flatbuffers::Vector<uint8_t> *testarrayofbools() const { return GetPointer<const flatbuffers::Vector<uint8_t> *>(VT_TESTARRAYOFBOOLS); }
flatbuffers::Vector<uint8_t> *mutable_testarrayofbools() { return GetPointer<flatbuffers::Vector<uint8_t> *>(VT_TESTARRAYOFBOOLS); }
-<<<<<<< HEAD
-=======
float testf() const { return GetField<float>(VT_TESTF, 3.14159f); }
bool mutate_testf(float _testf) { return SetField(VT_TESTF, _testf); }
float testf2() const { return GetField<float>(VT_TESTF2, 3.0f); }
@@ -325,7 +308,6 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool mutate_testf3(float _testf3) { return SetField(VT_TESTF3, _testf3); }
const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *testarrayofstring2() const { return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *>(VT_TESTARRAYOFSTRING2); }
flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *mutable_testarrayofstring2() { return GetPointer<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *>(VT_TESTARRAYOFSTRING2); }
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyField<Vec3>(verifier, VT_POS) &&
@@ -401,12 +383,6 @@ struct MonsterBuilder {
void add_testhashs64_fnv1a(int64_t testhashs64_fnv1a) { fbb_.AddElement<int64_t>(Monster::VT_TESTHASHS64_FNV1A, testhashs64_fnv1a, 0); }
void add_testhashu64_fnv1a(uint64_t testhashu64_fnv1a) { fbb_.AddElement<uint64_t>(Monster::VT_TESTHASHU64_FNV1A, testhashu64_fnv1a, 0); }
void add_testarrayofbools(flatbuffers::Offset<flatbuffers::Vector<uint8_t>> testarrayofbools) { fbb_.AddOffset(Monster::VT_TESTARRAYOFBOOLS, testarrayofbools); }
-<<<<<<< HEAD
- MonsterBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
- MonsterBuilder &operator=(const MonsterBuilder &);
- flatbuffers::Offset<Monster> Finish() {
- auto o = flatbuffers::Offset<Monster>(fbb_.EndTable(start_, 25));
-=======
void add_testf(float testf) { fbb_.AddElement<float>(Monster::VT_TESTF, testf, 3.14159f); }
void add_testf2(float testf2) { fbb_.AddElement<float>(Monster::VT_TESTF2, testf2, 3.0f); }
void add_testf3(float testf3) { fbb_.AddElement<float>(Monster::VT_TESTF3, testf3, 0.0f); }
@@ -415,7 +391,6 @@ struct MonsterBuilder {
MonsterBuilder &operator=(const MonsterBuilder &);
flatbuffers::Offset<Monster> Finish() {
auto o = flatbuffers::Offset<Monster>(fbb_.EndTable(start_, 29));
->>>>>>> 48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
fbb_.Required(o, Monster::VT_NAME); // name
return o;
}
--
GitLab