Commit Graph

773 Commits

Author SHA1 Message Date
Wouter van Oortmerssen e733d95e66 Merge pull request #3924 from TGIshib/master
Added --escape-proto-identifiers command-line option.
2016-07-11 09:47:31 -07:00
Wouter van Oortmerssen 14bdce41fe Merge pull request #3931 from jonathantullett/java_public_access
Fix for issue #3922
2016-07-11 09:20:43 -07:00
Raman df5575de17 Update idl_gen_fbs.cpp 2016-07-09 13:33:30 +02:00
Raman f0b2cc8f6e Update flatc.cpp 2016-07-09 13:32:45 +02:00
Raman 5f2b4e7872 Update idl_parser.cpp 2016-07-09 12:57:07 +02:00
Raman 22697722d9 Update test.cpp 2016-07-09 12:51:06 +02:00
Raman ffbc93526e Update flatc.cpp 2016-07-09 12:47:14 +02:00
Raman d9d47a53bd Update idl_gen_fbs.cpp 2016-07-09 12:40:50 +02:00
Raman 71d30d5c02 Update idl.h 2016-07-09 12:28:02 +02:00
Jonathan Tullett d9767b8315 Fix for issue #3922
Also, clean up redundant ';' at end of java classes.
2016-07-09 09:16:26 +01:00
Wouter van Oortmerssen 193a631708 Merge pull request #3929 from Lakedaemon/fixForMake
same fix for general code generator
2016-07-08 14:24:08 -07:00
lakedaemon a6764b9bf1 same fix for general code generator 2016-07-08 22:54:51 +02:00
Wouter van Oortmerssen 0f5dc152b8 Merge pull request #3928 from Lakedaemon/fixForMake
Fix for make
2016-07-08 13:37:05 -07:00
lakedaemon 8e1aae0fd6 fix missing space (clang format) 2016-07-08 22:02:47 +02:00
lakedaemon 084e5dbc4b fixed initialization of member var for old make (hopefully) 2016-07-08 22:00:15 +02:00
Raman 248432b92d Update idl_gen_fbs.cpp 2016-07-05 23:23:17 +02:00
Raman f738981ed5 Update idl_gen_fbs.cpp 2016-07-05 22:26:21 +02:00
Raman 4bb6ab3cd5 Update flatc.cpp 2016-07-05 22:24:21 +02:00
Raman 72e8219a65 Update idl_parser.cpp 2016-07-05 22:20:57 +02:00
Raman 4f8abaaf10 Update flatc.cpp 2016-07-04 22:58:58 +02:00
Raman 5043764247 Update test.cpp 2016-07-04 21:55:44 +02:00
Raman 9fd4d66438 Update flatc.cpp 2016-07-04 21:51:34 +02:00
Raman aae48e3a9d Update idl.h 2016-07-04 21:41:01 +02:00
Raman ff57f52b72 Update flatc.cpp 2016-07-04 21:37:50 +02:00
Raman 7d84a4914f Update idl_gen_fbs.cpp 2016-07-04 21:34:42 +02:00
Wouter van Oortmerssen 68a83eddd4 Merge pull request #3921 from LouisCAD/master
Fixed typo
2016-07-01 10:15:54 -07:00
Wouter van Oortmerssen b999d49945 Merge pull request #3920 from love-ginger/master
Fix mac build error
2016-07-01 09:48:09 -07:00
Louis Cognault c94cb6dae9 Fixed typo
is => it
2016-07-01 17:22:36 +02:00
吴凡 5ea2b49f58 Fix some error 2016-07-01 11:17:03 +08:00
吴凡 70deb70b76 Sync from upstream 2016-07-01 11:03:25 +08:00
Wouter van Oortmerssen 48f37f9e0a Added GRPC code generator to flatc.
Also added simple (in-process) test.

Change-Id: I38580d554dd52f590e3396ec4846e07546dcf07d
Tested: on Linux.
2016-06-29 15:51:44 -07:00
Wouter van Oortmerssen 6dff7c68f1 Merge pull request #3916 from YuryBandarchuk16/master
Added new constants
2016-06-27 09:52:57 -07:00
Yury Bandarchuk ec59dc026f Update Constants.java 2016-06-23 21:30:32 +03:00
Yury Bandarchuk c97abb1eea Added new constants
Add new constants in Constants.java

All single ints int FlatBufferBuilder.java were replaced by constants
from Constants.java
2016-06-23 19:51:55 +04:00
Wouter van Oortmerssen 2fdafa9a49 Merge pull request #3908 from Lakedaemon/intoTheClass
pulling methods inside the class... so as to share wrapInNamespace later
2016-06-22 18:00:48 -07:00
lakedaemon f794f97d88 fixing spaces 2016-06-23 00:37:55 +02:00
lakedaemon 03ad8fa4d9 sharing the WrapInNameSpace methods 2016-06-23 00:37:55 +02:00
lakedaemon 43fedfa8ba removed static from wrapInNamespace method 2016-06-23 00:36:33 +02:00
lakedaemon 2f52618c4e removed parser from the method signatures 2016-06-23 00:36:33 +02:00
lakedaemon a9e21170bc js:pulled methods inside the class 2016-06-23 00:36:33 +02:00
lakedaemon cb6cc3dfb6 php:removed parser from method signatures 2016-06-23 00:36:33 +02:00
lakedaemon 66f2aac26f php:pulled methods inside the generator 2016-06-23 00:36:33 +02:00
lakedaemon 4a249752ff removed lang signature method 2016-06-23 00:31:27 +02:00
lakedaemon f0695e0edf removed parser & static from method signatures 2016-06-23 00:28:35 +02:00
lakedaemon 07d4066847 general: moved methods into the class 2016-06-23 00:27:19 +02:00
Wouter van Oortmerssen 57ba8a4d46 Merge branch 'master' of https://github.com/google/flatbuffers 2016-06-20 16:41:40 -07:00
Wouter van Oortmerssen 9e6c5f9f2c 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
2016-06-20 16:30:14 -07:00
Wouter van Oortmerssen 3639032d1e 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
2016-06-20 11:47:04 -07:00
Robert 6f75ec8490 Merge pull request #3913 from rw/fix-pytest-binary-type
Fix test using compat.binary_types (from March).
2016-06-18 13:02:02 -07:00
rw fd43d3709e Fix test using compat.binary_types (from March). 2016-06-18 01:12:56 -07:00