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

Add grouping of module instances in Feature Tree (#6125)

Browse Source 
* Rename operations to be more generic grouping

* Add group enum

* Add module instance groups

* Change to export all operation ts-rs types to the same file

* Fix Feature Tree display of modules to use name

* Ignore clippy warning

* Update output after operation changes

* Change module instances in Feature Tree use to import icon

* Fix error message when attempting to delete module instance
This commit is contained in:
Jonathan Tran
2025-04-03 22:10:39 -04:00
committed by GitHub
parent c7b348390e
commit d38dcb9ba2
65 changed files with 12299 additions and 9315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
rust/kcl-lib/src/execution/cad_op.rs
View File

@ -3,12 +3,12 @@ use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use super::{types::NumericType, ArtifactId, KclValue};
use crate::{docs::StdLibFn, std::get_stdlib_fn, SourceRange};
use crate::{docs::StdLibFn, std::get_stdlib_fn, ModuleId, SourceRange};
/// A CAD modeling operation for display in the feature tree, AKA operations
/// timeline.
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)]
#[ts(export_to = "Operation.ts")]
#[serde(tag = "type")]
pub enum Operation {
#[serde(rename_all = "camelCase")]
@ -40,7 +40,34 @@ pub enum Operation {
is_error: bool,
},
#[serde(rename_all = "camelCase")]
UserDefinedFunctionCall {
GroupBegin {
/// The details of the group.
group: Group,
/// The source range of the operation in the source code.
source_range: SourceRange,
},
GroupEnd,
}
impl Operation {
/// If the variant is `StdLibCall`, set the `is_error` field.
pub(crate) fn set_std_lib_call_is_error(&mut self, is_err: bool) {
match self {
Self::StdLibCall { ref mut is_error, .. } => *is_error = is_err,
Self::KclStdLibCall { ref mut is_error, .. } => *is_error = is_err,
Self::GroupBegin { .. } | Self::GroupEnd => {}
}
}
}
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export_to = "Operation.ts")]
#[serde(tag = "type")]
#[expect(clippy::large_enum_variant)]
pub enum Group {
/// A function call.
#[serde(rename_all = "camelCase")]
FunctionCall {
/// The name of the user-defined function being called. Anonymous
/// functions have no name.
name: Option<String>,
@ -51,26 +78,20 @@ pub enum Operation {
unlabeled_arg: Option<OpArg>,
/// The labeled keyword arguments to the function.
labeled_args: IndexMap<String, OpArg>,
/// The source range of the operation in the source code.
source_range: SourceRange,
},
UserDefinedFunctionReturn,
}
impl Operation {
/// If the variant is `StdLibCall`, set the `is_error` field.
pub(crate) fn set_std_lib_call_is_error(&mut self, is_err: bool) {
match self {
Self::StdLibCall { ref mut is_error, .. } => *is_error = is_err,
Self::KclStdLibCall { ref mut is_error, .. } => *is_error = is_err,
Self::UserDefinedFunctionCall { .. } | Self::UserDefinedFunctionReturn => {}
}
}
/// A whole-module import use.
#[serde(rename_all = "camelCase")]
ModuleInstance {
/// The name of the module being used.
name: String,
/// The ID of the module which can be used to determine its path.
module_id: ModuleId,
},
}
/// An argument to a CAD modeling operation.
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)]
#[ts(export_to = "Operation.ts")]
#[serde(rename_all = "camelCase")]
pub struct OpArg {
/// The runtime value of the argument. Instead of using [`KclValue`], we
@ -90,7 +111,7 @@ impl OpArg {
/// A reference to a standard library function. This exists to implement
/// `PartialEq` and `Eq` for `Operation`.
#[derive(Debug, Clone, Deserialize, Serialize, ts_rs::TS, JsonSchema)]
#[ts(export)]
#[ts(export_to = "Operation.ts")]
#[serde(rename_all = "camelCase")]
pub struct StdLibFnRef {
// The following doc comment gets inlined into Operation, overriding what's
@ -154,7 +175,7 @@ fn is_false(b: &bool) -> bool {
/// A KCL value used in Operations. `ArtifactId`s are used to refer to the
/// actual scene objects. Any data not needed in the UI may be omitted.
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)]
#[ts(export_to = "Operation.ts")]
#[serde(tag = "type")]
pub enum OpKclValue {
Uuid {
@ -212,21 +233,21 @@ pub enum OpKclValue {
pub type OpKclObjectFields = IndexMap<String, OpKclValue>;
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)]
#[ts(export_to = "Operation.ts")]
#[serde(rename_all = "camelCase")]
pub struct OpSketch {
artifact_id: ArtifactId,
}
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)]
#[ts(export_to = "Operation.ts")]
#[serde(rename_all = "camelCase")]
pub struct OpSolid {
artifact_id: ArtifactId,
}
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)]
#[ts(export_to = "Operation.ts")]
#[serde(rename_all = "camelCase")]
pub struct OpHelix {
artifact_id: ArtifactId,

56
rust/kcl-lib/src/execution/exec_ast.rs
View File

@ -3,7 +3,7 @@ use std::collections::HashMap;
use async_recursion::async_recursion;
use indexmap::IndexMap;
use super::{kcl_value::TypeDef, types::PrimitiveType};
use super::{cad_op::Group, kcl_value::TypeDef, types::PrimitiveType};
use crate::{
engine::ExecutionKind,
errors::{KclError, KclErrorDetails},
@ -20,7 +20,7 @@ use crate::{
modules::{ModuleId, ModulePath, ModuleRepr},
parsing::ast::types::{
Annotation, ArrayExpression, ArrayRangeExpression, BinaryExpression, BinaryOperator, BinaryPart, BodyItem,
CallExpression, CallExpressionKw, Expr, FunctionExpression, IfExpression, ImportPath, ImportSelector,
BoxNode, CallExpression, CallExpressionKw, Expr, FunctionExpression, IfExpression, ImportPath, ImportSelector,
ItemVisibility, LiteralIdentifier, LiteralValue, MemberExpression, MemberObject, Name, Node, NodeRef,
ObjectExpression, PipeExpression, Program, TagDeclarator, Type, UnaryExpression, UnaryOperator,
},
@ -512,10 +512,19 @@ impl ExecutorContext {
async fn exec_module_for_result(
&self,
module_id: ModuleId,
module_name: &BoxNode<Name>,
exec_state: &mut ExecState,
exec_kind: ExecutionKind,
source_range: SourceRange,
) -> Result<Option<KclValue>, KclError> {
exec_state.global.operations.push(Operation::GroupBegin {
group: Group::ModuleInstance {
name: module_name.to_string(),
module_id,
},
source_range,
});
let path = exec_state.global.module_infos[&module_id].path.clone();
let mut repr = exec_state.global.module_infos[&module_id].take_repr();
// DON'T EARLY RETURN! We need to restore the module repr
@ -541,6 +550,9 @@ impl ExecutorContext {
};
exec_state.global.module_infos[&module_id].restore_repr(repr);
exec_state.global.operations.push(Operation::GroupEnd);
result
}
@ -592,7 +604,7 @@ impl ExecutorContext {
Expr::Name(name) => {
let value = name.get_result(exec_state, self).await?.clone();
if let KclValue::Module { value: module_id, meta } = value {
self.exec_module_for_result(module_id, exec_state, ExecutionKind::Normal, metadata.source_range)
self.exec_module_for_result(module_id, name, exec_state, ExecutionKind::Normal, metadata.source_range)
.await?
.unwrap_or_else(|| {
exec_state.warn(CompilationError::err(
@ -1349,7 +1361,7 @@ impl Node<CallExpressionKw> {
if matches!(fn_src, FunctionSource::User { .. }) && !ctx.is_isolated_execution().await {
// Track return operation.
exec_state.global.operations.push(Operation::UserDefinedFunctionReturn);
exec_state.global.operations.push(Operation::GroupEnd);
}
let result = return_value.ok_or_else(move || {
@ -1459,12 +1471,14 @@ impl Node<CallExpression> {
if !ctx.is_isolated_execution().await {
// Track call operation.
exec_state.global.operations.push(Operation::UserDefinedFunctionCall {
name: Some(fn_name.to_string()),
function_source_range: func.function_def_source_range().unwrap_or_default(),
unlabeled_arg: None,
// TODO: Add the arguments for legacy positional parameters.
labeled_args: Default::default(),
exec_state.global.operations.push(Operation::GroupBegin {
group: Group::FunctionCall {
name: Some(fn_name.to_string()),
function_source_range: func.function_def_source_range().unwrap_or_default(),
unlabeled_arg: None,
// TODO: Add the arguments for legacy positional parameters.
labeled_args: Default::default(),
},
source_range: callsite,
});
}
@ -1498,7 +1512,7 @@ impl Node<CallExpression> {
if !ctx.is_isolated_execution().await {
// Track return operation.
exec_state.global.operations.push(Operation::UserDefinedFunctionReturn);
exec_state.global.operations.push(Operation::GroupEnd);
}
Ok(result)
@ -2279,15 +2293,17 @@ impl FunctionSource {
.iter()
.map(|(k, arg)| (k.clone(), OpArg::new(OpKclValue::from(&arg.value), arg.source_range)))
.collect();
exec_state.global.operations.push(Operation::UserDefinedFunctionCall {
name: fn_name,
function_source_range: ast.as_source_range(),
unlabeled_arg: args
.kw_args
.unlabeled
.as_ref()
.map(|arg| OpArg::new(OpKclValue::from(&arg.value), arg.source_range)),
labeled_args: op_labeled_args,
exec_state.global.operations.push(Operation::GroupBegin {
group: Group::FunctionCall {
name: fn_name,
function_source_range: ast.as_source_range(),
unlabeled_arg: args
.kw_args
.unlabeled
.as_ref()
.map(|arg| OpArg::new(OpKclValue::from(&arg.value), arg.source_range)),
labeled_args: op_labeled_args,
},
source_range: callsite,
});
}

2323
rust/kcl-lib/tests/add_lots/ops.snap
View File

File diff suppressed because it is too large Load Diff

24
rust/kcl-lib/tests/assembly_mixed_units_cubes/ops.snap
View File

@ -3,6 +3,15 @@ source: kcl-lib/src/simulation_tests.rs
description: Operations executed assembly_mixed_units_cubes.kcl
---
[
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "cubeIn",
"moduleId": 5
},
"sourceRange": []
},
{
"labeledArgs": {
"data": {
@ -50,6 +59,18 @@ description: Operations executed assembly_mixed_units_cubes.kcl
"sourceRange": []
}
},
{
"type": "GroupEnd"
},
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "cubeMm",
"moduleId": 6
},
"sourceRange": []
},
{
"labeledArgs": {
"data": {
@ -96,5 +117,8 @@ description: Operations executed assembly_mixed_units_cubes.kcl
},
"sourceRange": []
}
},
{
"type": "GroupEnd"
}
]

24
rust/kcl-lib/tests/assembly_non_default_units/ops.snap
View File

@ -3,6 +3,15 @@ source: kcl-lib/src/simulation_tests.rs
description: Operations executed assembly_non_default_units.kcl
---
[
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "other1",
"moduleId": 5
},
"sourceRange": []
},
{
"labeledArgs": {
"data": {
@ -18,6 +27,18 @@ description: Operations executed assembly_non_default_units.kcl
"type": "StdLibCall",
"unlabeledArg": null
},
{
"type": "GroupEnd"
},
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "other2",
"moduleId": 6
},
"sourceRange": []
},
{
"labeledArgs": {
"data": {
@ -32,5 +53,8 @@ description: Operations executed assembly_non_default_units.kcl
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{
"type": "GroupEnd"
}
]

23
rust/kcl-lib/tests/computed_var/ops.snap
View File

@ -4,18 +4,21 @@ description: Operations executed computed_var.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

113
rust/kcl-lib/tests/cube/ops.snap
View File

@ -4,64 +4,67 @@ description: Operations executed cube.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "cube",
"functionSourceRange": [
7,
404,
0
],
"unlabeledArg": null,
"labeledArgs": {
"center": {
"value": {
"type": "Array",
"value": [
{
"type": "Number",
"value": 0.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube",
"functionSourceRange": [
7,
404,
0
],
"unlabeledArg": null,
"labeledArgs": {
"center": {
"value": {
"type": "Array",
"value": [
{
"type": "Number",
"value": 0.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
}
}
},
{
"type": "Number",
"value": 0.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
}
}
}
},
{
"type": "Number",
"value": 0.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
}
]
},
"sourceRange": []
},
"sideLength": {
"value": {
"type": "Number",
"value": 40.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
}
}
]
},
"sourceRange": []
},
"sideLength": {
"value": {
"type": "Number",
"value": 40.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
}
}
},
"sourceRange": []
},
"sourceRange": []
}
}
},
"sourceRange": []
@ -114,6 +117,6 @@ description: Operations executed cube.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

23
rust/kcl-lib/tests/cube_with_error/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed cube_with_error.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "cube",
"functionSourceRange": [
7,
392,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube",
"functionSourceRange": [
7,
392,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -63,6 +66,6 @@ description: Operations executed cube_with_error.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

92
rust/kcl-lib/tests/fillet-and-shell/ops.snap
View File

@ -122,15 +122,18 @@ description: Operations executed fillet-and-shell.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "m25Screw",
"functionSourceRange": [
1310,
1538,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "m25Screw",
"functionSourceRange": [
1310,
1538,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -207,18 +210,21 @@ description: Operations executed fillet-and-shell.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "m25Screw",
"functionSourceRange": [
1310,
1538,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "m25Screw",
"functionSourceRange": [
1310,
1538,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -295,18 +301,21 @@ description: Operations executed fillet-and-shell.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "m25Screw",
"functionSourceRange": [
1310,
1538,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "m25Screw",
"functionSourceRange": [
1310,
1538,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -383,18 +392,21 @@ description: Operations executed fillet-and-shell.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "m25Screw",
"functionSourceRange": [
1310,
1538,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "m25Screw",
"functionSourceRange": [
1310,
1538,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -471,7 +483,7 @@ description: Operations executed fillet-and-shell.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

23
rust/kcl-lib/tests/function_sketch/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed function_sketch.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "box",
"functionSourceRange": [
6,
220,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "box",
"functionSourceRange": [
6,
220,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -63,6 +66,6 @@ description: Operations executed function_sketch.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

23
rust/kcl-lib/tests/function_sketch_with_position/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed function_sketch_with_position.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "box",
"functionSourceRange": [
6,
218,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "box",
"functionSourceRange": [
6,
218,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -63,6 +66,6 @@ description: Operations executed function_sketch_with_position.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

19
rust/kcl-lib/tests/import_foreign/ops.snap
View File

@ -1,5 +1,18 @@
---
source: kcl/src/simulation_tests.rs
description: Operations executed import_glob.kcl
source: kcl-lib/src/simulation_tests.rs
description: Operations executed import_foreign.kcl
---
[]
[
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "cube",
"moduleId": 5
},
"sourceRange": []
},
{
"type": "GroupEnd"
}
]

15
rust/kcl-lib/tests/import_transform/ops.snap
View File

@ -2,4 +2,17 @@
source: kcl-lib/src/simulation_tests.rs
description: Operations executed import_transform.kcl
---
[]
[
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "screw",
"moduleId": 5
},
"sourceRange": []
},
{
"type": "GroupEnd"
}
]

12
rust/kcl-lib/tests/import_whole/ops.snap
View File

@ -3,6 +3,15 @@ source: kcl-lib/src/simulation_tests.rs
description: Operations executed import_whole.kcl
---
[
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "foo",
"moduleId": 5
},
"sourceRange": []
},
{
"labeledArgs": {
"data": {
@ -50,6 +59,9 @@ description: Operations executed import_whole.kcl
"sourceRange": []
}
},
{
"type": "GroupEnd"
},
{
"labeledArgs": {
"faces": {

46
rust/kcl-lib/tests/intersect_cubes/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed intersect_cubes.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "cube",
"functionSourceRange": [
7,
328,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube",
"functionSourceRange": [
7,
328,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -63,18 +66,21 @@ description: Operations executed intersect_cubes.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cube",
"functionSourceRange": [
7,
328,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube",
"functionSourceRange": [
7,
328,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -125,7 +131,7 @@ description: Operations executed intersect_cubes.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

23
rust/kcl-lib/tests/kcl_samples/80-20-rail/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed 80-20-rail.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "rail8020",
"functionSourceRange": [
214,
7479,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "rail8020",
"functionSourceRange": [
214,
7479,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -297,6 +300,6 @@ description: Operations executed 80-20-rail.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

23
rust/kcl-lib/tests/kcl_samples/ball-bearing/ops.snap
View File

@ -371,19 +371,22 @@ description: Operations executed ball-bearing.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "KclStdLibCall",

506
rust/kcl-lib/tests/kcl_samples/bench/ops.snap
View File

@ -4,27 +4,33 @@ description: Operations executed bench.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "divider",
"functionSourceRange": [
1331,
1606,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "divider",
"functionSourceRange": [
1331,
1606,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionCall",
"name": "dividerSketch",
"functionSourceRange": [
309,
1312,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "dividerSketch",
"functionSourceRange": [
309,
1312,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -43,7 +49,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -72,15 +78,18 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "dividerSketch",
"functionSourceRange": [
309,
1312,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "dividerSketch",
"functionSourceRange": [
309,
1312,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -99,7 +108,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -216,7 +225,7 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -243,27 +252,33 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "divider",
"functionSourceRange": [
1331,
1606,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "divider",
"functionSourceRange": [
1331,
1606,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionCall",
"name": "dividerSketch",
"functionSourceRange": [
309,
1312,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "dividerSketch",
"functionSourceRange": [
309,
1312,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -282,7 +297,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -311,15 +326,18 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "dividerSketch",
"functionSourceRange": [
309,
1312,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "dividerSketch",
"functionSourceRange": [
309,
1312,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -338,7 +356,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -455,7 +473,7 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -482,27 +500,33 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "divider",
"functionSourceRange": [
1331,
1606,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "divider",
"functionSourceRange": [
1331,
1606,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionCall",
"name": "dividerSketch",
"functionSourceRange": [
309,
1312,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "dividerSketch",
"functionSourceRange": [
309,
1312,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -521,7 +545,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -550,15 +574,18 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "dividerSketch",
"functionSourceRange": [
309,
1312,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "dividerSketch",
"functionSourceRange": [
309,
1312,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -577,7 +604,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -694,7 +721,7 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -721,27 +748,33 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "connector",
"functionSourceRange": [
1889,
2052,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "connector",
"functionSourceRange": [
1889,
2052,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionCall",
"name": "connectorSketch",
"functionSourceRange": [
1626,
1868,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "connectorSketch",
"functionSourceRange": [
1626,
1868,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -760,7 +793,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -795,15 +828,18 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "connectorSketch",
"functionSourceRange": [
1626,
1868,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "connectorSketch",
"functionSourceRange": [
1626,
1868,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -822,7 +858,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -857,7 +893,7 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -884,27 +920,33 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "seatSlats",
"functionSourceRange": [
2474,
2560,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "seatSlats",
"functionSourceRange": [
2474,
2560,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionCall",
"name": "seatSlatSketch",
"functionSourceRange": [
2071,
2453,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "seatSlatSketch",
"functionSourceRange": [
2071,
2453,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -923,7 +965,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -975,7 +1017,7 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1002,27 +1044,33 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "backSlats",
"functionSourceRange": [
2993,
3084,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "backSlats",
"functionSourceRange": [
2993,
3084,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionCall",
"name": "backSlatsSketch",
"functionSourceRange": [
2580,
2972,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "backSlatsSketch",
"functionSourceRange": [
2580,
2972,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1041,7 +1089,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1087,18 +1135,21 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "armRest",
"functionSourceRange": [
3671,
3859,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "armRest",
"functionSourceRange": [
3671,
3859,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1126,15 +1177,18 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "armRestPath",
"functionSourceRange": [
3100,
3325,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "armRestPath",
"functionSourceRange": [
3100,
3325,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1153,7 +1207,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1186,15 +1240,18 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "armRestProfile",
"functionSourceRange": [
3344,
3652,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "armRestProfile",
"functionSourceRange": [
3344,
3652,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1213,7 +1270,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1241,18 +1298,21 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "armRest",
"functionSourceRange": [
3671,
3859,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "armRest",
"functionSourceRange": [
3671,
3859,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1280,15 +1340,18 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "armRestPath",
"functionSourceRange": [
3100,
3325,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "armRestPath",
"functionSourceRange": [
3100,
3325,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1307,7 +1370,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1340,15 +1403,18 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "armRestProfile",
"functionSourceRange": [
3344,
3652,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "armRestProfile",
"functionSourceRange": [
3344,
3652,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1367,7 +1433,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1395,6 +1461,6 @@ description: Operations executed bench.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

129
rust/kcl-lib/tests/kcl_samples/car-wheel-assembly/ops.snap
View File

@ -3,6 +3,15 @@ source: kcl-lib/src/simulation_tests.rs
description: Operations executed car-wheel-assembly.kcl
---
[
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "carRotor",
"moduleId": 6
},
"sourceRange": []
},
{
"labeledArgs": {
"data": {
@ -685,6 +694,18 @@ description: Operations executed car-wheel-assembly.kcl
"sourceRange": []
}
},
{
"type": "GroupEnd"
},
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "carWheel",
"moduleId": 5
},
"sourceRange": []
},
{
"labeledArgs": {
"data": {
@ -1189,15 +1210,18 @@ description: Operations executed car-wheel-assembly.kcl
"sourceRange": []
},
{
"type": "UserDefinedFunctionCall",
"name": "spoke",
"functionSourceRange": [
2616,
4189,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "spoke",
"functionSourceRange": [
2616,
4189,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1573,18 +1597,21 @@ description: Operations executed car-wheel-assembly.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "spoke",
"functionSourceRange": [
2616,
4189,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "spoke",
"functionSourceRange": [
2616,
4189,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1960,7 +1987,7 @@ description: Operations executed car-wheel-assembly.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -2064,15 +2091,30 @@ description: Operations executed car-wheel-assembly.kcl
"sourceRange": []
},
{
"type": "UserDefinedFunctionCall",
"name": "lug",
"functionSourceRange": [
664,
1289,
8
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupEnd"
},
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "lugNut",
"moduleId": 8
},
"sourceRange": []
},
{
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "lug",
"functionSourceRange": [
664,
1289,
8
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -2347,7 +2389,10 @@ description: Operations executed car-wheel-assembly.kcl
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -2498,6 +2543,15 @@ description: Operations executed car-wheel-assembly.kcl
"sourceRange": []
}
},
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "brakeCaliper",
"moduleId": 7
},
"sourceRange": []
},
{
"labeledArgs": {
"data": {
@ -2620,6 +2674,18 @@ description: Operations executed car-wheel-assembly.kcl
},
"sourceRange": []
},
{
"type": "GroupEnd"
},
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "carTire",
"moduleId": 9
},
"sourceRange": []
},
{
"labeledArgs": {
"data": {
@ -2725,5 +2791,8 @@ description: Operations executed car-wheel-assembly.kcl
}
},
"sourceRange": []
},
{
"type": "GroupEnd"
}
]

138
rust/kcl-lib/tests/kcl_samples/color-cube/ops.snap
View File

@ -148,15 +148,18 @@ description: Operations executed color-cube.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "sketchRectangle",
"functionSourceRange": [
726,
1326,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sketchRectangle",
"functionSourceRange": [
726,
1326,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -192,18 +195,21 @@ description: Operations executed color-cube.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sketchRectangle",
"functionSourceRange": [
726,
1326,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sketchRectangle",
"functionSourceRange": [
726,
1326,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -239,18 +245,21 @@ description: Operations executed color-cube.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sketchRectangle",
"functionSourceRange": [
726,
1326,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sketchRectangle",
"functionSourceRange": [
726,
1326,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -286,18 +295,21 @@ description: Operations executed color-cube.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sketchRectangle",
"functionSourceRange": [
726,
1326,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sketchRectangle",
"functionSourceRange": [
726,
1326,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -333,18 +345,21 @@ description: Operations executed color-cube.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sketchRectangle",
"functionSourceRange": [
726,
1326,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sketchRectangle",
"functionSourceRange": [
726,
1326,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -380,18 +395,21 @@ description: Operations executed color-cube.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sketchRectangle",
"functionSourceRange": [
726,
1326,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sketchRectangle",
"functionSourceRange": [
726,
1326,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -427,6 +445,6 @@ description: Operations executed color-cube.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

368
rust/kcl-lib/tests/kcl_samples/cycloidal-gear/ops.snap
View File

@ -4,27 +4,33 @@ description: Operations executed cycloidal-gear.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "cycloidalGear",
"functionSourceRange": [
221,
1685,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cycloidalGear",
"functionSourceRange": [
221,
1685,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionCall",
"name": "gearSketch",
"functionSourceRange": [
447,
1476,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "gearSketch",
"functionSourceRange": [
447,
1476,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -73,64 +79,76 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -159,18 +177,21 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "gearSketch",
"functionSourceRange": [
447,
1476,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "gearSketch",
"functionSourceRange": [
447,
1476,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -213,64 +234,76 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -299,18 +332,21 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "gearSketch",
"functionSourceRange": [
447,
1476,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "gearSketch",
"functionSourceRange": [
447,
1476,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -359,64 +395,76 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -445,7 +493,7 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -482,6 +530,6 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

161
rust/kcl-lib/tests/kcl_samples/dodecahedron/ops.snap
View File

@ -4,109 +4,130 @@ description: Operations executed dodecahedron.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

92
rust/kcl-lib/tests/kcl_samples/enclosure/ops.snap
View File

@ -145,15 +145,18 @@ description: Operations executed enclosure.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "function001",
"functionSourceRange": [
1254,
1851,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "function001",
"functionSourceRange": [
1254,
1851,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -412,18 +415,21 @@ description: Operations executed enclosure.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "function001",
"functionSourceRange": [
1254,
1851,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "function001",
"functionSourceRange": [
1254,
1851,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -682,18 +688,21 @@ description: Operations executed enclosure.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "function001",
"functionSourceRange": [
1254,
1851,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "function001",
"functionSourceRange": [
1254,
1851,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -952,18 +961,21 @@ description: Operations executed enclosure.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "function001",
"functionSourceRange": [
1254,
1851,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "function001",
"functionSourceRange": [
1254,
1851,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1222,7 +1234,7 @@ description: Operations executed enclosure.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

276
rust/kcl-lib/tests/kcl_samples/exhaust-manifold/ops.snap
View File

@ -4,46 +4,55 @@ description: Operations executed exhaust-manifold.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "primaryTube",
"functionSourceRange": [
329,
1531,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "primaryTube",
"functionSourceRange": [
329,
1531,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -293,49 +302,58 @@ description: Operations executed exhaust-manifold.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "primaryTube",
"functionSourceRange": [
329,
1531,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "primaryTube",
"functionSourceRange": [
329,
1531,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -585,49 +603,58 @@ description: Operations executed exhaust-manifold.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "primaryTube",
"functionSourceRange": [
329,
1531,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "primaryTube",
"functionSourceRange": [
329,
1531,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -877,49 +904,58 @@ description: Operations executed exhaust-manifold.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "primaryTube",
"functionSourceRange": [
329,
1531,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "primaryTube",
"functionSourceRange": [
329,
1531,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1169,7 +1205,7 @@ description: Operations executed exhaust-manifold.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

23
rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "bracketSketch",
"functionSourceRange": [
1212,
1736,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "bracketSketch",
"functionSourceRange": [
1212,
1736,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -207,7 +210,7 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

276
rust/kcl-lib/tests/kcl_samples/food-service-spatula/ops.snap
View File

@ -19,139 +19,166 @@ description: Operations executed food-service-spatula.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionCall",
"name": "slot",
"functionSourceRange": [
481,
1373,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "slot",
"functionSourceRange": [
481,
1373,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "slot",
"functionSourceRange": [
481,
1373,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "slot",
"functionSourceRange": [
481,
1373,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "slot",
"functionSourceRange": [
481,
1373,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "slot",
"functionSourceRange": [
481,
1373,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -685,49 +712,58 @@ description: Operations executed food-service-spatula.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionCall",
"name": "slot",
"functionSourceRange": [
481,
1373,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "slot",
"functionSourceRange": [
481,
1373,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

23
rust/kcl-lib/tests/kcl_samples/gear-rack/ops.snap
View File

@ -51,15 +51,18 @@ description: Operations executed gear-rack.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "tooth",
"functionSourceRange": [
812,
1321,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "tooth",
"functionSourceRange": [
812,
1321,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -110,7 +113,7 @@ description: Operations executed gear-rack.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

11753
rust/kcl-lib/tests/kcl_samples/gear/ops.snap
View File

File diff suppressed because it is too large Load Diff

138
rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate-magnets/ops.snap
View File

@ -34,15 +34,18 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "face",
"functionSourceRange": [
868,
1182,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "face",
"functionSourceRange": [
868,
1182,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -61,7 +64,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -257,15 +260,18 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "face",
"functionSourceRange": [
868,
1182,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "face",
"functionSourceRange": [
868,
1182,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -284,7 +290,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "KclStdLibCall",
@ -1066,15 +1072,18 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionCall",
"name": "magnetBase",
"functionSourceRange": [
4348,
4690,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "magnetBase",
"functionSourceRange": [
4348,
4690,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1093,15 +1102,18 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionCall",
"name": "magnetCenterCutout",
"functionSourceRange": [
2697,
4288,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "magnetCenterCutout",
"functionSourceRange": [
2697,
4288,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1120,7 +1132,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1149,7 +1161,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1319,15 +1331,18 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "magnetBase",
"functionSourceRange": [
4348,
4690,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "magnetBase",
"functionSourceRange": [
4348,
4690,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1346,15 +1361,18 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionCall",
"name": "magnetCenterCutout",
"functionSourceRange": [
2697,
4288,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "magnetCenterCutout",
"functionSourceRange": [
2697,
4288,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1373,7 +1391,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1402,7 +1420,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

46
rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate/ops.snap
View File

@ -34,15 +34,18 @@ description: Operations executed gridfinity-baseplate.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "face",
"functionSourceRange": [
745,
1059,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "face",
"functionSourceRange": [
745,
1059,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -61,7 +64,7 @@ description: Operations executed gridfinity-baseplate.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -257,15 +260,18 @@ description: Operations executed gridfinity-baseplate.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "face",
"functionSourceRange": [
745,
1059,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "face",
"functionSourceRange": [
745,
1059,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -284,7 +290,7 @@ description: Operations executed gridfinity-baseplate.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "KclStdLibCall",

138
rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/ops.snap
View File

@ -34,15 +34,18 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "face",
"functionSourceRange": [
1133,
1506,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "face",
"functionSourceRange": [
1133,
1506,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -61,7 +64,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -257,15 +260,18 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "face",
"functionSourceRange": [
1133,
1506,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "face",
"functionSourceRange": [
1133,
1506,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -284,7 +290,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "KclStdLibCall",
@ -1569,15 +1575,18 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "lipFace",
"functionSourceRange": [
5302,
5960,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "lipFace",
"functionSourceRange": [
5302,
5960,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1772,7 +1781,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1801,15 +1810,18 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "lipFace",
"functionSourceRange": [
5302,
5960,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "lipFace",
"functionSourceRange": [
5302,
5960,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -2004,7 +2016,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -2307,15 +2319,18 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "lipFace",
"functionSourceRange": [
5302,
5960,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "lipFace",
"functionSourceRange": [
5302,
5960,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -2510,7 +2525,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "KclStdLibCall",
@ -2620,15 +2635,18 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"sourceRange": []
},
{
"type": "UserDefinedFunctionCall",
"name": "lipFace",
"functionSourceRange": [
5302,
5960,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "lipFace",
"functionSourceRange": [
5302,
5960,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -2817,7 +2835,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "KclStdLibCall",

46
rust/kcl-lib/tests/kcl_samples/gridfinity-bins/ops.snap
View File

@ -34,15 +34,18 @@ description: Operations executed gridfinity-bins.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "face",
"functionSourceRange": [
874,
1247,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "face",
"functionSourceRange": [
874,
1247,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -61,7 +64,7 @@ description: Operations executed gridfinity-bins.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -257,15 +260,18 @@ description: Operations executed gridfinity-bins.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "face",
"functionSourceRange": [
874,
1247,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "face",
"functionSourceRange": [
874,
1247,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -284,7 +290,7 @@ description: Operations executed gridfinity-bins.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "KclStdLibCall",

23
rust/kcl-lib/tests/kcl_samples/hex-nut/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed hex-nut.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "hexNut",
"functionSourceRange": [
503,
1054,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "hexNut",
"functionSourceRange": [
503,
1054,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -89,6 +92,6 @@ description: Operations executed hex-nut.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

598
rust/kcl-lib/tests/kcl_samples/keyboard/ops.snap
View File

@ -189,30 +189,36 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -535,18 +541,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -869,18 +878,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1203,18 +1215,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1537,18 +1552,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1871,18 +1889,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -2205,18 +2226,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -2539,18 +2563,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -2873,18 +2900,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -3207,18 +3237,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -3541,18 +3574,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -3875,18 +3911,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -4209,18 +4248,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -4543,18 +4585,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -4877,18 +4922,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -5211,18 +5259,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -5545,18 +5596,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -5879,18 +5933,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -6213,18 +6270,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -6547,18 +6607,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -6881,18 +6944,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn",
"functionSourceRange": [
1885,
3037,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -7215,33 +7281,39 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "z",
"functionSourceRange": [
4939,
6029,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "z",
"functionSourceRange": [
4939,
6029,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -7469,18 +7541,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "o",
"functionSourceRange": [
6076,
7199,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "o",
"functionSourceRange": [
6076,
7199,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -7932,18 +8007,21 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "o",
"functionSourceRange": [
6076,
7199,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "o",
"functionSourceRange": [
6076,
7199,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -8395,6 +8473,6 @@ description: Operations executed keyboard.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

966
rust/kcl-lib/tests/kcl_samples/kitt/ops.snap
View File

File diff suppressed because it is too large Load Diff

230
rust/kcl-lib/tests/kcl_samples/makeup-mirror/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed makeup-mirror.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "hingeFn",
"functionSourceRange": [
444,
623,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "hingeFn",
"functionSourceRange": [
444,
623,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -87,18 +90,21 @@ description: Operations executed makeup-mirror.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "hingeFn",
"functionSourceRange": [
444,
623,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "hingeFn",
"functionSourceRange": [
444,
623,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -167,18 +173,21 @@ description: Operations executed makeup-mirror.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "hingeFn",
"functionSourceRange": [
444,
623,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "hingeFn",
"functionSourceRange": [
444,
623,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -247,18 +256,21 @@ description: Operations executed makeup-mirror.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "hingeFn",
"functionSourceRange": [
444,
623,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "hingeFn",
"functionSourceRange": [
444,
623,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -327,18 +339,21 @@ description: Operations executed makeup-mirror.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "hingeFn",
"functionSourceRange": [
444,
623,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "hingeFn",
"functionSourceRange": [
444,
623,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -407,18 +422,21 @@ description: Operations executed makeup-mirror.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "hingeFn",
"functionSourceRange": [
444,
623,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "hingeFn",
"functionSourceRange": [
444,
623,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -487,18 +505,21 @@ description: Operations executed makeup-mirror.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "hingeFn",
"functionSourceRange": [
444,
623,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "hingeFn",
"functionSourceRange": [
444,
623,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -567,18 +588,21 @@ description: Operations executed makeup-mirror.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "armFn",
"functionSourceRange": [
1068,
1245,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "armFn",
"functionSourceRange": [
1068,
1245,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -629,18 +653,21 @@ description: Operations executed makeup-mirror.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "armFn",
"functionSourceRange": [
1068,
1245,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "armFn",
"functionSourceRange": [
1068,
1245,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -691,18 +718,21 @@ description: Operations executed makeup-mirror.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "mirrorFn",
"functionSourceRange": [
1389,
2151,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "mirrorFn",
"functionSourceRange": [
1389,
2151,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -809,6 +839,6 @@ description: Operations executed makeup-mirror.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

23
rust/kcl-lib/tests/kcl_samples/mounting-plate/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed mounting-plate.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "rectShape",
"functionSourceRange": [
519,
887,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "rectShape",
"functionSourceRange": [
519,
887,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -31,7 +34,7 @@ description: Operations executed mounting-plate.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

1060
rust/kcl-lib/tests/kcl_samples/multi-axis-robot/ops.snap
View File

File diff suppressed because it is too large Load Diff

184
rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed pipe-flange-assembly.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "flange",
"functionSourceRange": [
451,
1670,
6
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "flange",
"functionSourceRange": [
451,
1670,
6
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -295,18 +298,21 @@ description: Operations executed pipe-flange-assembly.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "flange",
"functionSourceRange": [
451,
1670,
6
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "flange",
"functionSourceRange": [
451,
1670,
6
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -589,18 +595,21 @@ description: Operations executed pipe-flange-assembly.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "gasket",
"functionSourceRange": [
414,
870,
7
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "gasket",
"functionSourceRange": [
414,
870,
7
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -707,18 +716,21 @@ description: Operations executed pipe-flange-assembly.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "washer",
"functionSourceRange": [
274,
695,
8
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "washer",
"functionSourceRange": [
274,
695,
8
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -825,7 +837,7 @@ description: Operations executed pipe-flange-assembly.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1089,15 +1101,18 @@ description: Operations executed pipe-flange-assembly.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "bolt",
"functionSourceRange": [
364,
1663,
9
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "bolt",
"functionSourceRange": [
364,
1663,
9
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1303,7 +1318,7 @@ description: Operations executed pipe-flange-assembly.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1455,15 +1470,18 @@ description: Operations executed pipe-flange-assembly.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "hexNut",
"functionSourceRange": [
297,
1231,
10
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "hexNut",
"functionSourceRange": [
297,
1231,
10
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1558,7 +1576,7 @@ description: Operations executed pipe-flange-assembly.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1710,15 +1728,18 @@ description: Operations executed pipe-flange-assembly.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "pipe",
"functionSourceRange": [
244,
658,
11
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pipe",
"functionSourceRange": [
244,
658,
11
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1825,18 +1846,21 @@ description: Operations executed pipe-flange-assembly.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "pipe",
"functionSourceRange": [
244,
658,
11
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pipe",
"functionSourceRange": [
244,
658,
11
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1943,6 +1967,6 @@ description: Operations executed pipe-flange-assembly.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

46
rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/ops.snap
View File

@ -4,30 +4,36 @@ description: Operations executed socket-head-cap-screw.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "bolt",
"functionSourceRange": [
662,
1968,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "bolt",
"functionSourceRange": [
662,
1968,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -277,6 +283,6 @@ description: Operations executed socket-head-cap-screw.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

506
rust/kcl-lib/tests/kcl_samples/walkie-talkie/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed walkie-talkie.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "body",
"functionSourceRange": [
359,
2786,
6
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "body",
"functionSourceRange": [
359,
2786,
6
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -143,64 +146,76 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -347,18 +362,21 @@ description: Operations executed walkie-talkie.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "antenna",
"functionSourceRange": [
266,
1051,
9
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "antenna",
"functionSourceRange": [
266,
1051,
9
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -450,18 +468,21 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "case",
"functionSourceRange": [
454,
3283,
7
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "case",
"functionSourceRange": [
454,
3283,
7
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -555,64 +576,76 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1539,19 +1572,22 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionCall",
"name": "zLogo",
"functionSourceRange": [
69,
1088,
8
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "zLogo",
"functionSourceRange": [
69,
1088,
8
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1595,19 +1631,22 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionCall",
"name": "oLogo",
"functionSourceRange": [
1146,
1656,
8
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "oLogo",
"functionSourceRange": [
1146,
1656,
8
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1651,19 +1690,22 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionCall",
"name": "oLogo2",
"functionSourceRange": [
1674,
2184,
8
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "oLogo2",
"functionSourceRange": [
1674,
2184,
8
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1707,19 +1749,22 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionCall",
"name": "oLogo",
"functionSourceRange": [
1146,
1656,
8
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "oLogo",
"functionSourceRange": [
1146,
1656,
8
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1763,19 +1808,22 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionCall",
"name": "oLogo2",
"functionSourceRange": [
1674,
2184,
8
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "oLogo2",
"functionSourceRange": [
1674,
2184,
8
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -1836,18 +1884,21 @@ description: Operations executed walkie-talkie.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "talkButton",
"functionSourceRange": [
202,
1023,
10
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "talkButton",
"functionSourceRange": [
202,
1023,
10
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -1954,18 +2005,21 @@ description: Operations executed walkie-talkie.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "knob",
"functionSourceRange": [
298,
746,
11
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "knob",
"functionSourceRange": [
298,
746,
11
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -2070,18 +2124,21 @@ description: Operations executed walkie-talkie.kcl
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "button",
"functionSourceRange": [
221,
827,
12
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "button",
"functionSourceRange": [
221,
827,
12
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -2180,18 +2237,21 @@ description: Operations executed walkie-talkie.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "button",
"functionSourceRange": [
221,
827,
12
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "button",
"functionSourceRange": [
221,
827,
12
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -2290,18 +2350,21 @@ description: Operations executed walkie-talkie.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "button",
"functionSourceRange": [
221,
827,
12
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "button",
"functionSourceRange": [
221,
827,
12
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -2400,18 +2463,21 @@ description: Operations executed walkie-talkie.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "button",
"functionSourceRange": [
221,
827,
12
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "button",
"functionSourceRange": [
221,
827,
12
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -2510,6 +2576,6 @@ description: Operations executed walkie-talkie.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

23
rust/kcl-lib/tests/kcl_samples/washer/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed washer.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "washer",
"functionSourceRange": [
711,
1003,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "washer",
"functionSourceRange": [
711,
1003,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -89,6 +92,6 @@ description: Operations executed washer.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

80
rust/kcl-lib/tests/kw_fn/ops.snap
View File

@ -4,49 +4,37 @@ description: Operations executed kw_fn.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "increment",
"functionSourceRange": [
12,
35,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "increment",
"functionSourceRange": [
12,
35,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "add",
"functionSourceRange": [
43,
77,
0
],
"unlabeledArg": {
"value": {
"type": "Number",
"value": 1.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
}
}
},
"sourceRange": []
},
"labeledArgs": {
"delta": {
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "add",
"functionSourceRange": [
43,
77,
0
],
"unlabeledArg": {
"value": {
"type": "Number",
"value": 2.0,
"value": 1.0,
"ty": {
"type": "Default",
"len": {
@ -58,11 +46,29 @@ description: Operations executed kw_fn.kcl
}
},
"sourceRange": []
},
"labeledArgs": {
"delta": {
"value": {
"type": "Number",
"value": 2.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
}
}
},
"sourceRange": []
}
}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

49
rust/kcl-lib/tests/kw_fn_too_few_args/ops.snap
View File

@ -4,30 +4,33 @@ description: Operations executed kw_fn_too_few_args.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "add",
"functionSourceRange": [
6,
31,
0
],
"unlabeledArg": null,
"labeledArgs": {
"x": {
"value": {
"type": "Number",
"value": 1.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "add",
"functionSourceRange": [
6,
31,
0
],
"unlabeledArg": null,
"labeledArgs": {
"x": {
"value": {
"type": "Number",
"value": 1.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
}
}
}
},
"sourceRange": []
},
"sourceRange": []
}
}
},
"sourceRange": []

49
rust/kcl-lib/tests/kw_fn_unlabeled_but_has_label/ops.snap
View File

@ -4,30 +4,33 @@ description: Operations executed kw_fn_unlabeled_but_has_label.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "add",
"functionSourceRange": [
6,
29,
0
],
"unlabeledArg": null,
"labeledArgs": {
"x": {
"value": {
"type": "Number",
"value": 1.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "add",
"functionSourceRange": [
6,
29,
0
],
"unlabeledArg": null,
"labeledArgs": {
"x": {
"value": {
"type": "Number",
"value": 1.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
}
}
}
},
"sourceRange": []
},
"sourceRange": []
}
}
},
"sourceRange": []

80
rust/kcl-lib/tests/kw_fn_with_defaults/ops.snap
View File

@ -4,49 +4,37 @@ description: Operations executed kw_fn_with_defaults.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "increment",
"functionSourceRange": [
12,
45,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "increment",
"functionSourceRange": [
12,
45,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "increment",
"functionSourceRange": [
12,
45,
0
],
"unlabeledArg": {
"value": {
"type": "Number",
"value": 1.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
}
}
},
"sourceRange": []
},
"labeledArgs": {
"by": {
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "increment",
"functionSourceRange": [
12,
45,
0
],
"unlabeledArg": {
"value": {
"type": "Number",
"value": 20.0,
"value": 1.0,
"ty": {
"type": "Default",
"len": {
@ -58,11 +46,29 @@ description: Operations executed kw_fn_with_defaults.kcl
}
},
"sourceRange": []
},
"labeledArgs": {
"by": {
"value": {
"type": "Number",
"value": 20.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
}
}
},
"sourceRange": []
}
}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

23
rust/kcl-lib/tests/pattern_circular_in_module/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed pattern_circular_in_module.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "thing",
"functionSourceRange": [
15,
378,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "thing",
"functionSourceRange": [
15,
378,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -86,6 +89,6 @@ description: Operations executed pattern_circular_in_module.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

23
rust/kcl-lib/tests/pattern_linear_in_module/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed pattern_linear_in_module.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "thing",
"functionSourceRange": [
15,
221,
5
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "thing",
"functionSourceRange": [
15,
221,
5
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -104,6 +107,6 @@ description: Operations executed pattern_linear_in_module.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

46
rust/kcl-lib/tests/pentagon_fillet_sugar/ops.snap
View File

@ -51,15 +51,18 @@ description: Operations executed pentagon_fillet_sugar.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "circl",
"functionSourceRange": [
421,
571,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "circl",
"functionSourceRange": [
421,
571,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -88,7 +91,7 @@ description: Operations executed pentagon_fillet_sugar.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -172,15 +175,18 @@ description: Operations executed pentagon_fillet_sugar.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "circl",
"functionSourceRange": [
421,
571,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "circl",
"functionSourceRange": [
421,
571,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -209,7 +215,7 @@ description: Operations executed pentagon_fillet_sugar.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

46
rust/kcl-lib/tests/pipe_as_arg/ops.snap
View File

@ -4,30 +4,36 @@ description: Operations executed pipe_as_arg.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "double",
"functionSourceRange": [
404,
426,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "double",
"functionSourceRange": [
404,
426,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cube",
"functionSourceRange": [
7,
393,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube",
"functionSourceRange": [
7,
393,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -72,6 +78,6 @@ description: Operations executed pipe_as_arg.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

46
rust/kcl-lib/tests/riddle_small/ops.snap
View File

@ -4,34 +4,40 @@ description: Operations executed riddle_small.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "t",
"functionSourceRange": [
20,
66,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "t",
"functionSourceRange": [
20,
66,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "t",
"functionSourceRange": [
20,
66,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "t",
"functionSourceRange": [
20,
66,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

46
rust/kcl-lib/tests/rotate_after_fillet/ops.snap
View File

@ -4,30 +4,36 @@ description: Operations executed rotate_after_fillet.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "bolt",
"functionSourceRange": [
264,
1573,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "bolt",
"functionSourceRange": [
264,
1573,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -277,6 +283,6 @@ description: Operations executed rotate_after_fillet.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

46
rust/kcl-lib/tests/scale_after_fillet/ops.snap
View File

@ -4,30 +4,36 @@ description: Operations executed scale_after_fillet.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "bolt",
"functionSourceRange": [
264,
1573,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "bolt",
"functionSourceRange": [
264,
1573,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -277,6 +283,6 @@ description: Operations executed scale_after_fillet.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

46
rust/kcl-lib/tests/sketch_in_object/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed sketch_in_object.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "test",
"functionSourceRange": [
7,
170,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "test",
"functionSourceRange": [
7,
170,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -31,7 +34,7 @@ description: Operations executed sketch_in_object.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {
@ -66,15 +69,18 @@ description: Operations executed sketch_in_object.kcl
}
},
{
"type": "UserDefinedFunctionCall",
"name": "test2",
"functionSourceRange": [
180,
405,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "test2",
"functionSourceRange": [
180,
405,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -93,7 +99,7 @@ description: Operations executed sketch_in_object.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

23
rust/kcl-lib/tests/sketch_on_face_circle_tagged/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed sketch_on_face_circle_tagged.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "cube",
"functionSourceRange": [
7,
184,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube",
"functionSourceRange": [
7,
184,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -31,7 +34,7 @@ description: Operations executed sketch_on_face_circle_tagged.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

23
rust/kcl-lib/tests/sketch_on_face_end/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed sketch_on_face_end.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "cube",
"functionSourceRange": [
7,
184,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube",
"functionSourceRange": [
7,
184,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -31,7 +34,7 @@ description: Operations executed sketch_on_face_end.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

23
rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed sketch_on_face_end_negative_extrude.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "cube",
"functionSourceRange": [
7,
184,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube",
"functionSourceRange": [
7,
184,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -31,7 +34,7 @@ description: Operations executed sketch_on_face_end_negative_extrude.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

23
rust/kcl-lib/tests/sketch_on_face_start/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed sketch_on_face_start.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "cube",
"functionSourceRange": [
7,
184,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube",
"functionSourceRange": [
7,
184,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -31,7 +34,7 @@ description: Operations executed sketch_on_face_start.kcl
"unlabeledArg": null
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

23
rust/kcl-lib/tests/subtract_cylinder_from_cube/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed subtract_cylinder_from_cube.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "cube",
"functionSourceRange": [
7,
328,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube",
"functionSourceRange": [
7,
328,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -63,7 +66,7 @@ description: Operations executed subtract_cylinder_from_cube.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

46
rust/kcl-lib/tests/translate_after_fillet/ops.snap
View File

@ -4,30 +4,36 @@ description: Operations executed translate_after_fillet.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [
0,
0,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "bolt",
"functionSourceRange": [
264,
1573,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "bolt",
"functionSourceRange": [
264,
1573,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -277,6 +283,6 @@ description: Operations executed translate_after_fillet.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
}
]

46
rust/kcl-lib/tests/union_cubes/ops.snap
View File

@ -4,15 +4,18 @@ description: Operations executed union_cubes.kcl
---
[
{
"type": "UserDefinedFunctionCall",
"name": "cube",
"functionSourceRange": [
7,
328,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube",
"functionSourceRange": [
7,
328,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -63,18 +66,21 @@ description: Operations executed union_cubes.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"type": "UserDefinedFunctionCall",
"name": "cube",
"functionSourceRange": [
7,
328,
0
],
"unlabeledArg": null,
"labeledArgs": {},
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube",
"functionSourceRange": [
7,
328,
0
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
@ -125,7 +131,7 @@ description: Operations executed union_cubes.kcl
}
},
{
"type": "UserDefinedFunctionReturn"
"type": "GroupEnd"
},
{
"labeledArgs": {

22
src/components/ModelingSidebar/ModelingPanes/FeatureTreePane.tsx
View File

@ -289,10 +289,7 @@ const OperationItem = (props: {
send: Prop<Actor<typeof featureTreeMachine>, 'send'>
}) => {
const kclContext = useKclContext()
const name =
'name' in props.item && props.item.name !== null
? getOperationLabel(props.item)
: 'anonymous'
const name = getOperationLabel(props.item)
const errors = useMemo(() => {
return kclContext.diagnostics.filter(
(diag) =>
@ -304,7 +301,7 @@ const OperationItem = (props: {
}, [kclContext.diagnostics.length])
function selectOperation() {
if (props.item.type === 'UserDefinedFunctionReturn') {
if (props.item.type === 'GroupEnd') {
return
}
props.send({
@ -352,7 +349,7 @@ const OperationItem = (props: {
function deleteOperation() {
if (
props.item.type === 'StdLibCall' ||
props.item.type === 'UserDefinedFunctionCall' ||
props.item.type === 'GroupBegin' ||
props.item.type === 'KclStdLibCall'
) {
props.send({
@ -368,7 +365,7 @@ const OperationItem = (props: {
() => [
<ContextMenuItem
onClick={() => {
if (props.item.type === 'UserDefinedFunctionReturn') {
if (props.item.type === 'GroupEnd') {
return
}
props.send({
@ -381,14 +378,19 @@ const OperationItem = (props: {
>
View KCL source code
</ContextMenuItem>,
...(props.item.type === 'UserDefinedFunctionCall'
...(props.item.type === 'GroupBegin' &&
props.item.group.type === 'FunctionCall'
? [
<ContextMenuItem
onClick={() => {
if (props.item.type !== 'UserDefinedFunctionCall') {
if (props.item.type !== 'GroupBegin') {
return
}
const functionRange = props.item.functionSourceRange
if (props.item.group.type !== 'FunctionCall') {
// TODO: Add module instance support.
return
}
const functionRange = props.item.group.functionSourceRange
// For some reason, the cursor goes to the end of the source
// range we select. So set the end equal to the beginning.
functionRange[1] = functionRange[0]

6
src/lang/modifyAst.ts
View File

@ -1303,7 +1303,9 @@ export async function deleteFromSelection(
if (!pathToNode) return new Error('Could not find extrude variable')
} else {
pathToNode = selection.codeRef.pathToNode
if (varDec.node.type !== 'VariableDeclarator') {
if (varDec.node.type === 'VariableDeclarator') {
extrudeNameToDelete = varDec.node.id.name
} else if (varDec.node.type === 'CallExpression') {
const callExp = getNodeFromPath<CallExpression>(
astClone,
pathToNode,
@ -1312,7 +1314,7 @@ export async function deleteFromSelection(
if (err(callExp)) return callExp
extrudeNameToDelete = callExp.node.callee.name.name
} else {
extrudeNameToDelete = varDec.node.id.name
return new Error('Could not find extrude variable or call')
}
}

15
src/lib/operations.test.ts
View File

@ -16,17 +16,20 @@ function stdlib(name: string): Operation {
function userCall(name: string): Operation {
return {
type: 'UserDefinedFunctionCall',
name,
functionSourceRange: defaultSourceRange(),
unlabeledArg: null,
labeledArgs: {},
type: 'GroupBegin',
group: {
type: 'FunctionCall',
name,
functionSourceRange: defaultSourceRange(),
unlabeledArg: null,
labeledArgs: {},
},
sourceRange: defaultSourceRange(),
}
}
function userReturn(): Operation {
return {
type: 'UserDefinedFunctionReturn',
type: 'GroupEnd',
}
}

83
src/lib/operations.ts
View File

@ -1,5 +1,4 @@
import type { Operation } from '@rust/kcl-lib/bindings/Operation'
import type { OpKclValue } from '@rust/kcl-lib/bindings/OpKclValue'
import type { Operation, OpKclValue } from '@rust/kcl-lib/bindings/Operation'
import type { CustomIconName } from '@src/components/CustomIcon'
import { getNodePathFromSourceRange } from '@src/lang/queryAstNodePathUtils'
@ -1118,10 +1117,20 @@ export function getOperationLabel(op: Operation): string {
return stdLibMap[op.name]?.label ?? op.name
case 'KclStdLibCall':
return stdLibMap[op.name]?.label ?? op.name
case 'UserDefinedFunctionCall':
return op.name ?? 'Anonymous custom function'
case 'UserDefinedFunctionReturn':
return 'User function return'
case 'GroupBegin':
if (op.group.type === 'FunctionCall') {
return op.group.name ?? 'anonymous'
} else if (op.group.type === 'ModuleInstance') {
return op.group.name
} else {
const _exhaustiveCheck: never = op.group
return '' // unreachable
}
case 'GroupEnd':
return 'Group end'
default:
const _exhaustiveCheck: never = op
return '' // unreachable
}
}
@ -1134,8 +1143,16 @@ export function getOperationIcon(op: Operation): CustomIconName {
return stdLibMap[op.name]?.icon ?? 'questionMark'
case 'KclStdLibCall':
return stdLibMap[op.name]?.icon ?? 'questionMark'
default:
case 'GroupBegin':
if (op.group.type === 'ModuleInstance') {
return 'import' // TODO: Use insert icon.
}
return 'make-variable'
case 'GroupEnd':
return 'questionMark'
default:
const _exhaustiveCheck: never = op
return 'questionMark' // unreachable
}
}
@ -1151,31 +1168,31 @@ export function filterOperations(operations: Operation[]): Operation[] {
* for use in the feature tree UI
*/
const operationFilters = [
isNotUserFunctionWithNoOperations,
isNotInsideUserFunction,
isNotUserFunctionReturn,
isNotGroupWithNoOperations,
isNotInsideGroup,
isNotGroupEnd,
]
/**
* A filter to exclude everything that occurs inside a UserDefinedFunctionCall
* and its corresponding UserDefinedFunctionReturn from a list of operations.
* This works even when there are nested function calls.
* A filter to exclude everything that occurs inside a GroupBegin and its
* corresponding GroupEnd from a list of operations. This works even when there
* are nested function calls and module instances.
*/
function isNotInsideUserFunction(operations: Operation[]): Operation[] {
function isNotInsideGroup(operations: Operation[]): Operation[] {
const ops: Operation[] = []
let depth = 0
for (const op of operations) {
if (depth === 0) {
ops.push(op)
}
if (op.type === 'UserDefinedFunctionCall') {
if (op.type === 'GroupBegin') {
depth++
}
if (op.type === 'UserDefinedFunctionReturn') {
if (op.type === 'GroupEnd') {
depth--
console.assert(
depth >= 0,
'Unbalanced UserDefinedFunctionCall and UserDefinedFunctionReturn; too many returns'
'Unbalanced GroupBegin and GroupEnd; too many ends'
)
}
}
@ -1184,26 +1201,23 @@ function isNotInsideUserFunction(operations: Operation[]): Operation[] {
}
/**
* A filter to exclude UserDefinedFunctionCall operations and their
* corresponding UserDefinedFunctionReturn that don't have any operations inside
* them from a list of operations.
* A filter to exclude GroupBegin operations and their corresponding GroupEnd
* that don't have any operations inside them from a list of operations.
*/
function isNotUserFunctionWithNoOperations(
operations: Operation[]
): Operation[] {
function isNotGroupWithNoOperations(operations: Operation[]): Operation[] {
return operations.filter((op, index) => {
if (
op.type === 'UserDefinedFunctionCall' &&
// If this is a call at the end of the array, it's preserved.
op.type === 'GroupBegin' &&
// If this is a begin at the end of the array, it's preserved.
index < operations.length - 1 &&
operations[index + 1].type === 'UserDefinedFunctionReturn'
operations[index + 1].type === 'GroupEnd'
)
return false
if (
op.type === 'UserDefinedFunctionReturn' &&
// If this return is at the beginning of the array, it's preserved.
op.type === 'GroupEnd' &&
// If this is an end at the beginning of the array, it's preserved.
index > 0 &&
operations[index - 1].type === 'UserDefinedFunctionCall'
operations[index - 1].type === 'GroupBegin'
)
return false
@ -1212,11 +1226,10 @@ function isNotUserFunctionWithNoOperations(
}
/**
* A filter to exclude UserDefinedFunctionReturn operations from a list of
* operations.
* A filter to exclude GroupEnd operations from a list of operations.
*/
function isNotUserFunctionReturn(ops: Operation[]): Operation[] {
return ops.filter((op) => op.type !== 'UserDefinedFunctionReturn')
function isNotGroupEnd(ops: Operation[]): Operation[] {
return ops.filter((op) => op.type !== 'GroupEnd')
}
export interface EnterEditFlowProps {
@ -1230,7 +1243,7 @@ export async function enterEditFlow({
}: EnterEditFlowProps): Promise<Error | CommandBarMachineEvent> {
if (operation.type !== 'StdLibCall' && operation.type !== 'KclStdLibCall') {
return new Error(
'Feature tree editing not yet supported for user-defined functions. Please edit in the code editor.'
'Feature tree editing not yet supported for user-defined functions or modules. Please edit in the code editor.'
)
}
const stdLibInfo = stdLibMap[operation.name]
@ -1269,7 +1282,7 @@ export async function enterAppearanceFlow({
}: EnterEditFlowProps): Promise<Error | CommandBarMachineEvent> {
if (operation.type !== 'StdLibCall' && operation.type !== 'KclStdLibCall') {
return new Error(
'Appearance setting not yet supported for user-defined functions. Please edit in the code editor.'
'Appearance setting not yet supported for user-defined functions or modules. Please edit in the code editor.'
)
}
const stdLibInfo = stdLibMap[operation.name]