X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Robust%2Fsrc%2FClassLibrary%2FInteger.java;h=1f7909f4584b18eaf0b7448a8c3683947afe29fc;hb=49f02b081d717c559f3739344164214fef287fb0;hp=06c621e12fcf2759e0732bfe73fc3023f91ad26c;hpb=1eab95935ad60c6fb3838107ffa24b35ab133abf;p=IRC.git

diff --git a/Robust/src/ClassLibrary/Integer.java b/Robust/src/ClassLibrary/Integer.java
index 06c621e1..1f7909f4 100644
--- a/Robust/src/ClassLibrary/Integer.java
+++ b/Robust/src/ClassLibrary/Integer.java
@@ -1,58 +1,119 @@
 public class Integer {
-    private int value;
+  private int value;
 
-    public Integer(int value) {
-	this.value=value;
-    }
+  public Integer(int value) {
+    this.value=value;
+  }
 
-    public Integer(String str) {
-	value=Integer.parseInt(str, 10);
-    }
+  public Integer(String str) {
+    value=Integer.parseInt(str, 10);
+  }
 
-    public int intValue() {
-	return value;
-    }
+  public int intValue() {
+    return value;
+  }
+
+  public double doubleValue() {
+    return (double)value;
+  }
 
-    public static int parseInt(String str) {
-	return Integer.parseInt(str, 10);
+  public float floatValue() {
+    return (float)value;
+  }
+
+  public byte[] intToByteArray() {
+    byte[] b = new byte[4];
+    for (int i = 0; i < 4; i++) {
+      int offset = (b.length - 1 - i) * 8;
+      b[i] = (byte) ((value >> offset) & 0xFF);
     }
+    return b;
+  }
 
-    public static int parseInt(String str, int radix) {
-	int value=0;
-	boolean isNeg=false;
-	int start=0;
-	byte[] chars=str.getBytes();
-
-	while(chars[start]==' '||chars[start]=='\t')
-	    start++;
-
-	if (chars[start]=='-') {
-	    isNeg=true;
-	    start++;
-	}
-	boolean cont=true;
-	for(int i=start;cont&&i<str.length();i++) {
-	    byte b=chars[i];
-	    int val;
-	    if (b>='0'&&b<='9')
-		val=b-'0';
-	    else if (b>='a'&&b<='z')
-		val=10+b-'a';
-	    else if (b>='A'&&b<='Z')
-		val=10+b-'A';
-	    else cont=false;
-	    if (cont) {
-		if (val>=radix)
-		    System.error();
-		value=value*radix+val;
-	    }
-	}
-	if (isNeg)
-	    value=-value;
-	return value;
+  public int byteArrayToInt(byte [] b) {
+    int value = 0;
+    for (int i = 0; i < 4; i++) {
+      int shift = (4 - 1 - i) * 8;
+      value += (b[i] & 0x000000FF) << shift;
     }
+    return value;
+  }
+
+  /*
+     public int byteArrayToInt(byte [] b) {
+     int val;
+     val = b[0] << 24 + ((b[1] & 0xFF) << 16) + ((b[2] & 0xFF) << 8) + (b[3] & 0xFF);
+     return val;
+     }
+   */
+
+  public static int parseInt(String str) {
+    return Integer.parseInt(str, 10);
+  }
+
+  public static int parseInt(String str, int radix) {
+    int value=0;
+    boolean isNeg=false;
+    int start=0;
+    byte[] chars=str.getBytes();
 
-    public String toString() {
-	return String.valueOf(value);
+    while(chars[start]==' '||chars[start]=='\t')
+      start++;
+
+    if (chars[start]=='-') {
+      isNeg=true;
+      start++;
+    }
+    boolean cont=true;
+    for(int i=start; cont&&i<str.length(); i++) {
+      byte b=chars[i];
+      int val;
+      if (b>='0'&&b<='9')
+        val=b-'0';
+      else if (b>='a'&&b<='z')
+        val=10+b-'a';
+      else if (b>='A'&&b<='Z')
+        val=10+b-'A';
+      else {
+        cont=false;
+      }
+      if (cont) {
+        if (val>=radix)
+          System.error();
+        value=value*radix+val;
+      }
     }
+    if (isNeg)
+      value=-value;
+    return value;
+  }
+
+  public String toString() {
+    return String.valueOf(value);
+  }
+
+  public static String toString(int i) {
+    Integer I = new Integer(i);
+    return I.toString();
+  }
+
+  public int hashCode() {
+    return value;
+  }
+
+  public boolean equals(Object o) {
+    if (o.getType()!=getType())
+      return false;
+    Integer s=(Integer)o;
+    if (s.intValue()!=this.value)
+      return false;
+    return true;
+  }
+
+  public int compareTo(Integer i) {
+    if (value == i.value)
+      return 0;
+    // Returns just -1 or 1 on inequality; doing math might overflow.
+    return value > i.value?1:-1;
+  }
 }