Completed removal of IStatement.

src/Compilers/CSharp/Portable/BoundTree/Expression.cs

@@ -62,14 +62,9 @@ ImmutableArray<IArgument> IInvocationExpression.ArgumentsInSourceOrder
                 return sourceOrderArguments.ToImmutableAndFree();
             }
         }
-<<<<<<< HEAD
-        
-        ImmutableArray<IArgument> IHasArgumentsExpression.ArgumentsInParameterOrder => DeriveArguments(this.Arguments, this.ArgumentNamesOpt, this.ArgsToParamsOpt, this.ArgumentRefKindsOpt, this.Method.Parameters);
-=======
-
-        ImmutableArray<IArgument> IInvocationExpression.ArgumentsInParameterOrder => DeriveArguments(this.Arguments, this.ArgumentNamesOpt, this.ArgsToParamsOpt, this.ArgumentRefKindsOpt, this.Method.Parameters);
->>>>>>> upstream/master
 
+        ImmutableArray<IArgument> IHasArgumentsExpression.ArgumentsInParameterOrder => DeriveArguments(this.Arguments, this.ArgumentNamesOpt, this.ArgsToParamsOpt, this.ArgumentRefKindsOpt, this.Method.Parameters);
+        
         IArgument IHasArgumentsExpression.GetArgumentMatchingParameter(IParameterSymbol parameter)
         {
             return ArgumentMatchingParameter(this.Arguments, this.ArgsToParamsOpt, this.ArgumentNamesOpt, this.ArgumentRefKindsOpt, parameter.ContainingSymbol as Symbols.MethodSymbol, parameter);
@@ -770,11 +765,7 @@ public override void Accept(OperationVisitor visitor)
         }
     }
 
-<<<<<<< HEAD
-    partial class BoundSizeOfOperator : ISizeOfExpression
-=======
-    internal partial class BoundSizeOfOperator : ITypeOperationExpression
->>>>>>> upstream/master
+    internal partial class BoundSizeOfOperator : ISizeOfExpression
     {
         ITypeSymbol ITypeOperationExpression.TypeOperand => this.SourceType.Type;
 
@@ -791,11 +782,7 @@ public override void Accept(OperationVisitor visitor)
         }
     }
 
