Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
5bc250b0
Unverified
Commit
5bc250b0
authored
Jun 25, 2019
by
Joshua Haberman
Committed by
GitHub
Jun 25, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5878 from Parad0X/fix-ns
Fix scope resolution for Google namespace
parents
7e276a32
c4e84ae8
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
11 deletions
+11
-11
ruby_generated_code_pb.rb
src/google/protobuf/compiler/ruby/ruby_generated_code_pb.rb
+3
-3
ruby_generated_code_proto2_pb.rb
...e/protobuf/compiler/ruby/ruby_generated_code_proto2_pb.rb
+3
-3
ruby_generated_pkg_explicit_legacy_pb.rb
...uf/compiler/ruby/ruby_generated_pkg_explicit_legacy_pb.rb
+1
-1
ruby_generated_pkg_explicit_pb.rb
.../protobuf/compiler/ruby/ruby_generated_pkg_explicit_pb.rb
+1
-1
ruby_generated_pkg_implicit_pb.rb
.../protobuf/compiler/ruby/ruby_generated_pkg_implicit_pb.rb
+1
-1
ruby_generator.cc
src/google/protobuf/compiler/ruby/ruby_generator.cc
+2
-2
No files found.
src/google/protobuf/compiler/ruby/ruby_generated_code_pb.rb
View file @
5bc250b0
...
...
@@ -68,9 +68,9 @@ end
module
A
module
B
module
C
TestMessage
=
Google
::
Protobuf
::
DescriptorPool
.
generated_pool
.
lookup
(
"A.B.C.TestMessage"
).
msgclass
TestMessage
::
NestedMessage
=
Google
::
Protobuf
::
DescriptorPool
.
generated_pool
.
lookup
(
"A.B.C.TestMessage.NestedMessage"
).
msgclass
TestEnum
=
Google
::
Protobuf
::
DescriptorPool
.
generated_pool
.
lookup
(
"A.B.C.TestEnum"
).
enummodule
TestMessage
=
::
Google
::
Protobuf
::
DescriptorPool
.
generated_pool
.
lookup
(
"A.B.C.TestMessage"
).
msgclass
TestMessage
::
NestedMessage
=
::
Google
::
Protobuf
::
DescriptorPool
.
generated_pool
.
lookup
(
"A.B.C.TestMessage.NestedMessage"
).
msgclass
TestEnum
=
::
Google
::
Protobuf
::
DescriptorPool
.
generated_pool
.
lookup
(
"A.B.C.TestEnum"
).
enummodule
end
end
end
src/google/protobuf/compiler/ruby/ruby_generated_code_proto2_pb.rb
View file @
5bc250b0
...
...
@@ -69,9 +69,9 @@ end
module
A
module
B
module
C
TestMessage
=
Google
::
Protobuf
::
DescriptorPool
.
generated_pool
.
lookup
(
"A.B.C.TestMessage"
).
msgclass
TestMessage
::
NestedMessage
=
Google
::
Protobuf
::
DescriptorPool
.
generated_pool
.
lookup
(
"A.B.C.TestMessage.NestedMessage"
).
msgclass
TestEnum
=
Google
::
Protobuf
::
DescriptorPool
.
generated_pool
.
lookup
(
"A.B.C.TestEnum"
).
enummodule
TestMessage
=
::
Google
::
Protobuf
::
DescriptorPool
.
generated_pool
.
lookup
(
"A.B.C.TestMessage"
).
msgclass
TestMessage
::
NestedMessage
=
::
Google
::
Protobuf
::
DescriptorPool
.
generated_pool
.
lookup
(
"A.B.C.TestMessage.NestedMessage"
).
msgclass
TestEnum
=
::
Google
::
Protobuf
::
DescriptorPool
.
generated_pool
.
lookup
(
"A.B.C.TestEnum"
).
enummodule
end
end
end
src/google/protobuf/compiler/ruby/ruby_generated_pkg_explicit_legacy_pb.rb
View file @
5bc250b0
...
...
@@ -14,7 +14,7 @@ end
module
AA
module
BB
module
CC
Four
=
Google
::
Protobuf
::
DescriptorPool
.
generated_pool
.
lookup
(
"one.two.a_three.and.Four"
).
msgclass
Four
=
::
Google
::
Protobuf
::
DescriptorPool
.
generated_pool
.
lookup
(
"one.two.a_three.and.Four"
).
msgclass
end
end
end
src/google/protobuf/compiler/ruby/ruby_generated_pkg_explicit_pb.rb
View file @
5bc250b0
...
...
@@ -14,7 +14,7 @@ end
module
A
module
B
module
C
Four
=
Google
::
Protobuf
::
DescriptorPool
.
generated_pool
.
lookup
(
"one.two.a_three.Four"
).
msgclass
Four
=
::
Google
::
Protobuf
::
DescriptorPool
.
generated_pool
.
lookup
(
"one.two.a_three.Four"
).
msgclass
end
end
end
src/google/protobuf/compiler/ruby/ruby_generated_pkg_implicit_pb.rb
View file @
5bc250b0
...
...
@@ -14,7 +14,7 @@ end
module
One
module
Two
module
AThree
Four
=
Google
::
Protobuf
::
DescriptorPool
.
generated_pool
.
lookup
(
"one.two.a_three.Four"
).
msgclass
Four
=
::
Google
::
Protobuf
::
DescriptorPool
.
generated_pool
.
lookup
(
"one.two.a_three.Four"
).
msgclass
end
end
end
src/google/protobuf/compiler/ruby/ruby_generator.cc
View file @
5bc250b0
...
...
@@ -371,7 +371,7 @@ void GenerateMessageAssignment(const std::string& prefix,
"prefix"
,
prefix
,
"name"
,
RubifyConstant
(
message
->
name
()));
printer
->
Print
(
"Google::Protobuf::DescriptorPool.generated_pool."
"
::
Google::Protobuf::DescriptorPool.generated_pool."
"lookup(
\"
$full_name$
\"
).msgclass
\n
"
,
"full_name"
,
message
->
full_name
());
...
...
@@ -391,7 +391,7 @@ void GenerateEnumAssignment(const std::string& prefix, const EnumDescriptor* en,
"prefix"
,
prefix
,
"name"
,
RubifyConstant
(
en
->
name
()));
printer
->
Print
(
"Google::Protobuf::DescriptorPool.generated_pool."
"
::
Google::Protobuf::DescriptorPool.generated_pool."
"lookup(
\"
$full_name$
\"
).enummodule
\n
"
,
"full_name"
,
en
->
full_name
());
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment