kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-04-30 04:35:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove boxing of 'SymbolicExpression's

Browse Source
This commit is contained in:
ASuciuX
2024-03-13 03:28:13 +02:00
parent 5150acf3b1
commit 93a918d4ab
4 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
clarity/src/vm/ast/sugar_expander/mod.rs
View File

@@ -77,14 +77,14 @@ impl SugarExpander {
PreSymbolicExpressionType::List(pre_exprs) => { PreSymbolicExpressionType::List(pre_exprs) => {
let drain = PreExpressionsDrain::new(pre_exprs.to_vec().drain(..), None); let drain = PreExpressionsDrain::new(pre_exprs.to_vec().drain(..), None);
let expression = self.transform(drain, contract_ast)?; let expression = self.transform(drain, contract_ast)?;
SymbolicExpression::list(expression.into_boxed_slice()) SymbolicExpression::list(expression)
} }
PreSymbolicExpressionType::Tuple(pre_exprs) => { PreSymbolicExpressionType::Tuple(pre_exprs) => {
let drain = PreExpressionsDrain::new(pre_exprs.to_vec().drain(..), None); let drain = PreExpressionsDrain::new(pre_exprs.to_vec().drain(..), None);
let expression = self.transform(drain, contract_ast)?; let expression = self.transform(drain, contract_ast)?;
let mut pairs = expression let mut pairs = expression
.chunks(2) .chunks(2)
.map(|pair| pair.to_vec().into_boxed_slice()) .map(|pair| pair.to_vec())
.map(SymbolicExpression::list) .map(SymbolicExpression::list)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
pairs.insert( pairs.insert(
@@ -96,7 +96,7 @@ impl SugarExpander {
.map_err(|_| ParseErrors::InterpreterFailure)?, .map_err(|_| ParseErrors::InterpreterFailure)?,
), ),
); );
SymbolicExpression::list(pairs.into_boxed_slice()) SymbolicExpression::list(pairs)
} }
PreSymbolicExpressionType::SugaredContractIdentifier(contract_name) => { PreSymbolicExpressionType::SugaredContractIdentifier(contract_name) => {
let contract_identifier = let contract_identifier =
@@ -277,7 +277,7 @@ mod test {
start_column: u32, start_column: u32,
end_line: u32, end_line: u32,
end_column: u32, end_column: u32,
x: Box<[SymbolicExpression]>, x: Vec<SymbolicExpression>,
) -> SymbolicExpression { ) -> SymbolicExpression {
let mut e = SymbolicExpression::list(x); let mut e = SymbolicExpression::list(x);
e.set_span(start_line, start_column, end_line, end_column); e.set_span(start_line, start_column, end_line, end_column);
@@ -395,42 +395,42 @@ mod test {
3, 3,
6, 6,
11, 11,
Box::new([ vec![
make_atom("let", 1, 4, 1, 6), make_atom("let", 1, 4, 1, 6),
make_list( make_list(
1, 1,
8, 8,
1, 1,
20, 20,
Box::new([ vec![
make_list( make_list(
1, 1,
9, 9,
1, 1,
13, 13,
Box::new([ vec![
make_atom("x", 1, 10, 1, 10), make_atom("x", 1, 10, 1, 10),
make_literal_value(Value::Int(1), 1, 12, 1, 12), make_literal_value(Value::Int(1), 1, 12, 1, 12),
]), ],
), ),
make_list( make_list(
1, 1,
15, 15,
1, 1,
19, 19,
Box::new([ vec![
make_atom("y", 1, 16, 1, 16), make_atom("y", 1, 16, 1, 16),
make_literal_value(Value::Int(2), 1, 18, 1, 18), make_literal_value(Value::Int(2), 1, 18, 1, 18),
]), ],
), ),
]), ],
), ),
make_list( make_list(
2, 2,
5, 5,
6, 6,
10, 10,
Box::new([ vec![
make_atom("+", 2, 6, 2, 6), make_atom("+", 2, 6, 2, 6),
make_atom("x", 2, 8, 2, 8), make_atom("x", 2, 8, 2, 8),
make_list( make_list(
@@ -438,41 +438,41 @@ mod test {
9, 9,
5, 5,
16, 16,
Box::new([ vec![
make_atom("let", 4, 10, 4, 12), make_atom("let", 4, 10, 4, 12),
make_list( make_list(
4, 4,
14, 14,
4, 4,
20, 20,
Box::new([make_list( vec![make_list(
4, 4,
15, 15,
4, 4,
19, 19,
Box::new([ vec![
make_atom("x", 4, 16, 4, 16), make_atom("x", 4, 16, 4, 16),
make_literal_value(Value::Int(3), 4, 18, 4, 18), make_literal_value(Value::Int(3), 4, 18, 4, 18),
]), ],
)]), )],
), ),
make_list( make_list(
5, 5,
9, 9,
5, 5,
15, 15,
Box::new([ vec![
make_atom("+", 5, 10, 5, 10), make_atom("+", 5, 10, 5, 10),
make_atom("x", 5, 12, 5, 12), make_atom("x", 5, 12, 5, 12),
make_atom("y", 5, 14, 5, 14), make_atom("y", 5, 14, 5, 14),
]), ],
), ),
]), ],
), ),
make_atom("x", 6, 9, 6, 9), make_atom("x", 6, 9, 6, 9),
]), ],
), ),
]), ],
), ),
make_atom("x", 6, 13, 6, 13), make_atom("x", 6, 13, 6, 13),
make_atom("y", 6, 15, 6, 15), make_atom("y", 6, 15, 6, 15),
@@ -508,19 +508,19 @@ mod test {
1, 1,
1, 1,
9, 9,
Box::new([ vec![
make_atom("tuple", 0, 0, 0, 0), make_atom("tuple", 0, 0, 0, 0),
make_list( make_list(
0, 0,
0, 0,
0, 0,
0, 0,
Box::new([ vec![
make_atom("id", 1, 2, 1, 3), make_atom("id", 1, 2, 1, 3),
make_literal_value(Value::Int(1337), 1, 5, 1, 8), make_literal_value(Value::Int(1337), 1, 5, 1, 8),
]), ],
), ),
]), ],
)]; )];
let contract_id = QualifiedContractIdentifier::parse( let contract_id = QualifiedContractIdentifier::parse(
"S1G2081040G2081040G2081040G208105NK8PE5.contract-a", "S1G2081040G2081040G2081040G208105NK8PE5.contract-a",
@@ -859,7 +859,7 @@ mod test {
end_column: 20, end_column: 20,
}, },
)]; )];
let list = make_list(1, 1, 4, 1, Box::new([foo])); let list = make_list(1, 1, 4, 1, vec![foo]);
let ast = vec![list]; let ast = vec![list];
let contract_id = QualifiedContractIdentifier::parse( let contract_id = QualifiedContractIdentifier::parse(

2
clarity/src/vm/costs/mod.rs
View File

@@ -991,7 +991,7 @@ fn compute_cost(
))); )));
} }
let function_invocation = [SymbolicExpression::list(program.into_boxed_slice())]; let function_invocation = [SymbolicExpression::list(program)];
let eval_result = eval_all( let eval_result = eval_all(
&function_invocation, &function_invocation,

8
clarity/src/vm/mod.rs
View File

@@ -609,16 +609,16 @@ mod test {
// (define a 59) // (define a 59)
// (do_work a) // (do_work a)
// //
let content = [SymbolicExpression::list(Box::new([ let content = [SymbolicExpression::list(vec![
SymbolicExpression::atom("do_work".into()), SymbolicExpression::atom("do_work".into()),
SymbolicExpression::atom("a".into()), SymbolicExpression::atom("a".into()),
]))]; ])];
let func_body = SymbolicExpression::list(Box::new([ let func_body = SymbolicExpression::list(vec![
SymbolicExpression::atom("+".into()), SymbolicExpression::atom("+".into()),
SymbolicExpression::atom_value(Value::Int(5)), SymbolicExpression::atom_value(Value::Int(5)),
SymbolicExpression::atom("x".into()), SymbolicExpression::atom("x".into()),
])); ]);
let func_args = vec![("x".into(), TypeSignature::IntType)]; let func_args = vec![("x".into(), TypeSignature::IntType)];
let user_function = DefinedFunction::new( let user_function = DefinedFunction::new(

4
clarity/src/vm/representations.rs
View File

@@ -412,7 +412,7 @@ impl PreSymbolicExpression {
pub enum SymbolicExpressionType { pub enum SymbolicExpressionType {
AtomValue(Value), AtomValue(Value),
Atom(ClarityName), Atom(ClarityName),
List(Box<[SymbolicExpression]>), List(Vec<SymbolicExpression>),
LiteralValue(Value), LiteralValue(Value),
Field(TraitIdentifier), Field(TraitIdentifier),
TraitReference(ClarityName, TraitDefinition), TraitReference(ClarityName, TraitDefinition),
@@ -544,7 +544,7 @@ impl SymbolicExpression {
} }
} }
pub fn list(val: Box<[SymbolicExpression]>) -> SymbolicExpression { pub fn list(val: Vec<SymbolicExpression>) -> SymbolicExpression {
SymbolicExpression { SymbolicExpression {
expr: SymbolicExpressionType::List(val), expr: SymbolicExpressionType::List(val),
..SymbolicExpression::cons() ..SymbolicExpression::cons()