Commit graph

1188 commits

Author SHA1 Message Date
Chris Fallin
db87a9c07a Merge pull request #211 from isaiah/map_inspect
Ruby implementation Map#inspect should be consistent with Hash#inspect
2015-02-17 13:02:32 -06:00
Isaiah Peng
4502626fa7 Google::Protobuf::Map#inspect should be consistent with Hash#inspect 2015-02-14 22:15:12 +01:00
Joshua Haberman
344a921a82 Merge pull request #209 from cfallin/ruby-protoc-maps
Properly support maps in Ruby protoc and another bugfix.
2015-02-13 15:45:48 -08:00
Chris Fallin
315b93fdcc Addressed code-review comment. 2015-02-13 14:32:09 -08:00
Chris Fallin
a2bea0a001 Properly support maps in Ruby protoc and another bugfix.
Previously, we supported map fields in the Ruby DSL. However, we never
connected the final link in the chain and generated `map` DSL commands
for map fields in `.proto` files. My apologies -- I had been testing
with the DSL directly so I missed this.

Also fixed a handlerdata-setup-infinite-loop when a map value field's
type is its containing message.
2015-02-12 16:08:01 -08:00
Feng Xiao
43beb6268b Merge pull request #201 from gordana-cmiljanovic-imgtec/mips-atomic-ops-fix
MIPS: remove immediate constraint within CompareAndSwap.
2015-02-12 14:13:45 +08:00
Chris Fallin
504d124287 Merge pull request #203 from pherl/gitignore
Add java compiled targets and several tests target into .gitignore.
2015-02-09 13:29:31 -08:00
Jisi Liu
7af23e88be Add java compiled targets and several tests target into .gitignore. 2015-02-09 13:11:03 -08:00
Gordana Cmiljanovic
b61b0c3304 MIPS: remove immediate constraint within CompareAndSwap.
Improper use of immediate constraint is slightly non-optimal with gcc/gnu-as
but may cause breakage with clang.
2015-02-09 14:04:24 +01:00
Chris Fallin
2e5123a399 Merge pull request #197 from nsuke/protoc-export-ruby
Add missing LIBPROTOC_EXPORT to ruby generator
2015-02-07 22:46:26 -08:00
Nobuaki Sukegawa
de525ec219 Add missing LIBPROTOC_EXPORT to ruby generator 2015-02-08 14:45:38 +09:00
Joshua Haberman
20490e33ca Merge pull request #189 from cfallin/update-ruby-upb
Updated to latest upb and added test for JSON map operation.
2015-02-05 15:22:17 -08:00
Chris Fallin
06bf6308ea README.md update for Ruby gem. 2015-02-05 14:58:57 -08:00
Chris Fallin
e7e79a43ed Merge pull request #190 from isaiah/to_ary
add #to_ary to RepeatedField
2015-02-03 09:57:13 -08:00
Isaiah Peng
ee5f6e9a35 add #to_ary to RepeatedField 2015-02-03 16:45:12 +01:00
Feng Xiao
a22bc812a4 Merge pull request #186 from ennerf/win32-msvc-fix
MSVC protoc compiler fix
2015-02-02 19:37:58 -08:00
Chris Fallin
a50759254f Updated to latest upb and added test for JSON map operation. 2015-02-02 15:07:34 -08:00
Joshua Haberman
17e4419188 Merge pull request #168 from cfallin/ruby-oneof
Support oneofs in MRI Ruby C extension.
2015-02-02 13:29:15 -08:00
Chris Fallin
a3953da536 Updated based on code-review comments. 2015-02-02 13:16:57 -08:00
Chris Fallin
eb33f9d3d6 Updated based on code-review comments. 2015-02-02 13:03:08 -08:00
Florian Enner
e544b38815 removed accidental whitespace 2015-02-02 15:19:01 -05:00
Florian Enner
e1e86b02a8 replaced type fix with the recommended way 2015-01-31 19:22:52 -05:00
Florian Enner
df4730ca9c fixed MSVC compile error
<stdint.h> is not part of the standard, so I've added a workaround.
2015-01-31 19:01:34 -05:00
Florian Enner
ec53b8cb60 added missing ruby generator to msvc project
https://github.com/google/protobuf/issues/87
2015-01-31 18:42:12 -05:00
Feng Xiao
8ccaa42ffb Remove deleted files from Makefile.am. 2015-01-29 11:02:12 -08:00
Feng Xiao
76cb776d94 Merge pull request #180 from ned14/master
Fix illegal C++ use of reinterpret_cast<> to cast between nullptr_t and a pointer
2015-01-27 15:31:54 -08:00
Feng Xiao
ae11803d77 Delete unused files. 2015-01-27 11:17:18 -08:00
Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)
f01c1441bc Fix illegal C++ use of reinterpret_cast<> to cast between nullptr_t and a pointer. 2015-01-27 15:44:38 +00:00
Chris Fallin
07b8b0f28d Addressed code-review comments. 2015-01-26 13:52:51 -08:00
Chris Fallin
9de35e7421 Addressed code-review comments. 2015-01-26 11:23:19 -08:00
Chris Fallin
e2debef5d8 Ruby extension: added oneof accessor. 2015-01-14 18:02:27 -08:00
Chris Fallin
e1b7d38d9a Addressed code-review comments. 2015-01-14 17:14:05 -08:00
Chris Fallin
b0670ddae7 Fix golden-file Ruby test to work with out-of-tree builds. 2015-01-14 16:46:10 -08:00
Chris Fallin
3f3820d8f8 Two tests for Ruby code generator:
- A golden-file test that ensures protoc produces known-valid output.
- A Ruby test that loads that golden file and ensures it actually works
  with the extension.

