ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Grackle: update execution-plan repo (#1324)

Browse Source
This commit is contained in:
Adam Chalmers
2024-01-26 18:16:19 +11:00
committed by GitHub
parent 09760fc2e9
commit 05f9e3c290
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/wasm-lib/Cargo.lock generated
View File

@ -1943,7 +1943,7 @@ dependencies = [
[[package]] [[package]]
name = "kittycad-execution-plan" name = "kittycad-execution-plan"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/KittyCAD/modeling-api?branch=main#935256e4a7080ea130b09b578e16820dc96e78e4" source = "git+https://github.com/KittyCAD/modeling-api?branch=main#cd3e2c339b4794478e995247ca693d17c6b8ac4d"
dependencies = [ dependencies = [
"bytes", "bytes",
"insta", "insta",
@ -1972,7 +1972,7 @@ dependencies = [
[[package]] [[package]]
name = "kittycad-execution-plan-macros" name = "kittycad-execution-plan-macros"
version = "0.1.2" version = "0.1.2"
source = "git+https://github.com/KittyCAD/modeling-api?branch=main#935256e4a7080ea130b09b578e16820dc96e78e4" source = "git+https://github.com/KittyCAD/modeling-api?branch=main#cd3e2c339b4794478e995247ca693d17c6b8ac4d"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1993,7 +1993,7 @@ dependencies = [
[[package]] [[package]]
name = "kittycad-modeling-cmds" name = "kittycad-modeling-cmds"
version = "0.1.12" version = "0.1.12"
source = "git+https://github.com/KittyCAD/modeling-api?branch=main#935256e4a7080ea130b09b578e16820dc96e78e4" source = "git+https://github.com/KittyCAD/modeling-api?branch=main#cd3e2c339b4794478e995247ca693d17c6b8ac4d"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",
@ -2020,7 +2020,7 @@ dependencies = [
[[package]] [[package]]
name = "kittycad-modeling-session" name = "kittycad-modeling-session"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/KittyCAD/modeling-api?branch=main#935256e4a7080ea130b09b578e16820dc96e78e4" source = "git+https://github.com/KittyCAD/modeling-api?branch=main#cd3e2c339b4794478e995247ca693d17c6b8ac4d"
dependencies = [ dependencies = [
"futures", "futures",
"kittycad", "kittycad",

5
src/wasm-lib/grackle/src/lib.rs
View File

@ -7,6 +7,7 @@ mod tests;
use std::collections::HashMap; use std::collections::HashMap;
use ep::Destination;
use kcl_lib::{ use kcl_lib::{
ast, ast,
ast::types::{BodyItem, FunctionExpressionParts, KclNone, LiteralValue, Program}, ast::types::{BodyItem, FunctionExpressionParts, KclNone, LiteralValue, Program},
@ -173,7 +174,7 @@ impl Planner {
}, },
operand: ep::Operand::Reference(binding), operand: ep::Operand::Reference(binding),
}, },
destination, destination: Destination::Address(destination),
}); });
Ok(EvalPlan { Ok(EvalPlan {
instructions: plan, instructions: plan,
@ -214,7 +215,7 @@ impl Planner {
operand0: ep::Operand::Reference(l_binding), operand0: ep::Operand::Reference(l_binding),
operand1: ep::Operand::Reference(r_binding), operand1: ep::Operand::Reference(r_binding),
}, },
destination, destination: Destination::Address(destination),
}); });
Ok(EvalPlan { Ok(EvalPlan {
instructions: plan, instructions: plan,

4
src/wasm-lib/grackle/src/native_functions.rs
View File

@ -3,7 +3,7 @@
//! But some other stdlib functions will be written in KCL. //! But some other stdlib functions will be written in KCL.
use kcl_lib::std::sketch::PlaneData; use kcl_lib::std::sketch::PlaneData;
use kittycad_execution_plan::{Address, BinaryArithmetic, Instruction}; use kittycad_execution_plan::{Address, BinaryArithmetic, Destination, Instruction};
use kittycad_execution_plan_traits::Value; use kittycad_execution_plan_traits::Value;
use crate::{CompileError, EpBinding, EvalPlan}; use crate::{CompileError, EpBinding, EvalPlan};
@ -104,7 +104,7 @@ impl Callable for Add {
operand0: kittycad_execution_plan::Operand::Reference(arg0), operand0: kittycad_execution_plan::Operand::Reference(arg0),
operand1: kittycad_execution_plan::Operand::Reference(arg1), operand1: kittycad_execution_plan::Operand::Reference(arg1),
}, },
destination, destination: Destination::Address(destination),
}], }],
binding: EpBinding::Single(destination), binding: EpBinding::Single(destination),
}) })

