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 | |
parent | 1d131c98f058dc0b5e0ebef73602e09dc88fe075 (diff) | |
download | protobuf-4cf9e3c619fbd00e47d5ec2503801814d3c8b4b6.tar.gz protobuf-4cf9e3c619fbd00e47d5ec2503801814d3c8b4b6.tar.bz2 protobuf-4cf9e3c619fbd00e47d5ec2503801814d3c8b4b6.zip |
Fix property special-casing
Diffstat (limited to 'src/ProtoGen')
-rw-r--r-- | src/ProtoGen/EnumFieldGenerator.cs | 26 | ||||
-rw-r--r-- | src/ProtoGen/FieldGeneratorBase.cs | 4 | ||||
-rw-r--r-- | src/ProtoGen/MessageFieldGenerator.cs | 54 | ||||
-rw-r--r-- | src/ProtoGen/MessageGenerator.cs | 4 | ||||
-rw-r--r-- | src/ProtoGen/PrimitiveFieldGenerator.cs | 26 | ||||
-rw-r--r-- | src/ProtoGen/RepeatedEnumFieldGenerator.cs | 30 | ||||
-rw-r--r-- | src/ProtoGen/RepeatedMessageFieldGenerator.cs | 34 | ||||
-rw-r--r-- | src/ProtoGen/RepeatedPrimitiveFieldGenerator.cs | 30 |
8 files changed, 102 insertions, 106 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("}"); } diff --git a/src/ProtoGen/FieldGeneratorBase.cs b/src/ProtoGen/FieldGeneratorBase.cs index d20745a4..f59da644 100644 --- a/src/ProtoGen/FieldGeneratorBase.cs +++ b/src/ProtoGen/FieldGeneratorBase.cs @@ -79,10 +79,6 @@ namespace Google.ProtocolBuffers.ProtoGen { } } - protected string CapitalizedName { - get { return NameHelpers.UnderscoresToPascalCase(GetFieldName(Descriptor)); } - } - protected string Name { get { return NameHelpers.UnderscoresToCamelCase(GetFieldName(Descriptor)); } } diff --git a/src/ProtoGen/MessageFieldGenerator.cs b/src/ProtoGen/MessageFieldGenerator.cs index e90c953b..7b5b66e8 100644 --- a/src/ProtoGen/MessageFieldGenerator.cs +++ b/src/ProtoGen/MessageFieldGenerator.cs @@ -8,54 +8,54 @@ 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, CapitalizedName); + writer.WriteLine("public {0} {1} {{", TypeName, PropertyName); writer.WriteLine(" get {{ return {0}_; }}", Name); writer.WriteLine("}"); } 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, CapitalizedName); - writer.WriteLine(" get {{ return result.{0}; }}", CapitalizedName); - writer.WriteLine(" set {{ Set{0}(value); }}", CapitalizedName); + writer.WriteLine("public {0} {1} {{", TypeName, PropertyName); + writer.WriteLine(" get {{ return result.{0}; }}", PropertyName); + 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 Set{0}({1}.Builder builderForValue) {{", CapitalizedName, TypeName); - writer.WriteLine(" result.has{0} = true;", CapitalizedName); + writer.WriteLine("public Builder Set{0}({1}.Builder builderForValue) {{", PropertyName, TypeName); + writer.WriteLine(" result.has{0} = true;", PropertyName); writer.WriteLine(" result.{0}_ = builderForValue.Build();", Name); writer.WriteLine(" return this;"); writer.WriteLine("}"); - writer.WriteLine("public Builder Merge{0}({1} value) {{", CapitalizedName, TypeName); - writer.WriteLine(" if (result.Has{0} &&", CapitalizedName); + writer.WriteLine("public Builder Merge{0}({1} value) {{", PropertyName, TypeName); + writer.WriteLine(" if (result.Has{0} &&", PropertyName); writer.WriteLine(" result.{0}_ != {1}) {{", Name, DefaultValue); writer.WriteLine(" result.{0}_ = {1}.CreateBuilder(result.{0}_).MergeFrom(value).BuildPartial();", Name, TypeName); writer.WriteLine(" } else {"); writer.WriteLine(" result.{0}_ = value;", Name); writer.WriteLine(" }"); - writer.WriteLine(" result.has{0} = true;", CapitalizedName); + writer.WriteLine(" result.has{0} = true;", PropertyName); 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(" Merge{0}(other.{0});", CapitalizedName); + writer.WriteLine("if (other.Has{0}) {{", PropertyName); + writer.WriteLine(" Merge{0}(other.{0});", PropertyName); writer.WriteLine("}"); } @@ -65,27 +65,27 @@ namespace Google.ProtocolBuffers.ProtoGen { public void GenerateParsingCode(TextGenerator writer) { writer.WriteLine("{0}.Builder subBuilder = {0}.CreateBuilder();", TypeName); - writer.WriteLine("if (Has{0}) {{", CapitalizedName); - writer.WriteLine(" subBuilder.MergeFrom({0});", CapitalizedName); + writer.WriteLine("if (Has{0}) {{", PropertyName); + writer.WriteLine(" subBuilder.MergeFrom({0});", PropertyName); writer.WriteLine("}"); if (Descriptor.FieldType == FieldType.Group) { writer.WriteLine("input.ReadGroup({0}, subBuilder, extensionRegistry);", Number); } else { writer.WriteLine("input.ReadMessage(subBuilder, extensionRegistry);"); } - writer.WriteLine("{0} = subBuilder.BuildPartial();", CapitalizedName); + writer.WriteLine("{0} = subBuilder.BuildPartial();", PropertyName); } public void GenerateSerializationCode(TextGenerator writer) { - writer.WriteLine("if (Has{0}) {{", CapitalizedName); - writer.WriteLine(" output.Write{0}({1}, {2});", MessageOrGroup, Number, CapitalizedName); + writer.WriteLine("if (Has{0}) {{", PropertyName); + writer.WriteLine(" output.Write{0}({1}, {2});", MessageOrGroup, 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});", - MessageOrGroup, Number, CapitalizedName); + MessageOrGroup, Number, PropertyName); writer.WriteLine("}"); } } diff --git a/src/ProtoGen/MessageGenerator.cs b/src/ProtoGen/MessageGenerator.cs index f877ac6d..1e10ce6c 100644 --- a/src/ProtoGen/MessageGenerator.cs +++ b/src/ProtoGen/MessageGenerator.cs @@ -51,7 +51,7 @@ namespace Google.ProtocolBuffers.ProtoGen { FullClassName, identifier); writer.Print(" new string[] { "); foreach (FieldDescriptor field in Descriptor.Fields) { - writer.Write("\"{0}\", ", NameHelpers.UnderscoresToPascalCase(GetFieldName(field))); + writer.Write("\"{0}\", ", field.CSharpOptions.PropertyName); } writer.WriteLine("});"); @@ -415,7 +415,7 @@ namespace Google.ProtocolBuffers.ProtoGen { // "has" fields into a single bitfield. foreach (FieldDescriptor field in Descriptor.Fields) { if (field.IsRequired) { - writer.WriteLine("if (!has{0}) return false;", NameHelpers.UnderscoresToPascalCase(field.Name)); + writer.WriteLine("if (!has{0}) return false;", field.CSharpOptions.PropertyName); } } 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("}"); diff --git a/src/ProtoGen/RepeatedEnumFieldGenerator.cs b/src/ProtoGen/RepeatedEnumFieldGenerator.cs index efc6466f..58d0141c 100644 --- a/src/ProtoGen/RepeatedEnumFieldGenerator.cs +++ b/src/ProtoGen/RepeatedEnumFieldGenerator.cs @@ -12,44 +12,44 @@ namespace Google.ProtocolBuffers.ProtoGen { public void GenerateMembers(TextGenerator writer) { writer.WriteLine("private pbc::PopsicleList<{0}> {1}_ = new pbc::PopsicleList<{0}>();", TypeName, Name); - writer.WriteLine("public scg::IList<{0}> {1}List {{", TypeName, CapitalizedName); + writer.WriteLine("public scg::IList<{0}> {1}List {{", TypeName, PropertyName); writer.WriteLine(" get {{ return pbc::Lists.AsReadOnly({0}_); }}", Name); writer.WriteLine("}"); // TODO(jonskeet): Redundant API calls? Possibly - include for portability though. Maybe create an option. - writer.WriteLine("public int {0}Count {{", CapitalizedName); + writer.WriteLine("public int {0}Count {{", PropertyName); writer.WriteLine(" get {{ return {0}_.Count; }}", Name); writer.WriteLine("}"); - writer.WriteLine("public {0} Get{1}(int index) {{", TypeName, CapitalizedName); + writer.WriteLine("public {0} Get{1}(int index) {{", TypeName, PropertyName); writer.WriteLine(" return {0}_[index];", Name); writer.WriteLine("}"); } public void GenerateBuilderMembers(TextGenerator writer) { // Note: We can return the original list here, because we make it unmodifiable when we build - writer.WriteLine("public scg::IList<{0}> {1}List {{", TypeName, CapitalizedName); + writer.WriteLine("public scg::IList<{0}> {1}List {{", TypeName, PropertyName); writer.WriteLine(" get {{ return result.{0}_; }}", Name); writer.WriteLine("}"); - writer.WriteLine("public int {0}Count {{", CapitalizedName); - writer.WriteLine(" get {{ return result.{0}Count; }}", CapitalizedName); + writer.WriteLine("public int {0}Count {{", PropertyName); + writer.WriteLine(" get {{ return result.{0}Count; }}", PropertyName); writer.WriteLine("}"); - writer.WriteLine("public {0} Get{1}(int index) {{", TypeName, CapitalizedName); - writer.WriteLine(" return result.Get{0}(index);", CapitalizedName); + writer.WriteLine("public {0} Get{1}(int index) {{", TypeName, PropertyName); + writer.WriteLine(" return result.Get{0}(index);", PropertyName); writer.WriteLine("}"); - writer.WriteLine("public Builder Set{0}(int index, {1} value) {{", CapitalizedName, TypeName); + writer.WriteLine("public Builder Set{0}(int index, {1} value) {{", PropertyName, TypeName); writer.WriteLine(" result.{0}_[index] = value;", Name); writer.WriteLine(" return this;"); writer.WriteLine("}"); - writer.WriteLine("public Builder Add{0}({1} value) {{", CapitalizedName, TypeName); + writer.WriteLine("public Builder Add{0}({1} value) {{", PropertyName, TypeName); writer.WriteLine(" result.{0}_.Add(value);", Name, TypeName); writer.WriteLine(" return this;"); writer.WriteLine("}"); - writer.WriteLine("public Builder AddRange{0}(scg::IEnumerable<{1}> values) {{", CapitalizedName, TypeName); + writer.WriteLine("public Builder AddRange{0}(scg::IEnumerable<{1}> values) {{", PropertyName, TypeName); writer.WriteLine(" base.AddRange(values, result.{0}_);", Name); writer.WriteLine(" return this;"); writer.WriteLine("}"); - writer.WriteLine("public Builder Clear{0}() {{", CapitalizedName); + writer.WriteLine("public Builder Clear{0}() {{", PropertyName); writer.WriteLine(" result.{0}_.Clear();", Name); writer.WriteLine(" return this;"); writer.WriteLine("}"); @@ -71,18 +71,18 @@ namespace Google.ProtocolBuffers.ProtoGen { writer.WriteLine("if (!global::System.Enum.IsDefined(typeof({0}), rawValue)) {{", TypeName); writer.WriteLine(" unknownFields.MergeVarintField({0}, (ulong) rawValue);", Number); writer.WriteLine("} else {"); - writer.WriteLine(" Add{0}(({1}) rawValue);", CapitalizedName, TypeName); + writer.WriteLine(" Add{0}(({1}) rawValue);", PropertyName, TypeName); writer.WriteLine("}"); } public void GenerateSerializationCode(TextGenerator writer) { - writer.WriteLine("foreach ({0} element in {1}List) {{", TypeName, CapitalizedName); + writer.WriteLine("foreach ({0} element in {1}List) {{", TypeName, PropertyName); writer.WriteLine(" output.WriteEnum({0}, (int) element);", Number); writer.WriteLine("}"); } public void GenerateSerializedSizeCode(TextGenerator writer) { - writer.WriteLine("foreach ({0} element in {1}List) {{", TypeName, CapitalizedName); + writer.WriteLine("foreach ({0} element in {1}List) {{", TypeName, PropertyName); writer.WriteLine(" size += pb::CodedOutputStream.ComputeEnumSize({0}, (int) element);", Number); writer.WriteLine("}"); } diff --git a/src/ProtoGen/RepeatedMessageFieldGenerator.cs b/src/ProtoGen/RepeatedMessageFieldGenerator.cs index ba110796..c7741ae5 100644 --- a/src/ProtoGen/RepeatedMessageFieldGenerator.cs +++ b/src/ProtoGen/RepeatedMessageFieldGenerator.cs @@ -12,54 +12,54 @@ namespace Google.ProtocolBuffers.ProtoGen { public void GenerateMembers(TextGenerator writer) { writer.WriteLine("private pbc::PopsicleList<{0}> {1}_ = new pbc::PopsicleList<{0}>();", TypeName, Name); - writer.WriteLine("public scg::IList<{0}> {1}List {{", TypeName, CapitalizedName); + writer.WriteLine("public scg::IList<{0}> {1}List {{", TypeName, PropertyName); writer.WriteLine(" get {{ return {0}_; }}", Name); writer.WriteLine("}"); // TODO(jonskeet): Redundant API calls? Possibly - include for portability though. Maybe create an option. - writer.WriteLine("public int {0}Count {{", CapitalizedName); + writer.WriteLine("public int {0}Count {{", PropertyName); writer.WriteLine(" get {{ return {0}_.Count; }}", Name); writer.WriteLine("}"); - writer.WriteLine("public {0} Get{1}(int index) {{", TypeName, CapitalizedName); + writer.WriteLine("public {0} Get{1}(int index) {{", TypeName, PropertyName); writer.WriteLine(" return {0}_[index];", Name); writer.WriteLine("}"); } public void GenerateBuilderMembers(TextGenerator writer) { // Note: We can return the original list here, because we make it unmodifiable when we build - writer.WriteLine("public scg::IList<{0}> {1}List {{", TypeName, CapitalizedName); + writer.WriteLine("public scg::IList<{0}> {1}List {{", TypeName, PropertyName); writer.WriteLine(" get {{ return result.{0}_; }}", Name); writer.WriteLine("}"); - writer.WriteLine("public int {0}Count {{", CapitalizedName); - writer.WriteLine(" get {{ return result.{0}Count; }}", CapitalizedName); + writer.WriteLine("public int {0}Count {{", PropertyName); + writer.WriteLine(" get {{ return result.{0}Count; }}", PropertyName); writer.WriteLine("}"); - writer.WriteLine("public {0} Get{1}(int index) {{", TypeName, CapitalizedName); - writer.WriteLine(" return result.Get{0}(index);", CapitalizedName); + writer.WriteLine("public {0} Get{1}(int index) {{", TypeName, PropertyName); + writer.WriteLine(" return result.Get{0}(index);", PropertyName); writer.WriteLine("}"); - writer.WriteLine("public Builder Set{0}(int index, {1} value) {{", CapitalizedName, TypeName); + writer.WriteLine("public Builder Set{0}(int index, {1} value) {{", PropertyName, TypeName); writer.WriteLine(" result.{0}_[index] = value;", Name); writer.WriteLine(" return this;"); writer.WriteLine("}"); // Extra overload for builder (just on messages) - writer.WriteLine("public Builder Set{0}(int index, {1}.Builder builderForValue) {{", CapitalizedName, TypeName); + writer.WriteLine("public Builder Set{0}(int index, {1}.Builder builderForValue) {{", PropertyName, TypeName); writer.WriteLine(" result.{0}_[index] = builderForValue.Build();", Name); writer.WriteLine(" return this;"); writer.WriteLine("}"); - writer.WriteLine("public Builder Add{0}({1} value) {{", CapitalizedName, TypeName); + writer.WriteLine("public Builder Add{0}({1} value) {{", PropertyName, TypeName); writer.WriteLine(" result.{0}_.Add(value);", Name, TypeName); writer.WriteLine(" return this;"); writer.WriteLine("}"); // Extra overload for builder (just on messages) - writer.WriteLine("public Builder Add{0}({1}.Builder builderForValue) {{", CapitalizedName, TypeName); + writer.WriteLine("public Builder Add{0}({1}.Builder builderForValue) {{", PropertyName, TypeName); writer.WriteLine(" result.{0}_.Add(builderForValue.Build());", Name); writer.WriteLine(" return this;"); writer.WriteLine("}"); - writer.WriteLine("public Builder AddRange{0}(scg::IEnumerable<{1}> values) {{", CapitalizedName, TypeName); + writer.WriteLine("public Builder AddRange{0}(scg::IEnumerable<{1}> values) {{", PropertyName, TypeName); writer.WriteLine(" base.AddRange(values, result.{0}_);", Name); writer.WriteLine(" return this;"); writer.WriteLine("}"); - writer.WriteLine("public Builder Clear{0}() {{", CapitalizedName); + writer.WriteLine("public Builder Clear{0}() {{", PropertyName); writer.WriteLine(" result.{0}_.Clear();", Name); writer.WriteLine(" return this;"); writer.WriteLine("}"); @@ -82,17 +82,17 @@ namespace Google.ProtocolBuffers.ProtoGen { } else { writer.WriteLine("input.ReadMessage(subBuilder, extensionRegistry);"); } - writer.WriteLine("Add{0}(subBuilder.BuildPartial());", CapitalizedName); + writer.WriteLine("Add{0}(subBuilder.BuildPartial());", PropertyName); } public void GenerateSerializationCode(TextGenerator writer) { - writer.WriteLine("foreach ({0} element in {1}List) {{", TypeName, CapitalizedName); + writer.WriteLine("foreach ({0} element in {1}List) {{", TypeName, PropertyName); writer.WriteLine(" output.Write{0}({1}, element);", MessageOrGroup, Number); writer.WriteLine("}"); } public void GenerateSerializedSizeCode(TextGenerator writer) { - writer.WriteLine("foreach ({0} element in {1}List) {{", TypeName, CapitalizedName); + writer.WriteLine("foreach ({0} element in {1}List) {{", TypeName, PropertyName); writer.WriteLine(" size += pb::CodedOutputStream.Compute{0}Size({1}, element);", MessageOrGroup, Number); writer.WriteLine("}"); } diff --git a/src/ProtoGen/RepeatedPrimitiveFieldGenerator.cs b/src/ProtoGen/RepeatedPrimitiveFieldGenerator.cs index 62e0ebbc..4e079dc3 100644 --- a/src/ProtoGen/RepeatedPrimitiveFieldGenerator.cs +++ b/src/ProtoGen/RepeatedPrimitiveFieldGenerator.cs @@ -12,44 +12,44 @@ namespace Google.ProtocolBuffers.ProtoGen { public void GenerateMembers(TextGenerator writer) { writer.WriteLine("private pbc::PopsicleList<{0}> {1}_ = new pbc::PopsicleList<{0}>();", TypeName, Name); - writer.WriteLine("public scg::IList<{0}> {1}List {{", TypeName, CapitalizedName); + writer.WriteLine("public scg::IList<{0}> {1}List {{", TypeName, PropertyName); writer.WriteLine(" get {{ return pbc::Lists.AsReadOnly({0}_); }}", Name); writer.WriteLine("}"); // TODO(jonskeet): Redundant API calls? Possibly - include for portability though. Maybe create an option. - writer.WriteLine("public int {0}Count {{", CapitalizedName); + writer.WriteLine("public int {0}Count {{", PropertyName); writer.WriteLine(" get {{ return {0}_.Count; }}", Name); writer.WriteLine("}"); - writer.WriteLine("public {0} Get{1}(int index) {{", TypeName, CapitalizedName); + writer.WriteLine("public {0} Get{1}(int index) {{", TypeName, PropertyName); writer.WriteLine(" return {0}_[index];", Name); writer.WriteLine("}"); } public void GenerateBuilderMembers(TextGenerator writer) { // Note: We can return the original list here, because we make it unmodifiable when we build - writer.WriteLine("public scg::IList<{0}> {1}List {{", TypeName, CapitalizedName); + writer.WriteLine("public scg::IList<{0}> {1}List {{", TypeName, PropertyName); writer.WriteLine(" get {{ return result.{0}_; }}", Name); writer.WriteLine("}"); - writer.WriteLine("public int {0}Count {{", CapitalizedName); - writer.WriteLine(" get {{ return result.{0}Count; }}", CapitalizedName); + writer.WriteLine("public int {0}Count {{", PropertyName); + writer.WriteLine(" get {{ return result.{0}Count; }}", PropertyName); writer.WriteLine("}"); - writer.WriteLine("public {0} Get{1}(int index) {{", TypeName, CapitalizedName); - writer.WriteLine(" return result.Get{0}(index);", CapitalizedName); + writer.WriteLine("public {0} Get{1}(int index) {{", TypeName, PropertyName); + writer.WriteLine(" return result.Get{0}(index);", PropertyName); writer.WriteLine("}"); - writer.WriteLine("public Builder Set{0}(int index, {1} value) {{", CapitalizedName, TypeName); + writer.WriteLine("public Builder Set{0}(int index, {1} value) {{", PropertyName, TypeName); writer.WriteLine(" result.{0}_[index] = value;", Name); writer.WriteLine(" return this;"); writer.WriteLine("}"); - writer.WriteLine("public Builder Add{0}({1} value) {{", CapitalizedName, TypeName); + writer.WriteLine("public Builder Add{0}({1} value) {{", PropertyName, TypeName); writer.WriteLine(" result.{0}_.Add(value);", Name, TypeName); writer.WriteLine(" return this;"); writer.WriteLine("}"); - writer.WriteLine("public Builder AddRange{0}(scg::IEnumerable<{1}> values) {{", CapitalizedName, TypeName); + writer.WriteLine("public Builder AddRange{0}(scg::IEnumerable<{1}> values) {{", PropertyName, TypeName); writer.WriteLine(" base.AddRange(values, result.{0}_);", Name); writer.WriteLine(" return this;"); writer.WriteLine("}"); - writer.WriteLine("public Builder Clear{0}() {{", CapitalizedName); + writer.WriteLine("public Builder Clear{0}() {{", PropertyName); writer.WriteLine(" result.{0}_.Clear();", Name); writer.WriteLine(" return this;"); writer.WriteLine("}"); @@ -66,17 +66,17 @@ namespace Google.ProtocolBuffers.ProtoGen { } public void GenerateParsingCode(TextGenerator writer) { - writer.WriteLine("Add{0}(input.Read{1}());", CapitalizedName, CapitalizedTypeName); + writer.WriteLine("Add{0}(input.Read{1}());", PropertyName, CapitalizedTypeName); } public void GenerateSerializationCode(TextGenerator writer) { - writer.WriteLine("foreach ({0} element in {1}List) {{", TypeName, CapitalizedName); + writer.WriteLine("foreach ({0} element in {1}List) {{", TypeName, PropertyName); writer.WriteLine(" output.Write{0}({1}, element);", CapitalizedTypeName, Number); writer.WriteLine("}"); } public void GenerateSerializedSizeCode(TextGenerator writer) { - writer.WriteLine("foreach ({0} element in {1}List) {{", TypeName, CapitalizedName); + writer.WriteLine("foreach ({0} element in {1}List) {{", TypeName, PropertyName); writer.WriteLine(" size += pb::CodedOutputStream.Compute{0}Size({1}, element);", CapitalizedTypeName, Number); writer.WriteLine("}"); } |