From: bdemsky <bdemsky>
Date: Fri, 3 Nov 2006 20:06:35 +0000 (+0000)
Subject: equals method
X-Git-Tag: preEdgeChange~768
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2b9ca2427467b83c3be1b0f3b9c60eb669153b04;p=IRC.git

equals method
better error message
hashcode for string method
---

diff --git a/Robust/src/ClassLibrary/Object.java b/Robust/src/ClassLibrary/Object.java
index d36f07aa..dfaa7d3f 100644
--- a/Robust/src/ClassLibrary/Object.java
+++ b/Robust/src/ClassLibrary/Object.java
@@ -1,6 +1,10 @@
 public class Object {
     public native int hashCode();
 
+    /* DON'T USE THIS METHOD UNLESS NECESSARY */
+    /* WE WILL DEPRECATE IT AS SOON AS INSTANCEOF WORKS */
+    public native int getType();
+
     public String toString() {
 	return String.valueOf(this);
     }
diff --git a/Robust/src/ClassLibrary/String.java b/Robust/src/ClassLibrary/String.java
index faabe029..eda12065 100644
--- a/Robust/src/ClassLibrary/String.java
+++ b/Robust/src/ClassLibrary/String.java
@@ -152,4 +152,24 @@ public class String {
 	} while (length!=0);
 	return new String(chararray);
     }
+
+    public int hashCode() {
+	int hashcode=0;
+	for(int i=0;i<count;i++)
+	    hashcode=hashcode*31+value[i+offset];
+	return hashcode;
+    }
+
+    public boolean equals(Object o) {
+	if (o.getType()!=getType())
+	    return false;
+	String s=(String)o;
+	if (s.count!=count)
+	    return false;
+	for(int i=0;i<count;i++) {
+	    if (s.value[i+s.offset]!=value[i+offset])
+		return false;
+	}
+	return true;
+    }
 }
diff --git a/Robust/src/ClassLibrary/System.java b/Robust/src/ClassLibrary/System.java
index 700f2b09..89b33ea4 100644
--- a/Robust/src/ClassLibrary/System.java
+++ b/Robust/src/ClassLibrary/System.java
@@ -7,6 +7,6 @@ public class System {
     public static native void printString(String s);
 
     public static void error() {
-	System.printString("Error");
+	System.printString("Error (Use Breakpoint on ___System______error method for more information!)\n");
     }
 }
diff --git a/Robust/src/Runtime/runtime.c b/Robust/src/Runtime/runtime.c
index 816fa839..971a1829 100644
--- a/Robust/src/Runtime/runtime.c
+++ b/Robust/src/Runtime/runtime.c
@@ -463,6 +463,10 @@ int ___Object______hashCode____(struct ___Object___ * ___this___) {
   return (int) ___this___;
 }
 
+int ___Object______getType____(struct ___Object___ * ptr) {
+  return ((int *)ptr)[0];
+}
+
 void ___System______printString____L___String___(struct ___String___ * s) {
     struct ArrayObject * chararray=s->___value___;
     int i;