Commit Graph

1260 Commits

Author SHA1 Message Date
Jisi Liu
2cb2358cba Merge pull request #204 from pherl/master
Implement maps for JavaNano
2015-02-17 14:06:19 -08:00
Jisi Liu
c265fbe3ca Mark factory setter API as private for alpha release. 2015-02-17 14:03:37 -08:00
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
Jisi Liu
d1bbd856af Merge the javanano map test into the main test target. 2015-02-09 14:15:26 -08:00
Jisi Liu
33ccbcbe26 Add java compiled targets and several tests target into .gitignore. 2015-02-09 13:33:46 -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
Jisi Liu
12d8a514c8 Get the map factory per mergeFrom() call for JavaNano. 2015-02-07 12:51:36 -08:00
Jisi Liu
d9a6f27bc3 implement hashCode() for JavaNano maps. 2015-02-06 15:55:04 -08:00
Jisi Liu
1536e93349 Implement Equals for nano. 2015-02-06 15:30:48 -08:00
Jisi Liu
b0f194885e Rename empty bytes in JavaNano. 2015-02-05 17:38:07 -08:00
Jisi Liu
cd99c12df2 Rename readData() to readPrimitiveField() in JavaNano. 2015-02-05 17:14:02 -08:00
Jisi Liu
7f3693184a Add tests merging empty entries in JavaNano map 2015-02-05 15:23:37 -08: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
Jisi Liu
bd3573cb09 Fix the behavior when merging conflicting keys, the new value always
override the existing one even for message types.
2015-02-05 14:52:17 -08:00
Jisi Liu
ca35a80303 Test keys and values cannot be null. 2015-02-05 14:26:52 -08:00
Jisi Liu
0d52964597 Basic serialization/parsing test. 2015-02-05 14:19:46 -08:00
Jisi Liu
3c0355ef37 Moving internal code to InternalNano and rename MapUtil to MapFactories. 2015-02-04 13:54:58 -08:00
Jisi Liu
d5839d2b4d parsing and serialzation for maps in JavaNano. 2015-02-03 18:15:12 -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
Jisi Liu
4d64e65f09 Parsing for Maps in JavaNano 2015-02-02 21:06:59 -08:00
Jisi Liu
0f2a7d3fea Add readData(int) to read primitive value. 2015-02-02 21:06:04 -08:00
Jisi Liu
60bccb6006 MOVE TYPE_XXX constants to InternalNano. 2015-02-02 21:05:37 -08: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
Jisi Liu
4a99897c0b Use map generator for maps field; skip entry message. 2015-02-02 14:51:36 -08:00
Jisi Liu
ab74fd1c4b Add package for map test for nano. 2015-02-02 14:50:39 -08:00
Jisi Liu
03b1416f0e Add tests for JavaNano maps. 2015-02-02 14:30:24 -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
Jisi Liu
dce816593d Initial checkin for maps support in JavaNano. 2015-01-30 16:14:15 -08: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