fix: interaction

Author: kermanx

src/builtins/prototypes/array.rs

@@ -1,15 +1,21 @@
-use crate::entity::builtin_fn::PureBuiltinFnEntity;
+use crate::entity::{builtin_fn::PureBuiltinFnEntity, interactions::InteractionKind};
 
 use super::{object::create_object_prototype, Prototype};
 
 pub fn create_array_prototype<'a>() -> Prototype<'a> {
   let mut prototype = create_object_prototype();
 
   prototype.insert("concat", PureBuiltinFnEntity::returns_array());
-  prototype.insert("copyWithin", PureBuiltinFnEntity::returns_unknown().mutates_this());
+  prototype.insert(
+    "copyWithin",
+    PureBuiltinFnEntity::returns_unknown().interaction_kind(InteractionKind::ArrayOp),
+  );
   prototype.insert("entries", PureBuiltinFnEntity::returns_array());
   prototype.insert("every", PureBuiltinFnEntity::returns_boolean());
-  prototype.insert("fill", PureBuiltinFnEntity::returns_unknown().mutates_this());
+  prototype.insert(
+    "fill",
+    PureBuiltinFnEntity::returns_unknown().interaction_kind(InteractionKind::ArrayOp),
+  );
   prototype.insert("filter", PureBuiltinFnEntity::returns_array());
   prototype.insert("find", PureBuiltinFnEntity::returns_unknown());
   prototype.insert("findIndex", PureBuiltinFnEntity::returns_number());
@@ -24,17 +30,38 @@ pub fn create_array_prototype<'a>() -> Prototype<'a> {
   prototype.insert("keys", PureBuiltinFnEntity::returns_unknown());
   prototype.insert("lastIndexOf", PureBuiltinFnEntity::returns_number());
   prototype.insert("map", PureBuiltinFnEntity::returns_array());
-  prototype.insert("pop", PureBuiltinFnEntity::returns_unknown().mutates_this());
-  prototype.insert("push", PureBuiltinFnEntity::returns_number().mutates_this());
+  prototype.insert(
+    "pop",
+    PureBuiltinFnEntity::returns_unknown().interaction_kind(InteractionKind::ArrayOp),
+  );
+  prototype.insert(
+    "push",
+    PureBuiltinFnEntity::returns_number().interaction_kind(InteractionKind::ArrayOp),
+  );
   prototype.insert("reduce", PureBuiltinFnEntity::returns_unknown());
   prototype.insert("reduceRight", PureBuiltinFnEntity::returns_unknown());
-  prototype.insert("reverse", PureBuiltinFnEntity::returns_unknown().mutates_this());
-  prototype.insert("shift", PureBuiltinFnEntity::returns_unknown().mutates_this());
+  prototype.insert(
+    "reverse",
+    PureBuiltinFnEntity::returns_unknown().interaction_kind(InteractionKind::ArrayOp),
+  );
+  prototype.insert(
+    "shift",
+    PureBuiltinFnEntity::returns_unknown().interaction_kind(InteractionKind::ArrayOp),
+  );
   prototype.insert("slice", PureBuiltinFnEntity::returns_array());
   prototype.insert("some", PureBuiltinFnEntity::returns_boolean());
-  prototype.insert("sort", PureBuiltinFnEntity::returns_unknown().mutates_this());
-  prototype.insert("splice", PureBuiltinFnEntity::returns_array().mutates_this());
-  prototype.insert("unshift", PureBuiltinFnEntity::returns_number().mutates_this());
+  prototype.insert(
+    "sort",
+    PureBuiltinFnEntity::returns_unknown().interaction_kind(InteractionKind::ArrayOp),
+  );
+  prototype.insert(
+    "splice",
+    PureBuiltinFnEntity::returns_array().interaction_kind(InteractionKind::ArrayOp),
+  );
+  prototype.insert(
+    "unshift",
+    PureBuiltinFnEntity::returns_number().interaction_kind(InteractionKind::ArrayOp),
+  );
   prototype.insert("values", PureBuiltinFnEntity::returns_unknown());
 
   prototype

src/entity/array.rs

@@ -48,7 +48,7 @@ impl<'a> EntityTrait<'a> for ArrayEntity<'a> {
 
   fn interact(&self, analyzer: &mut Analyzer<'a>, dep: EntityDep, kind: InteractionKind) {
     if kind == InteractionKind::ArrayOp {
-      self.deps.borrow_mut().push(dep);
+      self.add_dep(analyzer, dep);
     } else {
       self.consume(analyzer);
       consumed_object::interact(analyzer, dep, kind);
@@ -199,7 +199,7 @@ impl<'a> EntityTrait<'a> for ArrayEntity<'a> {
         }
       }
       if has_effect {
-        self.add_assignment_dep(analyzer, dep);
+        self.add_dep(analyzer, dep);
       }
     } else {
       self.consume(analyzer);
@@ -344,7 +344,7 @@ impl<'a> ArrayEntity<'a> {
     }
   }
 
-  fn add_assignment_dep(&self, analyzer: &Analyzer<'a>, dep: EntityDep) {
+  fn add_dep(&self, analyzer: &Analyzer<'a>, dep: EntityDep) {
     let target_variable_scope = analyzer.find_first_different_variable_scope(&self.variable_scopes);
     self.deps.borrow_mut().push(analyzer.get_assignment_deps(target_variable_scope, dep));
   }

src/entity/builtin_fn.rs

@@ -146,7 +146,7 @@ impl<'a> ImplementedBuiltinFnEntity<'a> {
 #[derive(Debug, Clone)]
 pub struct PureBuiltinFnEntity<'a> {
   return_value: Entity<'a>,
-  mutates_this: bool,
+  interaction_kind: InteractionKind,
 }
 
 impl<'a> BuiltinFnEntity<'a> for PureBuiltinFnEntity<'a> {
@@ -157,19 +157,19 @@ impl<'a> BuiltinFnEntity<'a> for PureBuiltinFnEntity<'a> {
     this: &Entity<'a>,
     args: &Entity<'a>,
   ) -> Entity<'a> {
-    this.interact(analyzer, dep, InteractionKind::Unknown);
+    this.interact(analyzer, dep, self.interaction_kind);
     args.consume(analyzer);
     self.return_value.clone()
   }
 }
 
 impl<'a> PureBuiltinFnEntity<'a> {
   pub fn new(return_value: Entity<'a>) -> Self {
-    Self { return_value, mutates_this: false }
+    Self { return_value, interaction_kind: InteractionKind::Unknown }
   }
 
-  pub fn mutates_this(mut self) -> Self {
-    self.mutates_this = true;
+  pub fn interaction_kind(mut self, interaction_kind: InteractionKind) -> Self {
+    self.interaction_kind = interaction_kind;
     self
   }
 

src/entity/interactions.rs

@@ -1,5 +1,6 @@
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum InteractionKind {
+  #[default]
   Unknown,
   ArrayOp,
 }