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

Remove CallExpression support (#6639)

Browse Source 
Users MUST use keyword call syntax now.

Closes https://github.com/KittyCAD/modeling-app/issues/4600
This commit is contained in:
Adam Chalmers
2025-05-02 16:08:12 -05:00
committed by GitHub
parent 75916d4300
commit 4fe8741ea7
309 changed files with 51419 additions and 66399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/kcl/modules.md
View File

@ -12,7 +12,7 @@ to other modules.
```kcl ```kcl
// util.kcl // util.kcl
export fn increment(x) { export fn increment(@x) {
return x + 1 return x + 1
} }
``` ```
@ -37,11 +37,11 @@ Multiple functions can be exported in a file.
```kcl ```kcl
// util.kcl // util.kcl
export fn increment(x) { export fn increment(@x) {
return x + 1 return x + 1
} }
export fn decrement(x) { export fn decrement(@x) {
return x - 1 return x - 1
} }
``` ```
@ -81,7 +81,7 @@ fn cube(center) {
|> extrude(length = 10) |> extrude(length = 10)
} }
myCube = cube([0, 0]) myCube = cube(center = [0, 0])
``` ```
*Pros* *Pros*

8
docs/kcl/types.md
View File

@ -249,8 +249,8 @@ fn rect(origin) {
|> close() |> close()
} }
rect([0, 0]) rect(origin = [0, 0])
rect([20, 0]) rect(origin = [20, 0])
``` ```
Those tags would only be available in the `rect` function and not globally. Those tags would only be available in the `rect` function and not globally.
@ -279,8 +279,8 @@ fn rect(origin) {
|> close() |> close()
} }
rect([0, 0]) rect(origin = [0, 0])
myRect = rect([20, 0]) myRect = rect(origin = [20, 0])
myRect myRect
|> extrude(length = 10) |> extrude(length = 10)

8
e2e/playwright/editor-tests.spec.ts
View File

@ -871,14 +871,18 @@ a1 = startSketchOn(offsetPlane(XY, offset = 10))
await page.keyboard.press('Enter') await page.keyboard.press('Enter')
await page.keyboard.type(`extrusion = startSketchOn(XY) await page.keyboard.type(`extrusion = startSketchOn(XY)
|> circle(center = [0, 0], radius = dia/2) |> circle(center = [0, 0], radius = dia/2)
|> subtract2d(tool = squareHole(length, width, height)) |> subtract2d(tool = squareHole(l = length, w = width, height))
|> extrude(length = height)`) |> extrude(length = height)`)
// error in gutter // error in gutter
await expect(page.locator('.cm-lint-marker-error').first()).toBeVisible() await expect(page.locator('.cm-lint-marker-error').first()).toBeVisible()
await page.hover('.cm-lint-marker-error:first-child') await page.hover('.cm-lint-marker-error:first-child')
await expect( await expect(
page.getByText('Expected 2 arguments, got 3').first() page
.getByText(
'TODO ADAM: find the right error Expected 2 arguments, got 3'
)
.first()
).toBeVisible() ).toBeVisible()
// Make sure there are two diagnostics // Make sure there are two diagnostics

2
e2e/playwright/feature-tree-pane.spec.ts
View File

@ -3,7 +3,7 @@ import * as fsp from 'fs/promises'
import { expect, test } from '@e2e/playwright/zoo-test' import { expect, test } from '@e2e/playwright/zoo-test'
const FEATURE_TREE_EXAMPLE_CODE = `export fn timesFive(x) { const FEATURE_TREE_EXAMPLE_CODE = `export fn timesFive(@x) {
return 5 * x return 5 * x
} }
export fn triangle() { export fn triangle() {

2
e2e/playwright/sketch-tests.spec.ts
View File

@ -1222,7 +1222,7 @@ profile001 = startProfile(sketch001, at = [299.72, 230.82])
return lugSketch return lugSketch
} }
lug([0, 0], 10, .5, XY)` lug(origin = [0, 0], length = 10, diameter = .5, plane = XY)`
) )
}) })

2
e2e/playwright/testing-selections.spec.ts
View File

@ -1130,7 +1130,7 @@ part001 = startSketchOn(XZ)
|> line(end = [-20.38, -10.12]) |> line(end = [-20.38, -10.12])
|> line(end = [-15.79, 17.08]) |> line(end = [-15.79, 17.08])
fn yohey(pos) { fn yohey(@pos) {
sketch004 = startSketchOn(XZ) sketch004 = startSketchOn(XZ)
${extrudeAndEditBlockedInFunction} ${extrudeAndEditBlockedInFunction}
|> line(end = [27.55, -1.65]) |> line(end = [27.55, -1.65])

1
package-lock.json generated
View File

@ -14664,6 +14664,7 @@
"version": "0.1.0", "version": "0.1.0",
"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=10" "node": ">=10"

2
public/kcl-samples/bench/bench-parts.kcl
View File

@ -125,7 +125,7 @@ fn armRestProfile(@plane, offset) {
} }
export fn armRest(@plane, offset) { export fn armRest(@plane, offset) {
path = armRestPath( offsetPlane(plane, offset = offset)) path = armRestPath(offsetPlane(plane, offset = offset))
profile = armRestProfile(offsetPlane(-XZ, offset = 20), offset = -offset) profile = armRestProfile(offsetPlane(-XZ, offset = 20), offset = -offset)
sweep(profile, path = path) sweep(profile, path = path)
return 0 return 0

2
public/kcl-samples/food-service-spatula/main.kcl
View File

@ -28,7 +28,7 @@ fn slot(sketch1, start, end, width) {
if end[0] < start[0] { if end[0] < start[0] {
units::toDegrees(atan((end[1] - start[1]) / (end[0] - start[0]))) + 180 units::toDegrees(atan((end[1] - start[1]) / (end[0] - start[0]))) + 180
} else { } else {
units::toDegrees( atan((end[1] - start[1]) / (end[0] - start[0]))) units::toDegrees(atan((end[1] - start[1]) / (end[0] - start[0])))
} }
} }
dist = sqrt(pow(end[1] - start[1], exp = 2) + pow(end[0] - start[0], exp = 2)) dist = sqrt(pow(end[1] - start[1], exp = 2) + pow(end[0] - start[0], exp = 2))

2
public/kcl-samples/gear/main.kcl
View File

@ -28,7 +28,7 @@ rs = map(
angles = map( angles = map(
rs, rs,
f = fn(r) { f = fn(r) {
return units::toDegrees( acos(baseDiameter / 2 / r)) return units::toDegrees(acos(baseDiameter / 2 / r))
}, },
) )

2
public/kcl-samples/makeup-mirror/main.kcl
View File

@ -52,7 +52,7 @@ armPartB = armFn(plane = XZ, offset = armLength, altitude = hingeHeight * 2.5 +
// Add a function to create the mirror // Add a function to create the mirror
fn mirrorFn(plane, offsetX, offsetY, altitude, radius, tiefe, gestellR, gestellD) { fn mirrorFn(plane, offsetX, offsetY, altitude, radius, tiefe, gestellR, gestellD) {
armPlane = startSketchOn( offsetPlane(plane, offset = offsetY - (tiefe / 2))) armPlane = startSketchOn(offsetPlane(plane, offset = offsetY - (tiefe / 2)))
armBody = circle(armPlane, center = [offsetX, altitude], radius = radius) armBody = circle(armPlane, center = [offsetX, altitude], radius = radius)
|> extrude(length = tiefe) |> extrude(length = tiefe)

4
rust/kcl-lib/e2e/executor/inputs/broken-code-test.kcl
View File

@ -32,13 +32,13 @@ bracket = startSketchOn(XY)
|> fillet( |> fillet(
radius = filletR, radius = filletR,
tags = [ tags = [
getPreviousAdjacentEdge('innerEdge', %) getPreviousAdjacentEdge('innerEdge')
] ]
) )
|> fillet( |> fillet(
radius = filletR + thickness, radius = filletR + thickness,
tags = [ tags = [
getPreviousAdjacentEdge('outerEdge', %) getPreviousAdjacentEdge('outerEdge')
] ]
) )

38
rust/kcl-lib/e2e/executor/inputs/math.kcl
View File

@ -1,20 +1,20 @@
svg = startSketchOn(XY) svg = startSketchOn(XY)
|> lineTo([0],%) |> line(endAbsolute = [0])
|> lineTo([0 + 1],%) |> line(endAbsolute = [0 + 1])
|> lineTo([0 + 1 + 2],%) |> line(endAbsolute = [0 + 1 + 2])
|> lineTo([0 + 1 + 2 + 3],%) |> line(endAbsolute = [0 + 1 + 2 + 3])
|> lineTo([0 + 1 + 2 + 3 + 4],%) |> line(endAbsolute = [0 + 1 + 2 + 3 + 4])
|> lineTo([0 + 1 + 2 + 3 + 4 + 5],%) |> line(endAbsolute = [0 + 1 + 2 + 3 + 4 + 5])
|> lineTo([0 + 1 + 2 + 3 + 4 + 5 + 6],%) |> line(endAbsolute = [0 + 1 + 2 + 3 + 4 + 5 + 6])
|> lineTo([0 + 1 + 2 + 3 + 4 + 5 + 6 + 7],%) |> line(endAbsolute = [0 + 1 + 2 + 3 + 4 + 5 + 6 + 7])
|> lineTo([0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8],%) |> line(endAbsolute = [0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8])
|> lineTo([0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9],%) |> line(endAbsolute = [0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9])
|> lineTo([0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10],%) |> line(endAbsolute = [0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10])
|> lineTo([0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11],%) |> line(endAbsolute = [0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11])
|> lineTo([0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12],%) |> line(endAbsolute = [0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12])
|> lineTo([0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13],%) |> line(endAbsolute = [0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13])
|> lineTo([0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14],%) |> line(endAbsolute = [0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14])
|> lineTo([0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15],%) |> line(endAbsolute = [0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15])
|> lineTo([0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16],%) |> line(endAbsolute = [0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16])
|> lineTo([0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17],%) |> line(endAbsolute = [0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17])
|> lineTo([0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18],%) |> line(endAbsolute = [0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18])

16
rust/kcl-lib/e2e/executor/inputs/router-template-slate.kcl
View File

@ -21,10 +21,10 @@ sketch001 = startSketchOn(XZ)
|> xLine(endAbsolute = slateWidthHalf + templateThickness, tag = $seg04) |> xLine(endAbsolute = slateWidthHalf + templateThickness, tag = $seg04)
|> yLine(length = -length002, tag = $seg03) |> yLine(length = -length002, tag = $seg03)
|> xLine(endAbsolute = 0, tag = $seg02) |> xLine(endAbsolute = 0, tag = $seg02)
|> xLine(length = -segLen(seg02, %)) |> xLine(length = -segLen(seg02))
|> yLine(length = segLen(seg03, %)) |> yLine(length = segLen(seg03))
|> xLine(length = segLen(seg04, %)) |> xLine(length = segLen(seg04))
|> yLine(length = segLen(seg05, %)) |> yLine(length = segLen(seg05))
|> arc( |> arc(
angleEnd = 90, angleEnd = 90,
angleStart = 180, angleStart = 180,
@ -36,16 +36,16 @@ extrude001 = extrude(sketch001, length = 5)
sketch002 = startSketchOn(extrude001, face = 'START') sketch002 = startSketchOn(extrude001, face = 'START')
|> startProfile(at = [-slateWidthHalf, -templateGap * 2 - (templateDiameter / 2)]) |> startProfile(at = [-slateWidthHalf, -templateGap * 2 - (templateDiameter / 2)])
|> xLine(length = -7, tag = $rectangleSegmentA001) |> xLine(length = -7, tag = $rectangleSegmentA001)
|> angledLine(angle = segAng(rectangleSegmentA001, %) + 90, length = minClampingDistance, tag = $rectangleSegmentB001) |> angledLine(angle = segAng(rectangleSegmentA001) + 90, length = minClampingDistance, tag = $rectangleSegmentB001)
|> angledLine(angle = segAng(rectangleSegmentA001, %), length = -segLen(rectangleSegmentA001, %), tag = $rectangleSegmentC001) |> angledLine(angle = segAng(rectangleSegmentA001), length = -segLen(rectangleSegmentA001), tag = $rectangleSegmentC001)
|> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
|> close() |> close()
extrude002 = extrude(sketch002, length = 7.5) extrude002 = extrude(sketch002, length = 7.5)
sketch003 = startSketchOn(extrude001, face = 'START') sketch003 = startSketchOn(extrude001, face = 'START')
|> startProfile(at = [slateWidthHalf, -templateGap * 2 - (templateDiameter / 2)]) |> startProfile(at = [slateWidthHalf, -templateGap * 2 - (templateDiameter / 2)])
|> xLine(length = 7, tag = $rectangleSegmentA002) |> xLine(length = 7, tag = $rectangleSegmentA002)
|> angledLine(angle = segAng(rectangleSegmentA002, %) - 90, length = minClampingDistance) |> angledLine(angle = segAng(rectangleSegmentA002) - 90, length = minClampingDistance)
|> angledLine(angle = segAng(rectangleSegmentA002, %), length = -segLen(rectangleSegmentA002, %)) |> angledLine(angle = segAng(rectangleSegmentA002), length = -segLen(rectangleSegmentA002))
|> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
|> close() |> close()
extrude003 = extrude(sketch003, length = 7.5) extrude003 = extrude(sketch003, length = 7.5)

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

@ -19,9 +19,9 @@ 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, CallExpressionKw, Expr, FunctionExpression, IfExpression, ImportPath, ImportSelector, ItemVisibility,
ItemVisibility, LiteralIdentifier, LiteralValue, MemberExpression, MemberObject, Name, Node, NodeRef, LiteralIdentifier, LiteralValue, MemberExpression, MemberObject, Name, Node, NodeRef, ObjectExpression,
ObjectExpression, PipeExpression, Program, TagDeclarator, Type, UnaryExpression, UnaryOperator, PipeExpression, Program, TagDeclarator, Type, UnaryExpression, UnaryOperator,
}, },
source_range::SourceRange, source_range::SourceRange,
std::{ std::{
@ -668,7 +668,6 @@ impl ExecutorContext {
} }
} }
} }
Expr::CallExpression(call_expression) => call_expression.execute(exec_state, self).await?,
Expr::CallExpressionKw(call_expression) => call_expression.execute(exec_state, self).await?, Expr::CallExpressionKw(call_expression) => call_expression.execute(exec_state, self).await?,
Expr::PipeExpression(pipe_expression) => pipe_expression.get_result(exec_state, self).await?, Expr::PipeExpression(pipe_expression) => pipe_expression.get_result(exec_state, self).await?,
Expr::PipeSubstitution(pipe_substitution) => match statement_kind { Expr::PipeSubstitution(pipe_substitution) => match statement_kind {
@ -755,7 +754,6 @@ impl BinaryPart {
BinaryPart::Literal(literal) => Ok(KclValue::from_literal((**literal).clone(), exec_state)), BinaryPart::Literal(literal) => Ok(KclValue::from_literal((**literal).clone(), exec_state)),
BinaryPart::Name(name) => name.get_result(exec_state, ctx).await.cloned(), BinaryPart::Name(name) => name.get_result(exec_state, ctx).await.cloned(),
BinaryPart::BinaryExpression(binary_expression) => binary_expression.get_result(exec_state, ctx).await, BinaryPart::BinaryExpression(binary_expression) => binary_expression.get_result(exec_state, ctx).await,
BinaryPart::CallExpression(call_expression) => call_expression.execute(exec_state, ctx).await,
BinaryPart::CallExpressionKw(call_expression) => call_expression.execute(exec_state, ctx).await, BinaryPart::CallExpressionKw(call_expression) => call_expression.execute(exec_state, ctx).await,
BinaryPart::UnaryExpression(unary_expression) => unary_expression.get_result(exec_state, ctx).await, BinaryPart::UnaryExpression(unary_expression) => unary_expression.get_result(exec_state, ctx).await,
BinaryPart::MemberExpression(member_expression) => member_expression.get_result(exec_state), BinaryPart::MemberExpression(member_expression) => member_expression.get_result(exec_state),
@ -1426,12 +1424,6 @@ impl Node<CallExpressionKw> {
e.add_source_ranges(vec![callsite]) e.add_source_ranges(vec![callsite])
})?; })?;
#[cfg(feature = "artifact-graph")]
if matches!(fn_src, FunctionSource::User { .. }) {
// Track return operation.
exec_state.global.operations.push(Operation::GroupEnd);
}
let result = return_value.ok_or_else(move || { let result = return_value.ok_or_else(move || {
let mut source_ranges: Vec<SourceRange> = vec![callsite]; let mut source_ranges: Vec<SourceRange> = vec![callsite];
// We want to send the source range of the original function. // We want to send the source range of the original function.
@ -1450,145 +1442,6 @@ impl Node<CallExpressionKw> {
} }
} }
impl Node<CallExpression> {
#[async_recursion]
pub async fn execute(&self, exec_state: &mut ExecState, ctx: &ExecutorContext) -> Result<KclValue, KclError> {
let fn_name = &self.callee;
let callsite = SourceRange::from(self);
let mut fn_args: Vec<Arg> = Vec::with_capacity(self.arguments.len());
for arg_expr in &self.arguments {
let metadata = Metadata {
source_range: SourceRange::from(arg_expr),
};
let value = ctx
.execute_expr(arg_expr, exec_state, &metadata, &[], StatementKind::Expression)
.await?;
let arg = Arg::new(value, SourceRange::from(arg_expr));
fn_args.push(arg);
}
let fn_args = fn_args; // remove mutability
match ctx.stdlib.get_either(fn_name) {
FunctionKind::Core(func) => {
if func.deprecated() {
exec_state.warn(CompilationError::err(
self.callee.as_source_range(),
format!("`{fn_name}` is deprecated, see the docs for a recommended replacement"),
));
}
#[cfg(feature = "artifact-graph")]
let op = if func.feature_tree_operation() {
let op_labeled_args = func
.args(false)
.iter()
.zip(&fn_args)
.map(|(k, arg)| {
(
k.name.clone(),
OpArg::new(OpKclValue::from(&arg.value), arg.source_range),
)
})
.collect();
Some(Operation::StdLibCall {
std_lib_fn: (&func).into(),
unlabeled_arg: None,
labeled_args: op_labeled_args,
source_range: callsite,
is_error: false,
})
} else {
None
};
// Attempt to call the function.
let args = crate::std::Args::new(
fn_args,
self.into(),
ctx.clone(),
exec_state.mod_local.pipe_value.clone().map(|v| Arg::new(v, callsite)),
);
let mut return_value = {
// Don't early-return in this block.
exec_state.mut_stack().push_new_env_for_rust_call();
let result = func.std_lib_fn()(exec_state, args).await;
exec_state.mut_stack().pop_env();
#[cfg(feature = "artifact-graph")]
if let Some(mut op) = op {
op.set_std_lib_call_is_error(result.is_err());
// Track call operation. We do this after the call
// since things like patternTransform may call user code
// before running, and we will likely want to use the
// return value. The call takes ownership of the args,
// so we need to build the op before the call.
exec_state.global.operations.push(op);
}
result
}?;
update_memory_for_tags_of_geometry(&mut return_value, exec_state)?;
Ok(return_value)
}
FunctionKind::UserDefined => {
let source_range = SourceRange::from(self);
// Clone the function so that we can use a mutable reference to
// exec_state.
let func = fn_name.get_result(exec_state, ctx).await?.clone();
// Track call operation.
#[cfg(feature = "artifact-graph")]
exec_state.global.operations.push(Operation::GroupBegin {
group: Group::FunctionCall {
name: Some(fn_name.to_string()),
function_source_range: func.function_def_source_range().unwrap_or_default(),
unlabeled_arg: None,
// TODO: Add the arguments for legacy positional parameters.
labeled_args: Default::default(),
},
source_range: callsite,
});
let Some(fn_src) = func.as_fn() else {
return Err(KclError::Semantic(KclErrorDetails {
message: "cannot call this because it isn't a function".to_string(),
source_ranges: vec![source_range],
}));
};
let return_value = fn_src
.call(Some(fn_name.to_string()), exec_state, ctx, fn_args, source_range)
.await
.map_err(|e| {
// Add the call expression to the source ranges.
// TODO currently ignored by the frontend
e.add_source_ranges(vec![source_range])
})?;
let result = return_value.ok_or_else(move || {
let mut source_ranges: Vec<SourceRange> = vec![source_range];
// We want to send the source range of the original function.
if let KclValue::Function { meta, .. } = func {
source_ranges = meta.iter().map(|m| m.source_range).collect();
};
KclError::UndefinedValue(KclErrorDetails {
message: format!("Result of function {} is undefined", fn_name),
source_ranges,
})
})?;
// Track return operation.
#[cfg(feature = "artifact-graph")]
exec_state.global.operations.push(Operation::GroupEnd);
Ok(result)
}
}
}
}
fn update_memory_for_tags_of_geometry(result: &mut KclValue, exec_state: &mut ExecState) -> Result<(), KclError> { fn update_memory_for_tags_of_geometry(result: &mut KclValue, exec_state: &mut ExecState) -> Result<(), KclError> {
// If the return result is a sketch or solid, we want to update the // If the return result is a sketch or solid, we want to update the
// memory for the tags of the group. // memory for the tags of the group.
@ -2474,7 +2327,15 @@ impl FunctionSource {
}); });
} }
call_user_defined_function_kw(fn_name.as_deref(), args.kw_args, *memory, ast, exec_state, ctx).await let result =
call_user_defined_function_kw(fn_name.as_deref(), args.kw_args, *memory, ast, exec_state, ctx)
.await;
// Track return operation.
#[cfg(feature = "artifact-graph")]
exec_state.global.operations.push(Operation::GroupEnd);
result
} }
FunctionSource::None => unreachable!(), FunctionSource::None => unreachable!(),
} }

