diff options
author | Jon Skeet <skeet@pobox.com> | 2008-11-24 11:11:28 +0000 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2008-11-24 11:11:28 +0000 |
commit | 4cf9e3c619fbd00e47d5ec2503801814d3c8b4b6 (patch) | |
tree | bf193777749c47932f7ffde7e60b116d70484baa /src/ProtoGen/EnumFieldGenerator.cs | |
parent | 1d131c98f058dc0b5e0ebef73602e09dc88fe075 (diff) | |
download | protobuf-4cf9e3c619fbd00e47d5ec2503801814d3c8b4b6.tar.gz protobuf-4cf9e3c619fbd00e47d5ec2503801814d3c8b4b6.tar.bz2 protobuf-4cf9e3c619fbd00e47d5ec2503801814d3c8b4b6.zip |
Fix property special-casing
Diffstat (limited to 'src/ProtoGen/EnumFieldGenerator.cs')
-rw-r--r-- | src/ProtoGen/EnumFieldGenerator.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/ProtoGen/EnumFieldGenerator.cs b/src/ProtoGen/EnumFieldGenerator.cs index 4a628d97..14c96dac 100644 --- a/src/ProtoGen/EnumFieldGenerator.cs +++ b/src/ProtoGen/EnumFieldGenerator.cs @@ -10,10 +10,10 @@ namespace Google.ProtocolBuffers.ProtoGen { } public void GenerateMembers(TextGenerator writer) { - writer.WriteLine("private bool has{0};", CapitalizedName); + writer.WriteLine("private bool has{0};", PropertyName); writer.WriteLine("private {0} {1}_ = {2};", TypeName, Name, DefaultValue); - writer.WriteLine("public bool Has{0} {{", CapitalizedName); - writer.WriteLine(" get {{ return has{0}; }}", CapitalizedName); + writer.WriteLine("public bool Has{0} {{", PropertyName); + writer.WriteLine(" get {{ return has{0}; }}", PropertyName); writer.WriteLine("}"); writer.WriteLine("public {0} {1} {{", TypeName, PropertyName); writer.WriteLine(" get {{ return {0}_; }}", Name); @@ -21,27 +21,27 @@ namespace Google.ProtocolBuffers.ProtoGen { } public void GenerateBuilderMembers(TextGenerator writer) { - writer.WriteLine("public bool Has{0} {{", CapitalizedName); - writer.WriteLine(" get {{ return result.Has{0}; }}", CapitalizedName); + writer.WriteLine("public bool Has{0} {{", PropertyName); + writer.WriteLine(" get {{ return result.Has{0}; }}", PropertyName); writer.WriteLine("}"); writer.WriteLine("public {0} {1} {{", TypeName, PropertyName); writer.WriteLine(" get {{ return result.{0}; }}", PropertyName); - writer.WriteLine(" set {{ Set{0}(value); }}", CapitalizedName); + writer.WriteLine(" set {{ Set{0}(value); }}", PropertyName); writer.WriteLine("}"); - writer.WriteLine("public Builder Set{0}({1} value) {{", CapitalizedName, TypeName); - writer.WriteLine(" result.has{0} = true;", CapitalizedName); + writer.WriteLine("public Builder Set{0}({1} value) {{", PropertyName, TypeName); + writer.WriteLine(" result.has{0} = true;", PropertyName); writer.WriteLine(" result.{0}_ = value;", Name); writer.WriteLine(" return this;"); writer.WriteLine("}"); - writer.WriteLine("public Builder Clear{0}() {{", CapitalizedName); - writer.WriteLine(" result.has{0} = false;", CapitalizedName); + writer.WriteLine("public Builder Clear{0}() {{", PropertyName); + writer.WriteLine(" result.has{0} = false;", PropertyName); writer.WriteLine(" result.{0}_ = {1};", Name, DefaultValue); writer.WriteLine(" return this;"); writer.WriteLine("}"); } public void GenerateMergingCode(TextGenerator writer) { - writer.WriteLine("if (other.Has{0}) {{", CapitalizedName); + writer.WriteLine("if (other.Has{0}) {{", PropertyName); writer.WriteLine(" {0} = other.{0};", PropertyName); writer.WriteLine("}"); } @@ -61,13 +61,13 @@ namespace Google.ProtocolBuffers.ProtoGen { } public void GenerateSerializationCode(TextGenerator writer) { - writer.WriteLine("if (Has{0}) {{", CapitalizedName); + writer.WriteLine("if (Has{0}) {{", PropertyName); writer.WriteLine(" output.WriteEnum({0}, (int) {1});", Number, PropertyName); writer.WriteLine("}"); } public void GenerateSerializedSizeCode(TextGenerator writer) { - writer.WriteLine("if (Has{0}) {{", CapitalizedName); + writer.WriteLine("if (Has{0}) {{", PropertyName); writer.WriteLine(" size += pb::CodedOutputStream.ComputeEnumSize({0}, (int) {1});", Number, PropertyName); writer.WriteLine("}"); } |