Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing readEvalFile to save off important Context data members. implemented identical_Default for string

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@74140 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
beard%netscape.com 2000-07-13 01:35:57 +00:00
parent 594bb3c2bb
commit 29fcfa000e
2 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/js/js2/interpreter.cpp
View File

@ -115,16 +115,32 @@ struct Activation : public gc_base {
};
/**
* exception-safe class to save off values.
*/
template <typename T>
class autosaver {
T& mRef;
T mOld;
public:
autosaver(T& ref, T val = T()) : mRef(ref), mOld(ref) { ref = val; }
~autosaver() { mRef = mOld; }
};
JSValue Context::readEvalFile(FILE* in, const String& fileName)
{
Context cx(mWorld, mGlobal);
String buffer;
string line;
LineReader inReader(in);
JSValues emptyArgs;
JSValue result;
// save off important member variables, to enable recursive call to interpret.
// this is a little stinky, but should be exception-safe.
autosaver<Activation*> activation(mActivation, 0);
autosaver<Linkage*> linkage(mLinkage, 0);
autosaver<InstructionIterator> pc(mPC);
while (inReader.readLine(line) != 0) {
appendChars(buffer, line.data(), line.size());
try {
@ -148,7 +164,7 @@ JSValue Context::readEvalFile(FILE* in, const String& fileName)
// list of zero or more statements
ICodeModule* icm = genCode(parsedStatements, fileName);
if (icm) {
result = cx.interpret(icm, emptyArgs);
result = interpret(icm, emptyArgs);
delete icm;
}
@ -368,11 +384,11 @@ static JSValue identical_Default(const JSValue& r1, const JSValue& r2)
}
else {
if (r1.isString())
return kFalseValue; // XXX implement me!! w_strcmp??
return JSValue(bool(r1.string->compare(*r2.string) == 0));
if (r1.isBoolean())
return JSValue(r1.boolean == r2.boolean);
return JSValue(bool(r1.boolean == r2.boolean));
if (r1.isObject())
return JSValue(r1.object == r2.object);
return JSValue(bool(r1.object == r2.object));
return kFalseValue;
}
}

26
mozilla/js2/src/interpreter.cpp
View File

@ -115,16 +115,32 @@ struct Activation : public gc_base {
};
/**
* exception-safe class to save off values.
*/
template <typename T>
class autosaver {
T& mRef;
T mOld;
public:
autosaver(T& ref, T val = T()) : mRef(ref), mOld(ref) { ref = val; }
~autosaver() { mRef = mOld; }
};
JSValue Context::readEvalFile(FILE* in, const String& fileName)
{
Context cx(mWorld, mGlobal);
String buffer;
string line;
LineReader inReader(in);
JSValues emptyArgs;
JSValue result;
// save off important member variables, to enable recursive call to interpret.
// this is a little stinky, but should be exception-safe.
autosaver<Activation*> activation(mActivation, 0);
autosaver<Linkage*> linkage(mLinkage, 0);
autosaver<InstructionIterator> pc(mPC);
while (inReader.readLine(line) != 0) {
appendChars(buffer, line.data(), line.size());
try {
@ -148,7 +164,7 @@ JSValue Context::readEvalFile(FILE* in, const String& fileName)
// list of zero or more statements
ICodeModule* icm = genCode(parsedStatements, fileName);
if (icm) {
result = cx.interpret(icm, emptyArgs);
result = interpret(icm, emptyArgs);
delete icm;
}
@ -368,11 +384,11 @@ static JSValue identical_Default(const JSValue& r1, const JSValue& r2)
}
else {
if (r1.isString())
return kFalseValue; // XXX implement me!! w_strcmp??
return JSValue(bool(r1.string->compare(*r2.string) == 0));
if (r1.isBoolean())
return JSValue(r1.boolean == r2.boolean);
return JSValue(bool(r1.boolean == r2.boolean));
if (r1.isObject())
return JSValue(r1.object == r2.object);
return JSValue(bool(r1.object == r2.object));
return kFalseValue;
}
}