Skip to content

Parser fixes #118

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
merged 7 commits into from
Nov 15, 2025
Merged

Parser fixes #118

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
6e0fe3e
Make object parsing tolerant of empty bodies
webdevred Nov 15, 2025
ea5e6a2
Unify ByteString usage
webdevred Nov 15, 2025
f2061fa
Refactor creating backup files
webdevred Nov 15, 2025
f920a9c
Be more tolerant when extracting beams
webdevred Nov 15, 2025
16cec4e
Rename support vertices directly moveSupportVertices
webdevred Nov 15, 2025
cf89e47
Updated generated examples
webdevred Nov 15, 2025
8b64fae
support node comments in suspension.jbeam
webdevred Nov 15, 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
21 changes: 21 additions & 0 deletions examples/ast/jbeam/suspension.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,13 @@ Object
( -1.314 )
, Number 0.382
]
, Comment
( InternalComment
{ cText = "support"
, cMultiline = False
, cAssociationDirection = PreviousNode
}
)
, Object
[ ObjectKey
( String "selfCollision"
Expand Down Expand Up @@ -220,6 +227,13 @@ Object
( -2.4e-2 )
, Number 0.578
]
, Comment
( InternalComment
{ cText = "support"
, cMultiline = False
, cAssociationDirection = PreviousNode
}
)
, Array
[ String "rl20"
, Number 0.837
Expand Down Expand Up @@ -426,6 +440,13 @@ Object
, Number 1.71
, Number 0.565
]
, Comment
( InternalComment
{ cText = "support"
, cMultiline = False
, cAssociationDirection = PreviousNode
}
)
, Array
[ String "rl49"
, Number 0.558
Expand Down
6 changes: 3 additions & 3 deletions examples/formatted_jbeam/suspension-complex-jbfl.jbeam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
[ "rl11", 0.547, -1.350, 0.364],
[ "rl12", -0.440, -1.350, 0.310],
[ "rl13", -0.440, -1.350, 0.364],
[ "rl14", 0.053, -1.314, 0.382],
[ "rl14", 0.053, -1.314, 0.382], // support
{"selfCollision" : true},
{"nodeWeight" : 3.5},
[ "rl15", 0.790, -0.919, 0.182],
[ "rl16", 0.790, -0.919, 0.233],
[ "rl17", -0.683, -0.919, 0.182],
[ "rl18", -0.683, -0.919, 0.233],
[ "rl19", 0.053, -0.024, 0.578],
[ "rl19", 0.053, -0.024, 0.578], // support
[ "rl20", 0.837, 0.002, 0.182], // ref node left
[ "rl21", 0.837, 0.002, 0.233],
[ "rl22", 0.415, 0.002, 0.182],
Expand Down Expand Up @@ -60,7 +60,7 @@
[ "rl45", -0.446, 1.654, 0.359],
[ "rl46", 0.553, 1.679, 0.448],
[ "rl47", -0.446, 1.679, 0.448],
[ "rl48", 0.053, 1.710, 0.565],
[ "rl48", 0.053, 1.710, 0.565], // support
[ "rl49", 0.558, 2.284, 0.364],
[ "rl50", 0.558, 2.284, 0.447],
[ "rl51", 0.053, 2.284, 0.370],
Expand Down
6 changes: 3 additions & 3 deletions examples/formatted_jbeam/suspension-minimal-jbfl.jbeam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
[ "rl11", 0.547, -1.350, 0.364],
[ "rl12", -0.440, -1.350, 0.310],
[ "rl13", -0.440, -1.350, 0.364],
[ "rl14", 0.053, -1.314, 0.382],
[ "rl14", 0.053, -1.314, 0.382], // support
{"selfCollision" : true},
{"nodeWeight" : 3.5},
[ "rl15", 0.790, -0.919, 0.182],
[ "rl16", 0.790, -0.919, 0.233],
[ "rl17", -0.683, -0.919, 0.182],
[ "rl18", -0.683, -0.919, 0.233],
[ "rl19", 0.053, -0.024, 0.578],
[ "rl19", 0.053, -0.024, 0.578], // support
[ "rl20", 0.837, 0.002, 0.182], // ref node left
[ "rl21", 0.837, 0.002, 0.233],
[ "rl22", 0.415, 0.002, 0.182],
Expand Down Expand Up @@ -60,7 +60,7 @@
[ "rl45", -0.446, 1.654, 0.359],
[ "rl46", 0.553, 1.679, 0.448],
[ "rl47", -0.446, 1.679, 0.448],
[ "rl48", 0.053, 1.710, 0.565],
[ "rl48", 0.053, 1.710, 0.565], // support
[ "rl49", 0.558, 2.284, 0.364],
[ "rl50", 0.558, 2.284, 0.447],
[ "rl51", 0.053, 2.284, 0.370],
Expand Down
6 changes: 3 additions & 3 deletions examples/jbeam/suspension.jbeam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
["rl11",0.547,-1.35,0.364],
["rl12",-0.44,-1.35,0.31],
["rl13",-0.44,-1.35,0.364],
["rl14",0.053,-1.314,0.382],
["rl14",0.053,-1.314,0.382], // support
{"selfCollision": true},
{"nodeWeight":3.5},
["rl15",0.79,-0.919,0.182],
["rl16",0.79,-0.919,0.233],
["rl17",-0.683,-0.919,0.182],
["rl18",-0.683,-0.919,0.233],
["rl19",0.053,-0.024,0.578],
["rl19",0.053,-0.024,0.578], // support
["rl20",0.837,0.002,0.182], //ref node left
["rl21",0.837,0.002,0.233],
["rl22",0.415,0.002,0.182],
Expand Down Expand Up @@ -62,7 +62,7 @@
["rl45",-0.446,1.654,0.359],
["rl46",0.553,1.679,0.448],
["rl47",-0.446,1.679,0.448],
["rl48",0.053,1.71,0.565],
["rl48",0.053,1.71,0.565], // support
["rl49",0.558,2.284,0.364],
["rl50",0.558,2.284,0.447],
["rl51",0.053,2.284,0.37],
Expand Down
98 changes: 49 additions & 49 deletions examples/transformed_jbeam/frame-cfg-default.jbeam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@
[ "rl_r7", -0.451, 2.284, 0.447],

// Support nodes
[ "rl1sm", 0.053, -0.024, 0.578], // support
["rl_r4sm", 0.053, 1.710, 0.565], // support for rear
["rl_f1sm", 0.053, -1.314, 0.382]
["rl_rsm", 0.053, 1.710, 0.565], // support for rear
[ "rlsm", 0.053, -0.024, 0.578], // support
["rl_fsm", 0.053, -1.314, 0.382]
],

// --Beams--
Expand Down Expand Up @@ -270,59 +270,59 @@

// Front end
{"beamDeform" : 19000.0},
["rl_fl2", "rl_f1sm"],
["rl_fr2", "rl_f1sm"],
["rl_fl2", "rl_fsm"],
["rl_fr2", "rl_fsm"],
["rl_f", "rl_fl0"],
["rl_fl4", "rl_f1sm"],
["rl_f1sm", "rl_fr5"],
["rl_fr1", "rl_f1sm"],
["rl_fl1", "rl_f1sm"],
["rl_fr4", "rl_f1sm"],
["rl_fm0", "rl_f1sm"],
["rl_f1sm", "rl_fr0"],
["rl_f1sm", "rl_fl3"],
["rl_f1sm", "rl_fr3"],
["rl_f1sm", "rl_fm1"],
["rl_f1sm", "rl_fl5"],
["rl_fl4", "rl_fsm"],
["rl_fsm", "rl_fr5"],
["rl_fr1", "rl_fsm"],
["rl_fl1", "rl_fsm"],
["rl_fr4", "rl_fsm"],
["rl_fm0", "rl_fsm"],
["rl_fsm", "rl_fr0"],
["rl_fsm", "rl_fl3"],
["rl_fsm", "rl_fr3"],
["rl_fsm", "rl_fm1"],
["rl_fsm", "rl_fl5"],

// Middle
{"beamDeform" : 11000.0},
["rlr5", "rl1sm"],
["rlr3", "rl1sm"],
["rlm0", "rl1sm"],
["rll4", "rl1sm"],
["rll3", "rl1sm"],
["rl1sm", "rll1"],
["rl1sm", "rll0"],
["rll7", "rl1sm"],
["rlr7", "rl1sm"],
["rlr2", "rl1sm"],
["rl1sm", "rlm1"],
["rll5", "rl1sm"],
["rll2", "rl1sm"],
["rl1sm", "rlr6"],
["rlr4", "rl1sm"],
["rl1sm", "rlr1"],
["rl1sm", "rlr0"],
["rl1sm", "rll6"],
["rlr5", "rlsm"],
["rlr3", "rlsm"],
["rlm0", "rlsm"],
["rll4", "rlsm"],
["rll3", "rlsm"],
["rlsm", "rll1"],
["rlsm", "rll0"],
["rll7", "rlsm"],
["rlr7", "rlsm"],
["rlr2", "rlsm"],
["rlsm", "rlm1"],
["rll5", "rlsm"],
["rll2", "rlsm"],
["rlsm", "rlr6"],
["rlr4", "rlsm"],
["rlsm", "rlr1"],
["rlsm", "rlr0"],
["rlsm", "rll6"],

// Rear end
{"beamDeform" : 19000.0},
["rl_r4sm", "rl_m2"],
["rl_r4sm", "rl_r7"],
["rl_r4", "rl_r4sm"],
["rl_r4sm", "rl_l7"],
["rl_r4sm", "rl_l3"],
["rl_r4sm", "rl_r5"],
["rl_l6", "rl_r4sm"],
["rl_m1", "rl_r4sm"],
["rl_r4sm", "rl_r3"],
["rl_l4", "rl_r4sm"],
["rl_r6", "rl_r4sm"],
["rl_m3", "rl_r4sm"],
["rl_l2", "rl_r4sm"],
["rl_r4sm", "rl_m0"],
["rl_r2", "rl_r4sm"],
["rl_rsm", "rl_m2"],
["rl_rsm", "rl_r7"],
["rl_r4", "rl_rsm"],
["rl_rsm", "rl_l7"],
["rl_rsm", "rl_l3"],
["rl_rsm", "rl_r5"],
["rl_l6", "rl_rsm"],
["rl_m1", "rl_rsm"],
["rl_rsm", "rl_r3"],
["rl_l4", "rl_rsm"],
["rl_r6", "rl_rsm"],
["rl_m3", "rl_rsm"],
["rl_l2", "rl_rsm"],
["rl_rsm", "rl_m0"],
["rl_r2", "rl_rsm"],
["rl_r4", "rl_l5"],

// Front crush
Expand Down
98 changes: 49 additions & 49 deletions examples/transformed_jbeam/frame-cfg-example.jbeam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@
[ "rl_r7", -0.451, 2.284, 0.447],

// Support nodes
[ "rl1sm", 0.053, -0.024, 0.578], // support
["rl_r4sm", 0.053, 1.710, 0.565], // support for rear
["rl_f1sm", 0.053, -1.314, 0.382]
["rl_rsm", 0.053, 1.710, 0.565], // support for rear
[ "rlsm", 0.053, -0.024, 0.578], // support
["rl_fsm", 0.053, -1.314, 0.382]
],

