- The protos are no longer publicly exposed at all - Oneof detection now works (as we default to -1, not 0) - OneofDescriptor exposes the fields in the oneof - Removed unnecessary code for replacing protos - remnant of extensions - There's now just the non-generic form of IDescriptorpull/566/head
Jon Skeet
10 years ago
parent
5350822b0a
commit
af259b77bf
17 changed files with 178 additions and 378 deletions
@ -1,53 +0,0 @@ |
||||
#region Copyright notice and license |
||||
// Protocol Buffers - Google's data interchange format |
||||
// Copyright 2008 Google Inc. All rights reserved. |
||||
// https://developers.google.com/protocol-buffers/ |
||||
// |
||||
// Redistribution and use in source and binary forms, with or without |
||||
// modification, are permitted provided that the following conditions are |
||||
// met: |
||||
// |
||||
// * Redistributions of source code must retain the above copyright |
||||
// notice, this list of conditions and the following disclaimer. |
||||
// * Redistributions in binary form must reproduce the above |
||||
// copyright notice, this list of conditions and the following disclaimer |
||||
// in the documentation and/or other materials provided with the |
||||
// distribution. |
||||
// * Neither the name of Google Inc. nor the names of its |
||||
// contributors may be used to endorse or promote products derived from |
||||
// this software without specific prior written permission. |
||||
// |
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
#endregion |
||||
|
||||
namespace Google.Protobuf.DescriptorProtos |
||||
{ |
||||
/// <summary> |
||||
/// Interface implemented by all DescriptorProtos. The generator doesn't |
||||
/// emit the interface implementation claim, so PartialClasses.cs contains |
||||
/// partial class declarations for each of them. |
||||
/// </summary> |
||||
/// <typeparam name="TOptions">The associated options protocol buffer type</typeparam> |
||||
public interface IDescriptorProto<TOptions> |
||||
{ |
||||
/// <summary> |
||||
/// The brief name of the descriptor's target. |
||||
/// </summary> |
||||
string Name { get; } |
||||
|
||||
/// <summary> |
||||
/// The options for this descriptor. |
||||
/// </summary> |
||||
TOptions Options { get; } |
||||
} |
||||
} |
||||
@ -1,65 +0,0 @@ |
||||
#region Copyright notice and license |
||||
// Protocol Buffers - Google's data interchange format |
||||
// Copyright 2008 Google Inc. All rights reserved. |
||||
// https://developers.google.com/protocol-buffers/ |
||||
// |
||||
// Redistribution and use in source and binary forms, with or without |
||||
// modification, are permitted provided that the following conditions are |
||||
// met: |
||||
// |
||||
// * Redistributions of source code must retain the above copyright |
||||
// notice, this list of conditions and the following disclaimer. |
||||
// * Redistributions in binary form must reproduce the above |
||||
// copyright notice, this list of conditions and the following disclaimer |
||||
// in the documentation and/or other materials provided with the |
||||
// distribution. |
||||
// * Neither the name of Google Inc. nor the names of its |
||||
// contributors may be used to endorse or promote products derived from |
||||
// this software without specific prior written permission. |
||||
// |
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
#endregion |
||||
|
||||
using Google.Protobuf.DescriptorProtos; |
||||
|
||||
namespace Google.Protobuf.Descriptors |
||||
{ |
||||
/// <summary> |
||||
/// Base class for descriptors which are also indexed. This is all of them other than |
||||
/// <see cref="FileDescriptor" />. |
||||
/// </summary> |
||||
public abstract class IndexedDescriptorBase<TProto, TOptions> : DescriptorBase<TProto, TOptions> |
||||
where TProto : IMessage<TProto>, IDescriptorProto<TOptions> |
||||
{ |
||||
private readonly int index; |
||||
|
||||
protected IndexedDescriptorBase(TProto proto, FileDescriptor file, string fullName, int index) |
||||
: base(proto, file, fullName) |
||||
{ |
||||
this.index = index; |
||||
} |
||||
|
||||
/// <value> |
||||
/// The index of this descriptor within its parent descriptor. |
||||
/// </value> |
||||
/// <remarks> |
||||
/// This returns the index of this descriptor within its parent, for |
||||
/// this descriptor's type. (There can be duplicate values for different |
||||
/// types, e.g. one enum type with index 0 and one message type with index 0.) |
||||
/// </remarks> |
||||
public int Index |
||||
{ |
||||
get { return index; } |
||||
} |
||||
} |
||||
} |
||||
Loading…
Reference in new issue