Skip to content

Commit aa373d4

Browse files
avm2: Add make_error_1126 function and use it
1 parent 9f6a276 commit aa373d4

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

core/src/avm2/error.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,20 @@ pub fn make_error_1125<'gc>(
768768
}
769769
}
770770

771+
#[inline(never)]
772+
#[cold]
773+
pub fn make_error_1126<'gc>(activation: &mut Activation<'_, 'gc>) -> Error<'gc> {
774+
let err = range_error(
775+
activation,
776+
"Error #1126: Cannot change the length of a fixed Vector.",
777+
1126,
778+
);
779+
match err {
780+
Ok(err) => Error::avm_error(err),
781+
Err(err) => err,
782+
}
783+
}
784+
771785
#[inline(never)]
772786
#[cold]
773787
pub fn make_error_1127<'gc>(activation: &mut Activation<'_, 'gc>) -> Error<'gc> {

core/src/avm2/vector.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use crate::avm2::activation::Activation;
44
use crate::avm2::class::Class;
5-
use crate::avm2::error::{make_error_1125, range_error};
5+
use crate::avm2::error::{make_error_1125, make_error_1126};
66
use crate::avm2::value::Value;
77
use crate::avm2::Error;
88
use gc_arena::Collect;
@@ -56,11 +56,7 @@ impl<'gc> VectorStorage<'gc> {
5656

5757
pub fn check_fixed(&self, activation: &mut Activation<'_, 'gc>) -> Result<(), Error<'gc>> {
5858
if self.is_fixed {
59-
return Err(Error::avm_error(range_error(
60-
activation,
61-
"Error #1126: Cannot change the length of a fixed Vector.",
62-
1126,
63-
)?));
59+
return Err(make_error_1126(activation));
6460
}
6561
Ok(())
6662
}

0 commit comments

Comments
 (0)