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

Don't spam the test log with `Resolving Multiname` messages for each scope that gets checked

This commit is contained in:
David Wendt 2020-02-23 16:32:16 -05:00
parent dd6b0a8728
commit a7ff2de476
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/avm2.rs
View File

@ -89,12 +89,13 @@ impl<'gc> Avm2<'gc> {
let abc_file = Rc::new(read.read()?); let abc_file = Rc::new(read.read()?);
if !abc_file.scripts.is_empty() { for i in (0..abc_file.scripts.len()).rev() {
let entrypoint_script: Index<AbcScript> = Index::new(abc_file.scripts.len() as u32 - 1); let entrypoint_script: Index<AbcScript> = Index::new(i as u32);
let entrypoint: Result<Avm2ScriptEntry, Error> = let entrypoint: Result<Avm2ScriptEntry, Error> =
Avm2ScriptEntry::from_script_index(abc_file, entrypoint_script.clone()).ok_or_else( Avm2ScriptEntry::from_script_index(abc_file.clone(), entrypoint_script.clone())
|| format!("Script method {} does not exist", entrypoint_script.0).into(), .ok_or_else(|| {
); format!("Script method {} does not exist", entrypoint_script.0).into()
});
let entrypoint = entrypoint?; let entrypoint = entrypoint?;
let scope = Scope::push_scope(None, self.globals(), context.gc_context); let scope = Scope::push_scope(None, self.globals(), context.gc_context);
@ -730,6 +731,7 @@ impl<'gc> Avm2<'gc> {
index: Index<AbcMultiname>, index: Index<AbcMultiname>,
) -> Result<(), Error> { ) -> Result<(), Error> {
let multiname = self.pool_multiname(index)?; let multiname = self.pool_multiname(index)?;
avm_debug!("Resolving {:?}", multiname);
let result = self let result = self
.current_stack_frame() .current_stack_frame()
.unwrap() .unwrap()
@ -748,6 +750,7 @@ impl<'gc> Avm2<'gc> {
index: Index<AbcMultiname>, index: Index<AbcMultiname>,
) -> Result<(), Error> { ) -> Result<(), Error> {
let multiname = self.pool_multiname(index)?; let multiname = self.pool_multiname(index)?;
avm_debug!("Resolving {:?}", multiname);
let found: Result<Object<'gc>, Error> = self let found: Result<Object<'gc>, Error> = self
.current_stack_frame() .current_stack_frame()
.unwrap() .unwrap()
@ -768,6 +771,7 @@ impl<'gc> Avm2<'gc> {
index: Index<AbcMultiname>, index: Index<AbcMultiname>,
) -> Result<(), Error> { ) -> Result<(), Error> {
let multiname = self.pool_multiname_static(index)?; let multiname = self.pool_multiname_static(index)?;
avm_debug!("Resolving {:?}", multiname);
let found: Result<Result<ReturnValue<'gc>, Error>, Error> = self let found: Result<Result<ReturnValue<'gc>, Error>, Error> = self
.current_stack_frame() .current_stack_frame()
.unwrap() .unwrap()

1
core/src/avm2/object.rs
View File

@ -75,7 +75,6 @@ pub trait TObject<'gc>: 'gc + Collect + Debug + Into<Object<'gc>> + Clone + Copy
/// Resolve a multiname into a single QName, if any of the namespaces /// Resolve a multiname into a single QName, if any of the namespaces
/// match. /// match.
fn resolve_multiname(self, multiname: &Multiname) -> Option<QName> { fn resolve_multiname(self, multiname: &Multiname) -> Option<QName> {
avm_debug!("Resolving {:?}", multiname);
for ns in multiname.namespace_set() { for ns in multiname.namespace_set() {
let qname = QName::new(ns.clone(), multiname.local_name()?); let qname = QName::new(ns.clone(), multiname.local_name()?);