This split strategy allows us to test end-to-end without needing to
integrate the Ruby gem build system and the protoc build system. This is
desirable because we do not want a gem build/install to depend on
building protoc, and we do not want building protoc to depend on
building and testing the gem.
2015-01-14 15:44:46 -08:00
Chris Fallin
7c4bbf07a5 Support oneofs in the Ruby code generator. 2015-01-14 14:56:17 -08:00
Chris Fallin
fcd8889d5b Support oneofs in MRI Ruby C extension. 2015-01-14 14:35:57 -08:00
Joshua Haberman
5446deaea7 Merge pull request #155 from cfallin/ruby-maps
Support for maps in the MRI C Ruby extension.
2015-01-13 13:50:11 -08:00
Chris Fallin
ace4212e60 Line-wraps at 80 chars. 2015-01-13 13:47:58 -08:00
Feng Xiao
052e0205a7 Merge pull request #160 from zhangkun83/master
Include names.h as java_names.h in the opensource tree
2015-01-12 16:18:07 -08:00
Chris Fallin
addd26cbb3 Addressed code-review comments. 2015-01-12 16:09:35 -08:00
zhangkun83
a6b3ab09e8 Align backslash vertically 2015-01-12 15:56:07 -08:00
zhangkun83
aa1713d9a4 Include names.h as java_names.h in the opensource tree 2015-01-12 15:38:59 -08:00
Chris Fallin
97b663a8be Update upb amalgamation. 2015-01-09 16:15:22 -08:00
Chris Fallin
4c92289766 Addressed code-review comments. 2015-01-09 15:37:55 -08:00
Chris Fallin
80276ac021 Addressed code-review comments. 2015-01-06 18:01:32 -08:00
Chris Fallin
fd1a3ff11d Support for maps in the MRI C Ruby extension.
This adds the Map container and support for parsing and serializing maps
in the protobuf wire format (as defined by the C++ implementation, with
MapEntry submessages in a repeated field). JSON map
serialization/parsing are not yet supported as these will require some
changes to upb as well.
2015-01-06 15:44:09 -08:00
Feng Xiao
644a6a1da7 Merge pull request #143 from Ivoz/patch-1
Update python version / setuptools instructions
2014-12-22 09:52:00 -08:00
Feng Xiao
b60a6df9ae Merge pull request #46 from adalq/version
Add __version__
2014-12-20 17:46:35 -08:00
Feng Xiao
bc3af606a7 Merge pull request #139 from c0nk/master
Improved little endian byte order detection
2014-12-20 17:43:04 -08:00
Matt Iversen
4186d4c9c9 Update python version / setuptools instructions
Reflect the change that protobuf should now only be supporting 2.6+ (I'd guess note python 3.x+ when its supported in implementation)

Refer to the Python Packaging User Guide for installing setuptools (and pip) instead of out of date telecommunity guide.
2014-12-17 20:11:08 +11:00