master_huanxiang
mashiyu 2019-01-17 19:43:08 +08:00
parent b7386110fb
commit eeb0de22b3
1 changed files with 10 additions and 3 deletions

View File

@ -266,7 +266,7 @@ def code_gen_enum(enum_desc, env):
full_name = env.get_local_name()
obj_name = full_name.upper().replace('.', '_')
env.descriptor.append(
"local %s = protobuf.EnumDescriptor();\n"% obj_name
"%s = protobuf.EnumDescriptor();\n"% obj_name
)
context = Writer(obj_name)
@ -316,7 +316,14 @@ def code_gen_field(index, field_desc, env):
context('.default_value = %s\n' % default_value)
if field_desc.HasField('type_name'):
type_name = env.get_ref_name(field_desc.type_name).upper().replace('.', '_')
type_name = env.get_ref_name(field_desc.type_name)
try:
pos = type_name.index('_pb.') + 4
except:
pos = 0
type_name = type_name[:pos] + type_name[pos:].upper().replace('.', '_')
if field_desc.type == FDP.TYPE_MESSAGE:
context('.message_type = %s\n' % type_name)
else:
@ -338,7 +345,7 @@ def code_gen_message(message_descriptor, env, containing_type = None):
full_name = env.get_local_name()
obj_name = full_name.upper().replace('.', '_')
env.descriptor.append(
"local %s = protobuf.Descriptor();\n"% obj_name
"%s = protobuf.Descriptor();\n"% obj_name
)
context = Writer(obj_name)