platform/upstream/flatbuffers.git
8 years agoMerge pull request #3904 from devantoine/patch-1
Wouter van Oortmerssen [Tue, 19 Jul 2016 00:35:43 +0000 (17:35 -0700)]
Merge pull request #3904 from devantoine/patch-1

Fix typo

8 years agoMerge pull request #3902 from rgilles/master
Wouter van Oortmerssen [Mon, 18 Jul 2016 21:13:36 +0000 (14:13 -0700)]
Merge pull request #3902 from rgilles/master

Create a maven like project structure for java development + OSGi + generation for test

8 years agoMerge pull request #3915 from Lakedaemon/clangFormat
Wouter van Oortmerssen [Mon, 18 Jul 2016 21:12:03 +0000 (14:12 -0700)]
Merge pull request #3915 from Lakedaemon/clangFormat

clang formating header and code generators for cpp, general, js, php

8 years agoMerge pull request #3948 from mortonfox/patch-1
Wouter van Oortmerssen [Mon, 18 Jul 2016 18:12:43 +0000 (11:12 -0700)]
Merge pull request #3948 from mortonfox/patch-1

Fix link to CONTRIBUTING

8 years agoFix link to CONTRIBUTING
Morton Fox [Sat, 16 Jul 2016 04:26:50 +0000 (00:26 -0400)]
Fix link to CONTRIBUTING

8 years agoclang formating cpp code generator and add missing generated classes
lakedaemon [Fri, 15 Jul 2016 13:35:24 +0000 (15:35 +0200)]
clang formating cpp code generator and add missing generated classes

8 years agoclangFormating base class
lakedaemon [Fri, 15 Jul 2016 13:21:09 +0000 (15:21 +0200)]
clangFormating base class

8 years agoAdded OSGi header generation for maven project.
Romain Gilles [Fri, 15 Jul 2016 12:34:56 +0000 (14:34 +0200)]
Added OSGi header generation for maven project.
This allow jar generated with maven to be used in OSGi environment.

8 years agoMerge branch 'master' of github.com:google/flatbuffers
Romain Gilles [Fri, 15 Jul 2016 12:27:31 +0000 (14:27 +0200)]
Merge branch 'master' of github.com:google/flatbuffers

8 years agoMerge pull request #3905 from bog-dan-ro/master
Wouter van Oortmerssen [Thu, 14 Jul 2016 17:55:22 +0000 (10:55 -0700)]
Merge pull request #3905 from bog-dan-ro/master

Verifier computes the buffersize, useful when streaming multiple flatbuffers

8 years agoMerge pull request #3939 from TGIshib/hex-bug
Wouter van Oortmerssen [Thu, 14 Jul 2016 17:47:34 +0000 (10:47 -0700)]
Merge pull request #3939 from TGIshib/hex-bug

Fixed bug with negative hex constants (2).

8 years agoVerify everything in one shot
BogDan Vatra [Thu, 14 Jul 2016 17:15:06 +0000 (20:15 +0300)]
Verify everything in one shot

8 years agoVerifier computes the buffersize, useful for streaming
BogDan Vatra [Thu, 14 Jul 2016 17:15:44 +0000 (20:15 +0300)]
Verifier computes the buffersize, useful for streaming

Close #3898

8 years agoUpdate test.cpp
Raman [Thu, 14 Jul 2016 16:51:23 +0000 (18:51 +0200)]
Update test.cpp

8 years agoUpdate test.cpp
Raman [Thu, 14 Jul 2016 08:30:06 +0000 (10:30 +0200)]
Update test.cpp

8 years agoUpdate test.cpp
Raman [Thu, 14 Jul 2016 08:01:08 +0000 (10:01 +0200)]
Update test.cpp

8 years agoMerge pull request #3943 from bog-dan-ro/crash
Wouter van Oortmerssen [Wed, 13 Jul 2016 18:17:12 +0000 (11:17 -0700)]
Merge pull request #3943 from bog-dan-ro/crash

Don't crash if str is null

8 years agoDon't crash if str is null
BogDan Vatra [Wed, 13 Jul 2016 18:04:26 +0000 (21:04 +0300)]
Don't crash if str is null