// --Beams--
Expand Down Expand Up @@ -270,59 +270,59 @@

// Front end
{"beamDeform" : 19000.0},
["rl_fl2", "rl_f1sm"],
["rl_fr2", "rl_f1sm"],
["rl_fl2", "rl_fsm"],
["rl_fr2", "rl_fsm"],
["rl_f", "rl_fl0"],
["rl_fl4", "rl_f1sm"],
["rl_f1sm", "rl_fr5"],
["rl_fr1", "rl_f1sm"],
["rl_fl1", "rl_f1sm"],
["rl_fr4", "rl_f1sm"],
["rl_fm0", "rl_f1sm"],
["rl_f1sm", "rl_fr0"],
["rl_f1sm", "rl_fl3"],
["rl_f1sm", "rl_fr3"],
["rl_f1sm", "rl_fm1"],
["rl_f1sm", "rl_fl5"],
["rl_fl4", "rl_fsm"],
["rl_fsm", "rl_fr5"],
["rl_fr1", "rl_fsm"],
["rl_fl1", "rl_fsm"],
["rl_fr4", "rl_fsm"],
["rl_fm0", "rl_fsm"],
["rl_fsm", "rl_fr0"],
["rl_fsm", "rl_fl3"],
["rl_fsm", "rl_fr3"],
["rl_fsm", "rl_fm1"],
["rl_fsm", "rl_fl5"],

