Merge branch 'master' of https://github.com/google/flatbuffers

Fixed conflicts and added missing generated files.

Change-Id: I4321c798543292d814c2c9e8b238c203b7526c7b

include/flatbuffers/idl.h

@@ -320,6 +320,7 @@ struct IDLOptions {
   bool one_file;
   bool proto_mode;
   bool generate_all;
+  bool skip_unexpected_fields_in_json;
 
   // Possible options for the more general generator below.
   enum Language { kJava, kCSharp, kGo, kMAX };
@@ -337,6 +338,7 @@ struct IDLOptions {
       one_file(false),
       proto_mode(false),
       generate_all(false),
+      skip_unexpected_fields_in_json(false),
       lang(IDLOptions::kJava) {}
 };
 
@@ -482,7 +484,10 @@ private:
   FLATBUFFERS_CHECKED_ERROR ParseProtoDecl();
   FLATBUFFERS_CHECKED_ERROR ParseProtoCurliesOrIdent();
   FLATBUFFERS_CHECKED_ERROR ParseTypeFromProtoType(Type *type);
-
+  FLATBUFFERS_CHECKED_ERROR SkipAnyJsonValue();
+  FLATBUFFERS_CHECKED_ERROR SkipJsonObject();
+  FLATBUFFERS_CHECKED_ERROR SkipJsonArray();
+  FLATBUFFERS_CHECKED_ERROR SkipJsonString();
   FLATBUFFERS_CHECKED_ERROR DoParse(const char *_source,
                                     const char **include_paths,
                                     const char *source_filename);

php/ByteBuffer.php

@@ -399,8 +399,13 @@ class ByteBuffer
         $sign = $index + (ByteBuffer::isLittleEndian() ? 3 : 0);
         $issigned = isset($this->_buffer[$sign]) && ord($this->_buffer[$sign]) & 0x80;
 
+        if (PHP_INT_SIZE > 4) {
             // 4294967296 = 1 << 32 = Maximum unsigned 32-bit int
             return $issigned ? $result - 4294967296 : $result;
+        } else {
+            // 32bit / Windows treated number as signed integer.
+            return $result;
+        }
     }
 
     /**

src/flatc.cpp

@@ -100,6 +100,9 @@ static void Error(const std::string &err, bool usage, bool show_exe_name) {
       "                  no trailing commas in tables/vectors.\n"
       "  --defaults-json Output fields whose value is the default when\n"
       "                  writing JSON\n"
+      "  --unknown-json  Allow fields in JSON that are not defined in the\n"
+      "                  schema. These fields will be discared when generating\n"
+      "                  binaries.\n"
       "  --no-prefix     Don\'t prefix enum values with the enum type in C++.\n"
       "  --scoped-enums  Use C++11 style scoped and strongly typed enums.\n"
       "                  also implies --no-prefix.\n"
@@ -155,6 +158,8 @@ int main(int argc, const char *argv[]) {
         opts.skip_js_exports = true;
       } else if(arg == "--defaults-json") {
         opts.output_default_scalars_in_json = true;
+      } else if (arg == "--unknown-json") {
+        opts.skip_unexpected_fields_in_json = true;
       } else if(arg == "--no-prefix") {
         opts.prefixed_enums = false;
       } else if(arg == "--scoped-enums") {

src/idl_gen_php.cpp

@@ -249,7 +249,13 @@ namespace php {
         NumToString(field.value.offset) +
         ");\n";
       code += Indent + Indent;
-      code += "return $o != 0 ? $obj->init($o + $this->bb_pos, $this->bb) : ";
+      code += "return $o != 0 ? $obj->init(";
+	  if (field.value.type.struct_def->fixed)
+      {
+        code += "$o + $this->bb_pos, $this->bb) : ";
+      } else {
+        code += "$this->__indirect($o + $this->bb_pos), $this->bb) : ";
+      }
       code += GenDefaultValue(field.value) + ";\n";
       code += Indent + "}\n\n";
     }

src/idl_parser.cpp

@@ -679,7 +679,14 @@ CheckedError Parser::ParseTable(const StructDef &struct_def, std::string *value,
       EXPECT(opts.strict_json ? kTokenStringConstant : kTokenIdentifier);
     }
     auto field = struct_def.fields.Lookup(name);
-    if (!field) return Error("unknown field: " + name);
+    if (!field) {
+      if (!opts.skip_unexpected_fields_in_json) {
+        return Error("unknown field: " + name);
+      } else {
+        EXPECT(':');
+        ECHECK(SkipAnyJsonValue());
+      }
+    } else {
       EXPECT(':');
       Value val = field->value;
       ECHECK(ParseAnyValue(val, field, fieldn));
@@ -694,9 +701,11 @@ CheckedError Parser::ParseTable(const StructDef &struct_def, std::string *value,
       }
       field_stack_.insert(field_stack_.begin() + i, std::make_pair(val, field));
       fieldn++;
+    }
     if (Is('}')) { NEXT(); break; }
     EXPECT(',');
   }
+
   if (struct_def.fixed && fieldn != struct_def.fields.vec.size())
     return Error("struct: wrong number of initializers: " + struct_def.name);
 
@@ -1486,6 +1495,72 @@ CheckedError Parser::ParseTypeFromProtoType(Type *type) {
   return NoError();
 }
 
+CheckedError Parser::SkipAnyJsonValue() {
+  switch (token_) {
+    case '{':
+      ECHECK(SkipJsonObject());
+      break;
+    case kTokenStringConstant:
+      ECHECK(SkipJsonString());
+      break;
+    case '[':
+      ECHECK(SkipJsonArray());
+      break;
+    case kTokenIntegerConstant:
+      EXPECT(kTokenIntegerConstant);
+      break;
+    case kTokenFloatConstant:
+      EXPECT(kTokenFloatConstant);
+      break;
+    default:
+      return Error(std::string("Unexpected token:") + std::string(1, token_));
+  }
+  return NoError();
+}
+
+CheckedError Parser::SkipJsonObject() {
+  EXPECT('{');
+  size_t fieldn = 0;
+
+  while (true) {
+    if ((!opts.strict_json || !fieldn) && Is('}')) break;
+
+    if (!Is(kTokenStringConstant))
+      EXPECT(opts.strict_json ? kTokenStringConstant : kTokenIdentifier);
+
+    EXPECT(':');
+    ECHECK(SkipAnyJsonValue());
+    fieldn++;
+
+    if (Is('}')) break;
+    EXPECT(',');
+  }
+
+  NEXT();
+  return NoError();
+}
+
+CheckedError Parser::SkipJsonArray() {
+  EXPECT('[');
+  
+  while (true) {
+    if (Is(']')) break;
+        
+    ECHECK(SkipAnyJsonValue());
+
+    if (Is(']')) break;
+    EXPECT(',');
+  }
+
+  NEXT();
+  return NoError();
+}
+
+CheckedError Parser::SkipJsonString() {
+  EXPECT(kTokenStringConstant);
+  return NoError();
+}
+
 bool Parser::Parse(const char *source, const char **include_paths,
                    const char *source_filename) {
   return !DoParse(source, include_paths, source_filename).Check();

tests/MyGame/Example/Monster.php

@@ -188,7 +188,7 @@ class Monster extends Table
     {
         $obj = new Monster();
         $o = $this->__offset(28);
-        return $o != 0 ? $obj->init($o + $this->bb_pos, $this->bb) : 0;
+        return $o != 0 ? $obj->init($this->__indirect($o + $this->bb_pos), $this->bb) : 0;
     }
 
     /**
@@ -214,7 +214,7 @@ class Monster extends Table
     {
         $obj = new Stat();
         $o = $this->__offset(32);
-        return $o != 0 ? $obj->init($o + $this->bb_pos, $this->bb) : 0;
+        return $o != 0 ? $obj->init($this->__indirect($o + $this->bb_pos), $this->bb) : 0;
     }
 
     /**

tests/monsterdata_test.json

@@ -37,6 +37,9 @@
     "test1",
     "test2"
   ],
+  enemy: {
+    name: "Fred"
+  },
   testarrayofbools:[
     true, false, true
   ],

tests/phpTest.php

@@ -30,6 +30,10 @@ function main()
 
     // We set up the same values as monsterdata.json:
     $str = $fbb->createString("MyMonster");
+    $name = $fbb->createString('Fred');
+    \MyGame\Example\Monster::startMonster($fbb);
+    \MyGame\Example\Monster::addName($fbb, $name);
+    $enemy = \MyGame\Example\Monster::endMonster($fbb);
 
     $inv = \MyGame\Example\Monster::CreateInventoryVector($fbb, array(0, 1, 2, 3, 4));
 
@@ -62,6 +66,7 @@ function main()
     \MyGame\Example\Monster::AddTest($fbb, $mon2);
     \MyGame\Example\Monster::AddTest4($fbb, $test4);
     \MyGame\Example\Monster::AddTestarrayofstring($fbb, $testArrayOfString);
+    \MyGame\Example\Monster::AddEnemy($fbb, $enemy);
     \MyGame\Example\Monster::AddTestbool($fbb, false);
     $mon = \MyGame\Example\Monster::EndMonster($fbb);
 
@@ -132,6 +137,10 @@ function test_buffer(Assert $assert, Google\FlatBuffers\ByteBuffer $bb) {
     $assert->strictEqual($monster->GetTestarrayofstringLength(), 2);
     $assert->strictEqual($monster->GetTestarrayofstring(0), 'test1');
     $assert->strictEqual($monster->GetTestarrayofstring(1), 'test2');
+
+    $fred = $monster->getEnemy();
+    $assert->Equal('Fred', $fred->getName());
+
     $assert->strictEqual($monster->GetTestbool(), false);
 }
 

tests/test.cpp

@@ -813,6 +813,26 @@ void UnicodeTest() {
                      "\\u5225\\u30B5\\u30A4\\u30C8\\x01\\x80\"}", true);
 }
 
+void UnknownFieldsTest() {
+  flatbuffers::IDLOptions opts;
+  opts.skip_unexpected_fields_in_json = true;
+  flatbuffers::Parser parser(opts);
+
+  TEST_EQ(parser.Parse("table T { str:string; i:int;}"
+                       "root_type T;"
+                       "{ str:\"test\","
+                       "unknown_int:10,"
+                       "unknown_float:1.0,"
+                       "unknown_array: [ 1, 2, 3, 4],"
+                       "unknown_object: { i: 10 },"
+                       "i:10}"), true);
+
+  std::string jsongen;
+  parser.opts.indent_step = -1;
+  GenerateText(parser, parser.builder_.GetBufferPointer(), &jsongen);
+  TEST_EQ(jsongen == "{str: \"test\",i: 10}", true);
+}
+
 int main(int /*argc*/, const char * /*argv*/[]) {
   // Run our various test suites:
 
@@ -837,6 +857,7 @@ int main(int /*argc*/, const char * /*argv*/[]) {
   ScientificTest();
   EnumStringsTest();
   UnicodeTest();
+  UnknownFieldsTest();
 
   if (!testing_fails) {
     TEST_OUTPUT_LINE("ALL TESTS PASSED");