Merge 706d8a7 into 7b3f42d

boa-dev · Jul 29, 2020 · 0ff082a · 0ff082a
2 parents 7b3f42d + 706d8a7
commit 0ff082a
Show file tree

Hide file tree

Showing 4 changed files with 199 additions and 181 deletions.
diff --git a/boa/src/builtins/object/mod.rs b/boa/src/builtins/object/mod.rs
@@ -19,7 +19,7 @@ use crate::{
         map::ordered_map::OrderedMap,
         property::Property,
         value::{RcBigInt, RcString, RcSymbol, ResultValue, Value},
-        BigInt,
+        BigInt, RegExp,
     },
     exec::Interpreter,
     BoaProfiler,
@@ -71,6 +71,7 @@ pub struct Object {
 pub enum ObjectData {
     Array,
     Map(OrderedMap<Value, Value>),
+    RegExp(RegExp),
     BigInt(RcBigInt),
     Boolean(bool),
     Function(Function),
@@ -87,8 +88,9 @@ impl Display for ObjectData {
             f,
             "{}",
             match self {
-                Self::Function(_) => "Function",
                 Self::Array => "Array",
+                Self::Function(_) => "Function",
+                Self::RegExp(_) => "RegExp",
                 Self::Map(_) => "Map",
                 Self::String(_) => "String",
                 Self::Symbol(_) => "Symbol",
@@ -381,6 +383,20 @@ impl Object {
         }
     }
 
+    /// Checks if it a `RegExp` object.
+    #[inline]
+    pub fn is_regexp(&self) -> bool {
+        matches!(self.data, ObjectData::RegExp(_))
+    }
+
+    #[inline]
+    pub fn as_regexp(&self) -> Option<&RegExp> {
+        match self.data {
+            ObjectData::RegExp(ref regexp) => Some(regexp),
+            _ => None,
+        }
+    }
+
     /// Checks if it an ordinary object.
     #[inline]
     pub fn is_ordinary(&self) -> bool {