18
src/wasm-lib/grackle/src/tests.rs
View File

@ -1,4 +1,4 @@
use ep::UnaryArithmetic; use ep::{Destination, UnaryArithmetic};
use pretty_assertions::assert_eq; use pretty_assertions::assert_eq;
use super::*; use super::*;
@ -181,7 +181,7 @@ fn use_native_function_add() {
operand0: ep::Operand::Reference(Address::ZERO), operand0: ep::Operand::Reference(Address::ZERO),
operand1: ep::Operand::Reference(Address::ZERO.offset(1)) operand1: ep::Operand::Reference(Address::ZERO.offset(1))
}, },
destination: Address::ZERO.offset(2), destination: Destination::Address(Address::ZERO.offset(2)),
} }
] ]
); );
@ -296,7 +296,7 @@ fn compile_flipped_sign() {
operation: ep::UnaryOperation::Neg, operation: ep::UnaryOperation::Neg,
operand: ep::Operand::Reference(Address::ZERO), operand: ep::Operand::Reference(Address::ZERO),
}, },
destination: Address::ZERO + 1, destination: Destination::Address(Address::ZERO + 1),
}, },
]; ];
assert_eq!(plan, expected); assert_eq!(plan, expected);
@ -323,7 +323,7 @@ fn add_literals() {
operand0: ep::Operand::Reference(Address::ZERO), operand0: ep::Operand::Reference(Address::ZERO),
operand1: ep::Operand::Reference(Address::ZERO.offset(1)), operand1: ep::Operand::Reference(Address::ZERO.offset(1)),
}, },
destination: Address::ZERO.offset(2), destination: Destination::Address(Address::ZERO.offset(2)),
} }
] ]
); );
@ -355,7 +355,7 @@ fn add_vars() {
operand0: ep::Operand::Reference(addr0), operand0: ep::Operand::Reference(addr0),
operand1: ep::Operand::Reference(addr1), operand1: ep::Operand::Reference(addr1),
}, },
destination: Address::ZERO.offset(2), destination: Destination::Address(Address::ZERO.offset(2)),
} }
] ]
); );
@ -396,7 +396,7 @@ fn composite_binary_exprs() {
operand0: ep::Operand::Reference(addr0), operand0: ep::Operand::Reference(addr0),
operand1: ep::Operand::Reference(addr1), operand1: ep::Operand::Reference(addr1),
}, },
destination: addr3, destination: Destination::Address(addr3),
}, },
// Adds `x` + 3, where `x` is (1 + 2) // Adds `x` + 3, where `x` is (1 + 2)
Instruction::BinaryArithmetic { Instruction::BinaryArithmetic {
@ -405,7 +405,7 @@ fn composite_binary_exprs() {
operand0: ep::Operand::Reference(addr3), operand0: ep::Operand::Reference(addr3),
operand1: ep::Operand::Reference(addr2), operand1: ep::Operand::Reference(addr2),
}, },
destination: Address::ZERO.offset(4), destination: Destination::Address(Address::ZERO.offset(4)),
} }
] ]
); );
@ -464,7 +464,7 @@ fn use_kcl_functions_with_optional_params() {
operand0: ep::Operand::Reference(Address::ZERO), operand0: ep::Operand::Reference(Address::ZERO),
operand1: ep::Operand::Reference(Address::ZERO + 2) operand1: ep::Operand::Reference(Address::ZERO + 2)
}, },
destination, destination: Destination::Address(destination),
} }
], ],
"failed test {i}" "failed test {i}"
@ -585,7 +585,7 @@ fn use_kcl_functions_with_params() {
operand0: ep::Operand::Reference(Address::ZERO), operand0: ep::Operand::Reference(Address::ZERO),
operand1: ep::Operand::Reference(Address::ZERO.offset(1)) operand1: ep::Operand::Reference(Address::ZERO.offset(1))
}, },
destination, destination: Destination::Address(destination),
} }
], ],
"failed test {i}" "failed test {i}"