diff options
Diffstat (limited to 'src/ProtoGen/PrimitiveFieldGenerator.cs')
-rw-r--r-- | src/ProtoGen/PrimitiveFieldGenerator.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/ProtoGen/PrimitiveFieldGenerator.cs b/src/ProtoGen/PrimitiveFieldGenerator.cs index 8292297d..dc733c0b 100644 --- a/src/ProtoGen/PrimitiveFieldGenerator.cs +++ b/src/ProtoGen/PrimitiveFieldGenerator.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("}"); } @@ -55,13 +55,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.Write{0}({1}, {2});", CapitalizedTypeName, 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.Compute{0}Size({1}, {2});", CapitalizedTypeName, Number, PropertyName); writer.WriteLine("}"); |