implement dynamic key; implement __curPos; other small changes

fix-vm/src/instructions/builtins.rs

@@ -165,7 +165,7 @@ impl<'gc> Vm<'gc> {
         let e1 = self.peek_forced(1);
 
         let children: SmallVec<_> = if let Some(attrs) = e1.as_gc::<AttrSet>() {
-            let attrs = attrs.entries.borrow();
+            let attrs = &attrs.entries;
             if attrs.is_empty() {
                 SmallVec::new()
             } else {
@@ -243,7 +243,7 @@ impl<'gc> Vm<'gc> {
 
         let mut added: usize = 0;
         if let Some(attrs) = item.as_gc::<AttrSet>() {
-            let attrs = attrs.entries.borrow();
+            let attrs = &attrs.entries;
             #[allow(clippy::unwrap_used)]
             let seen = self.peek_forced(2).as_gc::<List<'gc>>().unwrap();
             if !self.is_value_in_seen(seen, item) {
@@ -291,7 +291,7 @@ impl<'gc> Vm<'gc> {
         let val = self.peek_forced(0);
 
         let (count, has_children) = if let Some(attrs) = val.as_gc::<AttrSet>() {
-            let len = attrs.entries.borrow().len();
+            let len = attrs.entries.len();
             (len, len > 0)
         } else if let Some(list) = val.as_gc::<List<'gc>>() {
             let len = list.inner.borrow().len();
@@ -331,7 +331,7 @@ impl<'gc> Vm<'gc> {
 
         let val = self.peek_forced(2);
         let child = if let Some(attrs) = val.as_gc::<AttrSet>() {
-            attrs.entries.borrow().get(idx as usize).map(|&(_, v)| v)
+            attrs.entries.get(idx as usize).map(|&(_, v)| v)
         } else if let Some(list) = val.as_gc::<List<'gc>>() {
             list.inner.borrow().get(idx as usize).copied()
         } else {
@@ -400,7 +400,7 @@ impl<'gc> Vm<'gc> {
                     )));
                 }
             }
-            for &(key, _) in attrset.entries.borrow().iter() {
+            for &(key, _) in attrset.entries.iter() {
                 let is_expected =
                     pattern.required.contains(&key) || pattern.optional.contains(&key);
                 if !is_expected {