-<<<<<<< HEAD
-    partial class BoundTypeOfOperator : ITypeOfExpression
-=======
-    internal partial class BoundTypeOfOperator : ITypeOperationExpression
->>>>>>> upstream/master
+    internal partial class BoundTypeOfOperator : ITypeOfExpression
     {
         ITypeSymbol ITypeOperationExpression.TypeOperand => this.SourceType.Type;
 
@@ -1063,13 +1050,8 @@ internal partial class BoundBinaryOperator : IBinaryOperatorExpression
         IExpression IBinaryOperatorExpression.Left => this.Left;
 
         IExpression IBinaryOperatorExpression.Right => this.Right;
-<<<<<<< HEAD
-   
-        bool IHasOperatorMethodExpression.UsesOperatorMethod => (this.OperatorKind & BinaryOperatorKind.TypeMask) == BinaryOperatorKind.UserDefined;
-=======
 
-        bool IHasOperatorExpression.UsesOperatorMethod => (this.OperatorKind & BinaryOperatorKind.TypeMask) == BinaryOperatorKind.UserDefined;
->>>>>>> upstream/master
+        bool IHasOperatorMethodExpression.UsesOperatorMethod => (this.OperatorKind & BinaryOperatorKind.TypeMask) == BinaryOperatorKind.UserDefined;
 
         IMethodSymbol IHasOperatorMethodExpression.OperatorMethod => this.MethodOpt;
 

src/Compilers/CSharp/Portable/BoundTree/Statement.cs

@@ -8,11 +8,7 @@
 
 namespace Microsoft.CodeAnalysis.CSharp
 {
-<<<<<<< HEAD
-    partial class BoundStatement : IOperation
-=======
-    internal partial class BoundStatement : IStatement
->>>>>>> upstream/master
+    internal partial class BoundStatement : IOperation
     {
         OperationKind IOperation.Kind => this.StatementKind;
 
@@ -37,13 +33,8 @@ ImmutableArray<IOperation> IBlockStatement.Statements
             get
             {
                 // This is to filter out operations of kind None.
-<<<<<<< HEAD
-                return (ImmutableArray<IOperation>) s_blockStatementsMappings.GetValue(this,
+                return (ImmutableArray<IOperation>)s_blockStatementsMappings.GetValue(this,
                     blockStatement => { return blockStatement.Statements.AsImmutable<IOperation>().WhereAsArray(statement => statement.Kind != OperationKind.None); }
-=======
-                return (ImmutableArray<IStatement>)s_blockStatementsMappings.GetValue(this,
-                    blockStatement => { return blockStatement.Statements.AsImmutable<IStatement>().WhereAsArray(statement => statement.Kind != OperationKind.None); }
->>>>>>> upstream/master
                     );
             }
         }
@@ -97,11 +88,7 @@ public override void Accept(OperationVisitor visitor)
         }
     }
 
-<<<<<<< HEAD
-    partial class BoundYieldBreakStatement : IReturnStatement
-=======
-    internal partial class BoundYieldBreakStatement
->>>>>>> upstream/master
+    internal partial class BoundYieldBreakStatement : IReturnStatement
     {
         IExpression IReturnStatement.ReturnedValue => null;
 
@@ -135,11 +122,7 @@ public override void Accept(OperationVisitor visitor)
         }
     }
 
-<<<<<<< HEAD
-    partial class BoundNoOpStatement : IEmptyStatement
-=======
-    internal partial class BoundNoOpStatement
->>>>>>> upstream/master
+    internal partial class BoundNoOpStatement : IEmptyStatement
     {
         protected override OperationKind StatementKind => OperationKind.EmptyStatement;
 
@@ -241,11 +224,7 @@ internal partial class BoundForStatement : IForLoopStatement
 
         protected override OperationKind StatementKind => OperationKind.LoopStatement;
 
-<<<<<<< HEAD
-        ImmutableArray<IOperation> ToStatements(BoundStatement statement)
-=======
-        private ImmutableArray<IStatement> ToStatements(BoundStatement statement)
->>>>>>> upstream/master
+        private ImmutableArray<IOperation> ToStatements(BoundStatement statement)
         {
             BoundStatementList statementList = statement as BoundStatementList;
             if (statementList != null)
@@ -584,11 +563,7 @@ public override void Accept(OperationVisitor visitor)
         }
     }
 
-<<<<<<< HEAD
-    partial class BoundBadStatement : IInvalidStatement
-=======
-    internal partial class BoundBadStatement
->>>>>>> upstream/master
+    internal partial class BoundBadStatement : IInvalidStatement
     {
         protected override OperationKind StatementKind => OperationKind.InvalidStatement;
 
@@ -612,13 +587,8 @@ ImmutableArray<IVariableDeclaration> IVariableDeclarationStatement.Variables
         {
             get
             {
-<<<<<<< HEAD
                 return (ImmutableArray<IVariableDeclaration>) s_variablesMappings.GetValue(this, 
                     declaration => ImmutableArray.Create<IVariableDeclaration>(new VariableDeclaration(declaration.LocalSymbol, declaration.InitializerOpt, declaration.Syntax)));
-=======
-                return (ImmutableArray<IVariable>)s_variablesMappings.GetValue(this,
-                    declaration => ImmutableArray.Create<IVariable>(new VariableDeclaration(declaration.LocalSymbol, declaration.InitializerOpt, declaration.Syntax)));
->>>>>>> upstream/master
             }
         }
 
@@ -646,13 +616,8 @@ ImmutableArray<IVariableDeclaration> IVariableDeclarationStatement.Variables
             {
                 return (ImmutableArray<IVariableDeclaration>)s_variablesMappings.GetValue(this,
                     multipleDeclarations =>
-<<<<<<< HEAD
                         multipleDeclarations.LocalDeclarations.SelectAsArray(declaration => 
                             (IVariableDeclaration)new VariableDeclaration(declaration.LocalSymbol, declaration.InitializerOpt, declaration.Syntax)));
-=======
-                        multipleDeclarations.LocalDeclarations.SelectAsArray(declaration =>
-                            (IVariable)new VariableDeclaration(declaration.LocalSymbol, declaration.InitializerOpt, declaration.Syntax)));
->>>>>>> upstream/master
             }
         }
 

src/Compilers/Core/CodeAnalysisTest/Diagnostics/OperationTestAnalyzer.cs