// Middle
{"beamDeform" : 11000.0},
["rlr5", "rl1sm"],
["rlr3", "rl1sm"],
["rlm0", "rl1sm"],
["rll4", "rl1sm"],
["rll3", "rl1sm"],
["rl1sm", "rll1"],
["rl1sm", "rll0"],
["rll7", "rl1sm"],
["rlr7", "rl1sm"],
["rlr2", "rl1sm"],
["rl1sm", "rlm1"],
["rll5", "rl1sm"],
["rll2", "rl1sm"],
["rl1sm", "rlr6"],
["rlr4", "rl1sm"],
["rl1sm", "rlr1"],
["rl1sm", "rlr0"],
["rl1sm", "rll6"],
["rlr5", "rlsm"],
["rlr3", "rlsm"],
["rlm0", "rlsm"],
["rll4", "rlsm"],
["rll3", "rlsm"],
["rlsm", "rll1"],
["rlsm", "rll0"],
["rll7", "rlsm"],
["rlr7", "rlsm"],
["rlr2", "rlsm"],
["rlsm", "rlm1"],
["rll5", "rlsm"],
["rll2", "rlsm"],
["rlsm", "rlr6"],
["rlr4", "rlsm"],
["rlsm", "rlr1"],
["rlsm", "rlr0"],
["rlsm", "rll6"],

