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

avm1: Make current_stack_frame return a Result for easy chaining

This commit is contained in:
Nathan Adams 2020-06-27 11:51:35 +02:00
parent cdfd58d619
commit a841743962
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/avm1.rs
View File

@ -391,8 +391,8 @@ impl<'gc> Avm1<'gc> {
/// Retrieve the current AVM execution frame. /// Retrieve the current AVM execution frame.
/// ///
/// Yields None if there is no stack frame. /// Yields None if there is no stack frame.
pub fn current_stack_frame(&self) -> Option<GcCell<'gc, Activation<'gc>>> { pub fn current_stack_frame(&self) -> Result<GcCell<'gc, Activation<'gc>>, Error<'gc>> {
self.stack_frames.last().copied() self.stack_frames.last().copied().ok_or(Error::NoStackFrame)
} }
/// Checks if there is currently a stack frame. /// Checks if there is currently a stack frame.
@ -683,7 +683,7 @@ impl<'gc> Avm1<'gc> {
let path = unsafe { std::str::from_utf8_unchecked(path) }; let path = unsafe { std::str::from_utf8_unchecked(path) };
let var_name = unsafe { std::str::from_utf8_unchecked(var_name) }; let var_name = unsafe { std::str::from_utf8_unchecked(var_name) };
let mut current_scope = Some(self.current_stack_frame().unwrap().read().scope_cell()); let mut current_scope = Some(self.current_stack_frame()?.read().scope_cell());
while let Some(scope) = current_scope { while let Some(scope) = current_scope {
if let Some(object) = if let Some(object) =
self.resolve_target_path(context, start.root(), *scope.read().locals(), path)? self.resolve_target_path(context, start.root(), *scope.read().locals(), path)?
@ -701,7 +701,7 @@ impl<'gc> Avm1<'gc> {
// If it doesn't have a trailing variable, it can still be a slash path. // If it doesn't have a trailing variable, it can still be a slash path.
// We can skip this step if we didn't find a slash above. // We can skip this step if we didn't find a slash above.
if has_slash { if has_slash {
let mut current_scope = Some(self.current_stack_frame().unwrap().read().scope_cell()); let mut current_scope = Some(self.current_stack_frame()?.read().scope_cell());
while let Some(scope) = current_scope { while let Some(scope) = current_scope {
if let Some(object) = if let Some(object) =
self.resolve_target_path(context, start.root(), *scope.read().locals(), path)? self.resolve_target_path(context, start.root(), *scope.read().locals(), path)?
@ -714,8 +714,7 @@ impl<'gc> Avm1<'gc> {
// Finally! It's a plain old variable name. // Finally! It's a plain old variable name.
// Resolve using scope chain, as normal. // Resolve using scope chain, as normal.
self.current_stack_frame() self.current_stack_frame()?
.unwrap()
.read() .read()
.resolve(&path, self, context) .resolve(&path, self, context)
} }
@ -768,7 +767,7 @@ impl<'gc> Avm1<'gc> {
let path = unsafe { std::str::from_utf8_unchecked(path) }; let path = unsafe { std::str::from_utf8_unchecked(path) };
let var_name = unsafe { std::str::from_utf8_unchecked(var_name) }; let var_name = unsafe { std::str::from_utf8_unchecked(var_name) };
let mut current_scope = Some(self.current_stack_frame().unwrap().read().scope_cell()); let mut current_scope = Some(self.current_stack_frame()?.read().scope_cell());
while let Some(scope) = current_scope { while let Some(scope) = current_scope {
if let Some(object) = if let Some(object) =
self.resolve_target_path(context, start.root(), *scope.read().locals(), path)? self.resolve_target_path(context, start.root(), *scope.read().locals(), path)?
@ -786,7 +785,7 @@ impl<'gc> Avm1<'gc> {
// Set using scope chain, as normal. // Set using scope chain, as normal.
// This will overwrite the value if the property exists somewhere // This will overwrite the value if the property exists somewhere
// in the scope chain, otherwise it is created on the top-level object. // in the scope chain, otherwise it is created on the top-level object.
let sf = self.current_stack_frame().unwrap(); let sf = self.current_stack_frame()?;
let stack_frame = sf.read(); let stack_frame = sf.read();
let this = stack_frame.this_cell(); let this = stack_frame.this_cell();
let scope = stack_frame.scope_cell(); let scope = stack_frame.scope_cell();

2
core/src/avm1/stack_frame.rs
View File

@ -440,7 +440,7 @@ impl<'a, 'gc: 'a> StackFrame<'a, 'gc> {
action, action,
context, context,
); );
let frame = self.avm.current_stack_frame().unwrap(); let frame = self.avm.current_stack_frame()?;
self.avm.run_activation(context, frame)?; self.avm.run_activation(context, frame)?;
} }
} else { } else {