Is useful especially when we want to create a string from another message string that might be null.

8 years agoMerge pull request #3940 from rushabhy/patch-1
Wouter van Oortmerssen [Wed, 13 Jul 2016 17:00:56 +0000 (10:00 -0700)]
Merge pull request #3940 from rushabhy/patch-1

Rename CONTRIBUTING to CONTRIBUTING.md

8 years agoRename CONTRIBUTING to CONTRIBUTING.md
Rushabh Yapuram [Wed, 13 Jul 2016 02:27:36 +0000 (07:57 +0530)]
Rename CONTRIBUTING to CONTRIBUTING.md

8 years agoUpdate test.cpp
Raman [Tue, 12 Jul 2016 17:55:35 +0000 (19:55 +0200)]
Update test.cpp

8 years agoUpdate idl_parser.cpp
Raman [Tue, 12 Jul 2016 17:47:53 +0000 (19:47 +0200)]
Update idl_parser.cpp

8 years agoMerge pull request #3923 from daksenik/master
Wouter van Oortmerssen [Mon, 11 Jul 2016 17:55:17 +0000 (10:55 -0700)]
Merge pull request #3923 from daksenik/master

Fixed operator++. Added CreateXXX for vector types.

8 years agoFixed spaces. Removed redundant == nullptr. Vectors pointers made const.
daksenik [Mon, 11 Jul 2016 17:27:38 +0000 (20:27 +0300)]
Fixed spaces. Removed redundant == nullptr. Vectors pointers made const.

8 years agoMerge pull request #3924 from TGIshib/master
Wouter van Oortmerssen [Mon, 11 Jul 2016 16:47:31 +0000 (09:47 -0700)]
Merge pull request #3924 from TGIshib/master

Added --escape-proto-identifiers command-line option.

8 years agoMerge pull request #3931 from jonathantullett/java_public_access
Wouter van Oortmerssen [Mon, 11 Jul 2016 16:20:43 +0000 (09:20 -0700)]
Merge pull request #3931 from jonathantullett/java_public_access

Fix for issue #3922

8 years agoUpdate idl_gen_fbs.cpp
Raman [Sat, 9 Jul 2016 11:33:30 +0000 (13:33 +0200)]
Update idl_gen_fbs.cpp

8 years agoUpdate flatc.cpp
Raman [Sat, 9 Jul 2016 11:32:45 +0000 (13:32 +0200)]
Update flatc.cpp

8 years agoUpdate idl_parser.cpp
Raman [Sat, 9 Jul 2016 10:57:07 +0000 (12:57 +0200)]
Update idl_parser.cpp

8 years agoUpdate test.cpp
Raman [Sat, 9 Jul 2016 10:51:06 +0000 (12:51 +0200)]
Update test.cpp

8 years agoUpdate flatc.cpp
Raman [Sat, 9 Jul 2016 10:47:14 +0000 (12:47 +0200)]
Update flatc.cpp

8 years agoUpdate idl_gen_fbs.cpp
Raman [Sat, 9 Jul 2016 10:40:50 +0000 (12:40 +0200)]
Update idl_gen_fbs.cpp

8 years agoUpdate idl.h
Raman [Sat, 9 Jul 2016 10:28:02 +0000 (12:28 +0200)]
Update idl.h

8 years agoAdded function GenSimpleParam. Tests added.
daksenik [Sat, 9 Jul 2016 10:00:21 +0000 (13:00 +0300)]
Added function GenSimpleParam. Tests added.

8 years agoFix for issue #3922
Jonathan Tullett [Sat, 9 Jul 2016 08:16:26 +0000 (09:16 +0100)]
Fix for issue #3922

Also, clean up redundant ';' at end of java classes.

8 years agoMerge pull request #3929 from Lakedaemon/fixForMake
Wouter van Oortmerssen [Fri, 8 Jul 2016 21:24:08 +0000 (14:24 -0700)]
Merge pull request #3929 from Lakedaemon/fixForMake

same fix for general code generator

