Author: raja
Date: 2007-03-22 11:14:02 -0500 (Thu, 22 Mar 2007)
New Revision: 74814
Modified:
trunk/mcs/mcs/ChangeLog
trunk/mcs/mcs/flowanalysis.cs
Log:
* flowanalysis.cs (Reachability): Reorganize slightly, and remove
unused properties.
Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog 2007-03-22 15:34:16 UTC (rev 74813)
+++ trunk/mcs/mcs/ChangeLog 2007-03-22 16:14:02 UTC (rev 74814)
@@ -1,3 +1,8 @@
+2007-03-22 Raja R Harinath <[EMAIL PROTECTED]>
+
+ * flowanalysis.cs (Reachability): Reorganize slightly, and remove
+ unused properties.
+
2007-03-20 Bill Holmes <[EMAIL PROTECTED]>
* class.cs:
Added 2 MemberCoreArrayList objects, ordered_explicit_member_list and
Modified: trunk/mcs/mcs/flowanalysis.cs
===================================================================
--- trunk/mcs/mcs/flowanalysis.cs 2007-03-22 15:34:16 UTC (rev 74813)
+++ trunk/mcs/mcs/flowanalysis.cs 2007-03-22 16:14:02 UTC (rev 74814)
@@ -17,13 +17,6 @@
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 @@
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 @@
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 @@
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,27 +117,10 @@
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 {
+ public bool IsUnreachable {
get { return barrier == TriState.Always; }
}
- public bool IsUnreachable {
- get { return Unreachable == TriState.Always; }
- }
-
public void SetBarrier ()
{
barrier = TriState.Always;
@@ -161,7 +140,7 @@
public override string ToString ()
{
- return String.Format ("[{0}:{1}]", ShortName
(barrier), ShortName (Reachable));
+ return String.Format ("[{0}]", ShortName
(barrier));
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
