avm2: Fix getQualifiedClassName for null and undefined
This commit is contained in:
parent
66fa67cdcc
commit
53f42e0bec
|
@ -193,10 +193,14 @@ pub fn get_qualified_class_name<'gc>(
|
||||||
_this: Option<Object<'gc>>,
|
_this: Option<Object<'gc>>,
|
||||||
args: &[Value<'gc>],
|
args: &[Value<'gc>],
|
||||||
) -> Result<Value<'gc>, Error<'gc>> {
|
) -> Result<Value<'gc>, Error<'gc>> {
|
||||||
let obj = args
|
// This is a native method, which enforces the argument count.
|
||||||
.get(0)
|
let val = args[0];
|
||||||
.unwrap_or(&Value::Undefined)
|
match val {
|
||||||
.coerce_to_object(activation)?;
|
Value::Null => return Ok("null".into()),
|
||||||
|
Value::Undefined => return Ok("void".into()),
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
let obj = val.coerce_to_object(activation)?;
|
||||||
|
|
||||||
let class = match obj.as_class_object() {
|
let class = match obj.as_class_object() {
|
||||||
Some(class) => class,
|
Some(class) => class,
|
||||||
|
|
|
@ -21,3 +21,6 @@ trace(getQualifiedClassName(String));
|
||||||
trace(getQualifiedClassName(new flash.utils.ByteArray()));
|
trace(getQualifiedClassName(new flash.utils.ByteArray()));
|
||||||
|
|
||||||
trace(getQualifiedClassName(new String()));
|
trace(getQualifiedClassName(new String()));
|
||||||
|
|
||||||
|
trace(getQualifiedClassName(null));
|
||||||
|
trace(getQualifiedClassName(undefined));
|
|
@ -6,3 +6,5 @@ int
|
||||||
String
|
String
|
||||||
flash.utils::ByteArray
|
flash.utils::ByteArray
|
||||||
String
|
String
|
||||||
|
null
|
||||||
|
void
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue