core: use istr! instead of statically-known ascii_char calls

core/src/avm1/globals/array.rs

@@ -253,7 +253,7 @@ pub fn join<'gc>(
     let separator = if let Some(v) = args.get(0) {
         v.coerce_to_string(activation)?
     } else {
-        ",".into()
+        istr!(",")
     };
 
     if length <= 0 {

core/src/avm1/globals/number.rs

@@ -1,6 +1,7 @@
 //! `Number` class impl
 
 use gc_arena::Gc;
+use ruffle_macros::istr;
 
 use crate::avm1::activation::Activation;
 use crate::avm1::clamp::Clamp;
@@ -134,7 +135,7 @@ fn to_string<'gc>(
             Ordering::Greater => (number, false),
             Ordering::Equal => {
                 // Bail out immediately if we're 0.
-                return Ok("0".into());
+                return Ok(istr!("0").into());
             }
         };
 

core/src/avm1/globals/string.rs

@@ -269,7 +269,7 @@ fn split<'gc>(
     // and the empty string behaves the same as undefined does in later SWF versions.
     let is_swf5 = activation.swf_version() == 5;
     if let Some(delimiter) = match args.get(0).unwrap_or(&Value::Undefined) {
-        &Value::Undefined => is_swf5.then_some(",".into()),
+        &Value::Undefined => is_swf5.then_some(istr!(",")),
         v => Some(v.coerce_to_string(activation)?).filter(|s| !(is_swf5 && s.is_empty())),
     } {
         if delimiter.is_empty() {

core/src/avm1/value.rs

@@ -412,10 +412,10 @@ impl<'gc> Value<'gc> {
         Ok(match self {
             Value::Undefined if activation.swf_version() < 7 => istr!(""),
             Value::Bool(true) if activation.swf_version() < 5 => {
-                activation.strings().ascii_char(b'1')
+                istr!("1")
             }
             Value::Bool(false) if activation.swf_version() < 5 => {
-                activation.strings().ascii_char(b'0')
+                istr!("0")
             }
             Value::Object(object) => {
                 if let Some(object) = object
@@ -571,7 +571,7 @@ fn f64_to_string<'gc>(activation: &mut Activation<'_, 'gc>, mut n: f64) -> AvmSt
         // FIXME is there an easy way to use istr! here?
         AvmString::new_utf8_bytes(activation.gc(), b"-Infinity")
     } else if n == 0.0 {
-        activation.strings().ascii_char(b'0')
+        istr!("0")
     } else if n >= -2147483648.0 && n <= 2147483647.0 && n.fract() == 0.0 {
         // Fast path for integers.
         let n = n as i32;

core/src/avm2/globals/array.rs

@@ -165,7 +165,7 @@ pub fn join<'gc>(
 
     if let Some(array) = this.as_array_storage() {
         let string_separator = if matches!(separator, Value::Undefined) {
-            activation.strings().ascii_char(b',')
+            istr!(",")
         } else {
             separator.coerce_to_string(activation)?
         };

core/src/avm2/globals/avmplus.rs

@@ -458,7 +458,7 @@ fn display_name<'gc>(
     if let Some(name) = name {
         name.to_qualified_name_or_star(context)
     } else {
-        context.ascii_char(b'*')
+        istr!(context, "*")
     }
 }
 

core/src/avm2/globals/int.rs

@@ -1,5 +1,7 @@
 //! `int` impl
 
+use ruffle_macros::istr;
+
 use crate::avm2::activation::Activation;
 use crate::avm2::class::{Class, ClassAttributes};
 use crate::avm2::error::{make_error_1003, make_error_1004};
@@ -166,7 +168,7 @@ fn to_string<'gc>(
     if let Some(this) = this.as_object() {
         let int_proto = activation.avm2().classes().int.prototype();
         if Object::ptr_eq(int_proto, this) {
-            return Ok("0".into());
+            return Ok(istr!("0").into());
         }
     }
 

core/src/avm2/globals/number.rs

@@ -1,5 +1,7 @@
 //! `Number` impl
 
+use ruffle_macros::istr;
+
 use crate::avm2::activation::Activation;
 use crate::avm2::class::{Class, ClassAttributes};
 use crate::avm2::error::{make_error_1002, make_error_1003, make_error_1004};
@@ -309,7 +311,7 @@ fn to_string<'gc>(
     if let Some(this) = this.as_object() {
         let number_proto = activation.avm2().classes().number.prototype();
         if Object::ptr_eq(number_proto, this) {
-            return Ok("0".into());
+            return Ok(istr!("0").into());
         }
     }
 

core/src/avm2/globals/uint.rs

@@ -1,5 +1,7 @@
 //! `uint` impl
 
+use ruffle_macros::istr;
+
 use crate::avm2::activation::Activation;
 use crate::avm2::class::{Class, ClassAttributes};
 use crate::avm2::error::{make_error_1003, make_error_1004};
@@ -166,7 +168,7 @@ fn to_string<'gc>(
     if let Some(this) = this.as_object() {
         let uint_proto = activation.avm2().classes().uint.prototype();
         if Object::ptr_eq(uint_proto, this) {
-            return Ok("0".into());
+            return Ok(istr!("0").into());
         }
     }
 

core/src/avm2/multiname.rs

@@ -9,6 +9,7 @@ use crate::string::{AvmString, StringContext, WStr, WString};
 use bitflags::bitflags;
 use gc_arena::Gc;
 use gc_arena::{Collect, Mutation};
+use ruffle_macros::istr;
 use std::fmt::Debug;
 use std::ops::Deref;
 use swf::avm2::types::{Index, Multiname as AbcMultiname, NamespaceSet as AbcNamespaceSet};
@@ -480,7 +481,7 @@ impl<'gc> Multiname<'gc> {
     /// This is used by `describeType`
     pub fn to_qualified_name_or_star(&self, context: &mut StringContext<'gc>) -> AvmString<'gc> {
         if self.is_any_name() {
-            context.ascii_char(b'*')
+            istr!(context, "*")
         } else {
             self.to_qualified_name(context.gc())
         }
@@ -497,7 +498,7 @@ impl<'gc> Multiname<'gc> {
 
         if ns.is_empty() {
             // Special-case this to avoid allocating.
-            self.name.unwrap_or_else(|| context.ascii_char(b'*'))
+            self.name.unwrap_or_else(|| istr!(context, "*"))
         } else {
             let mut uri = WString::new();
             uri.push_str(ns);

core/src/avm2/object/proxy_object.rs

@@ -10,6 +10,7 @@ use crate::avm2::Error;
 use crate::avm2::Multiname;
 use core::fmt;
 use gc_arena::{Collect, Gc, GcWeak};
+use ruffle_macros::istr;
 
 /// A class instance allocator that allocates Proxy objects.
 pub fn proxy_allocator<'gc>(
@@ -130,10 +131,7 @@ impl<'gc> TObject<'gc> for ProxyObject<'gc> {
         Ok(self_val
             .call_method(
                 proxy_methods::HAS_PROPERTY,
-                &[name
-                    .local_name()
-                    .unwrap_or_else(|| activation.strings().ascii_char(b'*'))
-                    .into()],
+                &[name.local_name().unwrap_or_else(|| istr!("*")).into()],
                 activation,
             )?
             .coerce_to_boolean())

core/src/avm2/object/qname_object.rs

@@ -93,7 +93,7 @@ impl<'gc> QNameObject<'gc> {
     pub fn local_name(&self, context: &mut StringContext<'gc>) -> AvmString<'gc> {
         let name = self.name();
 
-        name.local_name().unwrap_or(context.ascii_char(b'*'))
+        name.local_name().unwrap_or_else(|| istr!(context, "*"))
     }
 
     pub fn set_is_qname(&self, mc: &Mutation<'gc>, is_qname: bool) {

core/src/avm2/property.rs

@@ -7,6 +7,7 @@ use crate::avm2::TranslationUnit;
 use crate::avm2::Value;
 use crate::string::{AvmString, StringContext};
 use gc_arena::{Collect, Gc};
+use ruffle_macros::istr;
 
 use super::class::Class;
 
@@ -116,7 +117,7 @@ impl<'gc> PropertyClass<'gc> {
         match self {
             PropertyClass::Class(class) => class.name().to_qualified_name(context.gc()),
             PropertyClass::Name(name, _) => name.to_qualified_name_or_star(context),
-            PropertyClass::Any => context.ascii_char(b'*'),
+            PropertyClass::Any => istr!(context, "*"),
         }
     }
 }

core/src/avm2/value.rs

@@ -777,7 +777,7 @@ impl<'gc> Value<'gc> {
             Value::Bool(true) => istr!("true"),
             Value::Bool(false) => istr!("false"),
             Value::Number(n) if n.is_nan() => istr!("NaN"),
-            Value::Number(n) if *n == 0.0 => activation.strings().ascii_char(b'0'),
+            Value::Number(n) if *n == 0.0 => istr!("0"),
             Value::Number(n) if *n < 0.0 => AvmString::new_utf8(
                 activation.gc(),
                 format!("-{}", Value::Number(-n).coerce_to_string(activation)?),