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

BREAKING: More units of measure work and keyword args (#6291)

Browse Source 
* More units of measure work

Signed-off-by: Nick Cameron <nrc@ncameron.org>

* Update CSG output since engine change

---------

Signed-off-by: Nick Cameron <nrc@ncameron.org>
Co-authored-by: Nick Cameron <nrc@ncameron.org>
This commit is contained in:
Jonathan Tran
2025-04-14 05:58:19 -04:00
committed by GitHub
parent 7d7b153085
commit 160f55ede5
447 changed files with 60364 additions and 34465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/artifact_graph_flowchart.snap.md
View File

@ -9,18 +9,18 @@ flowchart LR
7[Solid2d]
end
subgraph path23 [Path]
23["Path<br>[1059, 1206, 0]"]
24["Segment<br>[1059, 1206, 0]"]
23["Path<br>[1066, 1213, 0]"]
24["Segment<br>[1066, 1213, 0]"]
25[Solid2d]
end
subgraph path34 [Path]
34["Path<br>[1446, 1595, 0]"]
35["Segment<br>[1446, 1595, 0]"]
34["Path<br>[1460, 1609, 0]"]
35["Segment<br>[1460, 1609, 0]"]
36[Solid2d]
end
subgraph path44 [Path]
44["Path<br>[1840, 1888, 0]"]
45["Segment<br>[1840, 1888, 0]"]
44["Path<br>[1861, 1909, 0]"]
45["Segment<br>[1861, 1909, 0]"]
46[Solid2d]
end
1["Plane<br>[750, 767, 0]"]
@ -39,28 +39,28 @@ flowchart LR
20["SweepEdge Adjacent"]
21["SweepEdge Opposite"]
22["SweepEdge Adjacent"]
26["Sweep Extrusion<br>[1371, 1400, 0]"]
26["Sweep Extrusion<br>[1378, 1407, 0]"]
27[Wall]
28["Cap Start"]
29["SweepEdge Opposite"]
30["SweepEdge Adjacent"]
31["Sweep Extrusion<br>[1371, 1400, 0]"]
32["Sweep Extrusion<br>[1371, 1400, 0]"]
33["Sweep Extrusion<br>[1371, 1400, 0]"]
37["Sweep Extrusion<br>[1760, 1795, 0]"]
31["Sweep Extrusion<br>[1378, 1407, 0]"]
32["Sweep Extrusion<br>[1378, 1407, 0]"]
33["Sweep Extrusion<br>[1378, 1407, 0]"]
37["Sweep Extrusion<br>[1774, 1809, 0]"]
38[Wall]
39["SweepEdge Opposite"]
40["SweepEdge Adjacent"]
41["Sweep Extrusion<br>[1760, 1795, 0]"]
42["Sweep Extrusion<br>[1760, 1795, 0]"]
43["Sweep Extrusion<br>[1760, 1795, 0]"]
47["Sweep Extrusion<br>[1894, 1919, 0]"]
41["Sweep Extrusion<br>[1774, 1809, 0]"]
42["Sweep Extrusion<br>[1774, 1809, 0]"]
43["Sweep Extrusion<br>[1774, 1809, 0]"]
47["Sweep Extrusion<br>[1915, 1940, 0]"]
48[Wall]
49["SweepEdge Opposite"]
50["SweepEdge Adjacent"]
51["StartSketchOnFace<br>[1029, 1053, 0]"]
52["StartSketchOnFace<br>[1414, 1440, 0]"]
53["StartSketchOnFace<br>[1810, 1834, 0]"]
51["StartSketchOnFace<br>[1029, 1060, 0]"]
52["StartSketchOnFace<br>[1421, 1454, 0]"]
53["StartSketchOnFace<br>[1824, 1855, 0]"]
1 --- 2
2 --- 3
2 --- 4

174
rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/ast.snap
View File

@ -930,36 +930,30 @@ description: Result of parsing parametric-bearing-pillow-block.kcl
{
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "body",
"name": "face",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
},
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"arg": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": "END",
"name": {
"commentStart": 0,
"end": 0,
"name": "END",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
"type": "Name",
"type": "Name"
}
}
],
"callee": {
@ -980,8 +974,24 @@ description: Result of parsing parametric-bearing-pillow-block.kcl
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpression",
"type": "CallExpression"
"type": "CallExpressionKw",
"type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "body",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
},
{
"arguments": [
@ -1627,36 +1637,30 @@ description: Result of parsing parametric-bearing-pillow-block.kcl
{
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "body",
"name": "face",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
},
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"arg": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": "START",
"name": {
"commentStart": 0,
"end": 0,
"name": "START",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
"type": "Name",
"type": "Name"
}
}
],
"callee": {
@ -1677,8 +1681,24 @@ description: Result of parsing parametric-bearing-pillow-block.kcl
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpression",
"type": "CallExpression"
"type": "CallExpressionKw",
"type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "body",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
},
{
"arguments": [
@ -2342,36 +2362,30 @@ description: Result of parsing parametric-bearing-pillow-block.kcl
{
"arguments": [
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "body",
"name": "face",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
},
{
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"arg": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": "END",
"name": {
"commentStart": 0,
"end": 0,
"name": "END",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
"type": "Name",
"type": "Name"
}
}
],
"callee": {
@ -2392,8 +2406,24 @@ description: Result of parsing parametric-bearing-pillow-block.kcl
"commentStart": 0,
"end": 0,
"start": 0,
"type": "CallExpression",
"type": "CallExpression"
"type": "CallExpressionKw",
"type": "CallExpressionKw",
"unlabeled": {
"abs_path": false,
"commentStart": 0,
"end": 0,
"name": {
"commentStart": 0,
"end": 0,
"name": "body",
"start": 0,
"type": "Identifier"
},
"path": [],
"start": 0,
"type": "Name",
"type": "Name"
}
},
{
"arguments": [

65
rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/ops.snap
View File

@ -5,7 +5,7 @@ description: Operations executed parametric-bearing-pillow-block.kcl
[
{
"labeledArgs": {
"data": {
"planeOrSolid": {
"value": {
"type": "Plane",
"artifact_id": "[uuid]"
@ -52,16 +52,7 @@ description: Operations executed parametric-bearing-pillow-block.kcl
},
{
"labeledArgs": {
"data": {
"value": {
"type": "Solid",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"tag": {
"face": {
"value": {
"type": "String",
"value": "end"
@ -72,7 +63,15 @@ description: Operations executed parametric-bearing-pillow-block.kcl
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
"unlabeledArg": {
"value": {
"type": "Solid",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
},
{
"labeledArgs": {
@ -131,16 +130,7 @@ description: Operations executed parametric-bearing-pillow-block.kcl
},
{
"labeledArgs": {
"data": {
"value": {
"type": "Solid",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"tag": {
"face": {
"value": {
"type": "String",
"value": "start"
@ -151,7 +141,15 @@ description: Operations executed parametric-bearing-pillow-block.kcl
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
"unlabeledArg": {
"value": {
"type": "Solid",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
},
{
"labeledArgs": {
@ -210,16 +208,7 @@ description: Operations executed parametric-bearing-pillow-block.kcl
},
{
"labeledArgs": {
"data": {
"value": {
"type": "Solid",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"tag": {
"face": {
"value": {
"type": "String",
"value": "end"
@ -230,7 +219,15 @@ description: Operations executed parametric-bearing-pillow-block.kcl
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
"unlabeledArg": {
"value": {
"type": "Solid",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
},
{
"labeledArgs": {

335
rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/program_memory.snap
View File

@ -141,22 +141,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"origin": {
"x": 0.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"units": {
"type": "Inches"
@ -250,17 +262,26 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"solid": {
"type": "Solid",
@ -385,22 +406,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"origin": {
"x": 0.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"units": {
"type": "Inches"
@ -526,17 +559,26 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"solid": {
"type": "Solid",
@ -661,22 +703,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"origin": {
"x": 0.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"units": {
"type": "Inches"
@ -802,17 +856,26 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"solid": {
"type": "Solid",
@ -937,22 +1000,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"origin": {
"x": 0.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"units": {
"type": "Inches"
@ -1078,17 +1153,26 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"solid": {
"type": "Solid",
@ -1213,22 +1297,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"origin": {
"x": 0.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"units": {
"type": "Inches"
@ -1382,17 +1478,26 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"solid": {
"type": "Solid",
@ -1517,22 +1622,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"origin": {
"x": 0.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"units": {
"type": "Inches"
@ -1661,17 +1778,26 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"solid": {
"type": "Solid",
@ -1796,22 +1922,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"origin": {
"x": 0.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"units": {
"type": "Inches"
@ -1937,17 +2075,26 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"solid": {
"type": "Solid",
@ -2072,22 +2219,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"origin": {
"x": 0.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"units": {
"type": "Inches"
@ -2213,17 +2372,26 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"solid": {
"type": "Solid",
@ -2348,22 +2516,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"origin": {
"x": 0.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"units": {
"type": "Inches"
@ -2489,17 +2669,26 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"solid": {
"type": "Solid",
@ -2624,22 +2813,34 @@ description: Variables in memory after executing parametric-bearing-pillow-block
"origin": {
"x": 0.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"xAxis": {
"x": 1.0,
"y": 0.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"yAxis": {
"x": 0.0,
"y": 1.0,
"z": 0.0
"z": 0.0,
"units": {
"type": "Mm"
}
},
"zAxis": {
"x": 0.0,
"y": 0.0,
"z": 1.0
"z": 1.0,
"units": {
"type": "Mm"
}
},
"units": {
"type": "Inches"