8 years agosame fix for general code generator
lakedaemon [Fri, 8 Jul 2016 20:51:31 +0000 (22:51 +0200)]
same fix for general code generator

8 years agoMerge pull request #3928 from Lakedaemon/fixForMake
Wouter van Oortmerssen [Fri, 8 Jul 2016 20:37:05 +0000 (13:37 -0700)]
Merge pull request #3928 from Lakedaemon/fixForMake

Fix for make

8 years agofix missing space (clang format)
lakedaemon [Fri, 8 Jul 2016 20:02:47 +0000 (22:02 +0200)]
fix missing space (clang format)

8 years agofixed initialization of member var for old make (hopefully)
lakedaemon [Fri, 8 Jul 2016 20:00:15 +0000 (22:00 +0200)]
fixed initialization of member var for old make (hopefully)

8 years agoNew CreateXXX (with vectors and strings) calls old CreateXXX (with offsets).
daksenik [Fri, 8 Jul 2016 09:35:57 +0000 (12:35 +0300)]
New CreateXXX (with vectors and strings) calls old CreateXXX (with offsets).

8 years agoUpdate idl_gen_fbs.cpp
Raman [Tue, 5 Jul 2016 21:23:17 +0000 (23:23 +0200)]
Update idl_gen_fbs.cpp

8 years agoUpdate idl_gen_fbs.cpp
Raman [Tue, 5 Jul 2016 20:26:21 +0000 (22:26 +0200)]
Update idl_gen_fbs.cpp

8 years agoUpdate flatc.cpp
Raman [Tue, 5 Jul 2016 20:24:21 +0000 (22:24 +0200)]
Update flatc.cpp

8 years agoUpdate idl_parser.cpp
Raman [Tue, 5 Jul 2016 20:20:57 +0000 (22:20 +0200)]
Update idl_parser.cpp

8 years agoMove maven `pom.xml` from the java folder to the root folder.
Romain Gilles [Tue, 5 Jul 2016 12:29:12 +0000 (14:29 +0200)]
Move maven `pom.xml` from the java folder to the root folder.

This avoid to put the pom.xml file into the source directory. Normally the pom file is in a parent (/parent) folder and it is not mixed with the java source code.
An other thing is: this will make import of the project more easy from a IDE.

The side effect is that the target folder where maven build artifacts will move from the <flatbuffers>/java/target to <flatbuffers>/target therefore the gitignore file has been updated in consequences.

8 years agoMerge branch 'master' of github.com:google/flatbuffers
Romain Gilles [Tue, 5 Jul 2016 09:40:33 +0000 (11:40 +0200)]
Merge branch 'master' of github.com:google/flatbuffers

8 years agoRevert "Create a maven like project structure for java development. Make it OSGi...
Romain Gilles [Tue, 5 Jul 2016 09:38:17 +0000 (11:38 +0200)]
Revert "Create a maven like project structure for java development. Make it OSGi compliant. Generate the flatbuffers code for testing (example)."

This reverts commit 9875b0e0f8af5781a793fb93807641c9cebfb903.

8 years agoUpdate flatc.cpp
Raman [Mon, 4 Jul 2016 20:58:58 +0000 (22:58 +0200)]
Update flatc.cpp

8 years agoUpdate test.cpp
Raman [Mon, 4 Jul 2016 19:55:44 +0000 (21:55 +0200)]
Update test.cpp

8 years agoUpdate flatc.cpp
Raman [Mon, 4 Jul 2016 19:51:34 +0000 (21:51 +0200)]
Update flatc.cpp

8 years agoUpdate idl.h
Raman [Mon, 4 Jul 2016 19:41:01 +0000 (21:41 +0200)]
Update idl.h

8 years agoUpdate flatc.cpp
Raman [Mon, 4 Jul 2016 19:37:50 +0000 (21:37 +0200)]
Update flatc.cpp

8 years agoUpdate idl_gen_fbs.cpp
Raman [Mon, 4 Jul 2016 19:34:42 +0000 (21:34 +0200)]
Update idl_gen_fbs.cpp

