feat: less clone on symbol
This commit is contained in:
@@ -7,8 +7,6 @@ use derive_more::{IsVariant, Unwrap};
|
||||
use super::common as c;
|
||||
use super::public as p;
|
||||
|
||||
use c::Symbol;
|
||||
|
||||
use crate::bytecode::OpCodes;
|
||||
use crate::error::*;
|
||||
use crate::vm::{Env, VM};
|
||||
@@ -285,7 +283,7 @@ impl<'vm> Value<'vm> {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn push_attr(&mut self, sym: Symbol, val: Value<'vm>) -> &mut Self {
|
||||
pub fn push_attr(&mut self, sym: usize, val: Value<'vm>) -> &mut Self {
|
||||
if let Value::AttrSet(attrs) = self {
|
||||
attrs.push_attr(sym, val)
|
||||
} else if let Value::RecAttrSet(attrs) = self {
|
||||
@@ -309,7 +307,7 @@ impl<'vm> Value<'vm> {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn select(&mut self, sym: &Symbol) -> Result<&mut Self> {
|
||||
pub fn select(&mut self, sym: usize) -> Result<&mut Self> {
|
||||
let val = match self {
|
||||
Value::AttrSet(attrs) => attrs
|
||||
.select(sym)
|
||||
@@ -327,7 +325,7 @@ impl<'vm> Value<'vm> {
|
||||
Ok(self)
|
||||
}
|
||||
|
||||
pub fn select_with_default(&mut self, sym: &Symbol, default: Value<'vm>) -> Result<&mut Self> {
|
||||
pub fn select_with_default(&mut self, sym: usize, default: Value<'vm>) -> Result<&mut Self> {
|
||||
let val = match self {
|
||||
Value::AttrSet(attrs) => attrs.select(sym).unwrap_or(default),
|
||||
Value::RecAttrSet(attrs) => attrs.select(sym).unwrap_or(default),
|
||||
@@ -343,7 +341,7 @@ impl<'vm> Value<'vm> {
|
||||
Ok(self)
|
||||
}
|
||||
|
||||
pub fn has_attr(&mut self, sym: &Symbol) -> &mut Self {
|
||||
pub fn has_attr(&mut self, sym: usize) -> &mut Self {
|
||||
if let Value::AttrSet(attrs) = self {
|
||||
let val = VmConst(Const::Bool(attrs.has_attr(sym)));
|
||||
*self = val;
|
||||
|
||||
Reference in New Issue
Block a user