Skip to content

Remove last remnants of legacy positional call #6678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtran merged 6 commits into from
May 3, 2025
Merged

Remove last remnants of legacy positional call #6678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
81d89c0
Remove last remnants of legacy positional call
jtran May 2, 2025
e40904e
Update docs
jtran May 2, 2025
e149a17
Fix segAng()
jtran May 2, 2025
6a08d80
Fix more docs
jtran May 2, 2025
e5b63d0
Update docs again
jtran May 2, 2025
608dedd
Fix lezer grammar tests
jtran May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/kcl-src/types.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ As per the example above you can use the tag identifier to get a reference to th
tagged object. The syntax for this is `myTag`.

In the example above we use the tag identifier to get the angle of the segment
`segAng(rectangleSegmentA001, %)`.
`segAng(rectangleSegmentA001)`.

### `Start`

Expand Down
2 changes: 1 addition & 1 deletion docs/kcl/types.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ As per the example above you can use the tag identifier to get a reference to th
tagged object. The syntax for this is `myTag`.

In the example above we use the tag identifier to get the angle of the segment
`segAng(rectangleSegmentA001, %)`.
`segAng(rectangleSegmentA001)`.

### `Start`

Expand Down
8 changes: 5 additions & 3 deletions docs/kcl/types/std-types-tag.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ As per the example above you can use the tag identifier to get a reference to th
tagged object. The syntax for this is `myTag`.

In the example above we use the tag identifier to get the angle of the segment
`segAng(rectangleSegmentA001, %)`.
`segAng(rectangleSegmentA001)`.

### Tag Scope

Expand Down Expand Up @@ -81,11 +81,13 @@ fn rect(origin) {
|> angledLine(
angle = segAng(rectangleSegmentA001) - 90,
length = 196.99
, %, $rectangleSegmentB001)
tag = $rectangleSegmentB001,
)
|> angledLine(
angle = segAng(rectangleSegmentA001),
length = -segLen(rectangleSegmentA001)
, %, $rectangleSegmentC001)
tag = $rectangleSegmentC001,
)
|> line(endAbsolute = [profileStartX(%), profileStartY(%)])
|> close()
}
Expand Down
6 changes: 3 additions & 3 deletions e2e/playwright/snapshot-tests.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,16 @@ part001 = startSketchOn(-XZ)
|> xLine(endAbsolute = totalLen, tag = $seg03)
|> yLine(length = -armThick, tag = $seg01)
|> angledLineThatIntersects(angle = turns::HALF_TURN, offset = -armThick, intersectTag = seg04)
|> angledLine(angle = segAng(seg04, %) + 180, endAbsoluteY = turns::ZERO)
|> angledLine(angle = segAng(seg04) + 180, endAbsoluteY = turns::ZERO)
|> angledLine(
angle = -bottomAng,
endAbsoluteY = -totalHeightHalf - armThick,
tag = $seg02,
)
|> xLine(length = endAbsolute = segEndX(seg03) + 0)
|> yLine(length = -segLen(seg01, %))
|> yLine(length = -segLen(seg01))
|> angledLineThatIntersects(angle = turns::HALF_TURN, offset = -armThick, intersectTag = seg02)
|> angledLine(angle = segAng(seg02, %) + 180, endAbsoluteY = -baseHeight)
|> angledLine(angle = segAng(seg02) + 180, endAbsoluteY = -baseHeight)
|> xLine(endAbsolute = turns::ZERO)
|> close()
|> extrude(length = 4)`
Expand Down
2 changes: 1 addition & 1 deletion e2e/playwright/testing-segment-overlays.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ profile001 = startProfile(sketch001, at = [56.37, 120.33])
interiorAbsolute = [360.16, 231.76],
endAbsolute = [391.48, 131.54],
)
|> yLine(-131.54, %)
|> yLine(length = -131.54)
|> arc(angleStart = 33.53, angleEnd = -141.07, radius = 126.46)
`
)
Expand Down
39 changes: 14 additions & 25 deletions packages/codemirror-lang-kcl/test/call.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,37 +14,26 @@ f(1)
Program(ExpressionStatement(CallExpression(VariableName,
ArgumentList(Number))))

