revert jim's changes

diff --git a/Robust/src/IR/FieldDescriptor.java b/Robust/src/IR/FieldDescriptor.java
index f2259bf89eb9faae24786c6665e903de1815bc22..edfb8959db0276f9c780451ea6f7f350dba58c81 100644 (file)
--- a/Robust/src/IR/FieldDescriptor.java
+++ b/Robust/src/IR/FieldDescriptor.java
@@ -37,30 +37,6 @@ public class FieldDescriptor extends Descriptor {
     return td;
   }
 
-  public boolean equals(Object o) {
-    if( o == null ) return false;
-    if( !(o instanceof FieldDescriptor) ) return false;
-
-    FieldDescriptor fd = (FieldDescriptor) o;
-    if( modifier == null && fd.modifier != null ) return false;
-    if( modifier != null && !modifier.equals(fd.modifier) ) return false;
-    if( !(td == fd.td) ) return false;
-    if( !(en == fd.en) ) return false;
-    if( !isglobal == fd.isglobal ) return false;
-    if( identifier == null && fd.identifier != null ) return false;
-    if( identifier != null && !identifier.equals(fd.identifier) ) return false;
-    return true;
-  }
-
-  public int hashCode() {
-    int hashCode = modifier.hashCode();
-    hashCode += td.hashCode();
-    if( en != null ) hashCode += 81;
-    if( isglobal ) hashCode += 11;
-    if( identifier != null ) hashCode += identifier.hashCode();
-    return hashCode;
-  }
-
   public String toString() {
     if (en==null)
       return modifier.toString()+td.toString()+" "+getSymbol()+";";

diff --git a/Robust/src/IR/Tree/Modifiers.java b/Robust/src/IR/Tree/Modifiers.java
index 27bf685005d9f38b12a9af963595222f7bc6e78d..5b7b0ea9b2e26de9a14d2e089d7fddb2524639b4 100644 (file)
--- a/Robust/src/IR/Tree/Modifiers.java
+++ b/Robust/src/IR/Tree/Modifiers.java
@@ -50,17 +50,6 @@ public class Modifiers {
     return ((value&FINAL)!=0);
   }
 
-  public boolean equals(Object o) {
-    if( o == null ) return false;
-    if( !(o instanceof Modifiers) ) return false;
-    Modifiers m = (Modifiers) o;
-    return value == m.value;
-  }
-
-  public int hashCode() {
-    return value*7+1;
-  }
-
   public String toString() {
     String st="";
     if ((value&PUBLIC)!=0)