github
/
boa
mirror of https://github.com/boa-dev/boa.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Fix sync generator yield expressions (#2838) 

Depends on #2837.

This Pull Request changes the following:

- Fix the remaining `language/expressions/yield` tests.
- Align the sync generator execution more to the spec.

This breaks one async generator test. We can ignore that one as async generators are currently very broken. I will try to fix async generators next.
pull/2852/head
raskad 2 years ago
parent
40a5ae0a2f
commit
8a29c5025b
3 changed files with 73 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 119
      boa_engine/src/builtins/generator/mod.rs
  2. 22
      boa_engine/src/vm/opcode/generator/mod.rs
  3. 4
      boa_engine/src/vm/opcode/generator/yield_stm.rs

119
boa_engine/src/builtins/generator/mod.rs
Unescape View File

@ -189,13 +189,7 @@ impl Generator {
context: &mut Context<'_>,
) -> JsResult<JsValue> {
// 1. Return ? GeneratorResume(this value, value, empty).
let completion = Self::generator_resume(this, args.get_or_undefined(0).clone(), context);
match completion {
CompletionRecord::Return(value) => Ok(create_iter_result_object(value, false, context)),
CompletionRecord::Normal(value) => Ok(create_iter_result_object(value, true, context)),
CompletionRecord::Throw(err) => Err(err),
}
Self::generator_resume(this, args.get_or_undefined(0).clone(), context)
}
/// `Generator.prototype.return ( value )`
@ -216,14 +210,7 @@ impl Generator {
// 1. Let g be the this value.
// 2. Let C be Completion { [[Type]]: return, [[Value]]: value, [[Target]]: empty }.
// 3. Return ? GeneratorResumeAbrupt(g, C, empty).
let completion =
Self::generator_resume_abrupt(this, Ok(args.get_or_undefined(0).clone()), context);
match completion {
CompletionRecord::Return(value) => Ok(create_iter_result_object(value, false, context)),
CompletionRecord::Normal(value) => Ok(create_iter_result_object(value, true, context)),
CompletionRecord::Throw(err) => Err(err),
}
Self::generator_resume_abrupt(this, Ok(args.get_or_undefined(0).clone()), context)
}
/// `Generator.prototype.throw ( exception )`
@ -245,17 +232,11 @@ impl Generator {
// 1. Let g be the this value.
// 2. Let C be ThrowCompletion(exception).
// 3. Return ? GeneratorResumeAbrupt(g, C, empty).
let completion = Self::generator_resume_abrupt(
Self::generator_resume_abrupt(
this,
Err(JsError::from_opaque(args.get_or_undefined(0).clone())),
context,
);
match completion {
CompletionRecord::Return(value) => Ok(create_iter_result_object(value, false, context)),
CompletionRecord::Normal(value) => Ok(create_iter_result_object(value, true, context)),
CompletionRecord::Throw(err) => Err(err),
}
)
}
/// `27.5.3.3 GeneratorResume ( generator, value, generatorBrand )`
@ -268,10 +249,10 @@ impl Generator {
gen: &JsValue,
value: JsValue,
context: &mut Context<'_>,
) -> CompletionRecord {
) -> JsResult<JsValue> {
// 1. Let state be ? GeneratorValidate(generator, generatorBrand).
let Some(generator_obj) = gen.as_object() else {
return CompletionRecord::Throw(
return Err(
JsNativeError::typ()
.with_message("Generator method called on non generator")
.into()
@ -279,7 +260,7 @@ impl Generator {
};
let mut generator_obj_mut = generator_obj.borrow_mut();
let Some(generator) = generator_obj_mut.as_generator_mut() else {
return CompletionRecord::Throw(
return Err(
JsNativeError::typ()
.with_message("generator resumed on non generator object")
.into()
@ -293,16 +274,18 @@ impl Generator {
let (mut generator_context, first_execution) =
match std::mem::replace(&mut generator.state, GeneratorState::Executing) {
GeneratorState::Executing => {
return CompletionRecord::Throw(
JsNativeError::typ()
.with_message("Generator should not be executing")
.into(),
);
return Err(JsNativeError::typ()
.with_message("Generator should not be executing")
.into());
}
// 2. If state is completed, return CreateIterResultObject(undefined, true).
GeneratorState::Completed => {
generator.state = GeneratorState::Completed;
return CompletionRecord::Normal(JsValue::undefined());
return Ok(create_iter_result_object(
JsValue::undefined(),
true,
context,
));
}
// 3. Assert: state is either suspendedStart or suspendedYield.
GeneratorState::SuspendedStart { context } => (context, true),
@ -322,18 +305,26 @@ impl Generator {
.as_generator_mut()
.expect("already checked this object type");
generator.state = match record {
CompletionRecord::Return(_) => GeneratorState::SuspendedYield {
context: generator_context,
},
CompletionRecord::Normal(_) | CompletionRecord::Throw(_) => GeneratorState::Completed,
};
// 8. Push genContext onto the execution context stack; genContext is now the running execution context.
// 9. Resume the suspended evaluation of genContext using NormalCompletion(value) as the result of the operation that suspended it. Let result be the value returned by the resumed computation.
// 10. Assert: When we return here, genContext has already been removed from the execution context stack and methodContext is the currently running execution context.
// 11. Return Completion(result).
record
match record {
CompletionRecord::Return(value) => {
generator.state = GeneratorState::SuspendedYield {
context: generator_context,
};
Ok(value)
}
CompletionRecord::Normal(value) => {
generator.state = GeneratorState::Completed;
Ok(create_iter_result_object(value, true, context))
}
CompletionRecord::Throw(err) => {
generator.state = GeneratorState::Completed;
Err(err)
}
}
}
/// `27.5.3.4 GeneratorResumeAbrupt ( generator, abruptCompletion, generatorBrand )`
@ -346,10 +337,10 @@ impl Generator {
gen: &JsValue,
abrupt_completion: JsResult<JsValue>,
context: &mut Context<'_>,
) -> CompletionRecord {
) -> JsResult<JsValue> {
// 1. Let state be ? GeneratorValidate(generator, generatorBrand).
let Some(generator_obj) = gen.as_object() else {
return CompletionRecord::Throw(
return Err(
JsNativeError::typ()
.with_message("Generator method called on non generator")
.into()
@ -357,7 +348,7 @@ impl Generator {
};
let mut generator_obj_mut = generator_obj.borrow_mut();
let Some(generator) = generator_obj_mut.as_generator_mut() else {
return CompletionRecord::Throw(
return Err(
JsNativeError::typ()
.with_message("generator resumed on non generator object")
.into()
@ -372,11 +363,9 @@ impl Generator {
let mut generator_context =
match std::mem::replace(&mut generator.state, GeneratorState::Executing) {
GeneratorState::Executing => {
return CompletionRecord::Throw(
JsNativeError::typ()
.with_message("Generator should not be executing")
.into(),
);
return Err(JsNativeError::typ()
.with_message("Generator should not be executing")
.into());
}
// 2. If state is suspendedStart, then
// 3. If state is completed, then
@ -389,10 +378,14 @@ impl Generator {
// with generator can be discarded at this point.
// a. If abruptCompletion.[[Type]] is return, then
// i. Return CreateIterResultObject(abruptCompletion.[[Value]], true).
if let Ok(value) = abrupt_completion {
// i. Return CreateIterResultObject(abruptCompletion.[[Value]], true).
let value = create_iter_result_object(value, true, context);
return Ok(value);
}
// b. Return Completion(abruptCompletion).
return abrupt_completion
.map_or_else(CompletionRecord::Throw, CompletionRecord::Normal);
return abrupt_completion;
}
GeneratorState::SuspendedYield { context } => context,
};
@ -415,13 +408,21 @@ impl Generator {
.as_generator_mut()
.expect("already checked this object type");
generator.state = match record {
CompletionRecord::Return(_) => GeneratorState::SuspendedYield {
context: generator_context,
},
CompletionRecord::Normal(_) | CompletionRecord::Throw(_) => GeneratorState::Completed,
};
record
match record {
CompletionRecord::Return(value) => {
generator.state = GeneratorState::SuspendedYield {
context: generator_context,
};
Ok(value)
}
CompletionRecord::Normal(value) => {
generator.state = GeneratorState::Completed;
Ok(create_iter_result_object(value, true, context))
}
CompletionRecord::Throw(err) => {
generator.state = GeneratorState::Completed;
Err(err)
}
}
}
}

22
boa_engine/src/vm/opcode/generator/mod.rs
Unescape View File

@ -7,7 +7,7 @@ use crate::{
string::utf16,
vm::{
call_frame::{AbruptCompletionRecord, GeneratorResumeKind},
opcode::Operation,
opcode::{control_flow::Return, Operation},
CompletionType,
},
Context, JsError, JsResult, JsValue,
@ -139,8 +139,9 @@ impl Operation for GeneratorNextDelegate {
match context.vm.frame().generator_resume_kind {
GeneratorResumeKind::Normal => {
let result = next_method.call(&iterator.clone().into(), &[received], context)?;
let result = result.as_object().ok_or_else(|| {
let result_value =
next_method.call(&iterator.clone().into(), &[received], context)?;
let result = result_value.as_object().ok_or_else(|| {
JsNativeError::typ().with_message("generator next method returned non-object")
})?;
// TODO: This is wrong for async generators, since we need to await the result first.
@ -151,10 +152,9 @@ impl Operation for GeneratorNextDelegate {
context.vm.push(value);
return Ok(CompletionType::Normal);
}
let value = result.get(utf16!("value"), context)?;
context.vm.push(iterator.clone());
context.vm.push(next_method.clone());
context.vm.push(value);
context.vm.push(result_value);
context.vm.frame_mut().r#yield = true;
Ok(CompletionType::Return)
}
@ -173,10 +173,9 @@ impl Operation for GeneratorNextDelegate {
context.vm.push(value);
return Ok(CompletionType::Normal);
}
let value = result_object.get(utf16!("value"), context)?;
context.vm.push(iterator.clone());
context.vm.push(next_method.clone());
context.vm.push(value);
context.vm.push(result);
context.vm.frame_mut().r#yield = true;
return Ok(CompletionType::Return);
}
@ -198,21 +197,18 @@ impl Operation for GeneratorNextDelegate {
})?;
let done = result_object.get(utf16!("done"), context)?.to_boolean();
if done {
context.vm.frame_mut().pc = done_address as usize;
let value = result_object.get(utf16!("value"), context)?;
context.vm.push(value);
return Ok(CompletionType::Return);
return Return::execute(context);
}
let value = result_object.get(utf16!("value"), context)?;
context.vm.push(iterator.clone());
context.vm.push(next_method.clone());
context.vm.push(value);
context.vm.push(result);
context.vm.frame_mut().r#yield = true;
return Ok(CompletionType::Return);
}
context.vm.frame_mut().pc = done_address as usize;
context.vm.push(received);
Ok(CompletionType::Return)
Return::execute(context)
}
}
}

4
boa_engine/src/vm/opcode/generator/yield_stm.rs
Unescape View File

@ -1,4 +1,5 @@
use crate::{
builtins::iterable::create_iter_result_object,
vm::{opcode::Operation, CompletionType},
Context, JsResult,
};
@ -15,6 +16,9 @@ impl Operation for Yield {
const INSTRUCTION: &'static str = "INST - Yield";
fn execute(context: &mut Context<'_>) -> JsResult<CompletionType> {
let value = context.vm.pop();
let value = create_iter_result_object(value, false, context);
context.vm.push(value);
context.vm.frame_mut().r#yield = true;
Ok(CompletionType::Return)
}

Write Preview
Loading…
Cancel
Save