Skip to content

Make support-vertex renaming a fixed point and fix the #189 output regressions #218

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

Draft
webdevred wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Make support-vertex renaming a fixed point and fix the #189 output regressions #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6810c7d
Merge support-vertex groups from different origins into one section
webdevred Aug 9, 2026
3f8c2c3
Derive support vertex names without pre-mutating them
webdevred Aug 9, 2026
872c11a
Rename bfl_f and bfr_f back to bfl0 and bfr0
webdevred Aug 9, 2026
e729f77
Sort support vertices by the name they will get
webdevred Aug 9, 2026
536a04f
Keep comment order when a vertex tree is split
webdevred Aug 9, 2026
2e5ea11
Add a fixed-point spec over the transformed examples
webdevred Aug 9, 2026
90260c8
Normalise line endings before parsing in the fixed-point spec
webdevred Aug 9, 2026
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
4 changes: 2 additions & 2 deletions examples/ast/jbeam/fender.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Object
( ArrayValue
{ avElements =
[
( String "bfl_f", True ),
( String "bfl0", True ),
( Number
( NumberValue
{ nvText = "0.959", nvValue = 0.959 } ), True ),
Expand Down Expand Up @@ -257,7 +257,7 @@ Object
( ArrayValue
{ avElements =
[
( String "bfr_f", True ),
( String "bfr0", True ),
( Number
( NumberValue
{ nvText = "-0.906", nvValue = -0.906 } ), True ),
Expand Down
4 changes: 2 additions & 2 deletions examples/formatted_jbeam/fender-complex-jbfl.jbeam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

// Left side
{"group" : "cot_fender_l"},
["bfl_f", 0.959, -1.762, 0.576],
["bfl0", 0.959, -1.762, 0.576],
["bfl1", 0.855, -1.788, 0.707],
["bfl2", 0.739, -1.845, 0.716],
["bfl3", 0.948, -1.435, 0.730],
Expand All @@ -37,7 +37,7 @@

// Right side
{"group" : "cot_fender_r"},
["bfr_f", -0.906, -1.737, 0.578],
["bfr0", -0.906, -1.737, 0.578],
["bfr1", -0.807, -1.769, 0.707],
["bfr2", -0.691, -1.829, 0.716],
["bfr3", -0.890, -1.409, 0.729],
Expand Down
4 changes: 2 additions & 2 deletions examples/formatted_jbeam/fender-minimal-jbfl.jbeam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

// Left side
{"group" : "cot_fender_l"},
["bfl_f", 0.959, -1.762, 0.576],
["bfl0", 0.959, -1.762, 0.576],
["bfl1", 0.855, -1.788, 0.707],
["bfl2", 0.739, -1.845, 0.716],
["bfl3", 0.948, -1.435, 0.730],
Expand All @@ -37,7 +37,7 @@

// Right side
{"group" : "cot_fender_r"},
["bfr_f", -0.906, -1.737, 0.578],
["bfr0", -0.906, -1.737, 0.578],
["bfr1", -0.807, -1.769, 0.707],
["bfr2", -0.691, -1.829, 0.716],
["bfr3", -0.890, -1.409, 0.729],
Expand Down
4 changes: 2 additions & 2 deletions examples/jbeam/fender.jbeam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

//Left side
{"group":"cot_fender_l"},
["bfl_f",0.959,-1.762,0.576],
["bfl0",0.959,-1.762,0.576],
["bfl1",0.855,-1.788,0.707],
["bfl2",0.739,-1.845,0.716],
["bfl3",0.948,-1.435,0.730],
Expand All @@ -39,7 +39,7 @@

//Right side
{"group":"cot_fender_r"},
["bfr_f",-0.906,-1.737,0.578],
["bfr0",-0.906,-1.737,0.578],
["bfr1",-0.807,-1.769,0.707],
["bfr2",-0.691,-1.829,0.716],
["bfr3",-0.890,-1.409,0.729],
Expand Down
9 changes: 9 additions & 0 deletions examples/regression_jbeam/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Regression jbeam fixtures

Small `.jbeam` files that exist purely to reproduce a specific bug for a
regression test. Unlike `examples/jbeam/`, these are **not** written or
vetted by the jbeam maintainer, not curated demo material, and
not picked up by `jbeam-edit-dump-ast` (which only scans `examples/jbeam/`).
Don't treat them as examples of good jbeam, and don't add to this
directory unless a test genuinely needs a fixture that can't be built
from what's already in the project.
34 changes: 34 additions & 0 deletions examples/regression_jbeam/letter-ending-nodes-repro.jbeam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"testpart":{
"nodes":[
["id", "posX", "posY", "posZ"],
// Names ending in a letter rather than a digit, in several prefix
// groups. These used to be dropped silently: every such group got
// the same SupportKey, and the insert replaced instead of merged,
// so only the last group survived.
["nl_f", 1.0, -1.0, 0.0],
["nr_f", -1.0, -1.0, 0.0],
["nll", 1.0, 0.0, 0.0],
["nrr", -1.0, 0.0, 0.0],
["nl_r", 1.0, 1.0, 0.0],
["nr_r", -1.0, 1.0, 0.0],
// Digit-ending names alongside them, so both paths are exercised.
["nl0", 1.0, 2.0, 0.0],
["nr0", -1.0, 2.0, 0.0],
],
"beams":[
["id1:", "id2:"],
["nl_f", "nll"],
["nll", "nl_r"],
["nl_r", "nl0"],
["nr_f", "nrr"],
["nrr", "nr_r"],
["nr_r", "nr0"],
],
"triangles":[
["id1:", "id2:", "id3:"],
["nl_f", "nll", "nl_r"],
["nr_f", "nrr", "nr_r"],
],
},
}
34 changes: 34 additions & 0 deletions examples/regression_jbeam/support-rename-idempotency-repro.jbeam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"testpart":{
"nodes":[
["id", "posX", "posY", "posZ"],
["nl0", 1.0, -3.0, 0.0],
["nl1", 1.0, -3.3, 0.0],
["nl2", 1.0, -3.6, 0.0],
["nl3", 1.0, -3.9, 0.5],
["nl10", 1.0, 0.0, 0.0],
["nl11", 1.0, 0.3, 0.0],
["nl12", 1.0, 0.6, 0.0],
["nl13", 1.0, 0.9, 0.5],
["nl20", 1.0, 3.0, 0.0],
["nl21", 1.0, 3.3, 0.0],
["nl22", 1.0, 3.6, 0.0],
["nl23", 1.0, 3.9, 0.5],
],
"beams":[
["id1:", "id2:"],
["nl0", "nl1"],
["nl0", "nl2"],
["nl0", "nl3"],
["nl10", "nl11"],
["nl10", "nl12"],
["nl10", "nl13"],
["nl20", "nl21"],
["nl20", "nl22"],
["nl20", "nl23"],
],
"triangles":[
["id1:", "id2:", "id3:"],
],
},
}
4 changes: 2 additions & 2 deletions examples/transformed_jbeam/fender-after-frame-cfg-default.jbeam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

// Left side
{"group" : "cot_fender_l"},
["bfl_f", 0.959, -1.762, 0.576],
["bfl0", 0.959, -1.762, 0.576],
["bfl1", 0.855, -1.788, 0.707],
["bfl2", 0.739, -1.845, 0.716],
["bfl3", 0.948, -1.435, 0.730],
Expand All @@ -37,7 +37,7 @@

// Right side
{"group" : "cot_fender_r"},
["bfr_f", -0.906, -1.737, 0.578],
["bfr0", -0.906, -1.737, 0.578],
["bfr1", -0.807, -1.769, 0.707],
["bfr2", -0.691, -1.829, 0.716],
["bfr3", -0.890, -1.409, 0.729],
Expand Down
4 changes: 2 additions & 2 deletions examples/transformed_jbeam/fender-after-frame-cfg-example.jbeam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

// Left side
{"group" : "cot_fender_l"},
["bfl_f", 0.959, -1.762, 0.576],
["bfl0", 0.959, -1.762, 0.576],
["bfl1", 0.855, -1.788, 0.707],
["bfl2", 0.739, -1.845, 0.716],
["bfl3", 0.948, -1.435, 0.730],
Expand All @@ -37,7 +37,7 @@

// Right side
{"group" : "cot_fender_r"},
["bfr_f", -0.906, -1.737, 0.578],
["bfr0", -0.906, -1.737, 0.578],
["bfr1", -0.807, -1.769, 0.707],
["bfr2", -0.691, -1.829, 0.716],
["bfr3", -0.890, -1.409, 0.729],
Expand Down
Loading