Rename RegExpInstance to JsRegExp (#1595)

sebastienros · Jul 28, 2023 · 40f1f42 · 40f1f42
1 parent a41a0e3
commit 40f1f42
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 60 deletions.
diff --git a/Jint.Tests/Runtime/JsValueConversionTests.cs b/Jint.Tests/Runtime/JsValueConversionTests.cs
@@ -119,7 +119,7 @@ public void ShouldBeAnObject()
         [Fact]
         public void ShouldBeARegExp()
         {
-            var value = new RegExpInstance(_engine);
+            var value = new JsRegExp(_engine);
             Assert.Equal(false, value.IsBoolean());
             Assert.Equal(false, value.IsArray());
             Assert.Equal(false, value.IsDate());

diff --git a/Jint/JsValueExtensions.cs b/Jint/JsValueExtensions.cs
@@ -69,7 +69,7 @@ public static bool IsRegExp(this JsValue value)
                 return TypeConverter.ToBoolean(matcher);
             }
 
-            return value is RegExpInstance;
+            return value is JsRegExp;
         }
 
         [Pure]
@@ -148,14 +148,14 @@ public static JsDate AsDate(this JsValue value)
         }
 
         [Pure]
-        public static RegExpInstance AsRegExp(this JsValue value)
+        public static JsRegExp AsRegExp(this JsValue value)
         {
             if (!value.IsRegExp())
             {
                 ExceptionHelper.ThrowArgumentException("The value is not a regex");
             }
 
-            return (RegExpInstance) value;
+            return (JsRegExp) value;
         }
 
         [Pure]

