X-Git-Url: http://git.megacz.com/?p=org.ibex.js.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fjs%2FJSString.java;h=a0ca694ebaec795f34c9b2c7ac3b6b058221f75c;hp=c98a94e1b6bbe620788e34b1ae9f91dfe6f53591;hb=b7d7d6f7dc1ddac7889d8334c194a96f344524e7;hpb=73131826a18c93af4fb04672bc3ec820e1197ad1 diff --git a/src/org/ibex/js/JSString.java b/src/org/ibex/js/JSString.java index c98a94e..a0ca694 100644 --- a/src/org/ibex/js/JSString.java +++ b/src/org/ibex/js/JSString.java @@ -5,24 +5,25 @@ package org.ibex.js; import org.ibex.util.*; +import java.util.*; class JSString extends JSPrimitive { final String s; public JSString(String s) { this.s = s; } public int hashCode() { return s.hashCode(); } - public boolean jsequals(JS o) { + public boolean equals(Object o) { if(o == this) return true; if(o instanceof JSString) { return ((JSString)o).s.equals(s); } else if(o instanceof JSNumber) { - return o.jsequals(this); + return o.equals(this); } else { return false; } } - private final static Hash internHash = new Hash(); + private final static Map internHash = new HashMap(); static synchronized JS intern(String s) { synchronized(internHash) { JS js = (JS)internHash.get(s); @@ -35,5 +36,5 @@ class JSString extends JSPrimitive { protected void finalize() { synchronized(internHash) { internHash.put(s,null); } } } - String coerceToString() { return s; } + public String coerceToString() { return s; } }