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

Fix remaining exception handlings

Browse source 
Signed-off-by: HyukWoo Park <hyukwoo.park@samsung.com>
This commit is contained in:
HyukWoo Park 2023-09-01 14:11:02 +09:00
commit 14089804d5
4 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/builtins/BuiltinRegExp.cpp
View file

@ -232,6 +232,7 @@ static Value builtinRegExpCompile(ExecutionState& state, Value thisValue, size_t
} else {
retVal->init(state, patternRegExp->source());
}
RETURN_VALUE_IF_PENDING_EXCEPTION
return retVal;
}
}
@ -242,6 +243,7 @@ static Value builtinRegExpCompile(ExecutionState& state, Value thisValue, size_t
String* flags_str = argv[1].isUndefined() ? String::emptyString : argv[1].toString(state);
RETURN_VALUE_IF_PENDING_EXCEPTION
retVal->init(state, pattern_str, flags_str);
RETURN_VALUE_IF_PENDING_EXCEPTION
return retVal;
}
static Value builtinRegExpSearch(ExecutionState& state, Value thisValue, size_t argc, Value* argv, Optional<Object*> newTarget)
@ -563,6 +565,7 @@ static Value builtinRegExpReplace(ExecutionState& state, Value thisValue, size_t
replacement = res.toString(state);
} else {
replacement = String::getSubstitution(state, matched, str, position, captures, namedCaptures, replaceValue.toString(state));
RETURN_VALUE_IF_PENDING_EXCEPTION
}
RETURN_VALUE_IF_PENDING_EXCEPTION
if (position >= nextSourcePosition) {

19
src/builtins/BuiltinString.cpp
View file

@ -604,8 +604,14 @@ static Value builtinStringReplaceAll(ExecutionState& state, Value thisValue, siz
if (searchValue.isObject() && searchValue.asObject()->isRegExp(state)) {
Value flags = searchValue.asObject()->get(state, ObjectPropertyName(state, state.context()->staticStrings().flags)).value(state, searchValue);
RETURN_VALUE_IF_PENDING_EXCEPTION
if (flags.isUndefinedOrNull() || !flags.toString(state)->contains("g")) {
if (flags.isUndefinedOrNull()) {
THROW_BUILTIN_ERROR_RETURN_VALUE(state, ErrorCode::TypeError, state.context()->staticStrings().replaceAll.string(), true, state.context()->staticStrings().replaceAll.string(), ErrorObject::Messages::GlobalObject_IllegalFirstArgument);
} else {
String* flagsStr = flags.toString(state);
RETURN_VALUE_IF_PENDING_EXCEPTION
if (!flagsStr->contains("g")) {
THROW_BUILTIN_ERROR_RETURN_VALUE(state, ErrorCode::TypeError, state.context()->staticStrings().replaceAll.string(), true, state.context()->staticStrings().replaceAll.string(), ErrorObject::Messages::GlobalObject_IllegalFirstArgument);
}
}
}
// Let replacer be ? GetMethod(searchValue, @@replace).
@ -659,6 +665,7 @@ static Value builtinStringReplaceAll(ExecutionState& state, Value thisValue, siz
} else {
StringVector captures;
replacement = String::getSubstitution(state, searchString, string, p, captures, Value(), replaceValue.asString());
RETURN_VALUE_IF_PENDING_EXCEPTION
}
builder.appendString(replacement);
endOfLastMatch = p + searchLength;
@ -690,7 +697,6 @@ static Value builtinStringSearch(ExecutionState& state, Value thisValue, size_t
RETURN_VALUE_IF_PENDING_EXCEPTION
RegExpObject* rx = new RegExpObject(state, regexp.isUndefined() ? String::emptyString : regexp.toString(state), String::emptyString);
RETURN_VALUE_IF_PENDING_EXCEPTION
RETURN_VALUE_IF_PENDING_EXCEPTION
Value func = rx->get(state, ObjectPropertyName(state.context()->vmInstance()->globalSymbols().search)).value(state, rx);
RETURN_VALUE_IF_PENDING_EXCEPTION
Value args[1] = { Value(string) };
@ -1319,8 +1325,11 @@ static Value builtinStringRaw(ExecutionState& state, Value thisValue, size_t arg
// Let cooked be ? ToObject(template).
Object* cooked = argTemplate.toObject(state);
RETURN_VALUE_IF_PENDING_EXCEPTION
// Let raw be ? ToObject(? Get(cooked, "raw")).
Object* raw = cooked->get(state, ObjectPropertyName(state.context()->staticStrings().raw)).value(state, cooked).toObject(state);
Value rawValue = cooked->get(state, ObjectPropertyName(state.context()->staticStrings().raw)).value(state, cooked);
RETURN_VALUE_IF_PENDING_EXCEPTION
Object* raw = rawValue.toObject(state);
RETURN_VALUE_IF_PENDING_EXCEPTION
// Let literalSegments be ? ToLength(? Get(raw, "length")).
double literalSegments = raw->length(state);
@ -1337,7 +1346,9 @@ static Value builtinStringRaw(ExecutionState& state, Value thisValue, size_t arg
while (true) {
// Let nextKey be ! ToString(nextIndex).
// Let nextSeg be ? ToString(? Get(raw, nextKey)).
String* nextSeg = raw->get(state, ObjectPropertyName(state, Value(nextIndex))).value(state, raw).toString(state);
Value nextSegValue = raw->get(state, ObjectPropertyName(state, Value(nextIndex))).value(state, raw);
RETURN_VALUE_IF_PENDING_EXCEPTION
String* nextSeg = nextSegValue.toString(state);
RETURN_VALUE_IF_PENDING_EXCEPTION
// Append in order the code unit elements of nextSeg to the end of stringElements.
for (size_t i = 0; i < nextSeg->length(); i++) {

1
src/runtime/RegExpObject.h
View file

@ -143,6 +143,7 @@ public:
{
if (UNLIKELY(m_hasNonWritableLastIndexRegExpObject && (option() & (Option::Sticky | Option::Global)))) {
Object::throwCannotWriteError(state, ObjectStructurePropertyName(state, String::fromASCII("lastIndex")));
return;
}
m_lastIndex = v;
}

2
src/runtime/String.cpp
View file

@ -49,6 +49,7 @@
#include "Value.h"
#include "parser/Lexer.h"
#include "runtime/ErrorObject.h"
#include "fast-dtoa.h"
#include "bignum-dtoa.h"
@ -1128,6 +1129,7 @@ String* String::getSubstitution(ExecutionState& state, String* matched, String*
if (ValidNamedCapturedGroup && namedCaptureObj) {
String* groupName = replacement->substring((i + 2), (namedCaptureEnd));
Value capture = namedCaptureObj->get(state, ObjectPropertyName(state, groupName)).value(state, Value(0));
RETURN_NULL_IF_PENDING_EXCEPTION
if (!capture.isUndefined()) {
builder.appendString(capture.toString(state));
}