# deprecated multiple anon args
# unlabeled first arg and labeled arg

f(1, 2)
line(sketch001, end = [thickness, 0])

==>
Program(ExpressionStatement(CallExpression(VariableName,
ArgumentList(Number,
Number))))

# deprecated trailing %

startSketchOn('XY')
|> line([thickness, 0], %)

==>
Program(ExpressionStatement(PipeExpression(CallExpression(VariableName,
ArgumentList(String)),
PipeOperator,
CallExpression(VariableName,
ArgumentList(ArrayExpression(VariableName,
Number),
PipeSubstitution)))))
ArgumentList(VariableName,
LabeledArgument(ArgumentLabel,
Equals,
ArrayExpression(VariableName,
Number))))))

# % and named arg
# % and labeled arg

startSketchOn('XY')
startSketchOn(XY)
|> line(%, end = [thickness, 0])

==>
Program(ExpressionStatement(PipeExpression(CallExpression(VariableName,
ArgumentList(String)),
ArgumentList(VariableName)),
PipeOperator,
CallExpression(VariableName,
ArgumentList(PipeSubstitution,
Expand All @@ -53,22 +42,22 @@ Program(ExpressionStatement(PipeExpression(CallExpression(VariableName,
ArrayExpression(VariableName,
Number)))))))

# implied % and named arg
# implied % and labeled arg

startSketchOn('XY')
startSketchOn(XY)
|> line(end = [thickness, 0])

==>
Program(ExpressionStatement(PipeExpression(CallExpression(VariableName,
ArgumentList(String)),
ArgumentList(VariableName)),
PipeOperator,
CallExpression(VariableName,
ArgumentList(LabeledArgument(ArgumentLabel,
Equals,
ArrayExpression(VariableName,
Number)))))))

# multiple named arg
# multiple labeled arg

ngon(plane = "XY", numSides = 5, radius = pentR)

Expand Down
2 changes: 1 addition & 1 deletion rust/kcl-lib/e2e/executor/inputs/basic_fillet_cube_next_adjacent.kcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ part001 = startSketchOn(XY)
|> line(end = [0, -10], tag = $thing2)
|> close(tag = $thing3)
|> extrude(length = 10)
|> fillet(radius = 2, tags = [getNextAdjacentEdge(thing3)], %)
|> fillet(radius = 2, tags = [getNextAdjacentEdge(thing3)])
9 changes: 0 additions & 9 deletions rust/kcl-lib/e2e/executor/inputs/big_number_angle_to_match_length_x.kcl
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions rust/kcl-lib/e2e/executor/inputs/big_number_angle_to_match_length_y.kcl
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions rust/kcl-lib/e2e/executor/inputs/fillet-and-shell.kcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ connectorPadding = 4

miniHdmiHole = startSketchOn(XY)
|> startProfile(at = [0, border + miniHdmiDistance - (miniHdmiWidth / 2)])
|> lineTo([
|> line(endAbsolute = [
0,
border + miniHdmiDistance + miniHdmiWidth / 2
], %)
|> lineTo([
])
|> line(endAbsolute = [
1,
border + miniHdmiDistance + miniHdmiWidth / 2
], %)
|> lineTo([
])
|> line(endAbsolute = [
1,
border + miniHdmiDistance - (miniHdmiWidth / 2)
], %)
])
|> close()

case = startSketchOn(XY)
Expand Down
2 changes: 1 addition & 1 deletion rust/kcl-lib/e2e/executor/inputs/pentagon_fillet_sugar.kcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ plumbus0 =
|> fillet(
radius = 5,
tags = [c2.tags.arc_tag, getOppositeEdge(c2.tags.arc_tag)]
, %)
)


Loading
Loading