@@ -158,7 +158,7 @@ public sealed override void Initialize(AnalysisContext context)
 
                                  if (forLoop.Before.Length == 1)
                                  {
-                                     IStatement setup = forLoop.Before[0];
+                                     IOperation setup = forLoop.Before[0];
                                      if (setup.Kind == OperationKind.ExpressionStatement && ((IExpressionStatement)setup).Expression.Kind == OperationKind.AssignmentExpression)
                                      {
                                          IAssignmentExpression setupAssignment = (IAssignmentExpression)((IExpressionStatement)setup).Expression;
@@ -173,7 +173,7 @@ public sealed override void Initialize(AnalysisContext context)
 
                                              if (forLoop.AtLoopBottom.Length == 1)
                                              {
-                                                 IStatement advance = forLoop.AtLoopBottom[0];
+                                                 IOperation advance = forLoop.AtLoopBottom[0];
                                                  if (advance.Kind == OperationKind.ExpressionStatement)
                                                  {
                                                      IExpression advanceExpression = ((IExpressionStatement)advance).Expression;

src/Compilers/Core/Portable/Compilation/Expression.cs

@@ -263,13 +263,8 @@ public IntegerLiteral(long value, ITypeSymbol resultType, SyntaxNode syntax)
             this.Type = resultType;
             this.Syntax = syntax;
         }
-<<<<<<< HEAD
-        
-        public string Text =>_value.ToString();
-=======
 
-        public string Spelling => _value.ToString();
->>>>>>> upstream/master
+        public string Text =>_value.ToString();
 
         public ITypeSymbol Type { get; }
 

src/Compilers/VisualBasic/Portable/BoundTree/Statement.vb

@@ -6,13 +6,8 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
 
 Namespace Microsoft.CodeAnalysis.VisualBasic
 
-<<<<<<< HEAD
-    Partial Class BoundStatement
+    Partial Friend Class BoundStatement
         Implements IOperation
-=======
-    Friend Partial Class BoundStatement
-        Implements IStatement
->>>>>>> upstream/master
 
         Private ReadOnly Property IKind As OperationKind Implements IOperation.Kind
             Get
@@ -231,11 +226,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
         End Function
 
         Public Overrides Sub Accept(visitor As OperationVisitor)
-            visitor.VisitEmptyStatement(Me)
+            visitor.VisitNoneOperation(Me)
         End Sub
 
         Public Overrides Function Accept(Of TArgument, TResult)(visitor As OperationVisitor(Of TArgument, TResult), argument As TArgument) As TResult
-            Return visitor.VisitEmptyStatement(Me, argument)
+            Return visitor.VisitNoneOperation(Me, argument)
         End Function
     End Class
 
@@ -443,11 +438,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
         End Function
 
         Public Overrides Sub Accept(visitor As OperationVisitor)
-            visitor.VisitEmptyStatement(Me)
+            visitor.VisitNoneOperation(Me)
         End Sub
 
         Public Overrides Function Accept(Of TArgument, TResult)(visitor As OperationVisitor(Of TArgument, TResult), argument As TArgument) As TResult
-            Return visitor.VisitEmptyStatement(Me, argument)
+            Return visitor.VisitNoneOperation(Me, argument)
         End Function
     End Class
 
@@ -879,12 +874,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
         End Function
     End Class
 
-<<<<<<< HEAD
-    Partial Class BoundBadStatement
+    Partial Friend Class BoundBadStatement
         Implements IInvalidStatement
-=======
-    Friend Partial Class BoundBadStatement
->>>>>>> upstream/master
+
         Protected Overrides Function StatementKind() As OperationKind
             Return OperationKind.InvalidStatement
         End Function
@@ -1165,13 +1157,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
         End Function
     End Class
 
-<<<<<<< HEAD
-    Partial Class BoundNoOpStatement
+    Partial Friend Class BoundNoOpStatement
         Implements IEmptyStatement
 
-=======
-    Friend Partial Class BoundNoOpStatement
->>>>>>> upstream/master
         Protected Overrides Function StatementKind() As OperationKind
             Return OperationKind.EmptyStatement
         End Function
@@ -1191,11 +1179,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
         End Function
 
         Public Overrides Sub Accept(visitor As OperationVisitor)
-            visitor.VisitEmptyStatement(Me)
+            visitor.VisitNoneOperation(Me)
         End Sub
 
         Public Overrides Function Accept(Of TArgument, TResult)(visitor As OperationVisitor(Of TArgument, TResult), argument As TArgument) As TResult
-            Return visitor.VisitEmptyStatement(Me, argument)
+            Return visitor.VisitNoneOperation(Me, argument)
         End Function
     End Class
 
@@ -1205,11 +1193,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
         End Function
 
         Public Overrides Sub Accept(visitor As OperationVisitor)
-            visitor.VisitEmptyStatement(Me)
+            visitor.VisitNoneOperation(Me)
         End Sub
 
         Public Overrides Function Accept(Of TArgument, TResult)(visitor As OperationVisitor(Of TArgument, TResult), argument As TArgument) As TResult
-            Return visitor.VisitEmptyStatement(Me, argument)
+            Return visitor.VisitNoneOperation(Me, argument)
         End Function
     End Class
 
@@ -1219,21 +1207,17 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
         End Function
 
         Public Overrides Sub Accept(visitor As OperationVisitor)
-            visitor.VisitEmptyStatement(Me)
+            visitor.VisitNoneOperation(Me)
         End Sub
 
         Public Overrides Function Accept(Of TArgument, TResult)(visitor As OperationVisitor(Of TArgument, TResult), argument As TArgument) As TResult
-            Return visitor.VisitEmptyStatement(Me, argument)
+            Return visitor.VisitNoneOperation(Me, argument)
         End Function
     End Class
 
-<<<<<<< HEAD
-    Partial Class BoundStopStatement
+    Partial Friend Class BoundStopStatement
         Implements IStopStatement
 
-=======
-    Friend Partial Class BoundStopStatement
->>>>>>> upstream/master
         Protected Overrides Function StatementKind() As OperationKind
             Return OperationKind.StopStatement
         End Function
@@ -1247,13 +1231,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
         End Function
     End Class
 
-<<<<<<< HEAD
-    Partial Class BoundEndStatement
+    Partial Friend Class BoundEndStatement
         Implements IEndStatement
 
-=======
-    Friend Partial Class BoundEndStatement
->>>>>>> upstream/master
         Protected Overrides Function StatementKind() As OperationKind
             Return OperationKind.EndStatement
         End Function