Skip to content

Commit d7469e6

Browse files
committed
Remove deprecated overload from internal types.
1 parent 9c499ae commit d7469e6

File tree

5 files changed

+3
-88
lines changed

5 files changed

+3
-88
lines changed

src/MsgPack/Serialization/AbstractSerializers/SerializerBuilderContract`3.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -451,17 +451,6 @@ protected override TConstruct EmitAndConditionalExpression( TContext context, IL
451451
return default( TConstruct );
452452
}
453453

454-
protected override TConstruct EmitStringSwitchStatement( TContext context, TConstruct target, IDictionary<string, TConstruct> cases )
455-
{
456-
Contract.Requires( context != null );
457-
Contract.Requires( target != null );
458-
Contract.Requires( cases != null );
459-
Contract.Requires( cases.Count > 0 );
460-
Contract.Ensures( Contract.Result<TConstruct>() != null );
461-
Contract.Ensures( Contract.Result<TConstruct>().ContextType == typeof( void ) );
462-
return default( TConstruct );
463-
}
464-
465454
protected override TConstruct EmitStringSwitchStatement (TContext context, TConstruct target, TConstruct defaultCase, IDictionary<string, TConstruct> cases) {
466455
Contract.Requires(context != null);
467456
Contract.Requires(target != null);

src/MsgPack/Serialization/AbstractSerializers/SerializerBuilder`3.CommonConstructs.cs

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,24 +1287,13 @@ protected abstract TConstruct EmitAndConditionalExpression(
12871287
TConstruct elseExpression
12881288
);
12891289

1290-
/// <summary>
1291-
/// Emits string switch statement.
1292-
/// </summary>
1290+
/// <summary>
1291+
/// Emits string switch statement.
1292+
/// </summary>
12931293
/// <param name="context">The generation context.</param>
12941294
/// <param name="target">Target string expression.</param>
12951295
/// <param name="cases">The case statements. The keys are case condition, and values are actual statement.</param>
1296-
/// <returns>The switch statement.</returns>
1297-
protected abstract TConstruct EmitStringSwitchStatement(
1298-
TContext context, TConstruct target, IDictionary<string, TConstruct> cases
1299-
);
1300-
1301-
/// <summary>
1302-
/// Emits string switch statement.
1303-
/// </summary>
1304-
/// <param name="context">The generation context.</param>
1305-
/// <param name="target">Target string expression.</param>
13061296
/// <param name="defaultCase">Default case expression.</param>
1307-
/// <param name="cases">The case statements. The keys are case condition, and values are actual statement.</param>
13081297
/// <returns>The switch statement.</returns>
13091298
protected abstract TConstruct EmitStringSwitchStatement (
13101299
TContext context, TConstruct target, TConstruct defaultCase, IDictionary<string, TConstruct> cases

src/MsgPack/Serialization/CodeDomSerializers/CodeDomSerializerBuilder`1.cs

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -646,30 +646,6 @@ protected override CodeDomConstruct EmitAndConditionalExpression( CodeDomContext
646646
);
647647
}
648648

649-
protected override CodeDomConstruct EmitStringSwitchStatement( CodeDomContext context, CodeDomConstruct target, IDictionary<string, CodeDomConstruct> cases )
650-
{
651-
#if DEBUG
652-
Contract.Assert( target.IsExpression );
653-
Contract.Assert( cases.Values.All( c => c.IsStatement ) );
654-
#endif
655-
return
656-
CodeDomConstruct.Statement(
657-
cases.Aggregate<KeyValuePair<string, CodeDomConstruct>, CodeConditionStatement>(
658-
null,
659-
( current, caseStatement ) =>
660-
new CodeConditionStatement(
661-
new CodeBinaryOperatorExpression(
662-
target.AsExpression(),
663-
CodeBinaryOperatorType.ValueEquality,
664-
new CodePrimitiveExpression( caseStatement.Key )
665-
),
666-
caseStatement.Value.AsStatements().ToArray(),
667-
current == null ? new CodeStatement[ 0 ] : new CodeStatement[] { current }
668-
)
669-
)
670-
);
671-
}
672-
673649
protected override CodeDomConstruct EmitStringSwitchStatement (CodeDomContext context, CodeDomConstruct target, CodeDomConstruct defaultCase, IDictionary<string, CodeDomConstruct> cases) {
674650
#if DEBUG
675651
Contract.Assert(target.IsExpression);

src/MsgPack/Serialization/EmittingSerializers/ILEmittingSerializerBuilder`2.cs

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -676,31 +676,6 @@ protected override ILConstruct EmitAndConditionalExpression( TContext context, I
676676
);
677677
}
678678

679-
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "2", Justification = "Asserted internally" )]
680-
protected override ILConstruct EmitStringSwitchStatement( TContext context, ILConstruct target, IDictionary<string, ILConstruct> cases )
681-
{
682-
// Simple if statements
683-
ILConstruct @else = null;
684-
foreach ( var @case in cases )
685-
{
686-
@else =
687-
this.EmitConditionalExpression(
688-
context,
689-
this.EmitInvokeMethodExpression(
690-
context,
691-
null,
692-
Metadata._String.op_Equality,
693-
target,
694-
this.MakeStringLiteral( context, @case.Key )
695-
),
696-
@case.Value,
697-
@else
698-
);
699-
}
700-
701-
return @else;
702-
}
703-
704679
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "2", Justification = "Asserted internally")]
705680
protected override ILConstruct EmitStringSwitchStatement (TContext context, ILConstruct target, ILConstruct defaultCase, IDictionary<string, ILConstruct> cases) {
706681
// Simple if statements

src/MsgPack/Serialization/ExpressionSerializers/ExpressionTreeSerializerBuilder`1.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -467,20 +467,6 @@ ExpressionConstruct elseExpression
467467
);
468468
}
469469

470-
protected override ExpressionConstruct EmitStringSwitchStatement(
471-
ExpressionTreeContext context, ExpressionConstruct target, IDictionary<string, ExpressionConstruct> cases
472-
)
473-
{
474-
return
475-
Expression.Switch(
476-
typeof( void ),
477-
target,
478-
null,
479-
Metadata._String.op_Equality,
480-
cases.Select( kv => Expression.SwitchCase( kv.Value, Expression.Constant( kv.Key ) ) ).ToArray()
481-
);
482-
}
483-
484470
protected override ExpressionConstruct EmitStringSwitchStatement (
485471
ExpressionTreeContext context, ExpressionConstruct target, ExpressionConstruct defaultCase, IDictionary<string, ExpressionConstruct> cases
486472
) {

0 commit comments

Comments
 (0)