* flowanalysis.cs (Reachability): Reorganize slightly, and remove

unused properties.

svn path=/trunk/mcs/; revision=74814

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index e028786d169f6840949d14f33562e6c845d8ad76..3006ead4e1569a695549fc2192f072cccd0d8191 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-22  Raja R Harinath  <rharinath@novell.com>
+
+       * flowanalysis.cs (Reachability): Reorganize slightly, and remove
+       unused properties.
+
 2007-03-20  Bill Holmes  <billholmes54@gmail.com>
        * class.cs: 
        Added 2 MemberCoreArrayList objects, ordered_explicit_member_list and

diff --git a/mcs/mcs/flowanalysis.cs b/mcs/mcs/flowanalysis.cs
index fc1e27270113637e53a07e8e40a78cd1619b7b33..50ecd9f91eeb4235345709a96e8c55b48ad4fc92 100644 (file)
--- a/mcs/mcs/flowanalysis.cs
+++ b/mcs/mcs/flowanalysis.cs
@@ -17,13 +17,6 @@ using System.Diagnostics;
 
 namespace Mono.CSharp
 {
-       public enum TriState : byte {
-               // Never < Sometimes < Always
-               Never,
-               Sometimes,
-               Always
-       }
-
        // <summary>
        //   A new instance of this class is created every time a new block is resolved
        //   and if there's branching in the block's control flow.
@@ -76,12 +69,15 @@ namespace Mono.CSharp
 
                public sealed class Reachability
                {
-                       TriState barrier;
-
-                       public TriState Barrier {
-                               get { return barrier; }
+                       public enum TriState : byte {
+                               // Never < Sometimes < Always
+                               Never,
+                               Sometimes,
+                               Always
                        }
 
+                       TriState barrier;
+
                        Reachability (TriState barrier)
                        {
                                this.barrier = barrier;
@@ -92,7 +88,7 @@ namespace Mono.CSharp
                                return new Reachability (barrier);
                        }
 
-                       public static TriState TriState_Meet (TriState a, TriState b)
+                       static TriState TriState_Meet (TriState a, TriState b)
                        {
                                // (1) if both are Never, return Never
                                // (2) if both are Always, return Always
@@ -101,7 +97,7 @@ namespace Mono.CSharp
                                return a == b ? a : TriState.Sometimes;
                        }
 
-                       public static TriState TriState_Max (TriState a, TriState b)
+                       static TriState TriState_Max (TriState a, TriState b)
                        {
                                return ((byte) a > (byte) b) ? a : b;
                        }
@@ -121,25 +117,8 @@ namespace Mono.CSharp
                                return new Reachability (TriState.Never);
                        }
 
-                       TriState Unreachable {
-                               get { return barrier; }
-                       }
-
-                       TriState Reachable {
-                               get {
-                                       TriState unreachable = Unreachable;
-                                       if (unreachable == TriState.Sometimes)
-                                               return TriState.Sometimes;
-                                       return unreachable == TriState.Always ? TriState.Never : TriState.Always;
-                               }
-                       }
-
-                       public bool AlwaysHasBarrier {
-                               get { return barrier == TriState.Always; }
-                       }
-
                        public bool IsUnreachable {
-                               get { return Unreachable == TriState.Always; }
+                               get { return barrier == TriState.Always; }
                        }
 
                        public void SetBarrier ()
@@ -161,7 +140,7 @@ namespace Mono.CSharp
 
                        public override string ToString ()
                        {
-                               return String.Format ("[{0}:{1}]", ShortName (barrier), ShortName (Reachable));
+                               return String.Format ("[{0}]", ShortName (barrier));
                        }
                }