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 serde::{Deserialize, Serialize};
use super::{types::NumericType, ArtifactId, KclValue}; 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 /// A CAD modeling operation for display in the feature tree, AKA operations
/// timeline. /// timeline.
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)] #[ts(export_to = "Operation.ts")]
#[serde(tag = "type")] #[serde(tag = "type")]
pub enum Operation { pub enum Operation {
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
@ -40,7 +40,34 @@ pub enum Operation {
is_error: bool, is_error: bool,
}, },
#[serde(rename_all = "camelCase")] #[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 /// The name of the user-defined function being called. Anonymous
/// functions have no name. /// functions have no name.
name: Option<String>, name: Option<String>,
@ -51,26 +78,20 @@ pub enum Operation {
unlabeled_arg: Option<OpArg>, unlabeled_arg: Option<OpArg>,
/// The labeled keyword arguments to the function. /// The labeled keyword arguments to the function.
labeled_args: IndexMap<String, OpArg>, labeled_args: IndexMap<String, OpArg>,
/// The source range of the operation in the source code.
source_range: SourceRange,
}, },
UserDefinedFunctionReturn, /// A whole-module import use.
} #[serde(rename_all = "camelCase")]
ModuleInstance {
impl Operation { /// The name of the module being used.
/// If the variant is `StdLibCall`, set the `is_error` field. name: String,
pub(crate) fn set_std_lib_call_is_error(&mut self, is_err: bool) { /// The ID of the module which can be used to determine its path.
match self { module_id: ModuleId,
Self::StdLibCall { ref mut is_error, .. } => *is_error = is_err, },
Self::KclStdLibCall { ref mut is_error, .. } => *is_error = is_err,
Self::UserDefinedFunctionCall { .. } | Self::UserDefinedFunctionReturn => {}
}
}
} }
/// An argument to a CAD modeling operation. /// An argument to a CAD modeling operation.
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)] #[ts(export_to = "Operation.ts")]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct OpArg { pub struct OpArg {
/// The runtime value of the argument. Instead of using [`KclValue`], we /// 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 /// A reference to a standard library function. This exists to implement
/// `PartialEq` and `Eq` for `Operation`. /// `PartialEq` and `Eq` for `Operation`.
#[derive(Debug, Clone, Deserialize, Serialize, ts_rs::TS, JsonSchema)] #[derive(Debug, Clone, Deserialize, Serialize, ts_rs::TS, JsonSchema)]
#[ts(export)] #[ts(export_to = "Operation.ts")]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct StdLibFnRef { pub struct StdLibFnRef {
// The following doc comment gets inlined into Operation, overriding what's // 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 /// 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. /// actual scene objects. Any data not needed in the UI may be omitted.
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)] #[ts(export_to = "Operation.ts")]
#[serde(tag = "type")] #[serde(tag = "type")]
pub enum OpKclValue { pub enum OpKclValue {
Uuid { Uuid {
@ -212,21 +233,21 @@ pub enum OpKclValue {
pub type OpKclObjectFields = IndexMap<String, OpKclValue>; pub type OpKclObjectFields = IndexMap<String, OpKclValue>;
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)] #[ts(export_to = "Operation.ts")]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct OpSketch { pub struct OpSketch {
artifact_id: ArtifactId, artifact_id: ArtifactId,
} }
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)] #[ts(export_to = "Operation.ts")]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct OpSolid { pub struct OpSolid {
artifact_id: ArtifactId, artifact_id: ArtifactId,
} }
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)] #[ts(export_to = "Operation.ts")]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct OpHelix { pub struct OpHelix {
artifact_id: ArtifactId, 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 async_recursion::async_recursion;
use indexmap::IndexMap; use indexmap::IndexMap;
use super::{kcl_value::TypeDef, types::PrimitiveType}; use super::{cad_op::Group, kcl_value::TypeDef, types::PrimitiveType};
use crate::{ use crate::{
engine::ExecutionKind, engine::ExecutionKind,
errors::{KclError, KclErrorDetails}, errors::{KclError, KclErrorDetails},
@ -20,7 +20,7 @@ use crate::{
modules::{ModuleId, ModulePath, ModuleRepr}, modules::{ModuleId, ModulePath, ModuleRepr},
parsing::ast::types::{ parsing::ast::types::{
Annotation, ArrayExpression, ArrayRangeExpression, BinaryExpression, BinaryOperator, BinaryPart, BodyItem, 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, ItemVisibility, LiteralIdentifier, LiteralValue, MemberExpression, MemberObject, Name, Node, NodeRef,
ObjectExpression, PipeExpression, Program, TagDeclarator, Type, UnaryExpression, UnaryOperator, ObjectExpression, PipeExpression, Program, TagDeclarator, Type, UnaryExpression, UnaryOperator,
}, },
@ -512,10 +512,19 @@ impl ExecutorContext {
async fn exec_module_for_result( async fn exec_module_for_result(
&self, &self,
module_id: ModuleId, module_id: ModuleId,
module_name: &BoxNode<Name>,
exec_state: &mut ExecState, exec_state: &mut ExecState,
exec_kind: ExecutionKind, exec_kind: ExecutionKind,
source_range: SourceRange, source_range: SourceRange,
) -> Result<Option<KclValue>, KclError> { ) -> 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 path = exec_state.global.module_infos[&module_id].path.clone();
let mut repr = exec_state.global.module_infos[&module_id].take_repr(); let mut repr = exec_state.global.module_infos[&module_id].take_repr();
// DON'T EARLY RETURN! We need to restore the module 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.module_infos[&module_id].restore_repr(repr);
exec_state.global.operations.push(Operation::GroupEnd);
result result
} }
@ -592,7 +604,7 @@ impl ExecutorContext {
Expr::Name(name) => { Expr::Name(name) => {
let value = name.get_result(exec_state, self).await?.clone(); let value = name.get_result(exec_state, self).await?.clone();
if let KclValue::Module { value: module_id, meta } = value { 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? .await?
.unwrap_or_else(|| { .unwrap_or_else(|| {
exec_state.warn(CompilationError::err( exec_state.warn(CompilationError::err(
@ -1349,7 +1361,7 @@ impl Node<CallExpressionKw> {
if matches!(fn_src, FunctionSource::User { .. }) && !ctx.is_isolated_execution().await { if matches!(fn_src, FunctionSource::User { .. }) && !ctx.is_isolated_execution().await {
// Track return operation. // 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 || { let result = return_value.ok_or_else(move || {
@ -1459,12 +1471,14 @@ impl Node<CallExpression> {
if !ctx.is_isolated_execution().await { if !ctx.is_isolated_execution().await {
// Track call operation. // Track call operation.
exec_state.global.operations.push(Operation::UserDefinedFunctionCall { exec_state.global.operations.push(Operation::GroupBegin {
name: Some(fn_name.to_string()), group: Group::FunctionCall {
function_source_range: func.function_def_source_range().unwrap_or_default(), name: Some(fn_name.to_string()),
unlabeled_arg: None, function_source_range: func.function_def_source_range().unwrap_or_default(),
// TODO: Add the arguments for legacy positional parameters. unlabeled_arg: None,
labeled_args: Default::default(), // TODO: Add the arguments for legacy positional parameters.
labeled_args: Default::default(),
},
source_range: callsite, source_range: callsite,
}); });
} }
@ -1498,7 +1512,7 @@ impl Node<CallExpression> {
if !ctx.is_isolated_execution().await { if !ctx.is_isolated_execution().await {
// Track return operation. // Track return operation.
exec_state.global.operations.push(Operation::UserDefinedFunctionReturn); exec_state.global.operations.push(Operation::GroupEnd);
} }
Ok(result) Ok(result)
@ -2279,15 +2293,17 @@ impl FunctionSource {
.iter() .iter()
.map(|(k, arg)| (k.clone(), OpArg::new(OpKclValue::from(&arg.value), arg.source_range))) .map(|(k, arg)| (k.clone(), OpArg::new(OpKclValue::from(&arg.value), arg.source_range)))
.collect(); .collect();
exec_state.global.operations.push(Operation::UserDefinedFunctionCall { exec_state.global.operations.push(Operation::GroupBegin {
name: fn_name, group: Group::FunctionCall {
function_source_range: ast.as_source_range(), name: fn_name,
unlabeled_arg: args function_source_range: ast.as_source_range(),
.kw_args unlabeled_arg: args
.unlabeled .kw_args
.as_ref() .unlabeled
.map(|arg| OpArg::new(OpKclValue::from(&arg.value), arg.source_range)), .as_ref()
labeled_args: op_labeled_args, .map(|arg| OpArg::new(OpKclValue::from(&arg.value), arg.source_range)),
labeled_args: op_labeled_args,
},
source_range: callsite, 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 description: Operations executed assembly_mixed_units_cubes.kcl
--- ---
[ [
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "cubeIn",
"moduleId": 5
},
"sourceRange": []
},
{ {
"labeledArgs": { "labeledArgs": {
"data": { "data": {
@ -50,6 +59,18 @@ description: Operations executed assembly_mixed_units_cubes.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
{
"type": "GroupEnd"
},
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "cubeMm",
"moduleId": 6
},
"sourceRange": []
},
{ {
"labeledArgs": { "labeledArgs": {
"data": { "data": {
@ -96,5 +117,8 @@ description: Operations executed assembly_mixed_units_cubes.kcl
}, },
"sourceRange": [] "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 description: Operations executed assembly_non_default_units.kcl
--- ---
[ [
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "other1",
"moduleId": 5
},
"sourceRange": []
},
{ {
"labeledArgs": { "labeledArgs": {
"data": { "data": {
@ -18,6 +27,18 @@ description: Operations executed assembly_non_default_units.kcl
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": null
}, },
{
"type": "GroupEnd"
},
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "other2",
"moduleId": 6
},
"sourceRange": []
},
{ {
"labeledArgs": { "labeledArgs": {
"data": { "data": {
@ -32,5 +53,8 @@ description: Operations executed assembly_non_default_units.kcl
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "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", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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", "type": "GroupBegin",
"name": "cube", "group": {
"functionSourceRange": [ "type": "FunctionCall",
7, "name": "cube",
404, "functionSourceRange": [
0 7,
], 404,
"unlabeledArg": null, 0
"labeledArgs": { ],
"center": { "unlabeledArg": null,
"value": { "labeledArgs": {
"type": "Array", "center": {
"value": [ "value": {
{ "type": "Array",
"type": "Number", "value": [
"value": 0.0, {
"ty": { "type": "Number",
"type": "Default", "value": 0.0,
"len": { "ty": {
"type": "Mm" "type": "Default",
}, "len": {
"angle": { "type": "Mm"
"type": "Degrees" },
"angle": {
"type": "Degrees"
}
}
},
{
"type": "Number",
"value": 0.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
}
} }
} }
}, ]
{ },
"type": "Number", "sourceRange": []
"value": 0.0, },
"ty": { "sideLength": {
"type": "Default", "value": {
"len": { "type": "Number",
"type": "Mm" "value": 40.0,
}, "ty": {
"angle": { "type": "Default",
"type": "Degrees" "len": {
} "type": "Mm"
},
"angle": {
"type": "Degrees"
} }
} }
] },
}, "sourceRange": []
"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", "type": "GroupBegin",
"name": "cube", "group": {
"functionSourceRange": [ "type": "FunctionCall",
7, "name": "cube",
392, "functionSourceRange": [
0 7,
], 392,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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", "type": "GroupBegin",
"name": "m25Screw", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1310, "name": "m25Screw",
1538, "functionSourceRange": [
0 1310,
], 1538,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -207,18 +210,21 @@ description: Operations executed fillet-and-shell.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "m25Screw", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1310, "name": "m25Screw",
1538, "functionSourceRange": [
0 1310,
], 1538,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -295,18 +301,21 @@ description: Operations executed fillet-and-shell.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "m25Screw", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1310, "name": "m25Screw",
1538, "functionSourceRange": [
0 1310,
], 1538,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -383,18 +392,21 @@ description: Operations executed fillet-and-shell.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "m25Screw", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1310, "name": "m25Screw",
1538, "functionSourceRange": [
0 1310,
], 1538,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -471,7 +483,7 @@ description: Operations executed fillet-and-shell.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

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

@ -4,15 +4,18 @@ description: Operations executed function_sketch.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "box", "group": {
"functionSourceRange": [ "type": "FunctionCall",
6, "name": "box",
220, "functionSourceRange": [
0 6,
], 220,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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", "type": "GroupBegin",
"name": "box", "group": {
"functionSourceRange": [ "type": "FunctionCall",
6, "name": "box",
218, "functionSourceRange": [
0 6,
], 218,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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 source: kcl-lib/src/simulation_tests.rs
description: Operations executed import_glob.kcl 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 source: kcl-lib/src/simulation_tests.rs
description: Operations executed import_transform.kcl 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 description: Operations executed import_whole.kcl
--- ---
[ [
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "foo",
"moduleId": 5
},
"sourceRange": []
},
{ {
"labeledArgs": { "labeledArgs": {
"data": { "data": {
@ -50,6 +59,9 @@ description: Operations executed import_whole.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
{
"type": "GroupEnd"
},
{ {
"labeledArgs": { "labeledArgs": {
"faces": { "faces": {

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

@ -4,15 +4,18 @@ description: Operations executed intersect_cubes.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cube", "group": {
"functionSourceRange": [ "type": "FunctionCall",
7, "name": "cube",
328, "functionSourceRange": [
0 7,
], 328,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -63,18 +66,21 @@ description: Operations executed intersect_cubes.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cube", "group": {
"functionSourceRange": [ "type": "FunctionCall",
7, "name": "cube",
328, "functionSourceRange": [
0 7,
], 328,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -125,7 +131,7 @@ description: Operations executed intersect_cubes.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "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", "type": "GroupBegin",
"name": "rail8020", "group": {
"functionSourceRange": [ "type": "FunctionCall",
214, "name": "rail8020",
7479, "functionSourceRange": [
0 214,
], 7479,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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 "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "KclStdLibCall", "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", "type": "GroupBegin",
"name": "divider", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1331, "name": "divider",
1606, "functionSourceRange": [
5 1331,
], 1606,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "dividerSketch", "group": {
"functionSourceRange": [ "type": "FunctionCall",
309, "name": "dividerSketch",
1312, "functionSourceRange": [
5 309,
], 1312,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -43,7 +49,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -72,15 +78,18 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "dividerSketch", "group": {
"functionSourceRange": [ "type": "FunctionCall",
309, "name": "dividerSketch",
1312, "functionSourceRange": [
5 309,
], 1312,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -99,7 +108,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -216,7 +225,7 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -243,27 +252,33 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "divider", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1331, "name": "divider",
1606, "functionSourceRange": [
5 1331,
], 1606,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "dividerSketch", "group": {
"functionSourceRange": [ "type": "FunctionCall",
309, "name": "dividerSketch",
1312, "functionSourceRange": [
5 309,
], 1312,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -282,7 +297,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -311,15 +326,18 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "dividerSketch", "group": {
"functionSourceRange": [ "type": "FunctionCall",
309, "name": "dividerSketch",
1312, "functionSourceRange": [
5 309,
], 1312,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -338,7 +356,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -455,7 +473,7 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -482,27 +500,33 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "divider", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1331, "name": "divider",
1606, "functionSourceRange": [
5 1331,
], 1606,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "dividerSketch", "group": {
"functionSourceRange": [ "type": "FunctionCall",
309, "name": "dividerSketch",
1312, "functionSourceRange": [
5 309,
], 1312,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -521,7 +545,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -550,15 +574,18 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "dividerSketch", "group": {
"functionSourceRange": [ "type": "FunctionCall",
309, "name": "dividerSketch",
1312, "functionSourceRange": [
5 309,
], 1312,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -577,7 +604,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -694,7 +721,7 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -721,27 +748,33 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "connector", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1889, "name": "connector",
2052, "functionSourceRange": [
5 1889,
], 2052,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "connectorSketch", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1626, "name": "connectorSketch",
1868, "functionSourceRange": [
5 1626,
], 1868,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -760,7 +793,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -795,15 +828,18 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "connectorSketch", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1626, "name": "connectorSketch",
1868, "functionSourceRange": [
5 1626,
], 1868,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -822,7 +858,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -857,7 +893,7 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -884,27 +920,33 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "seatSlats", "group": {
"functionSourceRange": [ "type": "FunctionCall",
2474, "name": "seatSlats",
2560, "functionSourceRange": [
5 2474,
], 2560,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "seatSlatSketch", "group": {
"functionSourceRange": [ "type": "FunctionCall",
2071, "name": "seatSlatSketch",
2453, "functionSourceRange": [
5 2071,
], 2453,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -923,7 +965,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -975,7 +1017,7 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1002,27 +1044,33 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "backSlats", "group": {
"functionSourceRange": [ "type": "FunctionCall",
2993, "name": "backSlats",
3084, "functionSourceRange": [
5 2993,
], 3084,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "backSlatsSketch", "group": {
"functionSourceRange": [ "type": "FunctionCall",
2580, "name": "backSlatsSketch",
2972, "functionSourceRange": [
5 2580,
], 2972,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1041,7 +1089,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1087,18 +1135,21 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "armRest", "group": {
"functionSourceRange": [ "type": "FunctionCall",
3671, "name": "armRest",
3859, "functionSourceRange": [
5 3671,
], 3859,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1126,15 +1177,18 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "armRestPath", "group": {
"functionSourceRange": [ "type": "FunctionCall",
3100, "name": "armRestPath",
3325, "functionSourceRange": [
5 3100,
], 3325,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1153,7 +1207,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1186,15 +1240,18 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "armRestProfile", "group": {
"functionSourceRange": [ "type": "FunctionCall",
3344, "name": "armRestProfile",
3652, "functionSourceRange": [
5 3344,
], 3652,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1213,7 +1270,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1241,18 +1298,21 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "armRest", "group": {
"functionSourceRange": [ "type": "FunctionCall",
3671, "name": "armRest",
3859, "functionSourceRange": [
5 3671,
], 3859,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1280,15 +1340,18 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "armRestPath", "group": {
"functionSourceRange": [ "type": "FunctionCall",
3100, "name": "armRestPath",
3325, "functionSourceRange": [
5 3100,
], 3325,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1307,7 +1370,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1340,15 +1403,18 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "armRestProfile", "group": {
"functionSourceRange": [ "type": "FunctionCall",
3344, "name": "armRestProfile",
3652, "functionSourceRange": [
5 3344,
], 3652,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1367,7 +1433,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "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 description: Operations executed car-wheel-assembly.kcl
--- ---
[ [
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "carRotor",
"moduleId": 6
},
"sourceRange": []
},
{ {
"labeledArgs": { "labeledArgs": {
"data": { "data": {
@ -685,6 +694,18 @@ description: Operations executed car-wheel-assembly.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
{
"type": "GroupEnd"
},
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "carWheel",
"moduleId": 5
},
"sourceRange": []
},
{ {
"labeledArgs": { "labeledArgs": {
"data": { "data": {
@ -1189,15 +1210,18 @@ description: Operations executed car-wheel-assembly.kcl
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "spoke", "group": {
"functionSourceRange": [ "type": "FunctionCall",
2616, "name": "spoke",
4189, "functionSourceRange": [
5 2616,
], 4189,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1573,18 +1597,21 @@ description: Operations executed car-wheel-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "spoke", "group": {
"functionSourceRange": [ "type": "FunctionCall",
2616, "name": "spoke",
4189, "functionSourceRange": [
5 2616,
], 4189,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1960,7 +1987,7 @@ description: Operations executed car-wheel-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -2064,15 +2091,30 @@ description: Operations executed car-wheel-assembly.kcl
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupEnd"
"name": "lug", },
"functionSourceRange": [ {
664, "type": "GroupBegin",
1289, "group": {
8 "type": "ModuleInstance",
], "name": "lugNut",
"unlabeledArg": null, "moduleId": 8
"labeledArgs": {}, },
"sourceRange": []
},
{
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "lug",
"functionSourceRange": [
664,
1289,
8
],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2347,7 +2389,10 @@ description: Operations executed car-wheel-assembly.kcl
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
},
{
"type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -2498,6 +2543,15 @@ description: Operations executed car-wheel-assembly.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "brakeCaliper",
"moduleId": 7
},
"sourceRange": []
},
{ {
"labeledArgs": { "labeledArgs": {
"data": { "data": {
@ -2620,6 +2674,18 @@ description: Operations executed car-wheel-assembly.kcl
}, },
"sourceRange": [] "sourceRange": []
}, },
{
"type": "GroupEnd"
},
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "carTire",
"moduleId": 9
},
"sourceRange": []
},
{ {
"labeledArgs": { "labeledArgs": {
"data": { "data": {
@ -2725,5 +2791,8 @@ description: Operations executed car-wheel-assembly.kcl
} }
}, },
"sourceRange": [] "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", "type": "GroupBegin",
"name": "sketchRectangle", "group": {
"functionSourceRange": [ "type": "FunctionCall",
726, "name": "sketchRectangle",
1326, "functionSourceRange": [
0 726,
], 1326,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -192,18 +195,21 @@ description: Operations executed color-cube.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sketchRectangle", "group": {
"functionSourceRange": [ "type": "FunctionCall",
726, "name": "sketchRectangle",
1326, "functionSourceRange": [
0 726,
], 1326,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -239,18 +245,21 @@ description: Operations executed color-cube.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sketchRectangle", "group": {
"functionSourceRange": [ "type": "FunctionCall",
726, "name": "sketchRectangle",
1326, "functionSourceRange": [
0 726,
], 1326,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -286,18 +295,21 @@ description: Operations executed color-cube.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sketchRectangle", "group": {
"functionSourceRange": [ "type": "FunctionCall",
726, "name": "sketchRectangle",
1326, "functionSourceRange": [
0 726,
], 1326,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -333,18 +345,21 @@ description: Operations executed color-cube.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sketchRectangle", "group": {
"functionSourceRange": [ "type": "FunctionCall",
726, "name": "sketchRectangle",
1326, "functionSourceRange": [
0 726,
], 1326,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -380,18 +395,21 @@ description: Operations executed color-cube.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sketchRectangle", "group": {
"functionSourceRange": [ "type": "FunctionCall",
726, "name": "sketchRectangle",
1326, "functionSourceRange": [
0 726,
], 1326,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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", "type": "GroupBegin",
"name": "cycloidalGear", "group": {
"functionSourceRange": [ "type": "FunctionCall",
221, "name": "cycloidalGear",
1685, "functionSourceRange": [
0 221,
], 1685,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "gearSketch", "group": {
"functionSourceRange": [ "type": "FunctionCall",
447, "name": "gearSketch",
1476, "functionSourceRange": [
0 447,
], 1476,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -73,64 +79,76 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -159,18 +177,21 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "gearSketch", "group": {
"functionSourceRange": [ "type": "FunctionCall",
447, "name": "gearSketch",
1476, "functionSourceRange": [
0 447,
], 1476,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -213,64 +234,76 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -299,18 +332,21 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "gearSketch", "group": {
"functionSourceRange": [ "type": "FunctionCall",
447, "name": "gearSketch",
1476, "functionSourceRange": [
0 447,
], 1476,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -359,64 +395,76 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -445,7 +493,7 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -482,6 +530,6 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null "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", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

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

@ -145,15 +145,18 @@ description: Operations executed enclosure.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "function001", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1254, "name": "function001",
1851, "functionSourceRange": [
0 1254,
], 1851,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -412,18 +415,21 @@ description: Operations executed enclosure.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "function001", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1254, "name": "function001",
1851, "functionSourceRange": [
0 1254,
], 1851,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -682,18 +688,21 @@ description: Operations executed enclosure.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "function001", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1254, "name": "function001",
1851, "functionSourceRange": [
0 1254,
], 1851,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -952,18 +961,21 @@ description: Operations executed enclosure.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "function001", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1254, "name": "function001",
1851, "functionSourceRange": [
0 1254,
], 1851,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1222,7 +1234,7 @@ description: Operations executed enclosure.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "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", "type": "GroupBegin",
"name": "primaryTube", "group": {
"functionSourceRange": [ "type": "FunctionCall",
329, "name": "primaryTube",
1531, "functionSourceRange": [
0 329,
], 1531,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -293,49 +302,58 @@ description: Operations executed exhaust-manifold.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "primaryTube", "group": {
"functionSourceRange": [ "type": "FunctionCall",
329, "name": "primaryTube",
1531, "functionSourceRange": [
0 329,
], 1531,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -585,49 +603,58 @@ description: Operations executed exhaust-manifold.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "primaryTube", "group": {
"functionSourceRange": [ "type": "FunctionCall",
329, "name": "primaryTube",
1531, "functionSourceRange": [
0 329,
], 1531,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -877,49 +904,58 @@ description: Operations executed exhaust-manifold.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "primaryTube", "group": {
"functionSourceRange": [ "type": "FunctionCall",
329, "name": "primaryTube",
1531, "functionSourceRange": [
0 329,
], 1531,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1169,7 +1205,7 @@ description: Operations executed exhaust-manifold.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "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", "type": "GroupBegin",
"name": "bracketSketch", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1212, "name": "bracketSketch",
1736, "functionSourceRange": [
0 1212,
], 1736,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -207,7 +210,7 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "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 "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "slot", "group": {
"functionSourceRange": [ "type": "FunctionCall",
481, "name": "slot",
1373, "functionSourceRange": [
0 481,
], 1373,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "slot", "group": {
"functionSourceRange": [ "type": "FunctionCall",
481, "name": "slot",
1373, "functionSourceRange": [
0 481,
], 1373,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "slot", "group": {
"functionSourceRange": [ "type": "FunctionCall",
481, "name": "slot",
1373, "functionSourceRange": [
0 481,
], 1373,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -685,49 +712,58 @@ description: Operations executed food-service-spatula.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "slot", "group": {
"functionSourceRange": [ "type": "FunctionCall",
481, "name": "slot",
1373, "functionSourceRange": [
0 481,
], 1373,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "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", "type": "GroupBegin",
"name": "tooth", "group": {
"functionSourceRange": [ "type": "FunctionCall",
812, "name": "tooth",
1321, "functionSourceRange": [
0 812,
], 1321,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -110,7 +113,7 @@ description: Operations executed gear-rack.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "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", "type": "GroupBegin",
"name": "face", "group": {
"functionSourceRange": [ "type": "FunctionCall",
868, "name": "face",
1182, "functionSourceRange": [
0 868,
], 1182,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -61,7 +64,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -257,15 +260,18 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "face", "group": {
"functionSourceRange": [ "type": "FunctionCall",
868, "name": "face",
1182, "functionSourceRange": [
0 868,
], 1182,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -284,7 +290,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "KclStdLibCall", "type": "KclStdLibCall",
@ -1066,15 +1072,18 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "magnetBase", "group": {
"functionSourceRange": [ "type": "FunctionCall",
4348, "name": "magnetBase",
4690, "functionSourceRange": [
0 4348,
], 4690,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1093,15 +1102,18 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "magnetCenterCutout", "group": {
"functionSourceRange": [ "type": "FunctionCall",
2697, "name": "magnetCenterCutout",
4288, "functionSourceRange": [
0 2697,
], 4288,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1120,7 +1132,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1149,7 +1161,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1319,15 +1331,18 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "magnetBase", "group": {
"functionSourceRange": [ "type": "FunctionCall",
4348, "name": "magnetBase",
4690, "functionSourceRange": [
0 4348,
], 4690,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1346,15 +1361,18 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "magnetCenterCutout", "group": {
"functionSourceRange": [ "type": "FunctionCall",
2697, "name": "magnetCenterCutout",
4288, "functionSourceRange": [
0 2697,
], 4288,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1373,7 +1391,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1402,7 +1420,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "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", "type": "GroupBegin",
"name": "face", "group": {
"functionSourceRange": [ "type": "FunctionCall",
745, "name": "face",
1059, "functionSourceRange": [
0 745,
], 1059,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -61,7 +64,7 @@ description: Operations executed gridfinity-baseplate.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -257,15 +260,18 @@ description: Operations executed gridfinity-baseplate.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "face", "group": {
"functionSourceRange": [ "type": "FunctionCall",
745, "name": "face",
1059, "functionSourceRange": [
0 745,
], 1059,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -284,7 +290,7 @@ description: Operations executed gridfinity-baseplate.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "KclStdLibCall", "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", "type": "GroupBegin",
"name": "face", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1133, "name": "face",
1506, "functionSourceRange": [
0 1133,
], 1506,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -61,7 +64,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -257,15 +260,18 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "face", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1133, "name": "face",
1506, "functionSourceRange": [
0 1133,
], 1506,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -284,7 +290,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "KclStdLibCall", "type": "KclStdLibCall",
@ -1569,15 +1575,18 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "lipFace", "group": {
"functionSourceRange": [ "type": "FunctionCall",
5302, "name": "lipFace",
5960, "functionSourceRange": [
0 5302,
], 5960,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1772,7 +1781,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1801,15 +1810,18 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "lipFace", "group": {
"functionSourceRange": [ "type": "FunctionCall",
5302, "name": "lipFace",
5960, "functionSourceRange": [
0 5302,
], 5960,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2004,7 +2016,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -2307,15 +2319,18 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "lipFace", "group": {
"functionSourceRange": [ "type": "FunctionCall",
5302, "name": "lipFace",
5960, "functionSourceRange": [
0 5302,
], 5960,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2510,7 +2525,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "KclStdLibCall", "type": "KclStdLibCall",
@ -2620,15 +2635,18 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "lipFace", "group": {
"functionSourceRange": [ "type": "FunctionCall",
5302, "name": "lipFace",
5960, "functionSourceRange": [
0 5302,
], 5960,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2817,7 +2835,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "KclStdLibCall", "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", "type": "GroupBegin",
"name": "face", "group": {
"functionSourceRange": [ "type": "FunctionCall",
874, "name": "face",
1247, "functionSourceRange": [
0 874,
], 1247,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -61,7 +64,7 @@ description: Operations executed gridfinity-bins.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -257,15 +260,18 @@ description: Operations executed gridfinity-bins.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "face", "group": {
"functionSourceRange": [ "type": "FunctionCall",
874, "name": "face",
1247, "functionSourceRange": [
0 874,
], 1247,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -284,7 +290,7 @@ description: Operations executed gridfinity-bins.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "KclStdLibCall", "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", "type": "GroupBegin",
"name": "hexNut", "group": {
"functionSourceRange": [ "type": "FunctionCall",
503, "name": "hexNut",
1054, "functionSourceRange": [
0 503,
], 1054,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -535,18 +541,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -869,18 +878,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1203,18 +1215,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1537,18 +1552,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1871,18 +1889,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2205,18 +2226,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2539,18 +2563,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2873,18 +2900,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -3207,18 +3237,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -3541,18 +3574,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -3875,18 +3911,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -4209,18 +4248,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -4543,18 +4585,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -4877,18 +4922,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -5211,18 +5259,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -5545,18 +5596,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -5879,18 +5933,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -6213,18 +6270,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -6547,18 +6607,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -6881,18 +6944,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "keyFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1885, "name": "keyFn",
3037, "functionSourceRange": [
0 1885,
], 3037,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -7215,33 +7281,39 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "sin", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "sin",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "z", "group": {
"functionSourceRange": [ "type": "FunctionCall",
4939, "name": "z",
6029, "functionSourceRange": [
0 4939,
], 6029,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -7469,18 +7541,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "o", "group": {
"functionSourceRange": [ "type": "FunctionCall",
6076, "name": "o",
7199, "functionSourceRange": [
0 6076,
], 7199,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -7932,18 +8007,21 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "o", "group": {
"functionSourceRange": [ "type": "FunctionCall",
6076, "name": "o",
7199, "functionSourceRange": [
0 6076,
], 7199,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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", "type": "GroupBegin",
"name": "hingeFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
444, "name": "hingeFn",
623, "functionSourceRange": [
0 444,
], 623,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -87,18 +90,21 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "hingeFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
444, "name": "hingeFn",
623, "functionSourceRange": [
0 444,
], 623,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -167,18 +173,21 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "hingeFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
444, "name": "hingeFn",
623, "functionSourceRange": [
0 444,
], 623,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -247,18 +256,21 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "hingeFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
444, "name": "hingeFn",
623, "functionSourceRange": [
0 444,
], 623,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -327,18 +339,21 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "hingeFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
444, "name": "hingeFn",
623, "functionSourceRange": [
0 444,
], 623,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -407,18 +422,21 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "hingeFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
444, "name": "hingeFn",
623, "functionSourceRange": [
0 444,
], 623,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -487,18 +505,21 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "hingeFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
444, "name": "hingeFn",
623, "functionSourceRange": [
0 444,
], 623,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -567,18 +588,21 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "armFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1068, "name": "armFn",
1245, "functionSourceRange": [
0 1068,
], 1245,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -629,18 +653,21 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "armFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1068, "name": "armFn",
1245, "functionSourceRange": [
0 1068,
], 1245,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -691,18 +718,21 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "mirrorFn", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1389, "name": "mirrorFn",
2151, "functionSourceRange": [
0 1389,
], 2151,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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", "type": "GroupBegin",
"name": "rectShape", "group": {
"functionSourceRange": [ "type": "FunctionCall",
519, "name": "rectShape",
887, "functionSourceRange": [
0 519,
], 887,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -31,7 +34,7 @@ description: Operations executed mounting-plate.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "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", "type": "GroupBegin",
"name": "flange", "group": {
"functionSourceRange": [ "type": "FunctionCall",
451, "name": "flange",
1670, "functionSourceRange": [
6 451,
], 1670,
"unlabeledArg": null, 6
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -295,18 +298,21 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "flange", "group": {
"functionSourceRange": [ "type": "FunctionCall",
451, "name": "flange",
1670, "functionSourceRange": [
6 451,
], 1670,
"unlabeledArg": null, 6
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -589,18 +595,21 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "gasket", "group": {
"functionSourceRange": [ "type": "FunctionCall",
414, "name": "gasket",
870, "functionSourceRange": [
7 414,
], 870,
"unlabeledArg": null, 7
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -707,18 +716,21 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "washer", "group": {
"functionSourceRange": [ "type": "FunctionCall",
274, "name": "washer",
695, "functionSourceRange": [
8 274,
], 695,
"unlabeledArg": null, 8
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -825,7 +837,7 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1089,15 +1101,18 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "bolt", "group": {
"functionSourceRange": [ "type": "FunctionCall",
364, "name": "bolt",
1663, "functionSourceRange": [
9 364,
], 1663,
"unlabeledArg": null, 9
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1303,7 +1318,7 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1455,15 +1470,18 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "hexNut", "group": {
"functionSourceRange": [ "type": "FunctionCall",
297, "name": "hexNut",
1231, "functionSourceRange": [
10 297,
], 1231,
"unlabeledArg": null, 10
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1558,7 +1576,7 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1710,15 +1728,18 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "pipe", "group": {
"functionSourceRange": [ "type": "FunctionCall",
244, "name": "pipe",
658, "functionSourceRange": [
11 244,
], 658,
"unlabeledArg": null, 11
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1825,18 +1846,21 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "pipe", "group": {
"functionSourceRange": [ "type": "FunctionCall",
244, "name": "pipe",
658, "functionSourceRange": [
11 244,
], 658,
"unlabeledArg": null, 11
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "bolt", "group": {
"functionSourceRange": [ "type": "FunctionCall",
662, "name": "bolt",
1968, "functionSourceRange": [
0 662,
], 1968,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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", "type": "GroupBegin",
"name": "body", "group": {
"functionSourceRange": [ "type": "FunctionCall",
359, "name": "body",
2786, "functionSourceRange": [
6 359,
], 2786,
"unlabeledArg": null, 6
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -143,64 +146,76 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -347,18 +362,21 @@ description: Operations executed walkie-talkie.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "antenna", "group": {
"functionSourceRange": [ "type": "FunctionCall",
266, "name": "antenna",
1051, "functionSourceRange": [
9 266,
], 1051,
"unlabeledArg": null, 9
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -450,18 +468,21 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "case", "group": {
"functionSourceRange": [ "type": "FunctionCall",
454, "name": "case",
3283, "functionSourceRange": [
7 454,
], 3283,
"unlabeledArg": null, 7
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -555,64 +576,76 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1539,19 +1572,22 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "zLogo", "group": {
"functionSourceRange": [ "type": "FunctionCall",
69, "name": "zLogo",
1088, "functionSourceRange": [
8 69,
], 1088,
"unlabeledArg": null, 8
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1595,19 +1631,22 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "oLogo", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1146, "name": "oLogo",
1656, "functionSourceRange": [
8 1146,
], 1656,
"unlabeledArg": null, 8
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1651,19 +1690,22 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "oLogo2", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1674, "name": "oLogo2",
2184, "functionSourceRange": [
8 1674,
], 2184,
"unlabeledArg": null, 8
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1707,19 +1749,22 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "oLogo", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1146, "name": "oLogo",
1656, "functionSourceRange": [
8 1146,
], 1656,
"unlabeledArg": null, 8
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1763,19 +1808,22 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "oLogo2", "group": {
"functionSourceRange": [ "type": "FunctionCall",
1674, "name": "oLogo2",
2184, "functionSourceRange": [
8 1674,
], 2184,
"unlabeledArg": null, 8
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1836,18 +1884,21 @@ description: Operations executed walkie-talkie.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "talkButton", "group": {
"functionSourceRange": [ "type": "FunctionCall",
202, "name": "talkButton",
1023, "functionSourceRange": [
10 202,
], 1023,
"unlabeledArg": null, 10
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1954,18 +2005,21 @@ description: Operations executed walkie-talkie.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "knob", "group": {
"functionSourceRange": [ "type": "FunctionCall",
298, "name": "knob",
746, "functionSourceRange": [
11 298,
], 746,
"unlabeledArg": null, 11
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2070,18 +2124,21 @@ description: Operations executed walkie-talkie.kcl
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "button", "group": {
"functionSourceRange": [ "type": "FunctionCall",
221, "name": "button",
827, "functionSourceRange": [
12 221,
], 827,
"unlabeledArg": null, 12
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2180,18 +2237,21 @@ description: Operations executed walkie-talkie.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "button", "group": {
"functionSourceRange": [ "type": "FunctionCall",
221, "name": "button",
827, "functionSourceRange": [
12 221,
], 827,
"unlabeledArg": null, 12
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2290,18 +2350,21 @@ description: Operations executed walkie-talkie.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "button", "group": {
"functionSourceRange": [ "type": "FunctionCall",
221, "name": "button",
827, "functionSourceRange": [
12 221,
], 827,
"unlabeledArg": null, 12
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2400,18 +2463,21 @@ description: Operations executed walkie-talkie.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "button", "group": {
"functionSourceRange": [ "type": "FunctionCall",
221, "name": "button",
827, "functionSourceRange": [
12 221,
], 827,
"unlabeledArg": null, 12
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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", "type": "GroupBegin",
"name": "washer", "group": {
"functionSourceRange": [ "type": "FunctionCall",
711, "name": "washer",
1003, "functionSourceRange": [
0 711,
], 1003,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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", "type": "GroupBegin",
"name": "increment", "group": {
"functionSourceRange": [ "type": "FunctionCall",
12, "name": "increment",
35, "functionSourceRange": [
0 12,
], 35,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "add", "group": {
"functionSourceRange": [ "type": "FunctionCall",
43, "name": "add",
77, "functionSourceRange": [
0 43,
], 77,
"unlabeledArg": { 0
"value": { ],
"type": "Number", "unlabeledArg": {
"value": 1.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
}
}
},
"sourceRange": []
},
"labeledArgs": {
"delta": {
"value": { "value": {
"type": "Number", "type": "Number",
"value": 2.0, "value": 1.0,
"ty": { "ty": {
"type": "Default", "type": "Default",
"len": { "len": {
@ -58,11 +46,29 @@ description: Operations executed kw_fn.kcl
} }
}, },
"sourceRange": [] "sourceRange": []
},
"labeledArgs": {
"delta": {
"value": {
"type": "Number",
"value": 2.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
}
}
},
"sourceRange": []
}
} }
}, },
"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", "type": "GroupBegin",
"name": "add", "group": {
"functionSourceRange": [ "type": "FunctionCall",
6, "name": "add",
31, "functionSourceRange": [
0 6,
], 31,
"unlabeledArg": null, 0
"labeledArgs": { ],
"x": { "unlabeledArg": null,
"value": { "labeledArgs": {
"type": "Number", "x": {
"value": 1.0, "value": {
"ty": { "type": "Number",
"type": "Default", "value": 1.0,
"len": { "ty": {
"type": "Mm" "type": "Default",
}, "len": {
"angle": { "type": "Mm"
"type": "Degrees" },
"angle": {
"type": "Degrees"
}
} }
} },
}, "sourceRange": []
"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", "type": "GroupBegin",
"name": "add", "group": {
"functionSourceRange": [ "type": "FunctionCall",
6, "name": "add",
29, "functionSourceRange": [
0 6,
], 29,
"unlabeledArg": null, 0
"labeledArgs": { ],
"x": { "unlabeledArg": null,
"value": { "labeledArgs": {
"type": "Number", "x": {
"value": 1.0, "value": {
"ty": { "type": "Number",
"type": "Default", "value": 1.0,
"len": { "ty": {
"type": "Mm" "type": "Default",
}, "len": {
"angle": { "type": "Mm"
"type": "Degrees" },
"angle": {
"type": "Degrees"
}
} }
} },
}, "sourceRange": []
"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", "type": "GroupBegin",
"name": "increment", "group": {
"functionSourceRange": [ "type": "FunctionCall",
12, "name": "increment",
45, "functionSourceRange": [
0 12,
], 45,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "increment", "group": {
"functionSourceRange": [ "type": "FunctionCall",
12, "name": "increment",
45, "functionSourceRange": [
0 12,
], 45,
"unlabeledArg": { 0
"value": { ],
"type": "Number", "unlabeledArg": {
"value": 1.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
}
}
},
"sourceRange": []
},
"labeledArgs": {
"by": {
"value": { "value": {
"type": "Number", "type": "Number",
"value": 20.0, "value": 1.0,
"ty": { "ty": {
"type": "Default", "type": "Default",
"len": { "len": {
@ -58,11 +46,29 @@ description: Operations executed kw_fn_with_defaults.kcl
} }
}, },
"sourceRange": [] "sourceRange": []
},
"labeledArgs": {
"by": {
"value": {
"type": "Number",
"value": 20.0,
"ty": {
"type": "Default",
"len": {
"type": "Mm"
},
"angle": {
"type": "Degrees"
}
}
},
"sourceRange": []
}
} }
}, },
"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", "type": "GroupBegin",
"name": "thing", "group": {
"functionSourceRange": [ "type": "FunctionCall",
15, "name": "thing",
378, "functionSourceRange": [
5 15,
], 378,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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", "type": "GroupBegin",
"name": "thing", "group": {
"functionSourceRange": [ "type": "FunctionCall",
15, "name": "thing",
221, "functionSourceRange": [
5 15,
], 221,
"unlabeledArg": null, 5
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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", "type": "GroupBegin",
"name": "circl", "group": {
"functionSourceRange": [ "type": "FunctionCall",
421, "name": "circl",
571, "functionSourceRange": [
0 421,
], 571,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -88,7 +91,7 @@ description: Operations executed pentagon_fillet_sugar.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -172,15 +175,18 @@ description: Operations executed pentagon_fillet_sugar.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "circl", "group": {
"functionSourceRange": [ "type": "FunctionCall",
421, "name": "circl",
571, "functionSourceRange": [
0 421,
], 571,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -209,7 +215,7 @@ description: Operations executed pentagon_fillet_sugar.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "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", "type": "GroupBegin",
"name": "double", "group": {
"functionSourceRange": [ "type": "FunctionCall",
404, "name": "double",
426, "functionSourceRange": [
0 404,
], 426,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cube", "group": {
"functionSourceRange": [ "type": "FunctionCall",
7, "name": "cube",
393, "functionSourceRange": [
0 7,
], 393,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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", "type": "GroupBegin",
"name": "t", "group": {
"functionSourceRange": [ "type": "FunctionCall",
20, "name": "t",
66, "functionSourceRange": [
0 20,
], 66,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "t", "group": {
"functionSourceRange": [ "type": "FunctionCall",
20, "name": "t",
66, "functionSourceRange": [
0 20,
], 66,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "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", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "bolt", "group": {
"functionSourceRange": [ "type": "FunctionCall",
264, "name": "bolt",
1573, "functionSourceRange": [
0 264,
], 1573,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "bolt", "group": {
"functionSourceRange": [ "type": "FunctionCall",
264, "name": "bolt",
1573, "functionSourceRange": [
0 264,
], 1573,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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", "type": "GroupBegin",
"name": "test", "group": {
"functionSourceRange": [ "type": "FunctionCall",
7, "name": "test",
170, "functionSourceRange": [
0 7,
], 170,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -31,7 +34,7 @@ description: Operations executed sketch_in_object.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -66,15 +69,18 @@ description: Operations executed sketch_in_object.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "test2", "group": {
"functionSourceRange": [ "type": "FunctionCall",
180, "name": "test2",
405, "functionSourceRange": [
0 180,
], 405,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -93,7 +99,7 @@ description: Operations executed sketch_in_object.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "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", "type": "GroupBegin",
"name": "cube", "group": {
"functionSourceRange": [ "type": "FunctionCall",
7, "name": "cube",
184, "functionSourceRange": [
0 7,
], 184,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -31,7 +34,7 @@ description: Operations executed sketch_on_face_circle_tagged.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "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", "type": "GroupBegin",
"name": "cube", "group": {
"functionSourceRange": [ "type": "FunctionCall",
7, "name": "cube",
184, "functionSourceRange": [
0 7,
], 184,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -31,7 +34,7 @@ description: Operations executed sketch_on_face_end.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "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", "type": "GroupBegin",
"name": "cube", "group": {
"functionSourceRange": [ "type": "FunctionCall",
7, "name": "cube",
184, "functionSourceRange": [
0 7,
], 184,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -31,7 +34,7 @@ description: Operations executed sketch_on_face_end_negative_extrude.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "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", "type": "GroupBegin",
"name": "cube", "group": {
"functionSourceRange": [ "type": "FunctionCall",
7, "name": "cube",
184, "functionSourceRange": [
0 7,
], 184,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -31,7 +34,7 @@ description: Operations executed sketch_on_face_start.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "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", "type": "GroupBegin",
"name": "cube", "group": {
"functionSourceRange": [ "type": "FunctionCall",
7, "name": "cube",
328, "functionSourceRange": [
0 7,
], 328,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -63,7 +66,7 @@ description: Operations executed subtract_cylinder_from_cube.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "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", "type": "GroupBegin",
"name": "cos", "group": {
"functionSourceRange": [ "type": "FunctionCall",
0, "name": "cos",
0, "functionSourceRange": [
0 0,
], 0,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "bolt", "group": {
"functionSourceRange": [ "type": "FunctionCall",
264, "name": "bolt",
1573, "functionSourceRange": [
0 264,
], 1573,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "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", "type": "GroupBegin",
"name": "cube", "group": {
"functionSourceRange": [ "type": "FunctionCall",
7, "name": "cube",
328, "functionSourceRange": [
0 7,
], 328,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -63,18 +66,21 @@ description: Operations executed union_cubes.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"name": "cube", "group": {
"functionSourceRange": [ "type": "FunctionCall",
7, "name": "cube",
328, "functionSourceRange": [
0 7,
], 328,
"unlabeledArg": null, 0
"labeledArgs": {}, ],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -125,7 +131,7 @@ description: Operations executed union_cubes.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

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

@ -289,10 +289,7 @@ const OperationItem = (props: {
send: Prop<Actor<typeof featureTreeMachine>, 'send'> send: Prop<Actor<typeof featureTreeMachine>, 'send'>
}) => { }) => {
const kclContext = useKclContext() const kclContext = useKclContext()
const name = const name = getOperationLabel(props.item)
'name' in props.item && props.item.name !== null
? getOperationLabel(props.item)
: 'anonymous'
const errors = useMemo(() => { const errors = useMemo(() => {
return kclContext.diagnostics.filter( return kclContext.diagnostics.filter(
(diag) => (diag) =>
@ -304,7 +301,7 @@ const OperationItem = (props: {
}, [kclContext.diagnostics.length]) }, [kclContext.diagnostics.length])
function selectOperation() { function selectOperation() {
if (props.item.type === 'UserDefinedFunctionReturn') { if (props.item.type === 'GroupEnd') {
return return
} }
props.send({ props.send({
@ -352,7 +349,7 @@ const OperationItem = (props: {
function deleteOperation() { function deleteOperation() {
if ( if (
props.item.type === 'StdLibCall' || props.item.type === 'StdLibCall' ||
props.item.type === 'UserDefinedFunctionCall' || props.item.type === 'GroupBegin' ||
props.item.type === 'KclStdLibCall' props.item.type === 'KclStdLibCall'
) { ) {
props.send({ props.send({
@ -368,7 +365,7 @@ const OperationItem = (props: {
() => [ () => [
<ContextMenuItem <ContextMenuItem
onClick={() => { onClick={() => {
if (props.item.type === 'UserDefinedFunctionReturn') { if (props.item.type === 'GroupEnd') {
return return
} }
props.send({ props.send({
@ -381,14 +378,19 @@ const OperationItem = (props: {
> >
View KCL source code View KCL source code
</ContextMenuItem>, </ContextMenuItem>,
...(props.item.type === 'UserDefinedFunctionCall' ...(props.item.type === 'GroupBegin' &&
props.item.group.type === 'FunctionCall'
? [ ? [
<ContextMenuItem <ContextMenuItem
onClick={() => { onClick={() => {
if (props.item.type !== 'UserDefinedFunctionCall') { if (props.item.type !== 'GroupBegin') {
return 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 // For some reason, the cursor goes to the end of the source
// range we select. So set the end equal to the beginning. // range we select. So set the end equal to the beginning.
functionRange[1] = functionRange[0] 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') if (!pathToNode) return new Error('Could not find extrude variable')
} else { } else {
pathToNode = selection.codeRef.pathToNode 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>( const callExp = getNodeFromPath<CallExpression>(
astClone, astClone,
pathToNode, pathToNode,
@ -1312,7 +1314,7 @@ export async function deleteFromSelection(
if (err(callExp)) return callExp if (err(callExp)) return callExp
extrudeNameToDelete = callExp.node.callee.name.name extrudeNameToDelete = callExp.node.callee.name.name
} else { } 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 { function userCall(name: string): Operation {
return { return {
type: 'UserDefinedFunctionCall', type: 'GroupBegin',
name, group: {
functionSourceRange: defaultSourceRange(), type: 'FunctionCall',
unlabeledArg: null, name,
labeledArgs: {}, functionSourceRange: defaultSourceRange(),
unlabeledArg: null,
labeledArgs: {},
},
sourceRange: defaultSourceRange(), sourceRange: defaultSourceRange(),
} }
} }
function userReturn(): Operation { function userReturn(): Operation {
return { 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 { Operation, OpKclValue } from '@rust/kcl-lib/bindings/Operation'
import type { OpKclValue } from '@rust/kcl-lib/bindings/OpKclValue'
import type { CustomIconName } from '@src/components/CustomIcon' import type { CustomIconName } from '@src/components/CustomIcon'
import { getNodePathFromSourceRange } from '@src/lang/queryAstNodePathUtils' import { getNodePathFromSourceRange } from '@src/lang/queryAstNodePathUtils'
@ -1118,10 +1117,20 @@ export function getOperationLabel(op: Operation): string {
return stdLibMap[op.name]?.label ?? op.name return stdLibMap[op.name]?.label ?? op.name
case 'KclStdLibCall': case 'KclStdLibCall':
return stdLibMap[op.name]?.label ?? op.name return stdLibMap[op.name]?.label ?? op.name
case 'UserDefinedFunctionCall': case 'GroupBegin':
return op.name ?? 'Anonymous custom function' if (op.group.type === 'FunctionCall') {
case 'UserDefinedFunctionReturn': return op.group.name ?? 'anonymous'
return 'User function return' } 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' return stdLibMap[op.name]?.icon ?? 'questionMark'
case 'KclStdLibCall': case 'KclStdLibCall':
return stdLibMap[op.name]?.icon ?? 'questionMark' return stdLibMap[op.name]?.icon ?? 'questionMark'
default: case 'GroupBegin':
if (op.group.type === 'ModuleInstance') {
return 'import' // TODO: Use insert icon.
}
return 'make-variable' 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 * for use in the feature tree UI
*/ */
const operationFilters = [ const operationFilters = [
isNotUserFunctionWithNoOperations, isNotGroupWithNoOperations,
isNotInsideUserFunction, isNotInsideGroup,
isNotUserFunctionReturn, isNotGroupEnd,
] ]
/** /**
* A filter to exclude everything that occurs inside a UserDefinedFunctionCall * A filter to exclude everything that occurs inside a GroupBegin and its
* and its corresponding UserDefinedFunctionReturn from a list of operations. * corresponding GroupEnd from a list of operations. This works even when there
* This works even when there are nested function calls. * are nested function calls and module instances.
*/ */
function isNotInsideUserFunction(operations: Operation[]): Operation[] { function isNotInsideGroup(operations: Operation[]): Operation[] {
const ops: Operation[] = [] const ops: Operation[] = []
let depth = 0 let depth = 0
for (const op of operations) { for (const op of operations) {
if (depth === 0) { if (depth === 0) {
ops.push(op) ops.push(op)
} }
if (op.type === 'UserDefinedFunctionCall') { if (op.type === 'GroupBegin') {
depth++ depth++
} }
if (op.type === 'UserDefinedFunctionReturn') { if (op.type === 'GroupEnd') {
depth-- depth--
console.assert( console.assert(
depth >= 0, 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 * A filter to exclude GroupBegin operations and their corresponding GroupEnd
* corresponding UserDefinedFunctionReturn that don't have any operations inside * that don't have any operations inside them from a list of operations.
* them from a list of operations.
*/ */
function isNotUserFunctionWithNoOperations( function isNotGroupWithNoOperations(operations: Operation[]): Operation[] {
operations: Operation[]
): Operation[] {
return operations.filter((op, index) => { return operations.filter((op, index) => {
if ( if (
op.type === 'UserDefinedFunctionCall' && op.type === 'GroupBegin' &&
// If this is a call at the end of the array, it's preserved. // If this is a begin at the end of the array, it's preserved.
index < operations.length - 1 && index < operations.length - 1 &&
operations[index + 1].type === 'UserDefinedFunctionReturn' operations[index + 1].type === 'GroupEnd'
) )
return false return false
if ( if (
op.type === 'UserDefinedFunctionReturn' && op.type === 'GroupEnd' &&
// If this return is at the beginning of the array, it's preserved. // If this is an end at the beginning of the array, it's preserved.
index > 0 && index > 0 &&
operations[index - 1].type === 'UserDefinedFunctionCall' operations[index - 1].type === 'GroupBegin'
) )
return false return false
@ -1212,11 +1226,10 @@ function isNotUserFunctionWithNoOperations(
} }
/** /**
* A filter to exclude UserDefinedFunctionReturn operations from a list of * A filter to exclude GroupEnd operations from a list of operations.
* operations.
*/ */
function isNotUserFunctionReturn(ops: Operation[]): Operation[] { function isNotGroupEnd(ops: Operation[]): Operation[] {
return ops.filter((op) => op.type !== 'UserDefinedFunctionReturn') return ops.filter((op) => op.type !== 'GroupEnd')
} }
export interface EnterEditFlowProps { export interface EnterEditFlowProps {
@ -1230,7 +1243,7 @@ export async function enterEditFlow({
}: EnterEditFlowProps): Promise<Error | CommandBarMachineEvent> { }: EnterEditFlowProps): Promise<Error | CommandBarMachineEvent> {
if (operation.type !== 'StdLibCall' && operation.type !== 'KclStdLibCall') { if (operation.type !== 'StdLibCall' && operation.type !== 'KclStdLibCall') {
return new Error( 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] const stdLibInfo = stdLibMap[operation.name]
@ -1269,7 +1282,7 @@ export async function enterAppearanceFlow({
}: EnterEditFlowProps): Promise<Error | CommandBarMachineEvent> { }: EnterEditFlowProps): Promise<Error | CommandBarMachineEvent> {
if (operation.type !== 'StdLibCall' && operation.type !== 'KclStdLibCall') { if (operation.type !== 'StdLibCall' && operation.type !== 'KclStdLibCall') {
return new Error( 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] const stdLibInfo = stdLibMap[operation.name]