Commit Graph

1382 Commits

Author SHA1 Message Date
Jisi Liu
c72d3d51ff Oneof message level elements (consts, case getter/clear) and messsage type field oneof support. 2015-02-19 16:43:07 -08:00
Jisi Liu
7794a98ff4 Initial check-in for message oneof. 2015-02-19 16:43:07 -08:00
Jisi Liu
33222b5a02 Initial check in for primitive oneof fields. 2015-02-19 16:43:07 -08:00
Jisi Liu
f0e08fd4e4 Support maps in NanoPrinter. 2015-02-19 14:41:14 -08:00
Chris Fallin
709164e764 Merge pull request #213 from pherl/maps
Use EMPTY_BYTES in WireFormatNano
2015-02-19 12:14:57 -08:00
Jisi Liu
fbfdbe8ad8 Use EMPTY_BYTES in WireFormatNano 2015-02-19 11:29:24 -08:00
Chris Fallin
b262575bf2 Merge pull request #212 from haberman/update-from-google
Integrated changes from Google opensource branch.
2015-02-18 14:35:44 -08:00
Josh Haberman
55cf8abecb Merge branch 'master' of github.com:google/protobuf 2015-02-17 18:25:20 -08:00
Josh Haberman
cb3caf1e61 Integrate changes from Google open-source branch. 2015-02-17 18:23:41 -08:00
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
Bo Yang
eb2ce02931 Fix absolute/relative path in output 2015-02-09 11:57:41 -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
Feng Xiao
96e379ff8b Add the .proto files for well-known types. 2015-02-09 12:21:49 +08: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
Bo Yang
e2555e235f Change target to output filenames 2015-02-07 15:28:54 -08: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
zex
a4f634ce74 fix raise syntax issues for py3,
fix except syntax issue for py3
2015-02-06 13:51:49 +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
Bo Yang
1d627f85c3 Fix comment 2015-02-04 15:48:06 -08:00
Jisi Liu
3c0355ef37 Moving internal code to InternalNano and rename MapUtil to MapFactories. 2015-02-04 13:54:58 -08:00
Bo Yang
3edcbaf57a Clean code 2015-02-04 13:42:16 -08:00
Bo Yang
2e32b8b569 Remove "include sstream" from command_line_interface.cc 2015-02-04 10:27:52 -08:00
Bo Yang
a1b351c55b Change flag for generating dependency file to "dependency_out". Delete
test-driver
2015-02-04 10:20:20 -08:00
Bo Yang
5fa3956ede Fix comments. 2015-02-03 21:51:29 -08:00
Bo Yang
5914ce7a16 Implement a feature to generate a dependency file. By giving protoc the flag
"--dependency_manifest_out=FILE", protoc will write dependencies of
input proto files into FILE. In FILE, the format will be
<full path to FILE>: <full path to 1st proto>\\\n <full path to 2nd proto> ...
This cl is based on https://github.com/google/protobuf/pull/178
2015-02-03 21:35:50 -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