// Rear end
{"beamDeform" : 19000.0},
["rl_r4sm", "rl_m2"],
["rl_r4sm", "rl_r7"],
["rl_r4", "rl_r4sm"],
["rl_r4sm", "rl_l7"],
["rl_r4sm", "rl_l3"],
["rl_r4sm", "rl_r5"],
["rl_l6", "rl_r4sm"],
["rl_m1", "rl_r4sm"],
["rl_r4sm", "rl_r3"],
["rl_l4", "rl_r4sm"],
["rl_r6", "rl_r4sm"],
["rl_m3", "rl_r4sm"],
["rl_l2", "rl_r4sm"],
["rl_r4sm", "rl_m0"],
["rl_r2", "rl_r4sm"],
["rl_rsm", "rl_m2"],
["rl_rsm", "rl_r7"],
["rl_r4", "rl_rsm"],
["rl_rsm", "rl_l7"],
["rl_rsm", "rl_l3"],
["rl_rsm", "rl_r5"],
["rl_l6", "rl_rsm"],
["rl_m1", "rl_rsm"],
["rl_rsm", "rl_r3"],
["rl_l4", "rl_rsm"],
["rl_r6", "rl_rsm"],
["rl_m3", "rl_rsm"],
["rl_l2", "rl_rsm"],
["rl_rsm", "rl_m0"],
["rl_r2", "rl_rsm"],
["rl_r4", "rl_l5"],

// Front crush
Expand Down
Loading