diff --git a/Jint/Native/Iterator/IteratorInstance.cs b/Jint/Native/Iterator/IteratorInstance.cs
@@ -132,7 +132,7 @@ public override bool TryIteratorStep(out ObjectInstance nextItem)
 
         internal sealed class RegExpStringIterator : IteratorInstance
         {
-            private readonly RegExpInstance _iteratingRegExp;
+            private readonly JsRegExp _iteratingRegExp;
             private readonly string _s;
             private readonly bool _global;
             private readonly bool _unicode;
@@ -141,7 +141,7 @@ internal sealed class RegExpStringIterator : IteratorInstance
 
             public RegExpStringIterator(Engine engine, ObjectInstance iteratingRegExp, string iteratedString, bool global, bool unicode) : base(engine)
             {
-                var r = iteratingRegExp as RegExpInstance;
+                var r = iteratingRegExp as JsRegExp;
                 if (r is null)
                 {
                     ExceptionHelper.ThrowTypeError(engine.Realm);
@@ -174,9 +174,9 @@ public override bool TryIteratorStep(out ObjectInstance nextItem)
                     var macthStr = TypeConverter.ToString(match.Get(JsString.NumberZeroString));
                     if (macthStr == "")
                     {
-                        var thisIndex = TypeConverter.ToLength(_iteratingRegExp.Get(RegExpInstance.PropertyLastIndex));
+                        var thisIndex = TypeConverter.ToLength(_iteratingRegExp.Get(JsRegExp.PropertyLastIndex));
                         var nextIndex = thisIndex + 1;
-                        _iteratingRegExp.Set(RegExpInstance.PropertyLastIndex, nextIndex, true);
+                        _iteratingRegExp.Set(JsRegExp.PropertyLastIndex, nextIndex, true);
                     }
                 }
                 else

diff --git a/Jint/Native/Object/ObjectInstance.cs b/Jint/Native/Object/ObjectInstance.cs
@@ -1024,7 +1024,7 @@ private object ToObject(ObjectTraverseStack stack)
                     break;
 
                 case ObjectClass.RegExp:
-                    if (this is RegExpInstance regeExpInstance)
+                    if (this is JsRegExp regeExpInstance)
                     {
                         converted = regeExpInstance.Value;
                     }

diff --git a/Jint/Native/RegExp/RegExpInstance.cs → Jint/Native/RegExp/JsRegExp.cs b/Jint/Native/RegExp/RegExpInstance.cs → Jint/Native/RegExp/JsRegExp.cs
@@ -5,7 +5,7 @@
 
 namespace Jint.Native.RegExp
 {
-    public sealed class RegExpInstance : ObjectInstance
+    public sealed class JsRegExp : ObjectInstance
     {
         internal const string regExpForMatchingAllCharacters = "(?:)";
         internal static readonly JsString PropertyLastIndex = new("lastIndex");
@@ -14,7 +14,7 @@ public sealed class RegExpInstance : ObjectInstance
 
         private PropertyDescriptor _prototypeDescriptor = null!;
 
-        public RegExpInstance(Engine engine)
+        public JsRegExp(Engine engine)
             : base(engine, ObjectClass.RegExp)
         {
             Source = regExpForMatchingAllCharacters;

diff --git a/Jint/Native/RegExp/RegExpConstructor.cs b/Jint/Native/RegExp/RegExpConstructor.cs
@@ -72,7 +72,7 @@ public override ObjectInstance Construct(JsValue[] arguments, JsValue newTarget)
 
             JsValue p;
             JsValue f;
-            if (pattern is RegExpInstance regExpInstance)
+            if (pattern is JsRegExp regExpInstance)
             {
                 p = regExpInstance.Source;
                 f = flags.IsUndefined() ? regExpInstance.Flags : flags;
@@ -92,7 +92,7 @@ public override ObjectInstance Construct(JsValue[] arguments, JsValue newTarget)
             return RegExpInitialize(r, p, f);
         }
 
-        private ObjectInstance RegExpInitialize(RegExpInstance r, JsValue pattern, JsValue flags)
+        private ObjectInstance RegExpInitialize(JsRegExp r, JsValue pattern, JsValue flags)
         {
             var p = pattern.IsUndefined() ? "" : TypeConverter.ToString(pattern);
             if (string.IsNullOrEmpty(p))
@@ -129,18 +129,18 @@ private ObjectInstance RegExpInitialize(RegExpInstance r, JsValue pattern, JsVal
             return r;
         }
 
-        private RegExpInstance RegExpAlloc(JsValue newTarget)
+        private JsRegExp RegExpAlloc(JsValue newTarget)
         {
             var r = OrdinaryCreateFromConstructor(
                 newTarget,
                 static intrinsics => intrinsics.RegExp.PrototypeObject,
-                static (Engine engine, Realm _, object? _) => new RegExpInstance(engine));
+                static (Engine engine, Realm _, object? _) => new JsRegExp(engine));
             return r;
         }
 
-        public RegExpInstance Construct(Regex regExp, string source, string flags)
+        public JsRegExp Construct(Regex regExp, string source, string flags)
         {
-            var r = new RegExpInstance(Engine);
+            var r = new JsRegExp(Engine);
             r._prototype = PrototypeObject;
 
             r.Flags = flags;
@@ -161,9 +161,9 @@ public RegExpInstance Construct(Regex regExp, string source, string flags)
             return r;
         }
 
-        private static void RegExpInitialize(RegExpInstance r)
+        private static void RegExpInitialize(JsRegExp r)
         {
-            r.SetOwnProperty(RegExpInstance.PropertyLastIndex, new PropertyDescriptor(0, PropertyFlag.OnlyWritable));
+            r.SetOwnProperty(JsRegExp.PropertyLastIndex, new PropertyDescriptor(0, PropertyFlag.OnlyWritable));
         }
     }
 }
diff --git a/Jint/Native/RegExp/RegExpExtensions.cs b/Jint/Native/RegExp/RegExpExtensions.cs
@@ -12,7 +12,7 @@ internal static bool TryGetDefaultRegExpExec(this ObjectInstance? o, [NotNullWhe
                 return prototype.TryGetDefaultExec(prototype, out exec);
             }
 
-            if (o is RegExpInstance instance)
+            if (o is JsRegExp instance)
             {
                 exec = default;
                 return instance.Properties == null