test
parent
b7386110fb
commit
eeb0de22b3
|
@ -266,7 +266,7 @@ def code_gen_enum(enum_desc, env):
|
||||||
full_name = env.get_local_name()
|
full_name = env.get_local_name()
|
||||||
obj_name = full_name.upper().replace('.', '_')
|
obj_name = full_name.upper().replace('.', '_')
|
||||||
env.descriptor.append(
|
env.descriptor.append(
|
||||||
"local %s = protobuf.EnumDescriptor();\n"% obj_name
|
"%s = protobuf.EnumDescriptor();\n"% obj_name
|
||||||
)
|
)
|
||||||
|
|
||||||
context = Writer(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)
|
context('.default_value = %s\n' % default_value)
|
||||||
|
|
||||||
if field_desc.HasField('type_name'):
|
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:
|
if field_desc.type == FDP.TYPE_MESSAGE:
|
||||||
context('.message_type = %s\n' % type_name)
|
context('.message_type = %s\n' % type_name)
|
||||||
else:
|
else:
|
||||||
|
@ -338,7 +345,7 @@ def code_gen_message(message_descriptor, env, containing_type = None):
|
||||||
full_name = env.get_local_name()
|
full_name = env.get_local_name()
|
||||||
obj_name = full_name.upper().replace('.', '_')
|
obj_name = full_name.upper().replace('.', '_')
|
||||||
env.descriptor.append(
|
env.descriptor.append(
|
||||||
"local %s = protobuf.Descriptor();\n"% obj_name
|
"%s = protobuf.Descriptor();\n"% obj_name
|
||||||
)
|
)
|
||||||
|
|
||||||
context = Writer(obj_name)
|
context = Writer(obj_name)
|
||||||
|
|
Loading…
Reference in New Issue