8 years agoFixed operator++. Added CreateXXX for vector types.
daksenik [Mon, 4 Jul 2016 14:37:23 +0000 (17:37 +0300)]
Fixed operator++. Added CreateXXX for vector types.

8 years agoFixed operator++. Added CreateXXX for vector types.
daksenik [Mon, 4 Jul 2016 13:34:41 +0000 (16:34 +0300)]
Fixed operator++. Added CreateXXX for vector types.

8 years agoMerge pull request #3921 from LouisCAD/master
Wouter van Oortmerssen [Fri, 1 Jul 2016 17:15:54 +0000 (10:15 -0700)]
Merge pull request #3921 from LouisCAD/master

Fixed typo

8 years agoMerge pull request #3920 from love-ginger/master
Wouter van Oortmerssen [Fri, 1 Jul 2016 16:48:09 +0000 (09:48 -0700)]
Merge pull request #3920 from love-ginger/master

Fix mac build error

8 years agoFixed typo
Louis Cognault [Fri, 1 Jul 2016 15:22:36 +0000 (17:22 +0200)]
Fixed typo

is => it

8 years agoFix some error
吴凡 [Fri, 1 Jul 2016 03:17:03 +0000 (11:17 +0800)]
Fix some error

8 years agoSync from upstream
吴凡 [Fri, 1 Jul 2016 03:03:25 +0000 (11:03 +0800)]
Sync from upstream

8 years agoAdded GRPC code generator to flatc.
Wouter van Oortmerssen [Thu, 14 Apr 2016 01:16:05 +0000 (18:16 -0700)]
Added GRPC code generator to flatc.

Also added simple (in-process) test.

Change-Id: I38580d554dd52f590e3396ec4846e07546dcf07d
Tested: on Linux.

8 years agoMerge pull request #3916 from YuryBandarchuk16/master
Wouter van Oortmerssen [Mon, 27 Jun 2016 16:52:57 +0000 (09:52 -0700)]
Merge pull request #3916 from YuryBandarchuk16/master

Added new constants

8 years agoUpdate Constants.java
Yury Bandarchuk [Thu, 23 Jun 2016 18:30:32 +0000 (21:30 +0300)]
Update Constants.java

8 years agoAdded new constants
Yury Bandarchuk [Thu, 23 Jun 2016 15:51:55 +0000 (19:51 +0400)]
Added new constants

Add new constants in Constants.java

All single ints int FlatBufferBuilder.java were replaced by constants
from Constants.java

8 years agoMerge pull request #3908 from Lakedaemon/intoTheClass
Wouter van Oortmerssen [Thu, 23 Jun 2016 01:00:48 +0000 (18:00 -0700)]
Merge pull request #3908 from Lakedaemon/intoTheClass

pulling methods inside the class... so as to share wrapInNamespace later

8 years agofixing spaces
lakedaemon [Wed, 22 Jun 2016 22:23:11 +0000 (00:23 +0200)]
fixing spaces

8 years agosharing the WrapInNameSpace methods
lakedaemon [Tue, 14 Jun 2016 21:17:43 +0000 (23:17 +0200)]
sharing the WrapInNameSpace methods

8 years agoremoved static from wrapInNamespace method
lakedaemon [Tue, 14 Jun 2016 19:47:03 +0000 (21:47 +0200)]
removed static from wrapInNamespace method

8 years agoremoved parser from the method signatures
lakedaemon [Tue, 14 Jun 2016 19:43:35 +0000 (21:43 +0200)]
removed parser from the method signatures

8 years agojs:pulled methods inside the class
lakedaemon [Tue, 14 Jun 2016 19:41:11 +0000 (21:41 +0200)]
js:pulled methods inside the class

8 years agophp:removed parser from method signatures
lakedaemon [Tue, 14 Jun 2016 17:26:08 +0000 (19:26 +0200)]
php:removed parser from method signatures

8 years agophp:pulled methods inside the generator
lakedaemon [Tue, 14 Jun 2016 17:19:55 +0000 (19:19 +0200)]
php:pulled methods inside the generator

