Roll forward Ruby upb changes now that protobuf Ruby build is fixed (#5866)
* Rolled forward again with "Updated upb from defcleanup branch..."
Revert "Revert "Updated upb from defcleanup branch and modified Ruby to use it (#5539)" (#5848)"
This reverts commit 1568deab40db055a79fa415d21547eaffbd56d57.
* A few more merge fixes.
* Updated for defcleanup2 branch.
* Fixed upb to define upb_decode().
* Fixed names of nested messages.
* Revert submodule.
* Set -std=gnu90 and fixed warnings/errors.
Some of our Kokoro tests seem to run with this level of warnings,
and the source strives to be gnu90 compatible. Enforcing it for
every build removes the possibility of some errors showing up in
Kokoro/Travis tests only.
* Fixed remaining warnings with gnu90 mode.
I tried to match warning flags with what Ruby appears to do
in our Kokoro tests.
* Initialize values registered by rb_gc_register_address().
* Fixed subtle GC bug.
We need to initialize this marked value before creating the instance.
* Truly fix the GC bug.
* Updated upb for mktime() fix.
* Removed XOPEN_SOURCE as we are not using strptime().
* Removed fixed tests from the conformance failure list for Ruby.
* Fixed memory error related to oneof def names.
* Picked up new upb changes re: JSON printing.
* Uncomment concurrent decoding test.
diff --git a/ruby/lib/google/protobuf.rb b/ruby/lib/google/protobuf.rb
index 464982e..3aef079 100644
--- a/ruby/lib/google/protobuf.rb
+++ b/ruby/lib/google/protobuf.rb
@@ -50,6 +50,72 @@
rescue LoadError
require 'google/protobuf_c'
end
+
+ module Google
+ module Protobuf
+ module Internal
+ def self.infer_package(names)
+ # Package is longest common prefix ending in '.', if any.
+ min, max = names.minmax
+ last_common_dot = nil
+ min.size.times { |i|
+ if min[i] != max[i] then break end
+ if min[i] == ?. then last_common_dot = i end
+ }
+ if last_common_dot
+ return min.slice(0, last_common_dot)
+ end
+ end
+
+ class NestingBuilder
+ def initialize(msg_names, enum_names)
+ @to_pos = {nil=>nil}
+ @msg_children = Hash.new { |hash, key| hash[key] = [] }
+ @enum_children = Hash.new { |hash, key| hash[key] = [] }
+
+ msg_names.each_with_index { |name, idx| @to_pos[name] = idx }
+ enum_names.each_with_index { |name, idx| @to_pos[name] = idx }
+
+ msg_names.each { |name| @msg_children[parent(name)] << name }
+ enum_names.each { |name| @enum_children[parent(name)] << name }
+ end
+
+ def build(package)
+ return build_msg(package)
+ end
+
+ private
+ def build_msg(msg)
+ return {
+ :pos => @to_pos[msg],
+ :msgs => @msg_children[msg].map { |child| build_msg(child) },
+ :enums => @enum_children[msg].map { |child| @to_pos[child] },
+ }
+ end
+
+ private
+ def parent(name)
+ idx = name.rindex(?.)
+ if idx
+ return name.slice(0, idx)
+ else
+ return nil
+ end
+ end
+ end
+
+ def self.fixup_descriptor(package, msg_names, enum_names)
+ if package.nil?
+ package = self.infer_package(msg_names + enum_names)
+ end
+
+ nesting = NestingBuilder.new(msg_names, enum_names).build(package)
+
+ return package, nesting
+ end
+ end
+ end
+ end
end
require 'google/protobuf/repeated_field'
