core/avm1/avm2: Add AvmString::new_ascii_static and use it

Author: Lord-McSweeney

core/src/avm1/activation.rs

@@ -1008,7 +1008,7 @@ impl<'a, 'gc> Activation<'a, 'gc> {
         // SWF19: "If A is zero, the result NaN, Infinity, or -Infinity is pushed to the stack in SWF 5 and later.
         // In SWF 4, the result is the string #ERROR#."
         let result: Value<'gc> = if a == 0.0 && self.swf_version() < 5 {
-            AvmString::new_utf8(self.gc(), "#ERROR#").into()
+            AvmString::new_ascii_static(self.gc(), b"#ERROR#").into()
         } else {
             (b / a).into()
         };

core/src/avm1/globals/object.rs

@@ -116,9 +116,9 @@ fn to_string<'gc>(
     _args: &[Value<'gc>],
 ) -> Result<Value<'gc>, Error<'gc>> {
     if this.as_executable().is_some() {
-        Ok(AvmString::new_utf8(activation.gc(), "[type Function]").into())
+        Ok(AvmString::new_ascii_static(activation.gc(), b"[type Function]").into())
     } else {
-        Ok(AvmString::new_utf8(activation.gc(), "[object Object]").into())
+        Ok(AvmString::new_ascii_static(activation.gc(), b"[object Object]").into())
     }
 }
 

core/src/avm1/globals/system_ime.rs

@@ -44,7 +44,7 @@ fn get_conversion_mode<'gc>(
     _this: Object<'gc>,
     _args: &[Value<'gc>],
 ) -> Result<Value<'gc>, Error<'gc>> {
-    Ok(AvmString::new_utf8(activation.gc(), "KOREAN").into())
+    Ok(AvmString::new_ascii_static(activation.gc(), b"KOREAN").into())
 }
 
 fn get_enabled<'gc>(

core/src/avm1/value.rs

@@ -423,9 +423,9 @@ impl<'gc> Value<'gc> {
                         Value::String(s) => s,
                         _ => {
                             if object.as_executable().is_some() {
-                                AvmString::new_utf8(activation.gc(), "[type Function]")
+                                AvmString::new_ascii_static(activation.gc(), b"[type Function]")
                             } else {
-                                AvmString::new_utf8(activation.gc(), "[type Object]")
+                                AvmString::new_ascii_static(activation.gc(), b"[type Object]")
                             }
                         }
                     }

core/src/avm2/domain.rs

@@ -290,7 +290,7 @@ impl<'gc> Domain<'gc> {
                 activation.gc(),
                 &name[(start + 2)..(name.len() - 1)],
             ));
-            name = AvmString::new_utf8(activation.gc(), "__AS3__.vec::Vector");
+            name = AvmString::new_ascii_static(activation.gc(), b"__AS3__.vec::Vector");
         }
         // FIXME - is this the correct api version?
         let api_version = activation.avm2().root_api_version;

core/src/avm2/globals/Date.as

@@ -4,8 +4,6 @@ package {
     public dynamic class Date {
         public static const length:int = 7;
 
-        private static const invalidDateStr:String = "Invalid Date";
-
         prototype.valueOf = function():* {
             var d:Date = this;
             return d.AS3::valueOf();

core/src/avm2/globals/class.rs

@@ -103,7 +103,7 @@ pub fn create_c_class<'gc>(
     let gc_context = activation.gc();
     let namespaces = activation.avm2().namespaces;
 
-    let class_name = AvmString::new_utf8(gc_context, "Class$");
+    let class_name = AvmString::new_ascii_static(gc_context, b"Class$");
     let class_c_class = Class::custom_new(
         QName::new(namespaces.public_all(), class_name),
         Some(class_i_class),

core/src/avm2/globals/date.rs

@@ -934,7 +934,7 @@ pub fn to_string<'gc>(
         )
         .into())
     } else {
-        Ok(AvmString::new_utf8(activation.gc(), "Invalid Date").into())
+        Ok(AvmString::new_ascii_static(activation.gc(), b"Invalid Date").into())
     }
 }
 
@@ -955,7 +955,7 @@ pub fn to_utc_string<'gc>(
         )
         .into())
     } else {
-        Ok(AvmString::new_utf8(activation.gc(), "Invalid Date").into())
+        Ok(AvmString::new_ascii_static(activation.gc(), b"Invalid Date").into())
     }
 }
 
@@ -979,7 +979,7 @@ pub fn to_locale_string<'gc>(
         )
         .into())
     } else {
-        Ok(AvmString::new_utf8(activation.gc(), "Invalid Date").into())
+        Ok(AvmString::new_ascii_static(activation.gc(), b"Invalid Date").into())
     }
 }
 
@@ -999,7 +999,7 @@ pub fn to_time_string<'gc>(
     {
         Ok(AvmString::new_utf8(activation.gc(), date.format("%T GMT%z").to_string()).into())
     } else {
-        Ok(AvmString::new_utf8(activation.gc(), "Invalid Date").into())
+        Ok(AvmString::new_ascii_static(activation.gc(), b"Invalid Date").into())
     }
 }
 
@@ -1019,7 +1019,7 @@ pub fn to_locale_time_string<'gc>(
     {
         Ok(AvmString::new_utf8(activation.gc(), date.format("%T %p").to_string()).into())
     } else {
-        Ok(AvmString::new_utf8(activation.gc(), "Invalid Date").into())
+        Ok(AvmString::new_ascii_static(activation.gc(), b"Invalid Date").into())
     }
 }
 
@@ -1039,7 +1039,7 @@ pub fn to_date_string<'gc>(
     {
         Ok(AvmString::new_utf8(activation.gc(), date.format("%a %b %-d %-Y").to_string()).into())
     } else {
-        Ok(AvmString::new_utf8(activation.gc(), "Invalid Date").into())
+        Ok(AvmString::new_ascii_static(activation.gc(), b"Invalid Date").into())
     }
 }
 

core/src/avm2/globals/flash/ui/keyboard.rs

@@ -39,7 +39,7 @@ pub fn get_physical_keyboard_type<'gc>(
     _args: &[Value<'gc>],
 ) -> Result<Value<'gc>, Error<'gc>> {
     avm2_stub_getter!(activation, "flash.ui.Keyboard", "physicalKeyboardType");
-    Ok(AvmString::new_utf8(activation.gc(), "alphanumeric").into())
+    Ok(AvmString::new_ascii_static(activation.gc(), b"alphanumeric").into())
 }
 
 pub fn is_accessible<'gc>(

core/src/avm2/globals/number.rs

@@ -136,7 +136,7 @@ pub fn print_with_radix<'gc>(
 
     if number.is_infinite() {
         if number < 0.0 {
-            return Ok(AvmString::new_utf8(activation.gc(), "-Infinity"));
+            return Ok(AvmString::new_ascii_static(activation.gc(), b"-Infinity"));
         } else if number > 0.0 {
             return Ok(istr!("Infinity"));
         }