JSValue changes, closing in on JSObject API. Began 'correct' semantic

implementation for various operators.


git-svn-id: svn://10.0.0.236/trunk@32626 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rogerl%netscape.com
1999-05-25 21:49:40 +00:00
parent 2988832256
commit 1c31755a34
14 changed files with 291 additions and 146 deletions

View File

@@ -1,3 +1,6 @@
import java.util.Hashtable;
class JSObject extends JSValue {
static JSObject JSUndefined = new JSObject("undefined");
@@ -12,20 +15,16 @@ class JSObject extends JSValue {
return indent + "JSObject : " + value + "\n";
}
void evalLHS(Environment theEnv)
void eval(Environment theEnv)
{
theEnv.theStack.push(this);
}
void eval(Environment theEnv)
{
JSValue v = (JSValue)(theEnv.theGlobals.get(value));
if (v == null) {
System.out.println("Accessed undefined : " + value);
theEnv.theStack.push(JSUndefined);
}
void typeof(Environment theEnv) {
if (this == JSUndefined)
theEnv.theStack.push(new JSString("undefined"));
else
theEnv.theStack.push(v);
theEnv.theStack.push(new JSString("object"));
}
JSValue defaultValue(String hint) {
@@ -48,107 +47,25 @@ class JSObject extends JSValue {
return toPrimitive("Number").toJSDouble();
}
void gt(Environment theEnv) {
JSValue lV = toPrimitive("Number");
JSValue rV = theEnv.theStack.pop().toPrimitive("Number");
if ((lV instanceof JSString) && (rV instanceof JSString)) {
theEnv.theStack.push(rV);
lV.gt(theEnv);
}
else {
theEnv.theStack.push(rV.toJSDouble());
lV.toJSDouble().gt(theEnv);
}
}
void ge(Environment theEnv) {
JSValue lV = toPrimitive("Number");
JSValue rV = theEnv.theStack.pop().toPrimitive("Number");
if ((lV instanceof JSString) && (rV instanceof JSString)) {
theEnv.theStack.push(rV);
lV.ge(theEnv);
}
else {
theEnv.theStack.push(rV.toJSDouble());
lV.toJSDouble().ge(theEnv);
}
}
void lt(Environment theEnv) {
JSValue lV = toPrimitive("Number");
JSValue rV = theEnv.theStack.pop().toPrimitive("Number");
if ((lV instanceof JSString) && (rV instanceof JSString)) {
theEnv.theStack.push(rV);
lV.lt(theEnv);
}
else {
theEnv.theStack.push(rV.toJSDouble());
lV.toJSDouble().lt(theEnv);
}
}
void le(Environment theEnv) {
JSValue lV = toPrimitive("Number");
JSValue rV = theEnv.theStack.pop().toPrimitive("Number");
if ((lV instanceof JSString) && (rV instanceof JSString)) {
theEnv.theStack.push(rV);
lV.le(theEnv);
}
else {
theEnv.theStack.push(rV.toJSDouble());
lV.toJSDouble().le(theEnv);
}
}
void eq(Environment theEnv) {
JSValue lV = toPrimitive("Number");
JSValue rV = theEnv.theStack.pop().toPrimitive("Number");
if ((lV instanceof JSString) && (rV instanceof JSString)) {
theEnv.theStack.push(rV);
lV.eq(theEnv);
}
else {
theEnv.theStack.push(rV.toJSDouble());
lV.toJSDouble().eq(theEnv);
}
}
void ne(Environment theEnv) {
JSValue lV = toPrimitive("Number");
JSValue rV = theEnv.theStack.pop().toPrimitive("Number");
if ((lV instanceof JSString) && (rV instanceof JSString)) {
theEnv.theStack.push(rV);
lV.ne(theEnv);
}
else {
theEnv.theStack.push(rV.toJSDouble());
lV.toJSDouble().ne(theEnv);
}
}
void add(Environment theEnv) {
JSValue lV = toPrimitive("");
JSValue rV = theEnv.theStack.pop().toPrimitive("");
if ((lV instanceof JSString) || (rV instanceof JSString)) {
theEnv.theStack.push(rV);
lV.ne(theEnv);
}
else {
theEnv.theStack.push(rV.toJSDouble());
lV.toJSDouble().add(theEnv);
}
}
void subtract(Environment theEnv) {
theEnv.theStack.push(theEnv.theStack.pop().toJSDouble());
toJSDouble().subtract(theEnv);
}
public String toString() {
return value;
return value + contents.toString();
}
void getProp(Environment theEnv) {
JSString id = theEnv.theStack.pop().toJSString();
JSValue v = (JSValue)(contents.get(id.s));
theEnv.theStack.push(v);
}
void putProp(Environment theEnv) {
JSValue v = theEnv.theStack.pop();
JSString id = theEnv.theStack.pop().toJSString();
contents.put(id.s, v);
}
Hashtable contents = new Hashtable();
String value;
}