mirrors/escargot
2
0
Fork 0
mirror of https://github.com/Samsung/escargot.git synced 2026-06-29 10:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bugs in destruction operation

Browse source 
* fix to compare string/symbol correctly in marking enumerated key
* fix iterator close operation to call 'return' function of iterator and then throw exception
* add implicit name in object property parsing
* resolve each target of pattern first, and then store the value into it

Signed-off-by: HyukWoo Park <hyukwoo.park@samsung.com>
This commit is contained in:
HyukWoo Park 2020-01-20 16:48:22 +09:00 • committed by Boram Bae
commit f2439c2a41
9 changed files with 85 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/interpreter/ByteCodeInterpreter.cpp
View file

@ -1097,13 +1097,7 @@ Value ByteCodeInterpreter::interpret(ExecutionState* state, ByteCodeBlock* byteC
:
{
MarkEnumerateKey* code = (MarkEnumerateKey*)programCounter;
EnumerateObject* data = (EnumerateObject*)registerFile[code->m_dataRegisterIndex].asPointerValue();
SmallValue key = registerFile[code->m_keyRegisterIndex];
for (size_t i = 0; i < data->m_keys.size(); i++) {
if (data->m_keys[i] == key) {
data->m_keys[i] = Value(Value::EmptyValue);
}
}
markEnumerateKey(*state, code, registerFile);
ADD_PROGRAM_COUNTER(MarkEnumerateKey);
NEXT_INSTRUCTION();
@ -2834,6 +2828,27 @@ NEVER_INLINE void ByteCodeInterpreter::checkLastEnumerateKey(ExecutionState& sta
}
}
NEVER_INLINE void ByteCodeInterpreter::markEnumerateKey(ExecutionState& state, MarkEnumerateKey* code, Value* registerFile)
{
EnumerateObject* data = (EnumerateObject*)registerFile[code->m_dataRegisterIndex].asPointerValue();
Value key = registerFile[code->m_keyRegisterIndex];
bool mark = false;
for (size_t i = 0; i < data->m_keys.size(); i++) {
Value cachedKey = data->m_keys[i];
if (!cachedKey.isEmpty()) {
if (key.isString() && cachedKey.isString()) {
mark = key.asString()->equals(cachedKey.asString());
} else if (key.isSymbol() && cachedKey.isSymbol()) {
mark = (key.asSymbol() == cachedKey.asSymbol());
}
}
if (mark) {
data->m_keys[i] = Value(Value::EmptyValue);
break;
}
}
}
NEVER_INLINE Value ByteCodeInterpreter::executionPauseOperation(ExecutionState& state, Value* registerFile, size_t& programCounter, char* codeBuffer)
{
ExecutionPause* code = (ExecutionPause*)programCounter;
@ -3315,10 +3330,16 @@ NEVER_INLINE void ByteCodeInterpreter::iteratorCloseOperation(ExecutionState& st
innerResult = e;
innerResultHasException = true;
}
if (exceptionWasThrown) {
return;
}
if (innerResultHasException) {
state.throwException(innerResult);
}
if (!exceptionWasThrown && !innerResult.isObject()) {
if (!innerResult.isObject()) {
ErrorObject::throwBuiltinError(state, ErrorObject::TypeError, "Iterator close result is not an object");
}
}