liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement `coerce_s` and `convert_s`.

This commit is contained in:
David Wendt 2020-06-27 16:37:19 -04:00 committed by Mike Welsh
parent 90d2964adf
commit 0138300b5a
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/avm2/activation.rs
View File

@ -474,10 +474,12 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
Op::NewFunction { index } => self.op_new_function(method, index),
Op::NewClass { index } => self.op_new_class(method, index),
Op::CoerceA => self.op_coerce_a(),
Op::CoerceS => self.op_coerce_s(),
Op::ConvertB => self.op_convert_b(),
Op::ConvertI => self.op_convert_i(),
Op::ConvertU => self.op_convert_u(),
Op::ConvertD => self.op_convert_d(),
Op::ConvertS => self.op_convert_s(),
Op::Jump { offset } => self.op_jump(offset, reader),
Op::IfTrue { offset } => self.op_if_true(offset, reader),
Op::IfFalse { offset } => self.op_if_false(offset, reader),
@ -1313,6 +1315,19 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
Ok(FrameControl::Continue)
}
fn op_coerce_s(&mut self) -> Result<FrameControl<'gc>, Error> {
let value = self.context.avm2.pop();
let coerced = match value {
Value::Undefined | Value::Null => Value::Null,
_ => value.coerce_to_string(self)?.into(),
};
self.context.avm2.push(coerced);
Ok(FrameControl::Continue)
}
fn op_convert_b(&mut self) -> Result<FrameControl<'gc>, Error> {
let value = self.context.avm2.pop().coerce_to_boolean();
@ -1337,6 +1352,14 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
Ok(FrameControl::Continue)
}
fn op_convert_s(&mut self) -> Result<FrameControl<'gc>, Error> {
let value = self.context.avm2.pop().coerce_to_string(self)?;
self.context.avm2.push(value);
Ok(FrameControl::Continue)
}
fn op_convert_u(&mut self) -> Result<FrameControl<'gc>, Error> {
let value = self.context.avm2.pop().coerce_to_u32(self)?;