AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Add ARRAY for reserved name (#3150)

Browse Source
This commit is contained in:
Paul Yang 2017-05-29 15:30:47 -07:00 committed by Bo Yang
parent bf04c83267
commit dba8928ff5
6 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
php/ext/google/protobuf/def.c
View File

@ -30,8 +30,8 @@
#include "protobuf.h" #include "protobuf.h"
const char* const kReservedNames[] = {"Empty"}; const char* const kReservedNames[] = {"Empty", "ECHO", "ARRAY"};
const int kReservedNamesSize = 1; const int kReservedNamesSize = 3;
// Forward declare. // Forward declare.
static void descriptor_init_c_instance(Descriptor* intern TSRMLS_DC); static void descriptor_init_c_instance(Descriptor* intern TSRMLS_DC);

2
php/src/Google/Protobuf/descriptor.php
View File

@ -236,7 +236,7 @@ function getClassNamePrefix(
return $prefix; return $prefix;
} }
$reserved_words = array("Empty"); $reserved_words = array("Empty", "ECHO", "ARRAY");
foreach ($reserved_words as $reserved_word) { foreach ($reserved_words as $reserved_word) {
if ($classname === $reserved_word) { if ($classname === $reserved_word) {
if ($file_proto->getPackage() === "google.protobuf") { if ($file_proto->getPackage() === "google.protobuf") {

1
php/tests/generated_class_test.php
View File

@ -876,5 +876,6 @@ class GeneratedClassTest extends TestBase
$m = new \Foo\TestMessage_Empty(); $m = new \Foo\TestMessage_Empty();
$m = new \Foo\PBEmpty(); $m = new \Foo\PBEmpty();
$m = new \PrefixEmpty(); $m = new \PrefixEmpty();
$m = new \Foo\PBARRAY();
} }
} }

1
php/tests/memory_leak_test.php
View File

@ -8,6 +8,7 @@ require_once('generated/NoNamespaceMessage_NestedEnum.php');
require_once('generated/PrefixEmpty.php'); require_once('generated/PrefixEmpty.php');
require_once('generated/PrefixTestPrefix.php'); require_once('generated/PrefixTestPrefix.php');
require_once('generated/Bar/TestInclude.php'); require_once('generated/Bar/TestInclude.php');
require_once('generated/Foo/PBARRAY.php');
require_once('generated/Foo/PBEmpty.php'); require_once('generated/Foo/PBEmpty.php');
require_once('generated/Foo/TestEnum.php'); require_once('generated/Foo/TestEnum.php');
require_once('generated/Foo/TestIncludePrefixMessage.php'); require_once('generated/Foo/TestIncludePrefixMessage.php');

4
php/tests/proto/test.proto
View File

@ -127,6 +127,10 @@ message Empty {
int32 a = 1; int32 a = 1;
} }
message ARRAY {
int32 a = 1;
}
message TestPackedMessage { message TestPackedMessage {
repeated int32 repeated_int32 = 90 [packed = true]; repeated int32 repeated_int32 = 90 [packed = true];
repeated int64 repeated_int64 = 91 [packed = true]; repeated int64 repeated_int64 = 91 [packed = true];

4
src/google/protobuf/compiler/php/php_generator.cc
View File

@ -49,8 +49,8 @@ const std::string kDescriptorMetadataFile =
"GPBMetadata/Google/Protobuf/Internal/Descriptor.php"; "GPBMetadata/Google/Protobuf/Internal/Descriptor.php";
const std::string kDescriptorDirName = "Google/Protobuf/Internal"; const std::string kDescriptorDirName = "Google/Protobuf/Internal";
const std::string kDescriptorPackageName = "Google\\Protobuf\\Internal"; const std::string kDescriptorPackageName = "Google\\Protobuf\\Internal";
const char* const kReservedNames[] = {"Empty", "ECHO"}; const char* const kReservedNames[] = {"ARRAY", "Empty", "ECHO"};
const int kReservedNamesSize = 2; const int kReservedNamesSize = 3;
namespace google { namespace google {
namespace protobuf { namespace protobuf {