8 years agoremoved lang signature method
lakedaemon [Tue, 14 Jun 2016 15:13:58 +0000 (17:13 +0200)]
removed lang  signature method

8 years agoremoved parser & static from method signatures
lakedaemon [Tue, 14 Jun 2016 12:17:58 +0000 (14:17 +0200)]
removed parser & static from method signatures

8 years agogeneral: moved methods into the class
lakedaemon [Tue, 14 Jun 2016 12:02:26 +0000 (14:02 +0200)]
general: moved methods into the class

8 years agoMerge branch 'master' of https://github.com/google/flatbuffers
Wouter van Oortmerssen [Mon, 20 Jun 2016 23:41:40 +0000 (16:41 -0700)]
Merge branch 'master' of https://github.com/google/flatbuffers

8 years agoJSON Parser allows union type fields to come after unions.
Wouter van Oortmerssen [Mon, 20 Jun 2016 23:06:30 +0000 (16:06 -0700)]
JSON Parser allows union type fields to come after unions.

This is useful because many JSON generators will sort the fields,
cause X_type to follow X.

Change-Id: I00ef3ac05418224fc05aee93e6b3b3597e73ffe3
Tested: on Linux.
Bug: 29221752

8 years agoAllow unions of table types with the same name but from different namespaces.
Wouter van Oortmerssen [Sat, 18 Jun 2016 01:16:11 +0000 (18:16 -0700)]
Allow unions of table types with the same name but from different namespaces.

Also fixed most codegenerators using the wrong namespace when multiple
namespace were used in a file, with some files not being generated.

Change-Id: Ib42969221239d7244e431cbd667ef69200fc415f
Tested: on Linux.
Bug: 29338474

8 years agoMerge pull request #3913 from rw/fix-pytest-binary-type
Robert [Sat, 18 Jun 2016 20:02:02 +0000 (13:02 -0700)]
Merge pull request #3913 from rw/fix-pytest-binary-type

Fix test using compat.binary_types (from March).

8 years agoFix test using compat.binary_types (from March).
rw [Sat, 18 Jun 2016 08:12:56 +0000 (01:12 -0700)]
Fix test using compat.binary_types (from March).

8 years agoMerge branch 'master' of https://github.com/google/flatbuffers
Wouter van Oortmerssen [Sat, 18 Jun 2016 00:44:00 +0000 (17:44 -0700)]
Merge branch 'master' of https://github.com/google/flatbuffers

8 years agoAdded conversion operations that can be used inline in JSON.
Wouter van Oortmerssen [Wed, 15 Jun 2016 20:54:17 +0000 (13:54 -0700)]
Added conversion operations that can be used inline in JSON.

e.g.: { myfield: cos(rad(180)) } is equivalent to writing { myfield: -1.0 }

Bug: 29338398
Change-Id: I6fc4ef1fd10bda3ba78cba464414dd071a2f50ca
Tested: on Linux.

8 years agoAdded additional convenience overloads to CreateVector().
Wouter van Oortmerssen [Wed, 15 Jun 2016 19:10:01 +0000 (12:10 -0700)]
Added additional convenience overloads to CreateVector().

Bug: 2933788729336299
Change-Id: Iad8b3b2263f6cea7ee7e45994369194960df293b
Tested: on Linux.

8 years agoMerge pull request #3897 from Lakedaemon/namespaceWork
Wouter van Oortmerssen [Mon, 13 Jun 2016 22:16:28 +0000 (15:16 -0700)]
Merge pull request #3897 from Lakedaemon/namespaceWork

Namespace work

8 years agoMerge pull request #3903 from senior7515/master
Wouter van Oortmerssen [Mon, 13 Jun 2016 20:07:17 +0000 (13:07 -0700)]
Merge pull request #3903 from senior7515/master

Add env var for flatc schema compiler cmake module

8 years agoAdd env var for flatc schema compiler cmake module
Alexander Gallego [Tue, 7 Jun 2016 22:08:09 +0000 (18:08 -0400)]
Add env var for flatc schema compiler cmake module

8 years agoMerge branch 'master' of https://github.com/google/flatbuffers into fuzzer2
Wouter van Oortmerssen [Wed, 8 Jun 2016 18:51:49 +0000 (11:51 -0700)]
Merge branch 'master' of https://github.com/google/flatbuffers into fuzzer2

8 years agoFix typo
Antoine Descamps [Wed, 8 Jun 2016 07:32:37 +0000 (09:32 +0200)]
Fix typo

"your platform can't handling..." => "your platform can't handle"

8 years agoSetNameSpace algorithm documentation and more meaningful variable names
lakedaemon [Tue, 7 Jun 2016 12:46:25 +0000 (14:46 +0200)]
SetNameSpace algorithm documentation and more meaningful variable names

8 years agoCreate a maven like project structure for java development. Make it OSGi compliant...
Romain Gilles [Tue, 7 Jun 2016 07:05:56 +0000 (09:05 +0200)]
Create a maven like project structure for java development. Make it OSGi compliant. Generate the flatbuffers code for testing (example).

Java developer are mostly comfortable with maven project structure. One one the main concept behind maven is convention. If you follow the maven project convention then your development team will get more effective as they now this project structure and can easily find the production code versus the test code.
 In this pull request I have structured the java project around 2 main parts:
  * the `flatbuffers` project. This project is the api / lib project and contains the test code structure + an example of code generation for testing. This avoid to commit generated code. Pre-configure JUnit for test driven development and make this project OSGi compliant.
  * the `jmh` project. This project aims to provide a placeholder for micro-benchmarking. JMH is a 'de facto' standard for micro benchmarking you can find more details here: http://openjdk.java.net/projects/code-tools/jmh/

For now I didn't move the JavaTest class but it could be a next step with a migration to the JUnit framework.
The only impacts are the move of the class and the project structure => no code change.

8 years agoAdded a way to get mutable tables out of a mutable vector of tables.
Wouter van Oortmerssen [Tue, 7 Jun 2016 00:38:21 +0000 (17:38 -0700)]
Added a way to get mutable tables out of a mutable vector of tables.

Change-Id: I8f9ef1d14f86671ced929c7a159115b1d8510327
Tested: on Linux.

8 years agoFixed LoadFile crashing on directory arguments.
Wouter van Oortmerssen [Thu, 26 May 2016 00:47:44 +0000 (17:47 -0700)]
Fixed LoadFile crashing on directory arguments.

Change-Id: I737f6fd0bb1302ab7cfa6ab8b06108e221ebb63c
Tested: on Linux.

8 years agoFixed compile errors on Windows
Wouter van Oortmerssen [Thu, 2 Jun 2016 21:55:35 +0000 (14:55 -0700)]
Fixed compile errors on Windows

8 years agoBetter C++ namespace management
lakedaemon [Thu, 2 Jun 2016 21:01:40 +0000 (23:01 +0200)]
Better C++ namespace management

8 years agocpp generator : pulling all methods inside the class
lakedaemon [Thu, 2 Jun 2016 19:56:27 +0000 (21:56 +0200)]
cpp generator : pulling all methods inside the class

8 years agoMerge pull request #3885 from Lakedaemon/shareWarningAndTwoMethods
Wouter van Oortmerssen [Thu, 2 Jun 2016 18:35:41 +0000 (11:35 -0700)]
Merge pull request #3885 from Lakedaemon/shareWarningAndTwoMethods

Share warning and two methods

8 years agoMerge pull request #3870 from martinus/master
Wouter van Oortmerssen [Thu, 2 Jun 2016 18:26:16 +0000 (11:26 -0700)]
Merge pull request #3870 from martinus/master

Added helpers to access objects while creating the flatbuffer.

8 years agoMerge pull request #3891 from bog-dan-ro/master
Wouter van Oortmerssen [Thu, 2 Jun 2016 18:24:48 +0000 (11:24 -0700)]
Merge pull request #3891 from bog-dan-ro/master

More bit fields patches

8 years agorenamed functions
Martin Ankerl [Wed, 1 Jun 2016 11:13:00 +0000 (13:13 +0200)]
renamed functions

More descriptive name, show that it's really just a temporary object.