14
rust/kcl-lib/src/execution/kcl_value.rs
View File

@ -263,20 +263,6 @@ impl KclValue {
} }
} }
#[cfg(feature = "artifact-graph")]
pub(crate) fn function_def_source_range(&self) -> Option<SourceRange> {
let KclValue::Function {
value: FunctionSource::User { ast, .. },
..
} = self
else {
return None;
};
// TODO: It would be nice if we could extract the source range starting
// at the fn, but that's the variable declaration.
Some(ast.as_source_range())
}
#[allow(unused)] #[allow(unused)]
pub(crate) fn none() -> Self { pub(crate) fn none() -> Self {
Self::KclNone { Self::KclNone {

29
rust/kcl-lib/src/lint/checks/offset_plane.rs
View File

@ -6,8 +6,7 @@ use crate::{
execution::{types::UnitLen, PlaneInfo, Point3d}, execution::{types::UnitLen, PlaneInfo, Point3d},
lint::rule::{def_finding, Discovered, Finding}, lint::rule::{def_finding, Discovered, Finding},
parsing::ast::types::{ parsing::ast::types::{
BinaryPart, CallExpression, CallExpressionKw, Expr, LiteralValue, Node as AstNode, ObjectExpression, Program, BinaryPart, CallExpressionKw, Expr, LiteralValue, Node as AstNode, ObjectExpression, Program, UnaryOperator,
UnaryOperator,
}, },
walk::Node, walk::Node,
SourceRange, SourceRange,
@ -128,37 +127,11 @@ fn get_offset(info: &PlaneInfo) -> Option<f64> {
pub fn start_sketch_on_check_specific_plane(node: Node) -> Result<Option<(SourceRange, PlaneName, f64)>> { pub fn start_sketch_on_check_specific_plane(node: Node) -> Result<Option<(SourceRange, PlaneName, f64)>> {
match node { match node {
Node::CallExpression(node) => start_sketch_on_check_specific_plane_pos(node),
Node::CallExpressionKw(node) => start_sketch_on_check_specific_plane_kw(node), Node::CallExpressionKw(node) => start_sketch_on_check_specific_plane_kw(node),
_ => Ok(None), _ => Ok(None),
} }
} }
pub fn start_sketch_on_check_specific_plane_pos(
call: &AstNode<CallExpression>,
) -> Result<Option<(SourceRange, PlaneName, f64)>> {
if call.inner.callee.inner.name.name != "startSketchOn" {
return Ok(None);
}
if call.arguments.len() != 1 {
// we only look for single-argument object patterns, if there's more
// than that we don't have a plane decl
return Ok(None);
}
let call_source_range = SourceRange::new(
call.arguments[0].start(),
call.arguments[0].end(),
call.arguments[0].module_id(),
);
let Expr::ObjectExpression(arg) = &call.arguments[0] else {
return Ok(None);
};
common(arg, call_source_range)
}
pub fn start_sketch_on_check_specific_plane_kw( pub fn start_sketch_on_check_specific_plane_kw(
call: &AstNode<CallExpressionKw>, call: &AstNode<CallExpressionKw>,
) -> Result<Option<(SourceRange, PlaneName, f64)>> { ) -> Result<Option<(SourceRange, PlaneName, f64)>> {

33
rust/kcl-lib/src/lsp/kcl/hover.rs
View File

@ -89,7 +89,6 @@ impl Expr {
Expr::FunctionExpression(function_expression) => { Expr::FunctionExpression(function_expression) => {
function_expression.get_hover_value_for_position(pos, code, opts) function_expression.get_hover_value_for_position(pos, code, opts)
} }
Expr::CallExpression(call_expression) => call_expression.get_hover_value_for_position(pos, code, opts),
Expr::CallExpressionKw(call_expression) => call_expression.get_hover_value_for_position(pos, code, opts), Expr::CallExpressionKw(call_expression) => call_expression.get_hover_value_for_position(pos, code, opts),
Expr::PipeExpression(pipe_expression) => pipe_expression.get_hover_value_for_position(pos, code, opts), Expr::PipeExpression(pipe_expression) => pipe_expression.get_hover_value_for_position(pos, code, opts),
Expr::ArrayExpression(array_expression) => array_expression.get_hover_value_for_position(pos, code, opts), Expr::ArrayExpression(array_expression) => array_expression.get_hover_value_for_position(pos, code, opts),
@ -144,9 +143,6 @@ impl BinaryPart {
BinaryPart::BinaryExpression(binary_expression) => { BinaryPart::BinaryExpression(binary_expression) => {
binary_expression.get_hover_value_for_position(pos, code, opts) binary_expression.get_hover_value_for_position(pos, code, opts)
} }
BinaryPart::CallExpression(call_expression) => {
call_expression.get_hover_value_for_position(pos, code, opts)
}
BinaryPart::CallExpressionKw(call_expression) => { BinaryPart::CallExpressionKw(call_expression) => {
call_expression.get_hover_value_for_position(pos, code, opts) call_expression.get_hover_value_for_position(pos, code, opts)
} }
@ -161,35 +157,6 @@ impl BinaryPart {
} }
} }
impl CallExpression {
fn get_hover_value_for_position(&self, pos: usize, code: &str, opts: &HoverOpts) -> Option<Hover> {
let callee_source_range: SourceRange = self.callee.clone().into();
if callee_source_range.contains(pos) {
return Some(Hover::Function {
name: self.callee.to_string(),
range: callee_source_range.to_lsp_range(code),
});
}
for (index, arg) in self.arguments.iter().enumerate() {
let source_range: SourceRange = arg.into();
if source_range.contains(pos) {
return if opts.prefer_sig {
Some(Hover::Signature {
name: self.callee.to_string(),
parameter_index: index as u32,
range: source_range.to_lsp_range(code),
})
} else {
arg.get_hover_value_for_position(pos, code, opts)
};
}
}
None
}
}
impl CallExpressionKw { impl CallExpressionKw {
fn get_hover_value_for_position(&self, pos: usize, code: &str, opts: &HoverOpts) -> Option<Hover> { fn get_hover_value_for_position(&self, pos: usize, code: &str, opts: &HoverOpts) -> Option<Hover> {
let callee_source_range: SourceRange = self.callee.clone().into(); let callee_source_range: SourceRange = self.callee.clone().into();

17
rust/kcl-lib/src/lsp/kcl/mod.rs
View File

@ -516,23 +516,6 @@ impl Backend {
} }
return get_modifier(vec![SemanticTokenModifier::DECLARATION]); return get_modifier(vec![SemanticTokenModifier::DECLARATION]);
} }
crate::walk::Node::CallExpression(call_expr) => {
let sr: SourceRange = (&call_expr.callee).into();
if sr.contains(source_range.start()) {
let mut ti = token_index.lock().map_err(|_| anyhow::anyhow!("mutex"))?;
*ti = match self.get_semantic_token_type_index(&SemanticTokenType::FUNCTION) {
Some(index) => index,
None => token_type_index,
};
if self.stdlib_completions.contains_key(&call_expr.callee.name.name) {
// This is a stdlib function.
return get_modifier(vec![SemanticTokenModifier::DEFAULT_LIBRARY]);
}
return Ok(false);
}
}
crate::walk::Node::CallExpressionKw(call_expr) => { crate::walk::Node::CallExpressionKw(call_expr) => {
let sr: SourceRange = (&call_expr.callee).into(); let sr: SourceRange = (&call_expr.callee).into();
if sr.contains(source_range.start()) { if sr.contains(source_range.start()) {

22
rust/kcl-lib/src/parsing/ast/digest.rs
View File

@ -2,11 +2,11 @@ use sha2::{Digest as DigestTrait, Sha256};
use crate::parsing::ast::types::{ use crate::parsing::ast::types::{
Annotation, ArrayExpression, ArrayRangeExpression, AscribedExpression, BinaryExpression, BinaryPart, BodyItem, Annotation, ArrayExpression, ArrayRangeExpression, AscribedExpression, BinaryExpression, BinaryPart, BodyItem,
CallExpression, CallExpressionKw, DefaultParamVal, ElseIf, Expr, ExpressionStatement, FunctionExpression, CallExpressionKw, DefaultParamVal, ElseIf, Expr, ExpressionStatement, FunctionExpression, Identifier, IfExpression,
Identifier, IfExpression, ImportItem, ImportSelector, ImportStatement, ItemVisibility, KclNone, LabelledExpression, ImportItem, ImportSelector, ImportStatement, ItemVisibility, KclNone, LabelledExpression, Literal,
Literal, LiteralIdentifier, LiteralValue, MemberExpression, MemberObject, Name, ObjectExpression, ObjectProperty, LiteralIdentifier, LiteralValue, MemberExpression, MemberObject, Name, ObjectExpression, ObjectProperty, Parameter,
Parameter, PipeExpression, PipeSubstitution, PrimitiveType, Program, ReturnStatement, TagDeclarator, Type, PipeExpression, PipeSubstitution, PrimitiveType, Program, ReturnStatement, TagDeclarator, Type, TypeDeclaration,
TypeDeclaration, UnaryExpression, VariableDeclaration, VariableDeclarator, VariableKind, UnaryExpression, VariableDeclaration, VariableDeclarator, VariableKind,
}; };
/// Position-independent digest of the AST node. /// Position-independent digest of the AST node.
@ -132,7 +132,6 @@ impl Expr {
Expr::TagDeclarator(tag) => tag.compute_digest(), Expr::TagDeclarator(tag) => tag.compute_digest(),
Expr::BinaryExpression(be) => be.compute_digest(), Expr::BinaryExpression(be) => be.compute_digest(),
Expr::FunctionExpression(fe) => fe.compute_digest(), Expr::FunctionExpression(fe) => fe.compute_digest(),
Expr::CallExpression(ce) => ce.compute_digest(),
Expr::CallExpressionKw(ce) => ce.compute_digest(), Expr::CallExpressionKw(ce) => ce.compute_digest(),
Expr::PipeExpression(pe) => pe.compute_digest(), Expr::PipeExpression(pe) => pe.compute_digest(),
Expr::PipeSubstitution(ps) => ps.compute_digest(), Expr::PipeSubstitution(ps) => ps.compute_digest(),
@ -159,7 +158,6 @@ impl BinaryPart {
BinaryPart::Literal(lit) => lit.compute_digest(), BinaryPart::Literal(lit) => lit.compute_digest(),
BinaryPart::Name(id) => id.compute_digest(), BinaryPart::Name(id) => id.compute_digest(),
BinaryPart::BinaryExpression(be) => be.compute_digest(), BinaryPart::BinaryExpression(be) => be.compute_digest(),
BinaryPart::CallExpression(ce) => ce.compute_digest(),
BinaryPart::CallExpressionKw(ce) => ce.compute_digest(), BinaryPart::CallExpressionKw(ce) => ce.compute_digest(),
BinaryPart::UnaryExpression(ue) => ue.compute_digest(), BinaryPart::UnaryExpression(ue) => ue.compute_digest(),
BinaryPart::MemberExpression(me) => me.compute_digest(), BinaryPart::MemberExpression(me) => me.compute_digest(),
@ -480,16 +478,6 @@ impl PipeExpression {
}); });
} }
impl CallExpression {
compute_digest!(|slf, hasher| {
hasher.update(slf.callee.compute_digest());
hasher.update(slf.arguments.len().to_ne_bytes());
for argument in slf.arguments.iter_mut() {
hasher.update(argument.compute_digest());
}
});
}
impl CallExpressionKw { impl CallExpressionKw {
compute_digest!(|slf, hasher| { compute_digest!(|slf, hasher| {
hasher.update(slf.callee.compute_digest()); hasher.update(slf.callee.compute_digest());

2
rust/kcl-lib/src/parsing/ast/mod.rs
View File

@ -26,7 +26,6 @@ impl Expr {
Expr::TagDeclarator(tag) => tag.module_id, Expr::TagDeclarator(tag) => tag.module_id,
Expr::BinaryExpression(binary_expression) => binary_expression.module_id, Expr::BinaryExpression(binary_expression) => binary_expression.module_id,
Expr::FunctionExpression(function_expression) => function_expression.module_id, Expr::FunctionExpression(function_expression) => function_expression.module_id,
Expr::CallExpression(call_expression) => call_expression.module_id,
Expr::CallExpressionKw(call_expression) => call_expression.module_id, Expr::CallExpressionKw(call_expression) => call_expression.module_id,
Expr::PipeExpression(pipe_expression) => pipe_expression.module_id, Expr::PipeExpression(pipe_expression) => pipe_expression.module_id,
Expr::PipeSubstitution(pipe_substitution) => pipe_substitution.module_id, Expr::PipeSubstitution(pipe_substitution) => pipe_substitution.module_id,
@ -49,7 +48,6 @@ impl BinaryPart {
BinaryPart::Literal(literal) => literal.module_id, BinaryPart::Literal(literal) => literal.module_id,
BinaryPart::Name(identifier) => identifier.module_id, BinaryPart::Name(identifier) => identifier.module_id,
BinaryPart::BinaryExpression(binary_expression) => binary_expression.module_id, BinaryPart::BinaryExpression(binary_expression) => binary_expression.module_id,
BinaryPart::CallExpression(call_expression) => call_expression.module_id,
BinaryPart::CallExpressionKw(call_expression) => call_expression.module_id, BinaryPart::CallExpressionKw(call_expression) => call_expression.module_id,
BinaryPart::UnaryExpression(unary_expression) => unary_expression.module_id, BinaryPart::UnaryExpression(unary_expression) => unary_expression.module_id,
BinaryPart::MemberExpression(member_expression) => member_expression.module_id, BinaryPart::MemberExpression(member_expression) => member_expression.module_id,

113
rust/kcl-lib/src/parsing/ast/types/mod.rs
View File

@ -932,7 +932,6 @@ pub enum Expr {
TagDeclarator(BoxNode<TagDeclarator>), TagDeclarator(BoxNode<TagDeclarator>),
BinaryExpression(BoxNode<BinaryExpression>), BinaryExpression(BoxNode<BinaryExpression>),
FunctionExpression(BoxNode<FunctionExpression>), FunctionExpression(BoxNode<FunctionExpression>),
CallExpression(BoxNode<CallExpression>),
CallExpressionKw(BoxNode<CallExpressionKw>), CallExpressionKw(BoxNode<CallExpressionKw>),
PipeExpression(BoxNode<PipeExpression>), PipeExpression(BoxNode<PipeExpression>),
PipeSubstitution(BoxNode<PipeSubstitution>), PipeSubstitution(BoxNode<PipeSubstitution>),
@ -978,7 +977,6 @@ impl Expr {
Expr::MemberExpression(_mem_exp) => None, Expr::MemberExpression(_mem_exp) => None,
Expr::Literal(_literal) => None, Expr::Literal(_literal) => None,
Expr::FunctionExpression(_func_exp) => None, Expr::FunctionExpression(_func_exp) => None,
Expr::CallExpression(_call_exp) => None,
Expr::CallExpressionKw(_call_exp) => None, Expr::CallExpressionKw(_call_exp) => None,
Expr::Name(_ident) => None, Expr::Name(_ident) => None,
Expr::TagDeclarator(_tag) => None, Expr::TagDeclarator(_tag) => None,
@ -1006,7 +1004,6 @@ impl Expr {
Expr::MemberExpression(_) => {} Expr::MemberExpression(_) => {}
Expr::Literal(_) => {} Expr::Literal(_) => {}
Expr::FunctionExpression(ref mut func_exp) => func_exp.replace_value(source_range, new_value), Expr::FunctionExpression(ref mut func_exp) => func_exp.replace_value(source_range, new_value),
Expr::CallExpression(ref mut call_exp) => call_exp.replace_value(source_range, new_value),
Expr::CallExpressionKw(ref mut call_exp) => call_exp.replace_value(source_range, new_value), Expr::CallExpressionKw(ref mut call_exp) => call_exp.replace_value(source_range, new_value),
Expr::Name(_) => {} Expr::Name(_) => {}
Expr::TagDeclarator(_) => {} Expr::TagDeclarator(_) => {}
@ -1027,7 +1024,6 @@ impl Expr {
Expr::TagDeclarator(tag) => tag.start, Expr::TagDeclarator(tag) => tag.start,
Expr::BinaryExpression(binary_expression) => binary_expression.start, Expr::BinaryExpression(binary_expression) => binary_expression.start,
Expr::FunctionExpression(function_expression) => function_expression.start, Expr::FunctionExpression(function_expression) => function_expression.start,
Expr::CallExpression(call_expression) => call_expression.start,
Expr::CallExpressionKw(call_expression) => call_expression.start, Expr::CallExpressionKw(call_expression) => call_expression.start,
Expr::PipeExpression(pipe_expression) => pipe_expression.start, Expr::PipeExpression(pipe_expression) => pipe_expression.start,
Expr::PipeSubstitution(pipe_substitution) => pipe_substitution.start, Expr::PipeSubstitution(pipe_substitution) => pipe_substitution.start,
@ -1050,7 +1046,6 @@ impl Expr {
Expr::TagDeclarator(tag) => tag.end, Expr::TagDeclarator(tag) => tag.end,
Expr::BinaryExpression(binary_expression) => binary_expression.end, Expr::BinaryExpression(binary_expression) => binary_expression.end,
Expr::FunctionExpression(function_expression) => function_expression.end, Expr::FunctionExpression(function_expression) => function_expression.end,
Expr::CallExpression(call_expression) => call_expression.end,
Expr::CallExpressionKw(call_expression) => call_expression.end, Expr::CallExpressionKw(call_expression) => call_expression.end,
Expr::PipeExpression(pipe_expression) => pipe_expression.end, Expr::PipeExpression(pipe_expression) => pipe_expression.end,
Expr::PipeSubstitution(pipe_substitution) => pipe_substitution.end, Expr::PipeSubstitution(pipe_substitution) => pipe_substitution.end,
@ -1081,7 +1076,6 @@ impl Expr {
binary_expression.rename_identifiers(old_name, new_name) binary_expression.rename_identifiers(old_name, new_name)
} }
Expr::FunctionExpression(_function_identifier) => {} Expr::FunctionExpression(_function_identifier) => {}
Expr::CallExpression(ref mut call_expression) => call_expression.rename_identifiers(old_name, new_name),
Expr::CallExpressionKw(ref mut call_expression) => call_expression.rename_identifiers(old_name, new_name), Expr::CallExpressionKw(ref mut call_expression) => call_expression.rename_identifiers(old_name, new_name),
Expr::PipeExpression(ref mut pipe_expression) => pipe_expression.rename_identifiers(old_name, new_name), Expr::PipeExpression(ref mut pipe_expression) => pipe_expression.rename_identifiers(old_name, new_name),
Expr::PipeSubstitution(_) => {} Expr::PipeSubstitution(_) => {}
@ -1110,7 +1104,6 @@ impl Expr {
Expr::BinaryExpression(binary_expression) => binary_expression.get_constraint_level(), Expr::BinaryExpression(binary_expression) => binary_expression.get_constraint_level(),
Expr::FunctionExpression(function_identifier) => function_identifier.get_constraint_level(), Expr::FunctionExpression(function_identifier) => function_identifier.get_constraint_level(),
Expr::CallExpression(call_expression) => call_expression.get_constraint_level(),
Expr::CallExpressionKw(call_expression) => call_expression.get_constraint_level(), Expr::CallExpressionKw(call_expression) => call_expression.get_constraint_level(),
Expr::PipeExpression(pipe_expression) => pipe_expression.get_constraint_level(), Expr::PipeExpression(pipe_expression) => pipe_expression.get_constraint_level(),
Expr::PipeSubstitution(pipe_substitution) => ConstraintLevel::Ignore { Expr::PipeSubstitution(pipe_substitution) => ConstraintLevel::Ignore {
@ -1128,16 +1121,6 @@ impl Expr {
} }
} }
pub fn has_substitution_arg(&self) -> bool {
match self {
Expr::CallExpression(call_expression) => call_expression.has_substitution_arg(),
Expr::CallExpressionKw(call_expression) => call_expression.has_substitution_arg(),
Expr::LabelledExpression(expr) => expr.expr.has_substitution_arg(),
Expr::AscribedExpression(expr) => expr.expr.has_substitution_arg(),
_ => false,
}
}
pub fn literal_bool(&self) -> Option<bool> { pub fn literal_bool(&self) -> Option<bool> {
match self { match self {
Expr::Literal(lit) => match lit.value { Expr::Literal(lit) => match lit.value {
@ -1194,7 +1177,6 @@ impl From<&BinaryPart> for Expr {
BinaryPart::Literal(literal) => Expr::Literal(literal.clone()), BinaryPart::Literal(literal) => Expr::Literal(literal.clone()),
BinaryPart::Name(name) => Expr::Name(name.clone()), BinaryPart::Name(name) => Expr::Name(name.clone()),
BinaryPart::BinaryExpression(binary_expression) => Expr::BinaryExpression(binary_expression.clone()), BinaryPart::BinaryExpression(binary_expression) => Expr::BinaryExpression(binary_expression.clone()),
BinaryPart::CallExpression(call_expression) => Expr::CallExpression(call_expression.clone()),
BinaryPart::CallExpressionKw(call_expression) => Expr::CallExpressionKw(call_expression.clone()), BinaryPart::CallExpressionKw(call_expression) => Expr::CallExpressionKw(call_expression.clone()),
BinaryPart::UnaryExpression(unary_expression) => Expr::UnaryExpression(unary_expression.clone()), BinaryPart::UnaryExpression(unary_expression) => Expr::UnaryExpression(unary_expression.clone()),
BinaryPart::MemberExpression(member_expression) => Expr::MemberExpression(member_expression.clone()), BinaryPart::MemberExpression(member_expression) => Expr::MemberExpression(member_expression.clone()),
@ -1261,7 +1243,6 @@ pub enum BinaryPart {
Literal(BoxNode<Literal>), Literal(BoxNode<Literal>),
Name(BoxNode<Name>), Name(BoxNode<Name>),
BinaryExpression(BoxNode<BinaryExpression>), BinaryExpression(BoxNode<BinaryExpression>),
CallExpression(BoxNode<CallExpression>),
CallExpressionKw(BoxNode<CallExpressionKw>), CallExpressionKw(BoxNode<CallExpressionKw>),
UnaryExpression(BoxNode<UnaryExpression>), UnaryExpression(BoxNode<UnaryExpression>),
MemberExpression(BoxNode<MemberExpression>), MemberExpression(BoxNode<MemberExpression>),
@ -1287,7 +1268,6 @@ impl BinaryPart {
BinaryPart::Literal(literal) => literal.get_constraint_level(), BinaryPart::Literal(literal) => literal.get_constraint_level(),
BinaryPart::Name(identifier) => identifier.get_constraint_level(), BinaryPart::Name(identifier) => identifier.get_constraint_level(),
BinaryPart::BinaryExpression(binary_expression) => binary_expression.get_constraint_level(), BinaryPart::BinaryExpression(binary_expression) => binary_expression.get_constraint_level(),
BinaryPart::CallExpression(call_expression) => call_expression.get_constraint_level(),
BinaryPart::CallExpressionKw(call_expression) => call_expression.get_constraint_level(), BinaryPart::CallExpressionKw(call_expression) => call_expression.get_constraint_level(),
BinaryPart::UnaryExpression(unary_expression) => unary_expression.get_constraint_level(), BinaryPart::UnaryExpression(unary_expression) => unary_expression.get_constraint_level(),
BinaryPart::MemberExpression(member_expression) => member_expression.get_constraint_level(), BinaryPart::MemberExpression(member_expression) => member_expression.get_constraint_level(),
@ -1302,9 +1282,6 @@ impl BinaryPart {
BinaryPart::BinaryExpression(ref mut binary_expression) => { BinaryPart::BinaryExpression(ref mut binary_expression) => {
binary_expression.replace_value(source_range, new_value) binary_expression.replace_value(source_range, new_value)
} }
BinaryPart::CallExpression(ref mut call_expression) => {
call_expression.replace_value(source_range, new_value)
}
BinaryPart::CallExpressionKw(ref mut call_expression) => { BinaryPart::CallExpressionKw(ref mut call_expression) => {
call_expression.replace_value(source_range, new_value) call_expression.replace_value(source_range, new_value)
} }
@ -1321,7 +1298,6 @@ impl BinaryPart {
BinaryPart::Literal(literal) => literal.start, BinaryPart::Literal(literal) => literal.start,
BinaryPart::Name(identifier) => identifier.start, BinaryPart::Name(identifier) => identifier.start,
BinaryPart::BinaryExpression(binary_expression) => binary_expression.start, BinaryPart::BinaryExpression(binary_expression) => binary_expression.start,
BinaryPart::CallExpression(call_expression) => call_expression.start,
BinaryPart::CallExpressionKw(call_expression) => call_expression.start, BinaryPart::CallExpressionKw(call_expression) => call_expression.start,
BinaryPart::UnaryExpression(unary_expression) => unary_expression.start, BinaryPart::UnaryExpression(unary_expression) => unary_expression.start,
BinaryPart::MemberExpression(member_expression) => member_expression.start, BinaryPart::MemberExpression(member_expression) => member_expression.start,
@ -1334,7 +1310,6 @@ impl BinaryPart {
BinaryPart::Literal(literal) => literal.end, BinaryPart::Literal(literal) => literal.end,
BinaryPart::Name(identifier) => identifier.end, BinaryPart::Name(identifier) => identifier.end,
BinaryPart::BinaryExpression(binary_expression) => binary_expression.end, BinaryPart::BinaryExpression(binary_expression) => binary_expression.end,
BinaryPart::CallExpression(call_expression) => call_expression.end,
BinaryPart::CallExpressionKw(call_expression) => call_expression.end, BinaryPart::CallExpressionKw(call_expression) => call_expression.end,
BinaryPart::UnaryExpression(unary_expression) => unary_expression.end, BinaryPart::UnaryExpression(unary_expression) => unary_expression.end,
BinaryPart::MemberExpression(member_expression) => member_expression.end, BinaryPart::MemberExpression(member_expression) => member_expression.end,
@ -1350,9 +1325,6 @@ impl BinaryPart {
BinaryPart::BinaryExpression(ref mut binary_expression) => { BinaryPart::BinaryExpression(ref mut binary_expression) => {
binary_expression.rename_identifiers(old_name, new_name) binary_expression.rename_identifiers(old_name, new_name)
} }
BinaryPart::CallExpression(ref mut call_expression) => {
call_expression.rename_identifiers(old_name, new_name)
}
BinaryPart::CallExpressionKw(ref mut call_expression) => { BinaryPart::CallExpressionKw(ref mut call_expression) => {
call_expression.rename_identifiers(old_name, new_name) call_expression.rename_identifiers(old_name, new_name)
} }
@ -1844,18 +1816,6 @@ pub struct ExpressionStatement {
pub digest: Option<Digest>, pub digest: Option<Digest>,
} }
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)]
#[serde(tag = "type")]
pub struct CallExpression {
pub callee: Node<Name>,
pub arguments: Vec<Expr>,
#[serde(default, skip_serializing_if = "Option::is_none")]
#[ts(optional)]
pub digest: Option<Digest>,
}
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)] #[ts(export)]
#[serde(rename_all = "camelCase", tag = "type")] #[serde(rename_all = "camelCase", tag = "type")]
@ -1881,37 +1841,12 @@ pub struct LabeledArg {
pub arg: Expr, pub arg: Expr,
} }
impl From<Node<CallExpression>> for Expr {
fn from(call_expression: Node<CallExpression>) -> Self {
Expr::CallExpression(Box::new(call_expression))
}
}
impl From<Node<CallExpressionKw>> for Expr { impl From<Node<CallExpressionKw>> for Expr {
fn from(call_expression: Node<CallExpressionKw>) -> Self { fn from(call_expression: Node<CallExpressionKw>) -> Self {
Expr::CallExpressionKw(Box::new(call_expression)) Expr::CallExpressionKw(Box::new(call_expression))
} }
} }
impl Node<CallExpression> {
/// Return the constraint level for this call expression.
pub fn get_constraint_level(&self) -> ConstraintLevel {
if self.arguments.is_empty() {
return ConstraintLevel::Ignore {
source_ranges: vec![self.into()],
};
}
// Iterate over the arguments and get the constraint level for each one.
let mut constraint_levels = ConstraintLevels::new();
for arg in &self.arguments {
constraint_levels.push(arg.get_constraint_level());
}
constraint_levels.get_constraint_level(self.into())
}
}
impl Node<CallExpressionKw> { impl Node<CallExpressionKw> {
/// Return the constraint level for this call expression. /// Return the constraint level for this call expression.
pub fn get_constraint_level(&self) -> ConstraintLevel { pub fn get_constraint_level(&self) -> ConstraintLevel {
@ -1931,38 +1866,6 @@ impl Node<CallExpressionKw> {
} }
} }
impl CallExpression {
pub fn new(name: &str, arguments: Vec<Expr>) -> Result<Node<Self>, KclError> {
Ok(Node::no_src(Self {
callee: Name::new(name),
arguments,
digest: None,
}))
}
/// Is at least one argument the '%' i.e. the substitution operator?
pub fn has_substitution_arg(&self) -> bool {
self.arguments
.iter()
.any(|arg| matches!(arg, Expr::PipeSubstitution(_)))
}
pub fn replace_value(&mut self, source_range: SourceRange, new_value: Expr) {
for arg in &mut self.arguments {
arg.replace_value(source_range, new_value.clone());
}
}
/// Rename all identifiers that have the old name to the new given name.
fn rename_identifiers(&mut self, old_name: &str, new_name: &str) {
self.callee.rename(old_name, new_name);
for arg in &mut self.arguments {
arg.rename_identifiers(old_name, new_name);
}
}
}
impl CallExpressionKw { impl CallExpressionKw {
pub fn new(name: &str, unlabeled: Option<Expr>, arguments: Vec<LabeledArg>) -> Result<Node<Self>, KclError> { pub fn new(name: &str, unlabeled: Option<Expr>, arguments: Vec<LabeledArg>) -> Result<Node<Self>, KclError> {
Ok(Node::no_src(Self { Ok(Node::no_src(Self {
@ -1982,13 +1885,6 @@ impl CallExpressionKw {
.chain(self.arguments.iter().map(|arg| (Some(&arg.label), &arg.arg))) .chain(self.arguments.iter().map(|arg| (Some(&arg.label), &arg.arg)))
} }
/// Is at least one argument the '%' i.e. the substitution operator?
pub fn has_substitution_arg(&self) -> bool {
self.arguments
.iter()
.any(|arg| matches!(arg.arg, Expr::PipeSubstitution(_)))
}
pub fn replace_value(&mut self, source_range: SourceRange, new_value: Expr) { pub fn replace_value(&mut self, source_range: SourceRange, new_value: Expr) {
for arg in &mut self.arguments { for arg in &mut self.arguments {
arg.arg.replace_value(source_range, new_value.clone()); arg.arg.replace_value(source_range, new_value.clone());
@ -4188,13 +4084,8 @@ cylinder = startSketchOn(-XZ)
}; };
oe oe
} }
Expr::CallExpression(ce) => {
let Expr::ObjectExpression(ref oe) = (ce.arguments).first().unwrap() else { other => panic!("expected a CallKw, found {other:?}"),
panic!("expected an object!");
};
oe
}
other => panic!("expected a Call or CallKw, found {other:?}"),
}; };
assert_eq!(oe.properties.len(), 2); assert_eq!(oe.properties.len(), 2);

12
rust/kcl-lib/src/parsing/ast/types/path.rs
View File

@ -177,18 +177,6 @@ impl NodePath {
} }
} }
} }
Expr::CallExpression(node) => {
if node.callee.contains_range(&range) {
path.push(Step::CallCallee);
return Some(path);
}
for (i, arg) in node.arguments.iter().enumerate() {
if arg.contains_range(&range) {
path.push(Step::CallArg { index: i });
return Self::from_expr(arg, range, path);
}
}
}
Expr::CallExpressionKw(node) => { Expr::CallExpressionKw(node) => {
if node.callee.contains_range(&range) { if node.callee.contains_range(&range) {
path.push(Step::CallKwCallee); path.push(Step::CallKwCallee);

67
rust/kcl-lib/src/parsing/parser.rs
View File

@ -14,7 +14,7 @@ use winnow::{
}; };
use super::{ use super::{
ast::types::{AscribedExpression, CallExpression, ImportPath, LabelledExpression}, ast::types::{AscribedExpression, ImportPath, LabelledExpression},
token::{NumericSuffix, RESERVED_WORDS}, token::{NumericSuffix, RESERVED_WORDS},
DeprecationKind, DeprecationKind,
}; };
@ -630,7 +630,6 @@ fn operand(i: &mut TokenSlice) -> PResult<BinaryPart> {
Expr::Literal(x) => BinaryPart::Literal(x), Expr::Literal(x) => BinaryPart::Literal(x),
Expr::Name(x) => BinaryPart::Name(x), Expr::Name(x) => BinaryPart::Name(x),
Expr::BinaryExpression(x) => BinaryPart::BinaryExpression(x), Expr::BinaryExpression(x) => BinaryPart::BinaryExpression(x),
Expr::CallExpression(x) => BinaryPart::CallExpression(x),
Expr::CallExpressionKw(x) => BinaryPart::CallExpressionKw(x), Expr::CallExpressionKw(x) => BinaryPart::CallExpressionKw(x),
Expr::MemberExpression(x) => BinaryPart::MemberExpression(x), Expr::MemberExpression(x) => BinaryPart::MemberExpression(x),
Expr::IfExpression(x) => BinaryPart::IfExpression(x), Expr::IfExpression(x) => BinaryPart::IfExpression(x),
@ -2030,7 +2029,6 @@ fn expr_allowed_in_pipe_expr(i: &mut TokenSlice) -> PResult<Expr> {
bool_value.map(Expr::Literal), bool_value.map(Expr::Literal),
tag.map(Box::new).map(Expr::TagDeclarator), tag.map(Box::new).map(Expr::TagDeclarator),
literal.map(Expr::Literal), literal.map(Expr::Literal),
fn_call.map(Box::new).map(Expr::CallExpression),
fn_call_kw.map(Box::new).map(Expr::CallExpressionKw), fn_call_kw.map(Box::new).map(Expr::CallExpressionKw),
name.map(Box::new).map(Expr::Name), name.map(Box::new).map(Expr::Name),
array, array,
@ -2050,7 +2048,6 @@ fn possible_operands(i: &mut TokenSlice) -> PResult<Expr> {
bool_value.map(Expr::Literal), bool_value.map(Expr::Literal),
member_expression.map(Box::new).map(Expr::MemberExpression), member_expression.map(Box::new).map(Expr::MemberExpression),
literal.map(Expr::Literal), literal.map(Expr::Literal),
fn_call.map(Box::new).map(Expr::CallExpression),
fn_call_kw.map(Box::new).map(Expr::CallExpressionKw), fn_call_kw.map(Box::new).map(Expr::CallExpressionKw),
name.map(Box::new).map(Expr::Name), name.map(Box::new).map(Expr::Name),
binary_expr_in_parens.map(Box::new).map(Expr::BinaryExpression), binary_expr_in_parens.map(Box::new).map(Expr::BinaryExpression),
@ -2711,13 +2708,6 @@ fn pipe_sep(i: &mut TokenSlice) -> PResult<()> {
Ok(()) Ok(())
} }
/// Arguments are passed into a function.
fn arguments(i: &mut TokenSlice) -> PResult<Vec<Expr>> {
separated(0.., expression, comma_sep)
.context(expected("function arguments"))
.parse_next(i)
}
fn labeled_argument(i: &mut TokenSlice) -> PResult<LabeledArg> { fn labeled_argument(i: &mut TokenSlice) -> PResult<LabeledArg> {
separated_pair( separated_pair(
terminated(nameable_identifier, opt(whitespace)), terminated(nameable_identifier, opt(whitespace)),
@ -2986,11 +2976,7 @@ fn binding_name(i: &mut TokenSlice) -> PResult<Node<Identifier>> {
/// Either a positional or keyword function call. /// Either a positional or keyword function call.
fn fn_call_pos_or_kw(i: &mut TokenSlice) -> PResult<Expr> { fn fn_call_pos_or_kw(i: &mut TokenSlice) -> PResult<Expr> {
alt(( alt((fn_call_kw.map(Box::new).map(Expr::CallExpressionKw),)).parse_next(i)
fn_call.map(Box::new).map(Expr::CallExpression),
fn_call_kw.map(Box::new).map(Expr::CallExpressionKw),
))
.parse_next(i)
} }
fn labelled_fn_call(i: &mut TokenSlice) -> PResult<Expr> { fn labelled_fn_call(i: &mut TokenSlice) -> PResult<Expr> {
@ -3003,43 +2989,6 @@ fn labelled_fn_call(i: &mut TokenSlice) -> PResult<Expr> {
} }
} }
fn fn_call(i: &mut TokenSlice) -> PResult<Node<CallExpression>> {
let fn_name = name(i)?;
opt(whitespace).parse_next(i)?;
let _ = terminated(open_paren, opt(whitespace)).parse_next(i)?;
let args = arguments(i)?;
let end = preceded(opt(whitespace), close_paren).parse_next(i)?.end;
let result = Node::new_node(
fn_name.start,
end,
fn_name.module_id,
CallExpression {
callee: fn_name,
arguments: args,
digest: None,
},
);
let callee_str = result.callee.name.name.to_string();
if let Some(suggestion) = super::deprecation(&callee_str, DeprecationKind::Function) {
ParseContext::warn(
CompilationError::err(
result.as_source_range(),
format!("Calling `{}` is deprecated, prefer using `{}`.", callee_str, suggestion),
)
.with_suggestion(
format!("Replace `{}` with `{}`", callee_str, suggestion),
suggestion,
None,
Tag::Deprecated,
),
);
}
Ok(result)
}
fn fn_call_kw(i: &mut TokenSlice) -> PResult<Node<CallExpressionKw>> { fn fn_call_kw(i: &mut TokenSlice) -> PResult<Node<CallExpressionKw>> {
let fn_name = name(i)?; let fn_name = name(i)?;
opt(whitespace).parse_next(i)?; opt(whitespace).parse_next(i)?;
@ -3231,18 +3180,6 @@ mod tests {
assert_reserved("import"); assert_reserved("import");
} }
#[test]
fn parse_args() {
for (i, (test, expected_len)) in [("someVar", 1), ("5, 3", 2), (r#""a""#, 1)].into_iter().enumerate() {
let tokens = crate::parsing::token::lex(test, ModuleId::default()).unwrap();
let actual = match arguments.parse(tokens.as_slice()) {
Ok(x) => x,
Err(e) => panic!("Failed test {i}, could not parse function arguments from \"{test}\": {e:?}"),
};
assert_eq!(actual.len(), expected_len, "failed test {i}");
}
}
#[test] #[test]
fn parse_names() { fn parse_names() {
for (test, expected_len) in [("someVar", 0), ("::foo", 0), ("foo::bar::baz", 2)] { for (test, expected_len) in [("someVar", 0), ("::foo", 0), ("foo::bar::baz", 2)] {

38
rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__a.snap
View File

@ -19,24 +19,6 @@ expression: actual
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 26,
"end": 28,
"name": {
"commentStart": 26,
"end": 28,
"name": "XY",
"start": 26,
"type": "Identifier"
},
"path": [],
"start": 26,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 12, "commentStart": 12,
@ -55,8 +37,24 @@ expression: actual
"commentStart": 12, "commentStart": 12,
"end": 29, "end": 29,
"start": 12, "start": 12,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 26,
"end": 28,
"name": {
"commentStart": 26,
"end": 28,
"name": "XY",
"start": 26,
"type": "Identifier"
},
"path": [],
"start": 26,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [

6
rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ad.snap
View File

@ -63,7 +63,6 @@ expression: actual
"commentStart": 56, "commentStart": 56,
"end": 74, "end": 74,
"expression": { "expression": {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 56, "commentStart": 56,
@ -82,8 +81,9 @@ expression: actual
"commentStart": 56, "commentStart": 56,
"end": 74, "end": 74,
"start": 56, "start": 56,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
"start": 56, "start": 56,
"type": "ExpressionStatement", "type": "ExpressionStatement",

24
rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ae.snap
View File

@ -71,17 +71,6 @@ expression: actual
"commentStart": 48, "commentStart": 48,
"end": 60, "end": 60,
"expression": { "expression": {
"arguments": [
{
"commentStart": 54,
"end": 59,
"raw": "false",
"start": 54,
"type": "Literal",
"type": "Literal",
"value": false
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 48, "commentStart": 48,
@ -100,8 +89,17 @@ expression: actual
"commentStart": 48, "commentStart": 48,
"end": 60, "end": 60,
"start": 48, "start": 48,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 54,
"end": 59,
"raw": "false",
"start": 54,
"type": "Literal",
"type": "Literal",
"value": false
}
}, },
"start": 48, "start": 48,
"type": "ExpressionStatement", "type": "ExpressionStatement",

44
rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__af.snap
View File

@ -19,24 +19,6 @@ expression: actual
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 25,
"end": 27,
"name": {
"commentStart": 25,
"end": 27,
"name": "XY",
"start": 25,
"type": "Identifier"
},
"path": [],
"start": 25,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 11, "commentStart": 11,
@ -55,8 +37,24 @@ expression: actual
"commentStart": 11, "commentStart": 11,
"end": 28, "end": 28,
"start": 11, "start": 11,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 25,
"end": 27,
"name": {
"commentStart": 25,
"end": 27,
"name": "XY",
"start": 25,
"type": "Identifier"
},
"path": [],
"start": 25,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -367,7 +365,6 @@ expression: actual
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 223, "commentStart": 223,
@ -386,8 +383,9 @@ expression: actual
"commentStart": 223, "commentStart": 223,
"end": 230, "end": 230,
"start": 223, "start": 223,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 11, "commentStart": 11,

44
rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ag.snap
View File

@ -19,24 +19,6 @@ expression: actual
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 25,
"end": 27,
"name": {
"commentStart": 25,
"end": 27,
"name": "XY",
"start": 25,
"type": "Identifier"
},
"path": [],
"start": 25,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 11, "commentStart": 11,
@ -55,8 +37,24 @@ expression: actual
"commentStart": 11, "commentStart": 11,
"end": 28, "end": 28,
"start": 11, "start": 11,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 25,
"end": 27,
"name": {
"commentStart": 25,
"end": 27,
"name": "XY",
"start": 25,
"type": "Identifier"
},
"path": [],
"start": 25,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -195,7 +193,6 @@ expression: actual
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 90, "commentStart": 90,
@ -214,8 +211,9 @@ expression: actual
"commentStart": 90, "commentStart": 90,
"end": 97, "end": 97,
"start": 90, "start": 90,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 11, "commentStart": 11,

38
rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ah.snap
View File

@ -19,24 +19,6 @@ expression: actual
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 22,
"end": 24,
"name": {
"commentStart": 22,
"end": 24,
"name": "XY",
"start": 22,
"type": "Identifier"
},
"path": [],
"start": 22,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 8, "commentStart": 8,
@ -55,8 +37,24 @@ expression: actual
"commentStart": 8, "commentStart": 8,
"end": 25, "end": 25,
"start": 8, "start": 8,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 22,
"end": 24,
"name": {
"commentStart": 22,
"end": 24,
"name": "XY",
"start": 22,
"type": "Identifier"
},
"path": [],
"start": 22,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [

52
rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ai.snap
View File

@ -19,20 +19,6 @@ expression: actual
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"commentStart": 10,
"end": 11,
"raw": "1",
"start": 10,
"type": "Literal",
"type": "Literal",
"value": {
"value": 1.0,
"suffix": "None"
}
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 8, "commentStart": 8,
@ -51,24 +37,22 @@ expression: actual
"commentStart": 8, "commentStart": 8,
"end": 12, "end": 12,
"start": 8, "start": 8,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{ "commentStart": 10,
"arguments": [ "end": 11,
{ "raw": "1",
"commentStart": 18, "start": 10,
"end": 19,
"raw": "2",
"start": 18,
"type": "Literal", "type": "Literal",
"type": "Literal", "type": "Literal",
"value": { "value": {
"value": 2.0, "value": 1.0,
"suffix": "None" "suffix": "None"
} }
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 16, "commentStart": 16,
@ -87,8 +71,20 @@ expression: actual
"commentStart": 16, "commentStart": 16,
"end": 20, "end": 20,
"start": 16, "start": 16,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 18,
"end": 19,
"raw": "2",
"start": 18,
"type": "Literal",
"type": "Literal",
"value": {
"value": 2.0,
"suffix": "None"
}
}
} }
], ],
"commentStart": 8, "commentStart": 8,

38
rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__aj.snap
View File

@ -19,24 +19,6 @@ expression: actual
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 22,
"end": 24,
"name": {
"commentStart": 22,
"end": 24,
"name": "XY",
"start": 22,
"type": "Identifier"
},
"path": [],
"start": 22,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 8, "commentStart": 8,
@ -55,8 +37,24 @@ expression: actual
"commentStart": 8, "commentStart": 8,
"end": 25, "end": 25,
"start": 8, "start": 8,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 22,
"end": 24,
"name": {
"commentStart": 22,
"end": 24,
"name": "XY",
"start": 22,
"type": "Identifier"
},
"path": [],
"start": 22,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [

38
rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ap.snap
View File

@ -19,24 +19,6 @@ expression: actual
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 25,
"end": 27,
"name": {
"commentStart": 25,
"end": 27,
"name": "XY",
"start": 25,
"type": "Identifier"
},
"path": [],
"start": 25,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 11, "commentStart": 11,
@ -55,8 +37,24 @@ expression: actual
"commentStart": 11, "commentStart": 11,
"end": 28, "end": 28,
"start": 11, "start": 11,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 25,
"end": 27,
"name": {
"commentStart": 25,
"end": 27,
"name": "XY",
"start": 25,
"type": "Identifier"
},
"path": [],
"start": 25,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [

44
rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__at.snap
View File

@ -8,8 +8,27 @@ expression: actual
"commentStart": 0, "commentStart": 0,
"end": 12, "end": 12,
"expression": { "expression": {
"arguments": [ "callee": {
{ "abs_path": false,
"commentStart": 0,
"end": 4,
"name": {
"commentStart": 0,
"end": 4,
"name": "line",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 12,
"start": 0,
"type": "CallExpressionKw",
"type": "CallExpressionKw",
"unlabeled": {
"commentStart": 5, "commentStart": 5,
"elements": [ "elements": [
{ {
@ -46,27 +65,6 @@ expression: actual
"type": "ArrayExpression", "type": "ArrayExpression",
"type": "ArrayExpression" "type": "ArrayExpression"
} }
],
"callee": {
"abs_path": false,
"commentStart": 0,
"end": 4,
"name": {
"commentStart": 0,
"end": 4,
"name": "line",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 12,
"start": 0,
"type": "CallExpression",
"type": "CallExpression"
}, },
"start": 0, "start": 0,
"type": "ExpressionStatement", "type": "ExpressionStatement",

38
rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__au.snap
View File

@ -19,24 +19,6 @@ expression: actual
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 25,
"end": 27,
"name": {
"commentStart": 25,
"end": 27,
"name": "XY",
"start": 25,
"type": "Identifier"
},
"path": [],
"start": 25,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 11, "commentStart": 11,
@ -55,8 +37,24 @@ expression: actual
"commentStart": 11, "commentStart": 11,
"end": 28, "end": 28,
"start": 11, "start": 11,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 25,
"end": 27,
"name": {
"commentStart": 25,
"end": 27,
"name": "XY",
"start": 25,
"type": "Identifier"
},
"path": [],
"start": 25,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [

38
rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bd.snap
View File

@ -32,24 +32,6 @@ expression: actual
{ {
"commentStart": 38, "commentStart": 38,
"cond": { "cond": {
"arguments": [
{
"abs_path": false,
"commentStart": 51,
"end": 57,
"name": {
"commentStart": 51,
"end": 57,
"name": "radius",
"start": 51,
"type": "Identifier"
},
"path": [],
"start": 51,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 46, "commentStart": 46,
@ -68,8 +50,24 @@ expression: actual
"commentStart": 46, "commentStart": 46,
"end": 58, "end": 58,
"start": 46, "start": 46,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 51,
"end": 57,
"name": {
"commentStart": 51,
"end": 57,
"name": "radius",
"start": 51,
"type": "Identifier"
},
"path": [],
"start": 51,
"type": "Name",
"type": "Name"
}
}, },
"digest": null, "digest": null,
"end": 84, "end": 84,

30
rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__d.snap
View File

@ -51,20 +51,6 @@ expression: actual
"type": "BinaryExpression" "type": "BinaryExpression"
}, },
{ {
"arguments": [
{
"commentStart": 24,
"end": 26,
"raw": "45",
"start": 24,
"type": "Literal",
"type": "Literal",
"value": {
"value": 45.0,
"suffix": "None"
}
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 17, "commentStart": 17,
@ -83,8 +69,20 @@ expression: actual
"commentStart": 17, "commentStart": 17,
"end": 27, "end": 27,
"start": 17, "start": 17,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 24,
"end": 26,
"raw": "45",
"start": 24,
"type": "Literal",
"type": "Literal",
"value": {
"value": 45.0,
"suffix": "None"
}
}
} }
], ],
"commentStart": 8, "commentStart": 8,

64
rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__y.snap
View File

@ -19,24 +19,6 @@ expression: actual
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 19,
"end": 21,
"name": {
"commentStart": 19,
"end": 21,
"name": "XY",
"start": 19,
"type": "Identifier"
},
"path": [],
"start": 19,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 5, "commentStart": 5,
@ -55,28 +37,26 @@ expression: actual
"commentStart": 5, "commentStart": 5,
"end": 22, "end": 22,
"start": 5, "start": 5,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"abs_path": false, "abs_path": false,
"commentStart": 39, "commentStart": 19,
"end": 42, "end": 21,
"name": { "name": {
"commentStart": 39, "commentStart": 19,
"end": 42, "end": 21,
"name": "pos", "name": "XY",
"start": 39, "start": 19,
"type": "Identifier" "type": "Identifier"
}, },
"path": [], "path": [],
"start": 39, "start": 19,
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 26, "commentStart": 26,
@ -95,8 +75,24 @@ expression: actual
"commentStart": 26, "commentStart": 26,
"end": 43, "end": 43,
"start": 26, "start": 26,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 39,
"end": 42,
"name": {
"commentStart": 39,
"end": 42,
"name": "pos",
"start": 39,
"type": "Identifier"
},
"path": [],
"start": 39,
"type": "Name",
"type": "Name"
}
} }
], ],
"commentStart": 5, "commentStart": 5,

108
rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__z.snap
View File

@ -19,24 +19,6 @@ expression: actual
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 19,
"end": 21,
"name": {
"commentStart": 19,
"end": 21,
"name": "XY",
"start": 19,
"type": "Identifier"
},
"path": [],
"start": 19,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 5, "commentStart": 5,
@ -55,28 +37,26 @@ expression: actual
"commentStart": 5, "commentStart": 5,
"end": 22, "end": 22,
"start": 5, "start": 5,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"abs_path": false, "abs_path": false,
"commentStart": 43, "commentStart": 19,
"end": 46, "end": 21,
"name": { "name": {
"commentStart": 43, "commentStart": 19,
"end": 46, "end": 21,
"name": "pos", "name": "XY",
"start": 43, "start": 19,
"type": "Identifier" "type": "Identifier"
}, },
"path": [], "path": [],
"start": 43, "start": 19,
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 30, "commentStart": 30,
@ -95,12 +75,47 @@ expression: actual
"commentStart": 30, "commentStart": 30,
"end": 47, "end": 47,
"start": 30, "start": 30,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 43,
"end": 46,
"name": {
"commentStart": 43,
"end": 46,
"name": "pos",
"start": 43,
"type": "Identifier"
},
"path": [],
"start": 43,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "callee": {
{ "abs_path": false,
"commentStart": 51,
"end": 55,
"name": {
"commentStart": 51,
"end": 55,
"name": "line",
"start": 51,
"type": "Identifier"
},
"path": [],
"start": 51,
"type": "Name"
},
"commentStart": 51,
"end": 68,
"start": 51,
"type": "CallExpressionKw",
"type": "CallExpressionKw",
"unlabeled": {
"commentStart": 56, "commentStart": 56,
"elements": [ "elements": [
{ {
@ -145,27 +160,6 @@ expression: actual
"type": "ArrayExpression", "type": "ArrayExpression",
"type": "ArrayExpression" "type": "ArrayExpression"
} }
],
"callee": {
"abs_path": false,
"commentStart": 51,
"end": 55,
"name": {
"commentStart": 51,
"end": 55,
"name": "line",
"start": 51,
"type": "Identifier"
},
"path": [],
"start": 51,
"type": "Name"
},
"commentStart": 51,
"end": 68,
"start": 51,
"type": "CallExpression",
"type": "CallExpression"
} }
], ],
"commentStart": 5, "commentStart": 5,

34
rust/kcl-lib/src/unparser.rs
View File

@ -3,10 +3,10 @@ use std::fmt::Write;
use crate::parsing::{ use crate::parsing::{
ast::types::{ ast::types::{
Annotation, ArrayExpression, ArrayRangeExpression, BinaryExpression, BinaryOperator, BinaryPart, BodyItem, Annotation, ArrayExpression, ArrayRangeExpression, BinaryExpression, BinaryOperator, BinaryPart, BodyItem,
CallExpression, CallExpressionKw, CommentStyle, DefaultParamVal, Expr, FormatOptions, FunctionExpression, CallExpressionKw, CommentStyle, DefaultParamVal, Expr, FormatOptions, FunctionExpression, IfExpression,
IfExpression, ImportSelector, ImportStatement, ItemVisibility, LabeledArg, Literal, LiteralIdentifier, ImportSelector, ImportStatement, ItemVisibility, LabeledArg, Literal, LiteralIdentifier, LiteralValue,
LiteralValue, MemberExpression, MemberObject, Node, NonCodeNode, NonCodeValue, ObjectExpression, Parameter, MemberExpression, MemberObject, Node, NonCodeNode, NonCodeValue, ObjectExpression, Parameter, PipeExpression,
PipeExpression, Program, TagDeclarator, TypeDeclaration, UnaryExpression, VariableDeclaration, VariableKind, Program, TagDeclarator, TypeDeclaration, UnaryExpression, VariableDeclaration, VariableKind,
}, },
deprecation, deprecation,
token::NumericSuffix, token::NumericSuffix,
@ -291,7 +291,6 @@ impl Expr {
result += &func_exp.recast(options, indentation_level); result += &func_exp.recast(options, indentation_level);
result result
} }
Expr::CallExpression(call_exp) => call_exp.recast(options, indentation_level, ctxt),
Expr::CallExpressionKw(call_exp) => call_exp.recast(options, indentation_level, ctxt), Expr::CallExpressionKw(call_exp) => call_exp.recast(options, indentation_level, ctxt),
Expr::Name(name) => { Expr::Name(name) => {
let result = name.to_string(); let result = name.to_string();
@ -342,9 +341,6 @@ impl BinaryPart {
} }
} }
BinaryPart::BinaryExpression(binary_expression) => binary_expression.recast(options), BinaryPart::BinaryExpression(binary_expression) => binary_expression.recast(options),
BinaryPart::CallExpression(call_expression) => {
call_expression.recast(options, indentation_level, ExprContext::Other)
}
BinaryPart::CallExpressionKw(call_expression) => { BinaryPart::CallExpressionKw(call_expression) => {
call_expression.recast(options, indentation_level, ExprContext::Other) call_expression.recast(options, indentation_level, ExprContext::Other)
} }
@ -355,25 +351,6 @@ impl BinaryPart {
} }
} }
impl CallExpression {
fn recast(&self, options: &FormatOptions, indentation_level: usize, ctxt: ExprContext) -> String {
format!(
"{}{}({})",
if ctxt == ExprContext::Pipe {
"".to_string()
} else {
options.get_indentation(indentation_level)
},
self.callee,
self.arguments
.iter()
.map(|arg| arg.recast(options, indentation_level, ctxt))
.collect::<Vec<String>>()
.join(", ")
)
}
}
impl CallExpressionKw { impl CallExpressionKw {
fn recast_args(&self, options: &FormatOptions, indentation_level: usize, ctxt: ExprContext) -> Vec<String> { fn recast_args(&self, options: &FormatOptions, indentation_level: usize, ctxt: ExprContext) -> Vec<String> {
let mut arg_list = if let Some(first_arg) = &self.unlabeled { let mut arg_list = if let Some(first_arg) = &self.unlabeled {
@ -748,8 +725,7 @@ impl UnaryExpression {
| BinaryPart::Name(_) | BinaryPart::Name(_)
| BinaryPart::MemberExpression(_) | BinaryPart::MemberExpression(_)
| BinaryPart::IfExpression(_) | BinaryPart::IfExpression(_)
| BinaryPart::CallExpressionKw(_) | BinaryPart::CallExpressionKw(_) => {
| BinaryPart::CallExpression(_) => {
format!("{}{}", &self.operator, self.argument.recast(options, 0)) format!("{}{}", &self.operator, self.argument.recast(options, 0))
} }
BinaryPart::BinaryExpression(_) | BinaryPart::UnaryExpression(_) => { BinaryPart::BinaryExpression(_) | BinaryPart::UnaryExpression(_) => {

7
rust/kcl-lib/src/walk/ast_node.rs
View File

@ -23,7 +23,6 @@ pub enum Node<'a> {
Name(NodeRef<'a, types::Name>), Name(NodeRef<'a, types::Name>),
BinaryExpression(NodeRef<'a, types::BinaryExpression>), BinaryExpression(NodeRef<'a, types::BinaryExpression>),
FunctionExpression(NodeRef<'a, types::FunctionExpression>), FunctionExpression(NodeRef<'a, types::FunctionExpression>),
CallExpression(NodeRef<'a, types::CallExpression>),
CallExpressionKw(NodeRef<'a, types::CallExpressionKw>), CallExpressionKw(NodeRef<'a, types::CallExpressionKw>),
PipeExpression(NodeRef<'a, types::PipeExpression>), PipeExpression(NodeRef<'a, types::PipeExpression>),
PipeSubstitution(NodeRef<'a, types::PipeSubstitution>), PipeSubstitution(NodeRef<'a, types::PipeSubstitution>),
@ -64,7 +63,6 @@ impl Node<'_> {
Node::Name(n) => n.digest, Node::Name(n) => n.digest,
Node::BinaryExpression(n) => n.digest, Node::BinaryExpression(n) => n.digest,
Node::FunctionExpression(n) => n.digest, Node::FunctionExpression(n) => n.digest,
Node::CallExpression(n) => n.digest,
Node::CallExpressionKw(n) => n.digest, Node::CallExpressionKw(n) => n.digest,
Node::PipeExpression(n) => n.digest, Node::PipeExpression(n) => n.digest,
Node::PipeSubstitution(n) => n.digest, Node::PipeSubstitution(n) => n.digest,
@ -109,7 +107,6 @@ impl Node<'_> {
Node::Name(n) => *n as *const _ as *const (), Node::Name(n) => *n as *const _ as *const (),
Node::BinaryExpression(n) => *n as *const _ as *const (), Node::BinaryExpression(n) => *n as *const _ as *const (),
Node::FunctionExpression(n) => *n as *const _ as *const (), Node::FunctionExpression(n) => *n as *const _ as *const (),
Node::CallExpression(n) => *n as *const _ as *const (),
Node::CallExpressionKw(n) => *n as *const _ as *const (), Node::CallExpressionKw(n) => *n as *const _ as *const (),
Node::PipeExpression(n) => *n as *const _ as *const (), Node::PipeExpression(n) => *n as *const _ as *const (),
Node::PipeSubstitution(n) => *n as *const _ as *const (), Node::PipeSubstitution(n) => *n as *const _ as *const (),
@ -154,7 +151,6 @@ impl TryFrom<&Node<'_>> for SourceRange {
Node::Name(n) => SourceRange::from(*n), Node::Name(n) => SourceRange::from(*n),
Node::BinaryExpression(n) => SourceRange::from(*n), Node::BinaryExpression(n) => SourceRange::from(*n),
Node::FunctionExpression(n) => SourceRange::from(*n), Node::FunctionExpression(n) => SourceRange::from(*n),
Node::CallExpression(n) => SourceRange::from(*n),
Node::CallExpressionKw(n) => SourceRange::from(*n), Node::CallExpressionKw(n) => SourceRange::from(*n),
Node::PipeExpression(n) => SourceRange::from(*n), Node::PipeExpression(n) => SourceRange::from(*n),
Node::PipeSubstitution(n) => SourceRange::from(*n), Node::PipeSubstitution(n) => SourceRange::from(*n),
@ -199,7 +195,6 @@ impl<'tree> From<&'tree types::Expr> for Node<'tree> {
types::Expr::Name(id) => id.as_ref().into(), types::Expr::Name(id) => id.as_ref().into(),
types::Expr::BinaryExpression(be) => be.as_ref().into(), types::Expr::BinaryExpression(be) => be.as_ref().into(),
types::Expr::FunctionExpression(fe) => fe.as_ref().into(), types::Expr::FunctionExpression(fe) => fe.as_ref().into(),
types::Expr::CallExpression(ce) => ce.as_ref().into(),
types::Expr::CallExpressionKw(ce) => ce.as_ref().into(), types::Expr::CallExpressionKw(ce) => ce.as_ref().into(),
types::Expr::PipeExpression(pe) => pe.as_ref().into(), types::Expr::PipeExpression(pe) => pe.as_ref().into(),
types::Expr::PipeSubstitution(ps) => ps.as_ref().into(), types::Expr::PipeSubstitution(ps) => ps.as_ref().into(),
@ -222,7 +217,6 @@ impl<'tree> From<&'tree types::BinaryPart> for Node<'tree> {
types::BinaryPart::Literal(lit) => lit.as_ref().into(), types::BinaryPart::Literal(lit) => lit.as_ref().into(),
types::BinaryPart::Name(id) => id.as_ref().into(), types::BinaryPart::Name(id) => id.as_ref().into(),
types::BinaryPart::BinaryExpression(be) => be.as_ref().into(), types::BinaryPart::BinaryExpression(be) => be.as_ref().into(),
types::BinaryPart::CallExpression(ce) => ce.as_ref().into(),
types::BinaryPart::CallExpressionKw(ce) => ce.as_ref().into(), types::BinaryPart::CallExpressionKw(ce) => ce.as_ref().into(),
types::BinaryPart::UnaryExpression(ue) => ue.as_ref().into(), types::BinaryPart::UnaryExpression(ue) => ue.as_ref().into(),
types::BinaryPart::MemberExpression(me) => me.as_ref().into(), types::BinaryPart::MemberExpression(me) => me.as_ref().into(),
@ -282,7 +276,6 @@ impl_from!(Node, Identifier);
impl_from!(Node, Name); impl_from!(Node, Name);
impl_from!(Node, BinaryExpression); impl_from!(Node, BinaryExpression);
impl_from!(Node, FunctionExpression); impl_from!(Node, FunctionExpression);
impl_from!(Node, CallExpression);
impl_from!(Node, CallExpressionKw); impl_from!(Node, CallExpressionKw);
impl_from!(Node, PipeExpression); impl_from!(Node, PipeExpression);
impl_from!(Node, PipeSubstitution); impl_from!(Node, PipeSubstitution);

12
rust/kcl-lib/src/walk/ast_visitor.rs
View File

@ -78,19 +78,17 @@ impl<'tree> Visitable<'tree> for Node<'tree> {
children.push((&n.body).into()); children.push((&n.body).into());
children children
} }
Node::CallExpression(n) => {
let mut children = n.arguments.iter().map(|v| v.into()).collect::<Vec<Node>>();
children.insert(0, (&n.callee).into());
children
}
Node::CallExpressionKw(n) => { Node::CallExpressionKw(n) => {
let mut children = n.unlabeled.iter().map(|v| v.into()).collect::<Vec<Node>>(); let mut children: Vec<Node<'_>> =
Vec::with_capacity(1 + if n.unlabeled.is_some() { 1 } else { 0 } + n.arguments.len());
children.push((&n.callee).into());
children.extend(n.unlabeled.iter().map(Node::from));
// TODO: this is wrong but it's what the old walk code was doing. // TODO: this is wrong but it's what the old walk code was doing.
// We likely need a real LabeledArg AST node, but I don't // We likely need a real LabeledArg AST node, but I don't
// want to tango with it since it's a lot deeper than // want to tango with it since it's a lot deeper than
// adding it to the enum. // adding it to the enum.
children.extend(n.arguments.iter().map(|v| (&v.arg).into()).collect::<Vec<Node>>()); children.extend(n.arguments.iter().map(|v| Node::from(&v.arg)));
children children
} }
Node::PipeExpression(n) => n.body.iter().map(|v| v.into()).collect(), Node::PipeExpression(n) => n.body.iter().map(|v| v.into()).collect(),

1356
rust/kcl-lib/tests/add_lots/ast.snap
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

82
rust/kcl-lib/tests/angled_line/ast.snap
View File

@ -20,24 +20,6 @@ description: Result of parsing angled_line.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -56,8 +38,24 @@ description: Result of parsing angled_line.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -385,24 +383,6 @@ description: Result of parsing angled_line.kcl
"type": "Identifier" "type": "Identifier"
}, },
"arg": { "arg": {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "seg01",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -421,8 +401,24 @@ description: Result of parsing angled_line.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "seg01",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
} }
}, },
{ {
@ -547,7 +543,6 @@ description: Result of parsing angled_line.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -566,8 +561,9 @@ description: Result of parsing angled_line.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [

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

@ -4,8 +4,11 @@ description: Operations executed angled_line.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed angled_line.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {

114
rust/kcl-lib/tests/array_elem_pop/ast.snap
View File

@ -84,24 +84,6 @@ description: Result of parsing array_elem_pop.kcl
"type": "Identifier" "type": "Identifier"
}, },
"init": { "init": {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "arr",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -120,8 +102,24 @@ description: Result of parsing array_elem_pop.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "arr",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
"start": 0, "start": 0,
"type": "VariableDeclarator" "type": "VariableDeclarator"
@ -145,24 +143,6 @@ description: Result of parsing array_elem_pop.kcl
"type": "Identifier" "type": "Identifier"
}, },
"init": { "init": {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "new_arr1",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -181,8 +161,24 @@ description: Result of parsing array_elem_pop.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "new_arr1",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
"start": 0, "start": 0,
"type": "VariableDeclarator" "type": "VariableDeclarator"
@ -206,24 +202,6 @@ description: Result of parsing array_elem_pop.kcl
"type": "Identifier" "type": "Identifier"
}, },
"init": { "init": {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "new_arr2",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -242,8 +220,24 @@ description: Result of parsing array_elem_pop.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "new_arr2",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
"start": 0, "start": 0,
"type": "VariableDeclarator" "type": "VariableDeclarator"

38
rust/kcl-lib/tests/array_elem_pop_empty_fail/ast.snap
View File

@ -47,24 +47,6 @@ description: Result of parsing array_elem_pop_empty_fail.kcl
"type": "Identifier" "type": "Identifier"
}, },
"init": { "init": {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "arr",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -83,8 +65,24 @@ description: Result of parsing array_elem_pop_empty_fail.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "arr",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
"start": 0, "start": 0,
"type": "VariableDeclarator" "type": "VariableDeclarator"

38
rust/kcl-lib/tests/array_elem_pop_fail/ast.snap
View File

@ -84,24 +84,6 @@ description: Result of parsing array_elem_pop_fail.kcl
"type": "Identifier" "type": "Identifier"
}, },
"init": { "init": {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "arr",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -120,8 +102,24 @@ description: Result of parsing array_elem_pop_fail.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "arr",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
"start": 0, "start": 0,
"type": "VariableDeclarator" "type": "VariableDeclarator"

114
rust/kcl-lib/tests/artifact_graph_example_code1/ast.snap
View File

@ -20,24 +20,6 @@ description: Result of parsing artifact_graph_example_code1.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -56,8 +38,24 @@ description: Result of parsing artifact_graph_example_code1.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -406,15 +404,6 @@ description: Result of parsing artifact_graph_example_code1.kcl
"commentStart": 0, "commentStart": 0,
"elements": [ "elements": [
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -433,19 +422,17 @@ description: Result of parsing artifact_graph_example_code1.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "PipeSubstitution", "type": "PipeSubstitution",
"type": "PipeSubstitution" "type": "PipeSubstitution"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -464,8 +451,15 @@ description: Result of parsing artifact_graph_example_code1.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
} }
], ],
"end": 0, "end": 0,
@ -498,7 +492,6 @@ description: Result of parsing artifact_graph_example_code1.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -517,8 +510,9 @@ description: Result of parsing artifact_graph_example_code1.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,
@ -1041,15 +1035,6 @@ description: Result of parsing artifact_graph_example_code1.kcl
"commentStart": 0, "commentStart": 0,
"elements": [ "elements": [
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1068,19 +1053,17 @@ description: Result of parsing artifact_graph_example_code1.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "PipeSubstitution", "type": "PipeSubstitution",
"type": "PipeSubstitution" "type": "PipeSubstitution"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1099,8 +1082,15 @@ description: Result of parsing artifact_graph_example_code1.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
} }
], ],
"end": 0, "end": 0,
@ -1133,7 +1123,6 @@ description: Result of parsing artifact_graph_example_code1.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1152,8 +1141,9 @@ description: Result of parsing artifact_graph_example_code1.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,

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

@ -4,8 +4,11 @@ description: Operations executed artifact_graph_example_code1.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed artifact_graph_example_code1.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {

230
rust/kcl-lib/tests/artifact_graph_example_code_no_3d/ast.snap
View File

@ -20,24 +20,6 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "YZ",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -56,8 +38,24 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "YZ",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -229,24 +227,6 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"left": { "left": {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "rectangleSegmentA001",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -265,8 +245,24 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "rectangleSegmentA001",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
"operator": "-", "operator": "-",
"right": { "right": {
@ -361,24 +357,6 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
"type": "Identifier" "type": "Identifier"
}, },
"arg": { "arg": {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "rectangleSegmentA001",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -397,23 +375,9 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
} "unlabeled": {
},
{
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "length",
"start": 0,
"type": "Identifier"
},
"arg": {
"argument": {
"arguments": [
{
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -429,7 +393,19 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
} }
], }
},
{
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "length",
"start": 0,
"type": "Identifier"
},
"arg": {
"argument": {
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -448,8 +424,24 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "rectangleSegmentA001",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -515,15 +507,6 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
"commentStart": 0, "commentStart": 0,
"elements": [ "elements": [
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -542,19 +525,17 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "PipeSubstitution", "type": "PipeSubstitution",
"type": "PipeSubstitution" "type": "PipeSubstitution"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -573,8 +554,15 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
} }
], ],
"end": 0, "end": 0,
@ -607,7 +595,6 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -626,8 +613,9 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,
@ -660,8 +648,27 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [ "callee": {
{ "abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "startSketchOn",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpressionKw",
"type": "CallExpressionKw",
"unlabeled": {
"argument": { "argument": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -685,27 +692,6 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
"type": "UnaryExpression", "type": "UnaryExpression",
"type": "UnaryExpression" "type": "UnaryExpression"
} }
],
"callee": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "startSketchOn",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpression",
"type": "CallExpression"
}, },
{ {
"arguments": [ "arguments": [

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

@ -4,8 +4,11 @@ description: Operations executed artifact_graph_example_code_no_3d.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,24 +16,17 @@ description: Operations executed artifact_graph_example_code_no_3d.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
}, },
"sourceRange": [] "sourceRange": []
} }
},
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
} }
] ]

38
rust/kcl-lib/tests/artifact_graph_example_code_offset_planes/ast.snap
View File

@ -277,24 +277,6 @@ description: Result of parsing artifact_graph_example_code_offset_planes.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "offsetPlane001",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -313,8 +295,24 @@ description: Result of parsing artifact_graph_example_code_offset_planes.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "offsetPlane001",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [

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

@ -94,18 +94,16 @@ description: Operations executed artifact_graph_example_code_offset_planes.kcl
"sourceRange": [] "sourceRange": []
}, },
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
}, },
"sourceRange": [] "sourceRange": []
} }
},
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
} }
] ]

190
rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/ast.snap
View File

@ -20,24 +20,6 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XZ",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -56,8 +38,24 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XZ",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -304,15 +302,6 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"commentStart": 0, "commentStart": 0,
"elements": [ "elements": [
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -331,19 +320,17 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "PipeSubstitution", "type": "PipeSubstitution",
"type": "PipeSubstitution" "type": "PipeSubstitution"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -362,8 +349,15 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
} }
], ],
"end": 0, "end": 0,
@ -396,7 +390,6 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -415,8 +408,9 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,
@ -832,15 +826,6 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"commentStart": 0, "commentStart": 0,
"elements": [ "elements": [
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -859,19 +844,17 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "PipeSubstitution", "type": "PipeSubstitution",
"type": "PipeSubstitution" "type": "PipeSubstitution"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -890,8 +873,15 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
} }
], ],
"end": 0, "end": 0,
@ -924,7 +914,6 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -943,8 +932,9 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,
@ -1363,15 +1353,6 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"commentStart": 0, "commentStart": 0,
"elements": [ "elements": [
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1390,19 +1371,17 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "PipeSubstitution", "type": "PipeSubstitution",
"type": "PipeSubstitution" "type": "PipeSubstitution"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1421,8 +1400,15 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
} }
], ],
"end": 0, "end": 0,
@ -1455,7 +1441,6 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1474,8 +1459,9 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,
@ -1891,15 +1877,6 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"commentStart": 0, "commentStart": 0,
"elements": [ "elements": [
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1918,19 +1895,17 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "PipeSubstitution", "type": "PipeSubstitution",
"type": "PipeSubstitution" "type": "PipeSubstitution"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1949,8 +1924,15 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
} }
], ],
"end": 0, "end": 0,
@ -1983,7 +1965,6 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -2002,8 +1983,9 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,

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

@ -4,8 +4,11 @@ description: Operations executed artifact_graph_sketch_on_face_etc.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed artifact_graph_sketch_on_face_etc.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {

214
rust/kcl-lib/tests/bad_units_in_annotation/ast.snap
View File

@ -162,24 +162,6 @@ description: Result of parsing bad_units_in_annotation.kcl
"argument": { "argument": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -198,8 +180,24 @@ description: Result of parsing bad_units_in_annotation.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -560,10 +558,48 @@ description: Result of parsing bad_units_in_annotation.kcl
}, },
"operator": "*", "operator": "*",
"right": { "right": {
"arguments": [ "callee": {
{ "abs_path": false,
"arguments": [ "commentStart": 0,
{ "end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "cos",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpressionKw",
"type": "CallExpressionKw",
"unlabeled": {
"callee": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "toRadians",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpressionKw",
"type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"left": { "left": {
@ -599,49 +635,7 @@ description: Result of parsing bad_units_in_annotation.kcl
"type": "BinaryExpression", "type": "BinaryExpression",
"type": "BinaryExpression" "type": "BinaryExpression"
} }
],
"callee": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "toRadians",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpression",
"type": "CallExpression"
} }
],
"callee": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "cos",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpression",
"type": "CallExpression"
}, },
"start": 0, "start": 0,
"type": "BinaryExpression", "type": "BinaryExpression",
@ -694,10 +688,48 @@ description: Result of parsing bad_units_in_annotation.kcl
}, },
"operator": "*", "operator": "*",
"right": { "right": {
"arguments": [ "callee": {
{ "abs_path": false,
"arguments": [ "commentStart": 0,
{ "end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "sin",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpressionKw",
"type": "CallExpressionKw",
"unlabeled": {
"callee": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "toRadians",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpressionKw",
"type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"left": { "left": {
@ -733,49 +765,7 @@ description: Result of parsing bad_units_in_annotation.kcl
"type": "BinaryExpression", "type": "BinaryExpression",
"type": "BinaryExpression" "type": "BinaryExpression"
} }
],
"callee": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "toRadians",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpression",
"type": "CallExpression"
} }
],
"callee": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "sin",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpression",
"type": "CallExpression"
}, },
"start": 0, "start": 0,
"type": "BinaryExpression", "type": "BinaryExpression",

76
rust/kcl-lib/tests/basic_fillet_cube_close_opposite/ast.snap
View File

@ -20,24 +20,6 @@ description: Result of parsing basic_fillet_cube_close_opposite.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -56,8 +38,24 @@ description: Result of parsing basic_fillet_cube_close_opposite.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -518,24 +516,6 @@ description: Result of parsing basic_fillet_cube_close_opposite.kcl
"type": "Name" "type": "Name"
}, },
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "thing3",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -554,8 +534,24 @@ description: Result of parsing basic_fillet_cube_close_opposite.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "thing3",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
} }
], ],
"end": 0, "end": 0,

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

@ -4,8 +4,11 @@ description: Operations executed basic_fillet_cube_close_opposite.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed basic_fillet_cube_close_opposite.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {

96
rust/kcl-lib/tests/basic_fillet_cube_end/ast.snap
View File

@ -20,24 +20,6 @@ description: Result of parsing basic_fillet_cube_end.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -56,8 +38,24 @@ description: Result of parsing basic_fillet_cube_end.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -376,15 +374,6 @@ description: Result of parsing basic_fillet_cube_end.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -403,8 +392,15 @@ description: Result of parsing basic_fillet_cube_end.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
}, },
{ {
"arguments": [ "arguments": [
@ -506,24 +502,6 @@ description: Result of parsing basic_fillet_cube_end.kcl
"type": "Name" "type": "Name"
}, },
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "thing",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -542,8 +520,24 @@ description: Result of parsing basic_fillet_cube_end.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "thing",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
} }
], ],
"end": 0, "end": 0,

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

@ -4,8 +4,11 @@ description: Operations executed basic_fillet_cube_end.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed basic_fillet_cube_end.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {

76
rust/kcl-lib/tests/basic_fillet_cube_next_adjacent/ast.snap
View File

@ -20,24 +20,6 @@ description: Result of parsing basic_fillet_cube_next_adjacent.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -56,8 +38,24 @@ description: Result of parsing basic_fillet_cube_next_adjacent.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -520,24 +518,6 @@ description: Result of parsing basic_fillet_cube_next_adjacent.kcl
"commentStart": 0, "commentStart": 0,
"elements": [ "elements": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "thing3",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -556,8 +536,24 @@ description: Result of parsing basic_fillet_cube_next_adjacent.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "thing3",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
} }
], ],
"end": 0, "end": 0,

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

@ -4,8 +4,11 @@ description: Operations executed basic_fillet_cube_next_adjacent.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed basic_fillet_cube_next_adjacent.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {

76
rust/kcl-lib/tests/basic_fillet_cube_previous_adjacent/ast.snap
View File

@ -20,24 +20,6 @@ description: Result of parsing basic_fillet_cube_previous_adjacent.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -56,8 +38,24 @@ description: Result of parsing basic_fillet_cube_previous_adjacent.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -520,24 +518,6 @@ description: Result of parsing basic_fillet_cube_previous_adjacent.kcl
"commentStart": 0, "commentStart": 0,
"elements": [ "elements": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "thing3",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -556,8 +536,24 @@ description: Result of parsing basic_fillet_cube_previous_adjacent.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "thing3",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
} }
], ],
"end": 0, "end": 0,

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

@ -4,8 +4,11 @@ description: Operations executed basic_fillet_cube_previous_adjacent.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed basic_fillet_cube_previous_adjacent.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {

58
rust/kcl-lib/tests/basic_fillet_cube_start/ast.snap
View File

@ -20,24 +20,6 @@ description: Result of parsing basic_fillet_cube_start.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -56,8 +38,24 @@ description: Result of parsing basic_fillet_cube_start.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -376,15 +374,6 @@ description: Result of parsing basic_fillet_cube_start.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -403,8 +392,15 @@ description: Result of parsing basic_fillet_cube_start.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
}, },
{ {
"arguments": [ "arguments": [

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

@ -4,8 +4,11 @@ description: Operations executed basic_fillet_cube_start.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed basic_fillet_cube_start.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {

38
rust/kcl-lib/tests/circle_three_point/ast.snap
View File

@ -20,24 +20,6 @@ description: Result of parsing circle_three_point.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -56,8 +38,24 @@ description: Result of parsing circle_three_point.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [

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

@ -4,8 +4,11 @@ description: Operations executed circle_three_point.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed circle_three_point.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {

58
rust/kcl-lib/tests/circular_pattern3d_a_pattern/ast.snap
View File

@ -20,24 +20,6 @@ description: Result of parsing circular_pattern3d_a_pattern.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XZ",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -56,8 +38,24 @@ description: Result of parsing circular_pattern3d_a_pattern.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XZ",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -340,15 +338,6 @@ description: Result of parsing circular_pattern3d_a_pattern.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -367,8 +356,15 @@ description: Result of parsing circular_pattern3d_a_pattern.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
}, },
{ {
"arguments": [ "arguments": [

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

@ -4,8 +4,11 @@ description: Operations executed circular_pattern3d_a_pattern.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed circular_pattern3d_a_pattern.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {

156
rust/kcl-lib/tests/clone_w_fillets/ast.snap
View File

@ -152,24 +152,6 @@ description: Result of parsing clone_w_fillets.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -188,8 +170,24 @@ description: Result of parsing clone_w_fillets.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -921,8 +919,27 @@ description: Result of parsing clone_w_fillets.kcl
"commentStart": 0, "commentStart": 0,
"elements": [ "elements": [
{ {
"arguments": [ "callee": {
{ "abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "getNextAdjacentEdge",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpressionKw",
"type": "CallExpressionKw",
"unlabeled": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -938,7 +955,8 @@ description: Result of parsing clone_w_fillets.kcl
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -957,12 +975,9 @@ description: Result of parsing clone_w_fillets.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -978,7 +993,8 @@ description: Result of parsing clone_w_fillets.kcl
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -997,12 +1013,9 @@ description: Result of parsing clone_w_fillets.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -1018,7 +1031,8 @@ description: Result of parsing clone_w_fillets.kcl
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1037,12 +1051,9 @@ description: Result of parsing clone_w_fillets.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -1058,27 +1069,6 @@ description: Result of parsing clone_w_fillets.kcl
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
} }
],
"callee": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "getNextAdjacentEdge",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpression",
"type": "CallExpression"
} }
], ],
"end": 0, "end": 0,
@ -1141,24 +1131,6 @@ description: Result of parsing clone_w_fillets.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "mountingPlate",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1177,8 +1149,24 @@ description: Result of parsing clone_w_fillets.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "mountingPlate",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [

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

@ -4,8 +4,11 @@ description: Operations executed clone_w_fillets.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed clone_w_fillets.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {
@ -107,8 +105,11 @@ description: Operations executed clone_w_fillets.kcl
"sourceRange": [] "sourceRange": []
}, },
{ {
"labeledArgs": { "labeledArgs": {},
"geometry": { "name": "clone",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Solid", "type": "Solid",
"value": { "value": {
@ -117,10 +118,5 @@ description: Operations executed clone_w_fillets.kcl
}, },
"sourceRange": [] "sourceRange": []
} }
},
"name": "clone",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
} }
] ]

82
rust/kcl-lib/tests/clone_w_shell/ast.snap
View File

@ -20,24 +20,6 @@ description: Result of parsing clone_w_shell.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -56,8 +38,24 @@ description: Result of parsing clone_w_shell.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -356,7 +354,6 @@ description: Result of parsing clone_w_shell.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -375,8 +372,9 @@ description: Result of parsing clone_w_shell.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [
@ -595,24 +593,6 @@ description: Result of parsing clone_w_shell.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "firstShell",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -631,8 +611,24 @@ description: Result of parsing clone_w_shell.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "firstShell",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [

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

@ -4,8 +4,11 @@ description: Operations executed clone_w_shell.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed clone_w_shell.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {
@ -100,8 +98,11 @@ description: Operations executed clone_w_shell.kcl
"sourceRange": [] "sourceRange": []
}, },
{ {
"labeledArgs": { "labeledArgs": {},
"geometry": { "name": "clone",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Solid", "type": "Solid",
"value": { "value": {
@ -110,10 +111,5 @@ description: Operations executed clone_w_shell.kcl
}, },
"sourceRange": [] "sourceRange": []
} }
},
"name": "clone",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
} }
] ]

44
rust/kcl-lib/tests/computed_var/ast.snap
View File

@ -585,8 +585,27 @@ description: Result of parsing computed_var.kcl
"type": "Identifier" "type": "Identifier"
}, },
"init": { "init": {
"arguments": [ "callee": {
{ "abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "cos",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpressionKw",
"type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"expr": { "expr": {
@ -637,27 +656,6 @@ description: Result of parsing computed_var.kcl
"type": "AscribedExpression", "type": "AscribedExpression",
"type": "AscribedExpression" "type": "AscribedExpression"
} }
],
"callee": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "cos",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpression",
"type": "CallExpression"
}, },
"start": 0, "start": 0,
"type": "VariableDeclarator" "type": "VariableDeclarator"

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

@ -2,19 +2,4 @@
source: kcl-lib/src/simulation_tests.rs source: kcl-lib/src/simulation_tests.rs
description: Operations executed computed_var.kcl description: Operations executed computed_var.kcl
--- ---
[ []
{
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos",
"functionSourceRange": [],
"unlabeledArg": null,
"labeledArgs": {}
},
"sourceRange": []
},
{
"type": "GroupEnd"
}
]

606
rust/kcl-lib/tests/crazy_multi_profile/ast.snap
View File

@ -18,24 +18,6 @@ description: Result of parsing crazy_multi_profile.kcl
"type": "Identifier" "type": "Identifier"
}, },
"init": { "init": {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XZ",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -54,8 +36,24 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XZ",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
"start": 0, "start": 0,
"type": "VariableDeclarator" "type": "VariableDeclarator"
@ -366,15 +364,6 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"elements": [ "elements": [
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -393,19 +382,17 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "PipeSubstitution", "type": "PipeSubstitution",
"type": "PipeSubstitution" "type": "PipeSubstitution"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -424,8 +411,15 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
} }
], ],
"end": 0, "end": 0,
@ -458,7 +452,6 @@ description: Result of parsing crazy_multi_profile.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -477,8 +470,9 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,
@ -1122,24 +1116,6 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"left": { "left": {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "rectangleSegmentA001",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1158,8 +1134,24 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "rectangleSegmentA001",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
"operator": "-", "operator": "-",
"right": { "right": {
@ -1236,24 +1228,6 @@ description: Result of parsing crazy_multi_profile.kcl
"type": "Identifier" "type": "Identifier"
}, },
"arg": { "arg": {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "rectangleSegmentA001",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1272,23 +1246,9 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
} "unlabeled": {
},
{
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "length",
"start": 0,
"type": "Identifier"
},
"arg": {
"argument": {
"arguments": [
{
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -1304,7 +1264,19 @@ description: Result of parsing crazy_multi_profile.kcl
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
} }
], }
},
{
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "length",
"start": 0,
"type": "Identifier"
},
"arg": {
"argument": {
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1323,8 +1295,24 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "rectangleSegmentA001",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -1372,15 +1360,6 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"elements": [ "elements": [
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1399,19 +1378,17 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "PipeSubstitution", "type": "PipeSubstitution",
"type": "PipeSubstitution" "type": "PipeSubstitution"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1430,8 +1407,15 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
} }
], ],
"end": 0, "end": 0,
@ -1464,7 +1448,6 @@ description: Result of parsing crazy_multi_profile.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1483,8 +1466,9 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,
@ -1745,15 +1729,6 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"elements": [ "elements": [
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1772,19 +1747,17 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "PipeSubstitution", "type": "PipeSubstitution",
"type": "PipeSubstitution" "type": "PipeSubstitution"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1803,8 +1776,15 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
} }
], ],
"end": 0, "end": 0,
@ -1837,7 +1817,6 @@ description: Result of parsing crazy_multi_profile.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1856,8 +1835,9 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,
@ -2257,15 +2237,6 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"elements": [ "elements": [
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -2284,19 +2255,17 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "PipeSubstitution", "type": "PipeSubstitution",
"type": "PipeSubstitution" "type": "PipeSubstitution"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -2315,8 +2284,15 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
} }
], ],
"end": 0, "end": 0,
@ -2349,7 +2325,6 @@ description: Result of parsing crazy_multi_profile.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -2368,8 +2343,9 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,
@ -2433,24 +2409,6 @@ description: Result of parsing crazy_multi_profile.kcl
"type": "Identifier" "type": "Identifier"
}, },
"arg": { "arg": {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "seg01",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -2469,8 +2427,24 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "seg01",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
} }
} }
], ],
@ -2616,8 +2590,27 @@ description: Result of parsing crazy_multi_profile.kcl
"type": "Identifier" "type": "Identifier"
}, },
"init": { "init": {
"arguments": [ "callee": {
{ "abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "startSketchOn",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpressionKw",
"type": "CallExpressionKw",
"unlabeled": {
"argument": { "argument": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -2641,27 +2634,6 @@ description: Result of parsing crazy_multi_profile.kcl
"type": "UnaryExpression", "type": "UnaryExpression",
"type": "UnaryExpression" "type": "UnaryExpression"
} }
],
"callee": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "startSketchOn",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpression",
"type": "CallExpression"
}, },
"start": 0, "start": 0,
"type": "VariableDeclarator" "type": "VariableDeclarator"
@ -3185,15 +3157,6 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"elements": [ "elements": [
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -3212,19 +3175,17 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "PipeSubstitution", "type": "PipeSubstitution",
"type": "PipeSubstitution" "type": "PipeSubstitution"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -3243,8 +3204,15 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
} }
], ],
"end": 0, "end": 0,
@ -3277,7 +3245,6 @@ description: Result of parsing crazy_multi_profile.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -3296,8 +3263,9 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,
@ -3571,15 +3539,6 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"elements": [ "elements": [
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -3598,19 +3557,17 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "PipeSubstitution", "type": "PipeSubstitution",
"type": "PipeSubstitution" "type": "PipeSubstitution"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -3629,8 +3586,15 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
} }
], ],
"end": 0, "end": 0,
@ -3663,7 +3627,6 @@ description: Result of parsing crazy_multi_profile.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -3682,8 +3645,9 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,
@ -4042,24 +4006,6 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"left": { "left": {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "rectangleSegmentA002",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -4078,8 +4024,24 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "rectangleSegmentA002",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
"operator": "-", "operator": "-",
"right": { "right": {
@ -4156,24 +4118,6 @@ description: Result of parsing crazy_multi_profile.kcl
"type": "Identifier" "type": "Identifier"
}, },
"arg": { "arg": {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "rectangleSegmentA002",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -4192,23 +4136,9 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
} "unlabeled": {
},
{
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "length",
"start": 0,
"type": "Identifier"
},
"arg": {
"argument": {
"arguments": [
{
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -4224,7 +4154,19 @@ description: Result of parsing crazy_multi_profile.kcl
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
} }
], }
},
{
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "length",
"start": 0,
"type": "Identifier"
},
"arg": {
"argument": {
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -4243,8 +4185,24 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "rectangleSegmentA002",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -4292,15 +4250,6 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"elements": [ "elements": [
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -4319,19 +4268,17 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "PipeSubstitution", "type": "PipeSubstitution",
"type": "PipeSubstitution" "type": "PipeSubstitution"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -4350,8 +4297,15 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
} }
], ],
"end": 0, "end": 0,
@ -4384,7 +4338,6 @@ description: Result of parsing crazy_multi_profile.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -4403,8 +4356,9 @@ description: Result of parsing crazy_multi_profile.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,

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

@ -4,8 +4,11 @@ description: Operations executed crazy_multi_profile.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed crazy_multi_profile.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {
@ -151,8 +149,11 @@ description: Operations executed crazy_multi_profile.kcl
} }
}, },
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -160,11 +161,6 @@ description: Operations executed crazy_multi_profile.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {

44
rust/kcl-lib/tests/cube/ast.snap
View File

@ -651,24 +651,6 @@ description: Result of parsing cube.kcl
"argument": { "argument": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -687,8 +669,24 @@ description: Result of parsing cube.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -946,7 +944,6 @@ description: Result of parsing cube.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -965,8 +962,9 @@ description: Result of parsing cube.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [

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

@ -4,8 +4,11 @@ description: Operations executed cube.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed cube.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {

44
rust/kcl-lib/tests/cube_with_error/ast.snap
View File

@ -651,24 +651,6 @@ description: Result of parsing cube_with_error.kcl
"argument": { "argument": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -687,8 +669,24 @@ description: Result of parsing cube_with_error.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -946,7 +944,6 @@ description: Result of parsing cube_with_error.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -965,8 +962,9 @@ description: Result of parsing cube_with_error.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [

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

@ -4,8 +4,11 @@ description: Operations executed cube_with_error.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed cube_with_error.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {

214
rust/kcl-lib/tests/fillet-and-shell/ast.snap
View File

@ -664,24 +664,6 @@ description: Result of parsing fillet-and-shell.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -700,8 +682,24 @@ description: Result of parsing fillet-and-shell.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -1264,15 +1262,6 @@ description: Result of parsing fillet-and-shell.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1291,8 +1280,15 @@ description: Result of parsing fillet-and-shell.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
} }
], ],
"commentStart": 0, "commentStart": 0,
@ -1325,24 +1321,6 @@ description: Result of parsing fillet-and-shell.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1361,8 +1339,24 @@ description: Result of parsing fillet-and-shell.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -1837,8 +1831,27 @@ description: Result of parsing fillet-and-shell.kcl
"commentStart": 0, "commentStart": 0,
"elements": [ "elements": [
{ {
"arguments": [ "callee": {
{ "abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "getNextAdjacentEdge",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpressionKw",
"type": "CallExpressionKw",
"unlabeled": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -1854,7 +1867,8 @@ description: Result of parsing fillet-and-shell.kcl
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1873,12 +1887,9 @@ description: Result of parsing fillet-and-shell.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -1894,7 +1905,8 @@ description: Result of parsing fillet-and-shell.kcl
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1913,12 +1925,9 @@ description: Result of parsing fillet-and-shell.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -1934,7 +1943,8 @@ description: Result of parsing fillet-and-shell.kcl
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
} }
], },
{
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -1953,12 +1963,9 @@ description: Result of parsing fillet-and-shell.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
}, "unlabeled": {
{
"arguments": [
{
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -1974,27 +1981,6 @@ description: Result of parsing fillet-and-shell.kcl
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
} }
],
"callee": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "getNextAdjacentEdge",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name"
},
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpression",
"type": "CallExpression"
} }
], ],
"end": 0, "end": 0,
@ -2072,24 +2058,6 @@ description: Result of parsing fillet-and-shell.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -2108,8 +2076,24 @@ description: Result of parsing fillet-and-shell.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [

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

@ -4,8 +4,11 @@ description: Operations executed fillet-and-shell.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,14 +16,12 @@ description: Operations executed fillet-and-shell.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -28,11 +29,6 @@ description: Operations executed fillet-and-shell.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {
@ -122,8 +118,11 @@ description: Operations executed fillet-and-shell.kcl
"sourceRange": [] "sourceRange": []
}, },
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -131,14 +130,12 @@ description: Operations executed fillet-and-shell.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -146,14 +143,12 @@ description: Operations executed fillet-and-shell.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -161,14 +156,12 @@ description: Operations executed fillet-and-shell.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -176,11 +169,6 @@ description: Operations executed fillet-and-shell.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"tool": { "tool": {

38
rust/kcl-lib/tests/flush_batch_on_end/ast.snap
View File

@ -183,24 +183,6 @@ description: Result of parsing flush_batch_on_end.kcl
"type": "Identifier" "type": "Identifier"
}, },
"init": { "init": {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -219,8 +201,24 @@ description: Result of parsing flush_batch_on_end.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
"start": 0, "start": 0,
"type": "VariableDeclarator" "type": "VariableDeclarator"

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

@ -4,8 +4,11 @@ description: Operations executed flush_batch_on_end.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed flush_batch_on_end.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"tool": { "tool": {

58
rust/kcl-lib/tests/function_sketch/ast.snap
View File

@ -35,24 +35,6 @@ description: Result of parsing function_sketch.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -71,8 +53,24 @@ description: Result of parsing function_sketch.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -367,15 +365,6 @@ description: Result of parsing function_sketch.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -394,8 +383,15 @@ description: Result of parsing function_sketch.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
}, },
{ {
"arguments": [ "arguments": [

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

@ -4,8 +4,11 @@ description: Operations executed function_sketch.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed function_sketch.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {

58
rust/kcl-lib/tests/function_sketch_with_position/ast.snap
View File

@ -35,24 +35,6 @@ description: Result of parsing function_sketch_with_position.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -71,8 +53,24 @@ description: Result of parsing function_sketch_with_position.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -350,15 +348,6 @@ description: Result of parsing function_sketch_with_position.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -377,8 +366,15 @@ description: Result of parsing function_sketch_with_position.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
}, },
{ {
"arguments": [ "arguments": [

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

@ -4,8 +4,11 @@ description: Operations executed function_sketch_with_position.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed function_sketch_with_position.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {

38
rust/kcl-lib/tests/helix_ccw/ast.snap
View File

@ -20,24 +20,6 @@ description: Result of parsing helix_ccw.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -56,8 +38,24 @@ description: Result of parsing helix_ccw.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [

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

@ -4,8 +4,11 @@ description: Operations executed helix_ccw.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed helix_ccw.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {

38
rust/kcl-lib/tests/helix_simple/ast.snap
View File

@ -20,24 +20,6 @@ description: Result of parsing helix_simple.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XZ",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -56,8 +38,24 @@ description: Result of parsing helix_simple.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XZ",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [

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

@ -4,8 +4,11 @@ description: Operations executed helix_simple.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,11 +16,6 @@ description: Operations executed helix_simple.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"type": "KclStdLibCall", "type": "KclStdLibCall",
"name": "helix", "name": "helix",

116
rust/kcl-lib/tests/i_shape/ast.snap
View File

@ -354,24 +354,6 @@ description: Result of parsing i_shape.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -390,8 +372,24 @@ description: Result of parsing i_shape.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -2779,15 +2777,6 @@ description: Result of parsing i_shape.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -2806,8 +2795,15 @@ description: Result of parsing i_shape.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
} }
], ],
"commentStart": 0, "commentStart": 0,
@ -2847,24 +2843,6 @@ description: Result of parsing i_shape.kcl
"init": { "init": {
"body": [ "body": [
{ {
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -2883,8 +2861,24 @@ description: Result of parsing i_shape.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "XY",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
}, },
{ {
"arguments": [ "arguments": [
@ -3583,15 +3577,6 @@ description: Result of parsing i_shape.kcl
"unlabeled": null "unlabeled": null
}, },
{ {
"arguments": [
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
],
"callee": { "callee": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
@ -3610,8 +3595,15 @@ description: Result of parsing i_shape.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
}
} }
], ],
"commentStart": 0, "commentStart": 0,

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

@ -4,8 +4,11 @@ description: Operations executed i_shape.kcl
--- ---
[ [
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -13,14 +16,12 @@ description: Operations executed i_shape.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {},
"planeOrSolid": { "name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Plane", "type": "Plane",
"artifact_id": "[uuid]" "artifact_id": "[uuid]"
@ -28,11 +29,6 @@ description: Operations executed i_shape.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"tool": { "tool": {

986
rust/kcl-lib/tests/import_async/ast.snap
View File

File diff suppressed because it is too large Load Diff

24324
rust/kcl-lib/tests/import_async/ops.snap
View File

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More