AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Removed EnumDescriptorIndexAttribute - not really necessary.

Browse Source
This commit is contained in:
Jon Skeet 2008-08-14 20:35:33 +01:00
parent 283b7a1a51
commit 15041fa06c
4 changed files with 16 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
csharp/ProtocolBuffers/Descriptors/EnumDescriptorIndexAttribute.cs
View File

@ -1,35 +0,0 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc.
// http://code.google.com/p/protobuf/
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
using System;
namespace Google.ProtocolBuffers.Descriptors {
/// <summary>
/// Allows enum values to express the index within their descriptor.
/// TODO(jonskeet): Consider removing this. I don't think we need it after all.
/// </summary>
[AttributeUsage(AttributeTargets.Field)]
public class EnumDescriptorIndexAttribute : Attribute {
readonly int index;
internal int Index {
get { return index; }
}
internal EnumDescriptorIndexAttribute(int index) {
this.index = index;
}
}
}

15
csharp/ProtocolBuffers/FieldAccess/RepeatedEnumAccessor.cs
View File

@ -1,3 +1,18 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc.
// http://code.google.com/p/protobuf/
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
using System;
using System.Collections;
using System.Collections.Generic;

1
csharp/ProtocolBuffers/ProtocolBuffers.csproj
View File

@ -54,7 +54,6 @@
<Compile Include="Descriptors\DescriptorUtil.cs" />
<Compile Include="Descriptors\DescriptorValidationException.cs" />
<Compile Include="Descriptors\EnumDescriptor.cs" />
<Compile Include="Descriptors\EnumDescriptorIndexAttribute.cs" />
<Compile Include="Descriptors\EnumValueDescriptor.cs" />
<Compile Include="Descriptors\FieldDescriptor.cs" />
<Compile Include="Descriptors\FieldMappingAttribute.cs" />

5
src/google/protobuf/compiler/csharp/csharp_enum.cc
View File

@ -65,13 +65,10 @@ void EnumGenerator::Generate(io::Printer* printer) {
for (int i = 0; i < canonical_values_.size(); i++) {
map<string, string> vars;
vars["name"] = canonical_values_[i]->name();
vars["index"] = SimpleItoa(canonical_values_[i]->index());
vars["number"] = SimpleItoa(canonical_values_[i]->number());
// TODO(jonskeet): Change CONSTANT_CASE into PascalCase
// TODO(jonskeet): I don't think we need EnumDescriptorIndex after all
// TODO(jonskeet): Change CONSTANT_CASE into PascalCase? (Would muck up text format)
printer->Print(vars,
//"[pbd::EnumDescriptorIndex($index$)]\r\n"
"$name$ = $number$,\r\n");
}
printer->Outdent();