Skip to content

Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel

Convert old explicit profile segments to less verbose pipeline trace syntax.

Yuechen Li8f56f177f618
diff --git a/Aetheris.Kernel.Firmament/Assembly/AssemblyDisplayMeshExporter.cs b/Aetheris.Kernel.Firmament/Assembly/AssemblyDisplayMeshExporter.cs
index dff0d041..dfd8fbf1 100644
--- a/Aetheris.Kernel.Firmament/Assembly/AssemblyDisplayMeshExporter.cs
+++ b/Aetheris.Kernel.Firmament/Assembly/AssemblyDisplayMeshExporter.cs
@@ -46,9 +46,12 @@ public static class AssemblyDisplayMeshExporter
var ranges = new List<AssemblyDisplayMeshRange>();
foreach (var rawFace in tessellation.Value.FacePatches.OrderBy(p => p.FaceId.Value))
{
- // SurfaceMeshIR already applies the B-rep face sense to both
- // normals and winding; the legacy patch contains support normals.
- var face = useSurfaceMeshIr ? rawFace : DisplayMeshOrientation.Orient(body, rawFace);
+ // Both tessellation paths now emit face-oriented patches: SurfaceMeshIR always did,
+ // and BrepDisplayTessellator projects the face sense once, for every surface kind, at
+ // the single place face patches are produced. Re-orienting here flipped every face whose
+ // binding says same_sense=.F. a second time - one bore cylinder was enough to put this
+ // gear's enclosed volume 6.25% over its cap-area-times-height value.
+ var face = rawFace;
if (face.Positions.Count == 0 || face.Normals.Count != face.Positions.Count || face.TriangleIndices.Count == 0
|| face.TriangleIndices.Count % 3 != 0 || face.TriangleIndices.Any(i => i < 0 || i >= face.Positions.Count))
throw new InvalidOperationException($"assembly-mesh-face-invalid:{identity}:{face.FaceId}:positions={face.Positions.Count};normals={face.Normals.Count};indices={face.TriangleIndices.Count};" + string.Join(";", tessellation.Diagnostics.Select(d => d.Message)));
diff --git a/docs/development/firmament-v2-language-audit.md b/docs/development/firmament-v2-language-audit.md
new file mode 100644
index 00000000..4abb5eac
--- /dev/null
+++ b/docs/development/firmament-v2-language-audit.md
@@ -0,0 +1,206 @@
+# Firmament V2 — corpus rewrite and language-surface audit
+
+Date: 2026-09-21. Parser treated as source of truth throughout
+(`FirmamentV2/ProfileAuthoringParser.cs`, `FirmamentV2/FirmamentV2Parser.cs`).
+
+## 1. What was done
+
+The Canonical and Regression corpora were rewritten from the low-level `Segment`
+form to the `|>` pipeline form. 39 fixtures changed.
+
+Every rewrite was gated on two oracles, not on eyeballing:
+
+1. **Profile equivalence.** `ProfileAuthoringParser.ResolveNamedProfile` was run
+ over the before and after source, and the resolved frame, loop set, segment
+ names and segment geometry dumped to canonical text. A rewrite was applied
+ only when the two dumps were byte-identical.
+2. **Document parse identity.** The full 281-file document-level parse
+ (disposition plus diagnostic list, `Canonical` + `Regression/CanonicalGeometry`
+ + `Regression/ProfileComposition` + `Regression/Profile`) was compared before
+ and after. The diff is empty — no file changed disposition, and no file gained
+ or lost a diagnostic.
+
+Deliberately excluded from the rewrite, because the low-level form is the thing
+under test in those files: `Compatibility/LegacyV1`, `Regression/LanguageBurnIn`
+(its README calls it "regression and diagnostic evidence, not canonical
+examples"), `Speculative`, every `Invalid/*` negative fixture,
+`Canonical/Pipeline/manual-profile-parity.firmament`, and the four
+`*low-level*` / `*low-level-segments*` parity witnesses in
+`Regression/CanonicalGeometry`.
+
+Test state after the rewrite: Firmament 1550/1550, Kernel.Core 1080/1080,
+Server 59/59.
+
+## 2. A real bug the rewrite smoked out
+
+`Aetheris.Kernel.Firmament.Tests.Assembly.DifferenceEngineStorageGateTests.`
+`GearMeshIncludesEveryFlankWithOutwardNormalsAndClosedVolume` was failing at HEAD
+with enclosed volume 6.25% above cap-area-times-height. Bisected to `9b9d1ca7`
+("Fix same sense"), which wired `DisplayMeshOrientation.Orient` into
+`BrepDisplayTessellator`'s face dispatch.
+
+`AssemblyDisplayMeshExporter` was already calling `DisplayMeshOrientation.Orient`
+itself on the legacy tessellation path. Once the tessellator did it too, every
+face whose binding says `same_sense = .F.` got flipped twice. The gear has
+exactly one such face — the central bore cylinder — and its divergence-theorem
+contribution came back at `+293.666` through the exporter versus `-292.196`
+straight from the tessellator. Two times 293 over a 9369 part is precisely the
+6.25% seen.
+
+This is the same shape as the plane double-count fixed on the STEP import side in
+the same commit: two layers each honouring the face sense once. Fixed by deleting
+the exporter's own `Orient` call, since the tessellator now projects the face
+sense for every surface kind at the single place face patches are produced.
+
+Unrelated observation: `Step242RoundTripCorpusTests.ExportedBody_IsReadableByAetheris_AndKeepsItsShape`
+failed once under full-suite parallel load and passed both in isolation and on a
+rerun of the full suite. It is time-budgeted against the 5s display timeout, so
+it is load-sensitive rather than wrong. Worth a wider budget under xunit
+parallelism if it recurs.
+
+## 3. Audit: where the language is not yet coherent
+
+### 3.1 The pipeline traces whole guides; `Segment` traces sub-spans — MAJOR
+
+This is the only structural gap, and it is the reason every surviving `Segment`
+in the non-quarantined corpus survives.
+
+`Segment N { Trace: G; From: A; To: B }` selects the piece of `G` between two
+named points. A pipeline stage always traces `G` end to end. So the L-bracket
+pattern — two overlapping rectangles where the outer boundary walks part of
+`Horizontal.Top`, turns at a named interior point, and picks up `Vertical.Left` —
+has no pipeline spelling at all. Converting it yields
+`firmament-profile-pipeline-disconnected`.
+
+Files that are stuck on this: `Regression/CanonicalGeometry/profile-compose-l-bracket.firmament`,
+`profile-compose-l-bracket-external-modify-counterbore.firmament`,
+`profile-compose-reflex-chamfer-with-counterbore.firmament`,
+`profile-compose-reflex-chamfer-with-shaft.firmament`,
+`Canonical/PMI/counterbore-shaft-diameter.firmament`, and
+`Canonical/Revolve/sphere.firmament` (a half-circle meridian, which is the same
+gap wearing an arc).
+
+`docs/public/firmament/syntax.md:247` presents `Segment` as the low-level escape
+hatch the pipeline supersedes. That is not true today and the doc should be
+corrected regardless of whether the gap is closed.
+
+**Proposal (for review).** Give the pipeline a sub-span stage. Two spellings
+worth arguing about:
+
+```
+Horizontal.Top To Notch |> Vertical.Left |> Close # implicit From = current endpoint
+Horizontal.Top[TopRight..Notch] |> Vertical.Left |> Close
+```
+
+The first reads better and carries less syntax, and the pipeline already tracks
+`current` for connectivity, so `From:` is redundant in a chain — it is only
+needed on the opening stage, where `Reverse` already plays that role. The second
+is more explicit and survives the case where a stage is not the natural
+continuation. I lean to the first.
+
+This also subsumes `Sweep: Clockwise | CounterClockwise`, which likewise has no
+pipeline equivalent. For a full circle `TraceLoop` already resolves the
+direction; for a partial arc the sweep falls out of the two endpoints plus
+`Reverse`.
+
+### 3.2 Implicit-loop pipelines break on any inline guide declaration — MAJOR
+
+`Profile P Using Layout { A |> B |> C |> D |> Close }` works: the outer loop is
+implicit. But if the `Profile` body also declares a guide inline —
+
+```
+Profile SideProfile Using PositiveXWorkplane {
+ Rect2 Outline { Center: [0mm, 0mm]; Size: [20mm, 10mm] }
+ Outline.Bottom |> Outline.Right |> Outline.Top |> Outline.Left |> Close
+}
+```
+
+— it fails with `firmament-profile-pipeline-expression-required`, because the
+pipeline binder requires the loop body to consist of nothing but the pipeline,
+while the `Segment` binder scans for matches and tolerates neighbours. So the
+presence of an inline `Rect2` silently forces the legacy form. This is
+`Regression/Profile/valid/construction-plane-positive-x.firmament`, the one file
+in the whole sweep that failed *only* because of body purity.
+
+**Proposal.** Let the pipeline binder consume the pipeline expression and ignore
+recognized declarations in the remainder, rather than rejecting any non-pipeline
+content. The declaration set is already parsed by `AddOrdinaryGuides`; the purity
+check is the only thing standing in the way. Low risk, removes a real footgun.
+
+### 3.3 Inner-loop segment naming is asymmetric between the two forms — MAJOR
+
+Manual segments keep their declared name verbatim in every loop. Pipeline stages
+are named `{LoopName}.{leaf}` in any loop other than `Outer`, "to preserve
+Profile-wide uniqueness". Two consequences:
+
+- The manual form permits cross-loop identity collisions that the pipeline form
+ makes impossible.
+- A faithful rewrite of an inner loop must alias every single stage with `As`,
+ which is exactly the busywork the pipeline was introduced to remove.
+
+**Proposal.** Pick one rule and apply it to both binders. Qualifying in every
+loop including `Outer` is the coherent choice, but it churns stable ids for every
+existing selection. Qualifying in neither, and diagnosing a collision instead, is
+cheaper and matches what an author would predict. Either way, the two forms
+should not disagree.
+
+### 3.4 `TraceLoop` admissibility is inconsistent — MODERATE
+
+`TraceLoop` admits a full `Circle2` or `Ellipse2` guide, or a closed bound
+`Concept Path`. `Polygon2<Rhombus> |> TraceLoop` works — but only because
+`Polygon2` lowers to a `Concept Path` before pipeline validation runs.
+`Rect2 Stock |> TraceLoop` does not work, and must be spelled as four stages,
+even though `Rect2` declares exactly four named sub-guides that form a closed
+loop. Whether `|> TraceLoop` is available to an author is currently a fact about
+lowering order, not about the guide.
+
+**Proposal.** Admit any guide that exposes a closed named sub-guide family, which
+makes `Rect2 |> TraceLoop` work and collapses the most common four-stage pipeline
+in the corpus to one stage.
+
+Note that `TraceLoop` on a circle is not identity-preserving relative to a
+quadrant decomposition: it yields one `Boundary` segment where four `Q1..Q4`
+segments used to be. `Regression/ProfileComposition/mixed-line-arc-additive-overlap.firmament`
+was left in the manual form for exactly this reason — its round-trip test pins
+the four arc identities. `Canonical/Features/Boss/circular-boss-through-hole.firmament`
+and `boss-pocket-block.firmament` were converted, because nothing selects their
+quadrants.
+
+### 3.5 `Reverse` is load-bearing only on the first stage, and a trap after it — MODERATE
+
+`OrientPipelineCurve` auto-orients every stage after the first against the
+current endpoint. But when `Reverse` is written explicitly, auto-orientation is
+switched off and the stage must match the current endpoint at its *start* or the
+loop is reported disconnected. So mid-chain `Reverse` can only ever break a
+pipeline that would otherwise have worked. On the opening stage, where there is
+no current endpoint, `Reverse` is the only way to set the loop's initial
+direction.
+
+**Proposal.** Either diagnose `Reverse` on a non-opening stage, or redefine it as
+a preference — try the reversed orientation first, fall back to auto — so it is
+never worse than omitting it. The second keeps the keyword honest in both
+positions.
+
+### 3.6 One diagnostic code covers two unrelated errors — MINOR
+
+`firmament-pipeline-stage-type:<x>` is emitted both when `<x>` is a guide name
+that does not resolve, and when `<x>` is a stage kind (`Close`, `TraceLoop`) in a
+position that does not accept it. An author who misspells a guide gets a message
+about stage types.
+
+**Proposal.** Split out `firmament-pipeline-unknown-guide:<name>`.
+
+## 4. Summary of proposals
+
+| # | Change | Severity | Cost |
+|---|---|---|---|
+| 3.1 | Sub-span pipeline stage (`G To P`), subsuming `Sweep:` | Major | New grammar; unblocks 6 fixtures and retires `Segment` |
+| 3.2 | Implicit-loop pipeline tolerates inline guide declarations | Major | Small; drop a purity check |
+| 3.3 | One loop-qualification rule for both binders | Major | Medium; stable-id churn on one of the two options |
+| 3.4 | `TraceLoop` admits any closed named sub-guide family | Moderate | Small; collapses the commonest 4-stage pipeline |
+| 3.5 | `Reverse` is a preference, not a constraint | Moderate | Small |
+| 3.6 | Distinct unknown-guide diagnostic | Minor | Trivial |
+
+No new features are proposed. 3.1 is the only one that adds grammar, and it adds
+it to close a hole where the "correct way" is currently not the easy way but the
+impossible way.
diff --git a/docs/public/firmament/syntax.md b/docs/public/firmament/syntax.md
index d5917018..decf9650 100644
--- a/docs/public/firmament/syntax.md
+++ b/docs/public/firmament/syntax.md
@@ -244,4 +244,9 @@ Concept Path Guide {
}
```
-Pipeline source order is semantic order. Stages are limited to qualified geometry references, optional `Reverse`, optional `As`, `Close`, and `TraceLoop` in their admitted contexts. The operator has lower binding precedence than member access and does not admit arithmetic stages, calls, lambdas, conditionals, filtering, mutation, runtime execution, or repetition. Use Feature for a reusable semantic transformation, Pattern for bounded repetition, Template for specialization, and `|>` for finite semantic composition. Manual `Segment { Trace/From/To }` remains the explicit low-level Profile escape hatch.
+Pipeline source order is semantic order. Stages are limited to geometry references (qualified or unqualified), optional `Reverse`, optional `As`, `Close`, and `TraceLoop` in their admitted contexts. The operator has lower binding precedence than member access and does not admit arithmetic stages, calls, lambdas, conditionals, filtering, mutation, runtime execution, or repetition. Use Feature for a reusable semantic transformation, Pattern for bounded repetition, Template for specialization, and `|>` for finite semantic composition. Manual `Segment { Trace/From/To }` remains the explicit low-level Profile escape hatch, and is not yet
+fully subsumed by `|>`: a pipeline stage always traces a source span end to end, while `Segment`'s
+`From:`/`To:` may select a *partial* span between named interior points, and `Sweep:` may pick an arc
+direction on a partial circle. Profiles that need either - the L-bracket family in
+`Regression/CanonicalGeometry`, and `Canonical/Revolve/sphere.firmament` - have no pipeline spelling
+today. See `docs/development/firmament-v2-language-audit.md` for the proposed sub-span stage.
diff --git a/fixtures/Canonical/Feature/boss-pocket-feature.firmament b/fixtures/Canonical/Feature/boss-pocket-feature.firmament
index 27224e78..289eafb8 100644
--- a/fixtures/Canonical/Feature/boss-pocket-feature.firmament
+++ b/fixtures/Canonical/Feature/boss-pocket-feature.firmament
@@ -13,23 +13,26 @@ Model BossPocketFeature {
Rect2 Cutout { Center: [10mm, 0mm] Size: [8mm, 8mm] }
}
Profile BaseProfile Using Layout { Loop Outer {
- Segment Bottom { Trace: Stock.Bottom From: Stock.BottomLeft To: Stock.BottomRight }
- Segment Right { Trace: Stock.Right From: Stock.BottomRight To: Stock.TopRight }
- Segment Top { Trace: Stock.Top From: Stock.TopRight To: Stock.TopLeft }
- Segment Left { Trace: Stock.Left From: Stock.TopLeft To: Stock.BottomLeft }
- } }
+ Stock.Bottom
+ |> Stock.Right
+ |> Stock.Top
+ |> Stock.Left
+ |> Close
+ } }
Profile PadProfile Using Layout { Loop Outer {
- Segment Bottom { Trace: Pad.Bottom From: Pad.BottomLeft To: Pad.BottomRight }
- Segment Right { Trace: Pad.Right From: Pad.BottomRight To: Pad.TopRight }
- Segment Top { Trace: Pad.Top From: Pad.TopRight To: Pad.TopLeft }
- Segment Left { Trace: Pad.Left From: Pad.TopLeft To: Pad.BottomLeft }
- } }
+ Pad.Bottom
+ |> Pad.Right
+ |> Pad.Top
+ |> Pad.Left
+ |> Close
+ } }
Profile CutoutProfile Using Layout { Loop Outer {
- Segment Bottom { Trace: Cutout.Bottom From: Cutout.BottomLeft To: Cutout.BottomRight }
- Segment Right { Trace: Cutout.Right From: Cutout.BottomRight To: Cutout.TopRight }
- Segment Top { Trace: Cutout.Top From: Cutout.TopRight To: Cutout.TopLeft }
- Segment Left { Trace: Cutout.Left From: Cutout.TopLeft To: Cutout.BottomLeft }
- } }
+ Cutout.Bottom
+ |> Cutout.Right
+ |> Cutout.Top
+ |> Cutout.Left
+ |> Close
+ } }
Struct Product {
Compose Body {
Base Stock { Profile: BaseProfile From: 0mm To: 10mm Role: Stock }
diff --git a/fixtures/Canonical/Features/Boss/boss-pocket-block.firmament b/fixtures/Canonical/Features/Boss/boss-pocket-block.firmament
index 80f610b9..88e64eed 100644
--- a/fixtures/Canonical/Features/Boss/boss-pocket-block.firmament
+++ b/fixtures/Canonical/Features/Boss/boss-pocket-block.firmament
@@ -21,10 +21,7 @@ Model BossPocketMountingBlock {
|> Close
} }
Profile BossProfile Using Layout { Loop Outer {
- Segment Q1 { Trace: BossCircle; From: BossEast; To: BossNorth; Sweep: CounterClockwise }
- Segment Q2 { Trace: BossCircle; From: BossNorth; To: BossWest; Sweep: CounterClockwise }
- Segment Q3 { Trace: BossCircle; From: BossWest; To: BossSouth; Sweep: CounterClockwise }
- Segment Q4 { Trace: BossCircle; From: BossSouth; To: BossEast; Sweep: CounterClockwise }
+ BossCircle |> TraceLoop
} }
Profile PocketProfile Using Layout { Loop Outer {
Recess.Bottom
diff --git a/fixtures/Canonical/Features/Boss/circular-boss-through-hole.firmament b/fixtures/Canonical/Features/Boss/circular-boss-through-hole.firmament
index 699efd1b..c6f4e787 100644
--- a/fixtures/Canonical/Features/Boss/circular-boss-through-hole.firmament
+++ b/fixtures/Canonical/Features/Boss/circular-boss-through-hole.firmament
@@ -11,16 +11,14 @@ Model CircularBossThroughHole {
Circle2 Pad { Center: Center; Radius: 8mm }
}
Profile BaseProfile Using Layout { Loop Outer {
- Segment Bottom { Trace: Stock.Bottom; From: Stock.BottomLeft; To: Stock.BottomRight }
- Segment Right { Trace: Stock.Right; From: Stock.BottomRight; To: Stock.TopRight }
- Segment Top { Trace: Stock.Top; From: Stock.TopRight; To: Stock.TopLeft }
- Segment Left { Trace: Stock.Left; From: Stock.TopLeft; To: Stock.BottomLeft }
- } }
+ Stock.Bottom
+ |> Stock.Right
+ |> Stock.Top
+ |> Stock.Left
+ |> Close
+ } }
Profile BossProfile Using Layout { Loop Outer {
- Segment Q1 { Trace: Pad; From: East; To: North; Sweep: CounterClockwise }
- Segment Q2 { Trace: Pad; From: North; To: West; Sweep: CounterClockwise }
- Segment Q3 { Trace: Pad; From: West; To: South; Sweep: CounterClockwise }
- Segment Q4 { Trace: Pad; From: South; To: East; Sweep: CounterClockwise }
+ Pad |> TraceLoop
} }
Struct BearingMount {
diff --git a/fixtures/Canonical/Features/Boss/rectangular-boss.firmament b/fixtures/Canonical/Features/Boss/rectangular-boss.firmament
index 8186b83b..1b97071f 100644
--- a/fixtures/Canonical/Features/Boss/rectangular-boss.firmament
+++ b/fixtures/Canonical/Features/Boss/rectangular-boss.firmament
@@ -6,17 +6,19 @@ Model RectangularBoss {
Rect2 Pad { Center: [0mm, 0mm]; Size: [20mm, 12mm] }
}
Profile BaseProfile Using Layout { Loop Outer {
- Segment Bottom { Trace: Stock.Bottom; From: Stock.BottomLeft; To: Stock.BottomRight }
- Segment Right { Trace: Stock.Right; From: Stock.BottomRight; To: Stock.TopRight }
- Segment Top { Trace: Stock.Top; From: Stock.TopRight; To: Stock.TopLeft }
- Segment Left { Trace: Stock.Left; From: Stock.TopLeft; To: Stock.BottomLeft }
- } }
+ Stock.Bottom
+ |> Stock.Right
+ |> Stock.Top
+ |> Stock.Left
+ |> Close
+ } }
Profile BossProfile Using Layout { Loop Outer {
- Segment Bottom { Trace: Pad.Bottom; From: Pad.BottomLeft; To: Pad.BottomRight }
- Segment Right { Trace: Pad.Right; From: Pad.BottomRight; To: Pad.TopRight }
- Segment Top { Trace: Pad.Top; From: Pad.TopRight; To: Pad.TopLeft }
- Segment Left { Trace: Pad.Left; From: Pad.TopLeft; To: Pad.BottomLeft }
- } }
+ Pad.Bottom
+ |> Pad.Right
+ |> Pad.Top
+ |> Pad.Left
+ |> Close
+ } }
Struct BracketBlock {
Compose Body {
diff --git a/fixtures/Canonical/Features/Composition/boss-stack-current-top.firmament b/fixtures/Canonical/Features/Composition/boss-stack-current-top.firmament
index 62b129b0..02803ed3 100644
--- a/fixtures/Canonical/Features/Composition/boss-stack-current-top.firmament
+++ b/fixtures/Canonical/Features/Composition/boss-stack-current-top.firmament
@@ -6,23 +6,26 @@ Model BossStackCurrentTop {
Rect2 UpperRect { Center: [0mm, 0mm]; Size: [12mm, 8mm] }
}
Profile BaseProfile Using Layout { Loop Outer {
- Segment B { Trace: BaseRect.Bottom; From: BaseRect.BottomLeft; To: BaseRect.BottomRight }
- Segment R { Trace: BaseRect.Right; From: BaseRect.BottomRight; To: BaseRect.TopRight }
- Segment T { Trace: BaseRect.Top; From: BaseRect.TopRight; To: BaseRect.TopLeft }
- Segment L { Trace: BaseRect.Left; From: BaseRect.TopLeft; To: BaseRect.BottomLeft }
- } }
+ BaseRect.Bottom As B
+ |> BaseRect.Right As R
+ |> BaseRect.Top As T
+ |> BaseRect.Left As L
+ |> Close
+ } }
Profile MiddleProfile Using Layout { Loop Outer {
- Segment B { Trace: MiddleRect.Bottom; From: MiddleRect.BottomLeft; To: MiddleRect.BottomRight }
- Segment R { Trace: MiddleRect.Right; From: MiddleRect.BottomRight; To: MiddleRect.TopRight }
- Segment T { Trace: MiddleRect.Top; From: MiddleRect.TopRight; To: MiddleRect.TopLeft }
- Segment L { Trace: MiddleRect.Left; From: MiddleRect.TopLeft; To: MiddleRect.BottomLeft }
- } }
+ MiddleRect.Bottom As B
+ |> MiddleRect.Right As R
+ |> MiddleRect.Top As T
+ |> MiddleRect.Left As L
+ |> Close
+ } }
Profile UpperProfile Using Layout { Loop Outer {
- Segment B { Trace: UpperRect.Bottom; From: UpperRect.BottomLeft; To: UpperRect.BottomRight }
- Segment R { Trace: UpperRect.Right; From: UpperRect.BottomRight; To: UpperRect.TopRight }
- Segment T { Trace: UpperRect.Top; From: UpperRect.TopRight; To: UpperRect.TopLeft }
- Segment L { Trace: UpperRect.Left; From: UpperRect.TopLeft; To: UpperRect.BottomLeft }
- } }
+ UpperRect.Bottom As B
+ |> UpperRect.Right As R
+ |> UpperRect.Top As T
+ |> UpperRect.Left As L
+ |> Close
+ } }
Struct Part { Compose Body {
Base Stock { Profile: BaseProfile; From: 0mm; To: 10mm; Role: Stock }
Boss Middle { On: Top; Profile: MiddleProfile; Height: 6mm }
diff --git a/fixtures/Canonical/Features/EdgeFinish/semantic-selection-chamfer.firmament b/fixtures/Canonical/Features/EdgeFinish/semantic-selection-chamfer.firmament
index e1252287..5e367621 100644
--- a/fixtures/Canonical/Features/EdgeFinish/semantic-selection-chamfer.firmament
+++ b/fixtures/Canonical/Features/EdgeFinish/semantic-selection-chamfer.firmament
@@ -11,11 +11,12 @@ Model SelectionChamferPart {
Line2 West { From: NorthWest; To: SouthWest }
}
Profile MainPlate Using RectangleLayout { Loop Outer {
- Segment SouthEdge { Trace: South; From: SouthWest; To: SouthEast }
- Segment EastEdge { Trace: East; From: SouthEast; To: NorthEast }
- Segment NorthEdge { Trace: North; From: NorthEast; To: NorthWest }
- Segment WestEdge { Trace: West; From: NorthWest; To: SouthWest }
- } }
+ South As SouthEdge
+ |> East As EastEdge
+ |> North As NorthEdge
+ |> West As WestEdge
+ |> Close
+ } }
Struct Plate { Extrude MainPlate { Profile: MainPlate; From: -2mm; To: 0mm } }
Selection OuterTopBoundary {
Target: TopBoundary
diff --git a/fixtures/Canonical/Features/EdgeFinish/single-edge-fillet.firmament b/fixtures/Canonical/Features/EdgeFinish/single-edge-fillet.firmament
index 8b1df33d..8f126d8b 100644
--- a/fixtures/Canonical/Features/EdgeFinish/single-edge-fillet.firmament
+++ b/fixtures/Canonical/Features/EdgeFinish/single-edge-fillet.firmament
@@ -7,9 +7,12 @@ Concept Struct RectangleLayout On XY {
Line2 North { From: C; To: D } Line2 West { From: D; To: A }
}
Profile Bracket Using RectangleLayout { Loop Outer {
- Segment South { Trace: South; From: A; To: B } Segment East { Trace: East; From: B; To: C }
- Segment North { Trace: North; From: C; To: D } Segment West { Trace: West; From: D; To: A }
-} }
+ South
+ |> East
+ |> North
+ |> West
+ |> Close
+ } }
Struct Body { Extrude Bracket { Profile: Bracket; From: 0mm; To: 8mm } }
Modify Body { EdgeFinish SouthTopRound { Target: Bracket.Outer.South On: Top Kind: Fillet Radius: 2mm EndClearance: 3mm } }
Assert Volume Body {
diff --git a/fixtures/Canonical/Features/Pocket/rectangular-pocket.firmament b/fixtures/Canonical/Features/Pocket/rectangular-pocket.firmament
index 8f95ea80..348c0a48 100644
--- a/fixtures/Canonical/Features/Pocket/rectangular-pocket.firmament
+++ b/fixtures/Canonical/Features/Pocket/rectangular-pocket.firmament
@@ -7,17 +7,19 @@ Model RectangularPocket {
Rect2 Recess { Center: [0mm, 0mm]; Size: [24mm, 14mm] }
}
Profile BaseProfile Using Layout { Loop Outer {
- Segment Bottom { Trace: Stock.Bottom; From: Stock.BottomLeft; To: Stock.BottomRight }
- Segment Right { Trace: Stock.Right; From: Stock.BottomRight; To: Stock.TopRight }
- Segment Top { Trace: Stock.Top; From: Stock.TopRight; To: Stock.TopLeft }
- Segment Left { Trace: Stock.Left; From: Stock.TopLeft; To: Stock.BottomLeft }
- } }
+ Stock.Bottom
+ |> Stock.Right
+ |> Stock.Top
+ |> Stock.Left
+ |> Close
+ } }
Profile PocketProfile Using Layout { Loop Outer {
- Segment Bottom { Trace: Recess.Bottom; From: Recess.BottomLeft; To: Recess.BottomRight }
- Segment Right { Trace: Recess.Right; From: Recess.BottomRight; To: Recess.TopRight }
- Segment Top { Trace: Recess.Top; From: Recess.TopRight; To: Recess.TopLeft }
- Segment Left { Trace: Recess.Left; From: Recess.TopLeft; To: Recess.BottomLeft }
- } }
+ Recess.Bottom
+ |> Recess.Right
+ |> Recess.Top
+ |> Recess.Left
+ |> Close
+ } }
Struct MachinedBlock {
Compose Body {
diff --git a/fixtures/Canonical/Features/Slots/rounded-rectangle-opening.firmament b/fixtures/Canonical/Features/Slots/rounded-rectangle-opening.firmament
index 5a39c07f..058b539d 100644
--- a/fixtures/Canonical/Features/Slots/rounded-rectangle-opening.firmament
+++ b/fixtures/Canonical/Features/Slots/rounded-rectangle-opening.firmament
@@ -4,11 +4,12 @@ Model RoundedRectangleSlotPart {
Rect2 Stock { Center: [0mm, 0mm]; Size: [200mm, 100mm] }
}
Profile Plate Using SlotLayout { Loop Outer {
- Segment South { Trace: Stock.Bottom; From: Stock.BottomLeft; To: Stock.BottomRight }
- Segment East { Trace: Stock.Right; From: Stock.BottomRight; To: Stock.TopRight }
- Segment North { Trace: Stock.Top; From: Stock.TopRight; To: Stock.TopLeft }
- Segment West { Trace: Stock.Left; From: Stock.TopLeft; To: Stock.BottomLeft }
- } }
+ Stock.Bottom As South
+ |> Stock.Right As East
+ |> Stock.Top As North
+ |> Stock.Left As West
+ |> Close
+ } }
Struct SlotFixture { Compose SlotBody {
Base Stock { Profile: Plate; From: -10mm; To: 10mm; Role: Stock }
Slot<RoundedRectangle> Opening { Center: Point2(0mm, 0mm); Direction: Vector2(1, 0); Length: 100mm; Width: 50mm; CornerRadius: 8mm; Extent: ThroughAll; Role: ThroughSlot }
diff --git a/fixtures/Canonical/Features/Slots/straight-slot.firmament b/fixtures/Canonical/Features/Slots/straight-slot.firmament
index 18e1f790..ac1d2711 100644
--- a/fixtures/Canonical/Features/Slots/straight-slot.firmament
+++ b/fixtures/Canonical/Features/Slots/straight-slot.firmament
@@ -4,11 +4,12 @@ Model CapsuleSlotPart {
Rect2 Stock { Center: [0mm, 0mm]; Size: [200mm, 100mm] }
}
Profile Plate Using SlotLayout { Loop Outer {
- Segment South { Trace: Stock.Bottom; From: Stock.BottomLeft; To: Stock.BottomRight }
- Segment East { Trace: Stock.Right; From: Stock.BottomRight; To: Stock.TopRight }
- Segment North { Trace: Stock.Top; From: Stock.TopRight; To: Stock.TopLeft }
- Segment West { Trace: Stock.Left; From: Stock.TopLeft; To: Stock.BottomLeft }
- } }
+ Stock.Bottom As South
+ |> Stock.Right As East
+ |> Stock.Top As North
+ |> Stock.Left As West
+ |> Close
+ } }
Struct SlotFixture { Compose SlotBody {
Base Stock { Profile: Plate; From: -10mm; To: 10mm; Role: Stock }
Slot<Capsule> Relief { Center: Point2(0mm, 0mm); Direction: Vector2(1, 0); Length: 80mm; Width: 40mm; Extent: ThroughAll; Role: ThroughSlot }
diff --git a/fixtures/Canonical/Integration/machined-mounting-block.firmament b/fixtures/Canonical/Integration/machined-mounting-block.firmament
index b752fff9..9f9ad5be 100644
--- a/fixtures/Canonical/Integration/machined-mounting-block.firmament
+++ b/fixtures/Canonical/Integration/machined-mounting-block.firmament
@@ -8,23 +8,26 @@ Model MachinedMountingBlock {
}
Profile BaseProfile Using Layout { Loop Outer {
- Segment Bottom { Trace: Stock.Bottom; From: Stock.BottomLeft; To: Stock.BottomRight }
- Segment Right { Trace: Stock.Right; From: Stock.BottomRight; To: Stock.TopRight }
- Segment Top { Trace: Stock.Top; From: Stock.TopRight; To: Stock.TopLeft }
- Segment Left { Trace: Stock.Left; From: Stock.TopLeft; To: Stock.BottomLeft }
- } }
+ Stock.Bottom
+ |> Stock.Right
+ |> Stock.Top
+ |> Stock.Left
+ |> Close
+ } }
Profile BossProfile Using Layout { Loop Outer {
- Segment Bottom { Trace: BossPad.Bottom; From: BossPad.BottomLeft; To: BossPad.BottomRight }
- Segment Right { Trace: BossPad.Right; From: BossPad.BottomRight; To: BossPad.TopRight }
- Segment Top { Trace: BossPad.Top; From: BossPad.TopRight; To: BossPad.TopLeft }
- Segment Left { Trace: BossPad.Left; From: BossPad.TopLeft; To: BossPad.BottomLeft }
- } }
+ BossPad.Bottom
+ |> BossPad.Right
+ |> BossPad.Top
+ |> BossPad.Left
+ |> Close
+ } }
Profile PocketProfile Using Layout { Loop Outer {
- Segment Bottom { Trace: Recess.Bottom; From: Recess.BottomLeft; To: Recess.BottomRight }
- Segment Right { Trace: Recess.Right; From: Recess.BottomRight; To: Recess.TopRight }
- Segment Top { Trace: Recess.Top; From: Recess.TopRight; To: Recess.TopLeft }
- Segment Left { Trace: Recess.Left; From: Recess.TopLeft; To: Recess.BottomLeft }
- } }
+ Recess.Bottom
+ |> Recess.Right
+ |> Recess.Top
+ |> Recess.Left
+ |> Close
+ } }
Struct MountingBlock {
Compose Body {
diff --git a/fixtures/Canonical/Patterns/record-array-slot-pattern.firmament b/fixtures/Canonical/Patterns/record-array-slot-pattern.firmament
index 36c860fe..698f9fb9 100644
--- a/fixtures/Canonical/Patterns/record-array-slot-pattern.firmament
+++ b/fixtures/Canonical/Patterns/record-array-slot-pattern.firmament
@@ -27,10 +27,11 @@ Model GeneratedSlots {
}
Profile Plate Using Layout {
Loop Outer {
- Segment South { Trace: Stock.Bottom; From: Stock.BottomLeft; To: Stock.BottomRight }
- Segment East { Trace: Stock.Right; From: Stock.BottomRight; To: Stock.TopRight }
- Segment North { Trace: Stock.Top; From: Stock.TopRight; To: Stock.TopLeft }
- Segment West { Trace: Stock.Left; From: Stock.TopLeft; To: Stock.BottomLeft }
+ Stock.Bottom As South
+ |> Stock.Right As East
+ |> Stock.Top As North
+ |> Stock.Left As West
+ |> Close
}
}
Struct Plate {
diff --git a/fixtures/Canonical/Profiles/line-arc-profile-extrusion.firmament b/fixtures/Canonical/Profiles/line-arc-profile-extrusion.firmament
index 48d0961f..0b4ec90f 100644
--- a/fixtures/Canonical/Profiles/line-arc-profile-extrusion.firmament
+++ b/fixtures/Canonical/Profiles/line-arc-profile-extrusion.firmament
@@ -6,10 +6,11 @@ Model ProfilePlate {
}
Profile Plate Using Layout {
- Segment South { Trace: Stock.Bottom; From: Stock.BottomLeft; To: Stock.BottomRight }
- Segment East { Trace: Stock.Right; From: Stock.BottomRight; To: Stock.TopRight }
- Segment North { Trace: Stock.Top; From: Stock.TopRight; To: Stock.TopLeft }
- Segment West { Trace: Stock.Left; From: Stock.TopLeft; To: Stock.BottomLeft }
+ Stock.Bottom As South
+ |> Stock.Right As East
+ |> Stock.Top As North
+ |> Stock.Left As West
+ |> Close
}
Struct PlateBody {
diff --git a/fixtures/Canonical/Profiles/rect2-profile-extrusion.firmament b/fixtures/Canonical/Profiles/rect2-profile-extrusion.firmament
index 2d63ea77..0c7672c6 100644
--- a/fixtures/Canonical/Profiles/rect2-profile-extrusion.firmament
+++ b/fixtures/Canonical/Profiles/rect2-profile-extrusion.firmament
@@ -3,10 +3,11 @@ Concept Struct Rect2Layout On XY {
}
Profile MainPlate Using Rect2Layout {
Loop Outer {
- Segment South { Trace: Base.Bottom; From: Base.BottomLeft; To: Base.BottomRight }
- Segment East { Trace: Base.Right; From: Base.BottomRight; To: Base.TopRight }
- Segment North { Trace: Base.Top; From: Base.TopRight; To: Base.TopLeft }
- Segment West { Trace: Base.Left; From: Base.TopLeft; To: Base.BottomLeft }
+ Base.Bottom As South
+ |> Base.Right As East
+ |> Base.Top As North
+ |> Base.Left As West
+ |> Close
}
}
Struct Plate { Extrude MainPlate { Profile: MainPlate; From: 0mm; To: 5mm } }
diff --git a/fixtures/Canonical/Templates/record-array-profile-family.firmament b/fixtures/Canonical/Templates/record-array-profile-family.firmament
index 708b05be..980c22aa 100644
--- a/fixtures/Canonical/Templates/record-array-profile-family.firmament
+++ b/fixtures/Canonical/Templates/record-array-profile-family.firmament
@@ -7,10 +7,11 @@ Model GeneratedProfile {
Template<spec: ProfileSpec> PlateProfile {
Profile Plate Using Layout {
Loop Outer {
- Segment South { Trace: Stock.Bottom; From: Stock.BottomLeft; To: Stock.BottomRight }
- Segment East { Trace: Stock.Right; From: Stock.BottomRight; To: Stock.TopRight }
- Segment North { Trace: Stock.Top; From: Stock.TopRight; To: Stock.TopLeft }
- Segment West { Trace: Stock.Left; From: Stock.TopLeft; To: Stock.BottomLeft }
+ Stock.Bottom As South
+ |> Stock.Right As East
+ |> Stock.Top As North
+ |> Stock.Left As West
+ |> Close
}
}
}
diff --git a/fixtures/Regression/CanonicalGeometry/profile-boundary-chamfer-loop-bottom.firmament b/fixtures/Regression/CanonicalGeometry/profile-boundary-chamfer-loop-bottom.firmament
index ac661193..66eda02d 100644
--- a/fixtures/Regression/CanonicalGeometry/profile-boundary-chamfer-loop-bottom.firmament
+++ b/fixtures/Regression/CanonicalGeometry/profile-boundary-chamfer-loop-bottom.firmament
@@ -5,8 +5,11 @@ Concept Struct RectangleLayout On XY {
Line2 North { From: C; To: D } Line2 West { From: D; To: A }
}
Profile Bracket Using RectangleLayout { Loop Outer {
- Segment South { Trace: South; From: A; To: B } Segment East { Trace: East; From: B; To: C }
- Segment North { Trace: North; From: C; To: D } Segment West { Trace: West; From: D; To: A }
-} }
+ South
+ |> East
+ |> North
+ |> West
+ |> Close
+ } }
Struct Body { Extrude Bracket { Profile: Bracket; From: 0mm; To: 8mm } }
Modify Body { EdgeFinish BottomPerimeter { Target: Bracket.Outer On: Bottom Kind: Chamfer Distance: 1mm } }
diff --git a/fixtures/Regression/CanonicalGeometry/profile-boundary-chamfer-rectangle-loop-top.firmament b/fixtures/Regression/CanonicalGeometry/profile-boundary-chamfer-rectangle-loop-top.firmament
index d758ed24..5a9fa008 100644
--- a/fixtures/Regression/CanonicalGeometry/profile-boundary-chamfer-rectangle-loop-top.firmament
+++ b/fixtures/Regression/CanonicalGeometry/profile-boundary-chamfer-rectangle-loop-top.firmament
@@ -11,10 +11,11 @@ Concept Struct RectangleLayout On XY {
Profile Bracket Using RectangleLayout {
Loop Outer {
- Segment South { Trace: South; From: SouthWest; To: SouthEast }
- Segment East { Trace: East; From: SouthEast; To: NorthEast }
- Segment North { Trace: North; From: NorthEast; To: NorthWest }
- Segment West { Trace: West; From: NorthWest; To: SouthWest }
+ South
+ |> East
+ |> North
+ |> West
+ |> Close
}
}
diff --git a/fixtures/Regression/CanonicalGeometry/profile-boundary-chamfer-single-segment-top.firmament b/fixtures/Regression/CanonicalGeometry/profile-boundary-chamfer-single-segment-top.firmament
index da28f800..2dc288e2 100644
--- a/fixtures/Regression/CanonicalGeometry/profile-boundary-chamfer-single-segment-top.firmament
+++ b/fixtures/Regression/CanonicalGeometry/profile-boundary-chamfer-single-segment-top.firmament
@@ -5,8 +5,11 @@ Concept Struct RectangleLayout On XY {
Line2 North { From: C; To: D } Line2 West { From: D; To: A }
}
Profile Bracket Using RectangleLayout { Loop Outer {
- Segment South { Trace: South; From: A; To: B } Segment East { Trace: East; From: B; To: C }
- Segment North { Trace: North; From: C; To: D } Segment West { Trace: West; From: D; To: A }
-} }
+ South
+ |> East
+ |> North
+ |> West
+ |> Close
+ } }
Struct Body { Extrude Bracket { Profile: Bracket; From: 0mm; To: 8mm } }
Modify Body { EdgeFinish SouthTopBreak { Target: Bracket.Outer.South On: Top Kind: Chamfer Distance: 1mm } }
diff --git a/fixtures/Regression/CanonicalGeometry/profile-compose-base.firmament b/fixtures/Regression/CanonicalGeometry/profile-compose-base.firmament
index b8ac256b..5aeeac23 100644
--- a/fixtures/Regression/CanonicalGeometry/profile-compose-base.firmament
+++ b/fixtures/Regression/CanonicalGeometry/profile-compose-base.firmament
@@ -6,11 +6,12 @@ Model ComposePlate {
}
Profile Plate Using Layout { Loop Outer {
- Segment South { Trace: Stock.Bottom; From: Stock.BottomLeft; To: Stock.BottomRight }
- Segment East { Trace: Stock.Right; From: Stock.BottomRight; To: Stock.TopRight }
- Segment North { Trace: Stock.Top; From: Stock.TopRight; To: Stock.TopLeft }
- Segment West { Trace: Stock.Left; From: Stock.TopLeft; To: Stock.BottomLeft }
- } }
+ Stock.Bottom As South
+ |> Stock.Right As East
+ |> Stock.Top As North
+ |> Stock.Left As West
+ |> Close
+ } }
Struct PlateBody {
Compose Body {
diff --git a/fixtures/Regression/CanonicalGeometry/profile-fillet-convex-two-segment-bottom.firmament b/fixtures/Regression/CanonicalGeometry/profile-fillet-convex-two-segment-bottom.firmament
index 7bf9d293..27c34eb2 100644
--- a/fixtures/Regression/CanonicalGeometry/profile-fillet-convex-two-segment-bottom.firmament
+++ b/fixtures/Regression/CanonicalGeometry/profile-fillet-convex-two-segment-bottom.firmament
@@ -7,9 +7,12 @@ Concept Struct RectangleLayout On XY {
Line2 North { From: C; To: D } Line2 West { From: D; To: A }
}
Profile Bracket Using RectangleLayout { Loop Outer {
- Segment South { Trace: South; From: A; To: B } Segment East { Trace: East; From: B; To: C }
- Segment North { Trace: North; From: C; To: D } Segment West { Trace: West; From: D; To: A }
-} }
+ South
+ |> East
+ |> North
+ |> West
+ |> Close
+ } }
Struct Body { Extrude Bracket { Profile: Bracket; From: 0mm; To: 8mm } }
Selection CornerPair { Source: Bracket.Outer.[South, East] Require: ConnectedChain }
Modify Body { EdgeFinish RoundedCorner { Target: CornerPair On: Bottom Kind: Fillet Radius: 2mm EndClearance: 3mm } }
diff --git a/fixtures/Regression/CanonicalGeometry/profile-fillet-convex-two-segment-top.firmament b/fixtures/Regression/CanonicalGeometry/profile-fillet-convex-two-segment-top.firmament
index 16d6f637..5c0260e8 100644
--- a/fixtures/Regression/CanonicalGeometry/profile-fillet-convex-two-segment-top.firmament
+++ b/fixtures/Regression/CanonicalGeometry/profile-fillet-convex-two-segment-top.firmament
@@ -7,9 +7,12 @@ Concept Struct RectangleLayout On XY {
Line2 North { From: C; To: D } Line2 West { From: D; To: A }
}
Profile Bracket Using RectangleLayout { Loop Outer {
- Segment South { Trace: South; From: A; To: B } Segment East { Trace: East; From: B; To: C }
- Segment North { Trace: North; From: C; To: D } Segment West { Trace: West; From: D; To: A }
-} }
+ South
+ |> East
+ |> North
+ |> West
+ |> Close
+ } }
Struct Body { Extrude Bracket { Profile: Bracket; From: 0mm; To: 8mm } }
Selection CornerPair { Source: Bracket.Outer.[South, East] Require: ConnectedChain }
Modify Body { EdgeFinish RoundedCorner { Target: CornerPair On: Top Kind: Fillet Radius: 2mm EndClearance: 3mm } }
diff --git a/fixtures/Regression/CanonicalGeometry/profile-straight-edge-fillet-bottom.firmament b/fixtures/Regression/CanonicalGeometry/profile-straight-edge-fillet-bottom.firmament
index bc32db7d..2de45b2e 100644
--- a/fixtures/Regression/CanonicalGeometry/profile-straight-edge-fillet-bottom.firmament
+++ b/fixtures/Regression/CanonicalGeometry/profile-straight-edge-fillet-bottom.firmament
@@ -5,8 +5,11 @@ Concept Struct RectangleLayout On XY {
Line2 North { From: C; To: D } Line2 West { From: D; To: A }
}
Profile Bracket Using RectangleLayout { Loop Outer {
- Segment South { Trace: South; From: A; To: B } Segment East { Trace: East; From: B; To: C }
- Segment North { Trace: North; From: C; To: D } Segment West { Trace: West; From: D; To: A }
-} }
+ South
+ |> East
+ |> North
+ |> West
+ |> Close
+ } }
Struct Body { Extrude Bracket { Profile: Bracket; From: 0mm; To: 8mm } }
Modify Body { EdgeFinish SouthBottomRound { Target: Bracket.Outer.South On: Bottom Kind: Fillet Radius: 2mm EndClearance: 3mm } }
diff --git a/fixtures/Regression/Profile/valid/scaffold-rectangle.firmament b/fixtures/Regression/Profile/valid/scaffold-rectangle.firmament
index 532c4813..0b5f8f77 100644
--- a/fixtures/Regression/Profile/valid/scaffold-rectangle.firmament
+++ b/fixtures/Regression/Profile/valid/scaffold-rectangle.firmament
@@ -11,10 +11,11 @@ Concept Struct RectangleLayout On XY {
Profile MainPlate Using RectangleLayout {
Loop Outer {
- Segment SouthEdge { Trace: South; From: SouthWest; To: SouthEast }
- Segment EastEdge { Trace: East; From: SouthEast; To: NorthEast }
- Segment NorthEdge { Trace: North; From: NorthEast; To: NorthWest }
- Segment WestEdge { Trace: West; From: NorthWest; To: SouthWest }
+ South As SouthEdge
+ |> East As EastEdge
+ |> North As NorthEdge
+ |> West As WestEdge
+ |> Close
}
}
diff --git a/fixtures/Regression/Profile/valid/semantic-top-boundary-chamfer.firmament b/fixtures/Regression/Profile/valid/semantic-top-boundary-chamfer.firmament
index 273179c7..83981c08 100644
--- a/fixtures/Regression/Profile/valid/semantic-top-boundary-chamfer.firmament
+++ b/fixtures/Regression/Profile/valid/semantic-top-boundary-chamfer.firmament
@@ -11,10 +11,11 @@ Concept Struct RectangleLayout On XY {
Profile MainPlate Using RectangleLayout {
Loop Outer {
- Segment SouthEdge { Trace: South; From: SouthWest; To: SouthEast }
- Segment EastEdge { Trace: East; From: SouthEast; To: NorthEast }
- Segment NorthEdge { Trace: North; From: NorthEast; To: NorthWest }
- Segment WestEdge { Trace: West; From: NorthWest; To: SouthWest }
+ South As SouthEdge
+ |> East As EastEdge
+ |> North As NorthEdge
+ |> West As WestEdge
+ |> Close
}
}
diff --git a/fixtures/Regression/Profile/valid/semantic-top-boundary-loop.firmament b/fixtures/Regression/Profile/valid/semantic-top-boundary-loop.firmament
index 5d311bf2..aee7b88e 100644
--- a/fixtures/Regression/Profile/valid/semantic-top-boundary-loop.firmament
+++ b/fixtures/Regression/Profile/valid/semantic-top-boundary-loop.firmament
@@ -11,10 +11,11 @@ Concept Struct RectangleLayout On XY {
Profile MainPlate Using RectangleLayout {
Loop Outer {
- Segment SouthEdge { Trace: South; From: SouthWest; To: SouthEast }
- Segment EastEdge { Trace: East; From: SouthEast; To: NorthEast }
- Segment NorthEdge { Trace: North; From: NorthEast; To: NorthWest }
- Segment WestEdge { Trace: West; From: NorthWest; To: SouthWest }
+ South As SouthEdge
+ |> East As EastEdge
+ |> North As NorthEdge
+ |> West As WestEdge
+ |> Close
}
}
diff --git a/fixtures/Regression/ProfileComposition/add-overlapped-by-remove.firmament b/fixtures/Regression/ProfileComposition/add-overlapped-by-remove.firmament
index 745eb023..ef76409f 100644
--- a/fixtures/Regression/ProfileComposition/add-overlapped-by-remove.firmament
+++ b/fixtures/Regression/ProfileComposition/add-overlapped-by-remove.firmament
@@ -4,23 +4,26 @@ Concept Struct Layout On XY {
Rect2 RemoveGuide { Center: [2mm, 10mm]; Size: [4mm, 8mm]; Role: ProfileGuide }
}
Profile BaseProfile Using Layout { Loop Outer {
- Segment South { Trace: BaseGuide.Bottom; From: BaseGuide.BottomLeft; To: BaseGuide.BottomRight }
- Segment East { Trace: BaseGuide.Right; From: BaseGuide.BottomRight; To: BaseGuide.TopRight }
- Segment North { Trace: BaseGuide.Top; From: BaseGuide.TopRight; To: BaseGuide.TopLeft }
- Segment West { Trace: BaseGuide.Left; From: BaseGuide.TopLeft; To: BaseGuide.BottomLeft }
-} }
+ BaseGuide.Bottom As South
+ |> BaseGuide.Right As East
+ |> BaseGuide.Top As North
+ |> BaseGuide.Left As West
+ |> Close
+ } }
Profile AddProfile Using Layout { Loop Outer {
- Segment South { Trace: AddGuide.Bottom; From: AddGuide.BottomLeft; To: AddGuide.BottomRight }
- Segment East { Trace: AddGuide.Right; From: AddGuide.BottomRight; To: AddGuide.TopRight }
- Segment North { Trace: AddGuide.Top; From: AddGuide.TopRight; To: AddGuide.TopLeft }
- Segment West { Trace: AddGuide.Left; From: AddGuide.TopLeft; To: AddGuide.BottomLeft }
-} }
+ AddGuide.Bottom As South
+ |> AddGuide.Right As East
+ |> AddGuide.Top As North
+ |> AddGuide.Left As West
+ |> Close
+ } }
Profile RemoveProfile Using Layout { Loop Outer {
- Segment South { Trace: RemoveGuide.Bottom; From: RemoveGuide.BottomLeft; To: RemoveGuide.BottomRight }
- Segment East { Trace: RemoveGuide.Right; From: RemoveGuide.BottomRight; To: RemoveGuide.TopRight }
- Segment North { Trace: RemoveGuide.Top; From: RemoveGuide.TopRight; To: RemoveGuide.TopLeft }
- Segment West { Trace: RemoveGuide.Left; From: RemoveGuide.TopLeft; To: RemoveGuide.BottomLeft }
-} }
+ RemoveGuide.Bottom As South
+ |> RemoveGuide.Right As East
+ |> RemoveGuide.Top As North
+ |> RemoveGuide.Left As West
+ |> Close
+ } }
Struct Composition { Compose AddOverlappedByRemove {
Base Stock { Profile: BaseProfile; From: 0mm; To: 10mm; Role: Stock }
Add Pad { Profile: AddProfile; From: 5mm; To: 10mm; Role: Pad }
diff --git a/fixtures/Regression/ProfileComposition/crossing-removal-notch.firmament b/fixtures/Regression/ProfileComposition/crossing-removal-notch.firmament
index 6ced15b2..c2e2ee34 100644
--- a/fixtures/Regression/ProfileComposition/crossing-removal-notch.firmament
+++ b/fixtures/Regression/ProfileComposition/crossing-removal-notch.firmament
@@ -3,17 +3,19 @@ Concept Struct Layout On XY {
Rect2 NotchGuide { Center: [8mm, 0mm]; Size: [8mm, 8mm]; Role: ProfileGuide }
}
Profile BaseProfile Using Layout { Loop Outer {
- Segment S { Trace: BaseGuide.Bottom; From: BaseGuide.BottomLeft; To: BaseGuide.BottomRight }
- Segment E { Trace: BaseGuide.Right; From: BaseGuide.BottomRight; To: BaseGuide.TopRight }
- Segment N { Trace: BaseGuide.Top; From: BaseGuide.TopRight; To: BaseGuide.TopLeft }
- Segment W { Trace: BaseGuide.Left; From: BaseGuide.TopLeft; To: BaseGuide.BottomLeft }
-} }
+ BaseGuide.Bottom As S
+ |> BaseGuide.Right As E
+ |> BaseGuide.Top As N
+ |> BaseGuide.Left As W
+ |> Close
+ } }
Profile NotchProfile Using Layout { Loop Outer {
- Segment S { Trace: NotchGuide.Bottom; From: NotchGuide.BottomLeft; To: NotchGuide.BottomRight }
- Segment E { Trace: NotchGuide.Right; From: NotchGuide.BottomRight; To: NotchGuide.TopRight }
- Segment N { Trace: NotchGuide.Top; From: NotchGuide.TopRight; To: NotchGuide.TopLeft }
- Segment W { Trace: NotchGuide.Left; From: NotchGuide.TopLeft; To: NotchGuide.BottomLeft }
-} }
+ NotchGuide.Bottom As S
+ |> NotchGuide.Right As E
+ |> NotchGuide.Top As N
+ |> NotchGuide.Left As W
+ |> Close
+ } }
Struct Composition { Compose CrossingRemovalNotch {
Base Stock { Profile: BaseProfile; From: 0mm; To: 10mm; Role: Stock }
Remove Notch { Profile: NotchProfile; From: 5mm; To: 10mm; Role: Relief }
diff --git a/fixtures/Regression/ProfileComposition/overlapping-additive-rectangles.firmament b/fixtures/Regression/ProfileComposition/overlapping-additive-rectangles.firmament
index 34e23caf..6c7ab2ff 100644
--- a/fixtures/Regression/ProfileComposition/overlapping-additive-rectangles.firmament
+++ b/fixtures/Regression/ProfileComposition/overlapping-additive-rectangles.firmament
@@ -4,23 +4,26 @@ Concept Struct Layout On XY {
Rect2 RightGuide { Center: [3mm, 10mm]; Size: [10mm, 10mm]; Role: ProfileGuide }
}
Profile BaseProfile Using Layout { Loop Outer {
- Segment South { Trace: BaseGuide.Bottom; From: BaseGuide.BottomLeft; To: BaseGuide.BottomRight }
- Segment East { Trace: BaseGuide.Right; From: BaseGuide.BottomRight; To: BaseGuide.TopRight }
- Segment North { Trace: BaseGuide.Top; From: BaseGuide.TopRight; To: BaseGuide.TopLeft }
- Segment West { Trace: BaseGuide.Left; From: BaseGuide.TopLeft; To: BaseGuide.BottomLeft }
-} }
+ BaseGuide.Bottom As South
+ |> BaseGuide.Right As East
+ |> BaseGuide.Top As North
+ |> BaseGuide.Left As West
+ |> Close
+ } }
Profile LeftProfile Using Layout { Loop Outer {
- Segment South { Trace: LeftGuide.Bottom; From: LeftGuide.BottomLeft; To: LeftGuide.BottomRight }
- Segment East { Trace: LeftGuide.Right; From: LeftGuide.BottomRight; To: LeftGuide.TopRight }
- Segment North { Trace: LeftGuide.Top; From: LeftGuide.TopRight; To: LeftGuide.TopLeft }
- Segment West { Trace: LeftGuide.Left; From: LeftGuide.TopLeft; To: LeftGuide.BottomLeft }
-} }
+ LeftGuide.Bottom As South
+ |> LeftGuide.Right As East
+ |> LeftGuide.Top As North
+ |> LeftGuide.Left As West
+ |> Close
+ } }
Profile RightProfile Using Layout { Loop Outer {
- Segment South { Trace: RightGuide.Bottom; From: RightGuide.BottomLeft; To: RightGuide.BottomRight }
- Segment East { Trace: RightGuide.Right; From: RightGuide.BottomRight; To: RightGuide.TopRight }
- Segment North { Trace: RightGuide.Top; From: RightGuide.TopRight; To: RightGuide.TopLeft }
- Segment West { Trace: RightGuide.Left; From: RightGuide.TopLeft; To: RightGuide.BottomLeft }
-} }
+ RightGuide.Bottom As South
+ |> RightGuide.Right As East
+ |> RightGuide.Top As North
+ |> RightGuide.Left As West
+ |> Close
+ } }
Struct Composition { Compose Body {
Base Stock { Profile: BaseProfile; From: 0mm; To: 15mm; Role: Stock }
Add Left { Profile: LeftProfile; From: 10mm; To: 15mm; Role: Pad }
diff --git a/fixtures/Regression/ProfileComposition/overlapping-removes.firmament b/fixtures/Regression/ProfileComposition/overlapping-removes.firmament
index e5461d87..f32fe0d4 100644
--- a/fixtures/Regression/ProfileComposition/overlapping-removes.firmament
+++ b/fixtures/Regression/ProfileComposition/overlapping-removes.firmament
@@ -4,23 +4,26 @@ Concept Struct Layout On XY {
Rect2 RightGuide { Center: [2mm, 0mm]; Size: [8mm, 8mm]; Role: ProfileGuide }
}
Profile BaseProfile Using Layout { Loop Outer {
- Segment S { Trace: BaseGuide.Bottom; From: BaseGuide.BottomLeft; To: BaseGuide.BottomRight }
- Segment E { Trace: BaseGuide.Right; From: BaseGuide.BottomRight; To: BaseGuide.TopRight }
- Segment N { Trace: BaseGuide.Top; From: BaseGuide.TopRight; To: BaseGuide.TopLeft }
- Segment W { Trace: BaseGuide.Left; From: BaseGuide.TopLeft; To: BaseGuide.BottomLeft }
-} }
+ BaseGuide.Bottom As S
+ |> BaseGuide.Right As E
+ |> BaseGuide.Top As N
+ |> BaseGuide.Left As W
+ |> Close
+ } }
Profile LeftVoid Using Layout { Loop Outer {
- Segment S { Trace: LeftGuide.Bottom; From: LeftGuide.BottomLeft; To: LeftGuide.BottomRight }
- Segment E { Trace: LeftGuide.Right; From: LeftGuide.BottomRight; To: LeftGuide.TopRight }
- Segment N { Trace: LeftGuide.Top; From: LeftGuide.TopRight; To: LeftGuide.TopLeft }
- Segment W { Trace: LeftGuide.Left; From: LeftGuide.TopLeft; To: LeftGuide.BottomLeft }
-} }
+ LeftGuide.Bottom As S
+ |> LeftGuide.Right As E
+ |> LeftGuide.Top As N
+ |> LeftGuide.Left As W
+ |> Close
+ } }
Profile RightVoid Using Layout { Loop Outer {
- Segment S { Trace: RightGuide.Bottom; From: RightGuide.BottomLeft; To: RightGuide.BottomRight }
- Segment E { Trace: RightGuide.Right; From: RightGuide.BottomRight; To: RightGuide.TopRight }
- Segment N { Trace: RightGuide.Top; From: RightGuide.TopRight; To: RightGuide.TopLeft }
- Segment W { Trace: RightGuide.Left; From: RightGuide.TopLeft; To: RightGuide.BottomLeft }
-} }
+ RightGuide.Bottom As S
+ |> RightGuide.Right As E
+ |> RightGuide.Top As N
+ |> RightGuide.Left As W
+ |> Close
+ } }
Struct Composition { Compose OverlappingRemoves {
Base Stock { Profile: BaseProfile; From: 0mm; To: 15mm; Role: Stock }
Remove Left { Profile: LeftVoid; From: 10mm; To: 15mm; Role: Relief }
diff --git a/fixtures/Regression/ProfileComposition/shared-boundary-adds.firmament b/fixtures/Regression/ProfileComposition/shared-boundary-adds.firmament
index 3c2276bc..b99dbdf2 100644
--- a/fixtures/Regression/ProfileComposition/shared-boundary-adds.firmament
+++ b/fixtures/Regression/ProfileComposition/shared-boundary-adds.firmament
@@ -4,23 +4,26 @@ Concept Struct Layout On XY {
Rect2 RightGuide { Center: [5mm, 15mm]; Size: [10mm, 10mm]; Role: ProfileGuide }
}
Profile BaseProfile Using Layout { Loop Outer {
- Segment S { Trace: BaseGuide.Bottom; From: BaseGuide.BottomLeft; To: BaseGuide.BottomRight }
- Segment E { Trace: BaseGuide.Right; From: BaseGuide.BottomRight; To: BaseGuide.TopRight }
- Segment N { Trace: BaseGuide.Top; From: BaseGuide.TopRight; To: BaseGuide.TopLeft }
- Segment W { Trace: BaseGuide.Left; From: BaseGuide.TopLeft; To: BaseGuide.BottomLeft }
-} }
+ BaseGuide.Bottom As S
+ |> BaseGuide.Right As E
+ |> BaseGuide.Top As N
+ |> BaseGuide.Left As W
+ |> Close
+ } }
Profile LeftAdd Using Layout { Loop Outer {
- Segment S { Trace: LeftGuide.Bottom; From: LeftGuide.BottomLeft; To: LeftGuide.BottomRight }
- Segment E { Trace: LeftGuide.Right; From: LeftGuide.BottomRight; To: LeftGuide.TopRight }
- Segment N { Trace: LeftGuide.Top; From: LeftGuide.TopRight; To: LeftGuide.TopLeft }
- Segment W { Trace: LeftGuide.Left; From: LeftGuide.TopLeft; To: LeftGuide.BottomLeft }
-} }
+ LeftGuide.Bottom As S
+ |> LeftGuide.Right As E
+ |> LeftGuide.Top As N
+ |> LeftGuide.Left As W
+ |> Close
+ } }
Profile RightAdd Using Layout { Loop Outer {
- Segment S { Trace: RightGuide.Bottom; From: RightGuide.BottomLeft; To: RightGuide.BottomRight }
- Segment E { Trace: RightGuide.Right; From: RightGuide.BottomRight; To: RightGuide.TopRight }
- Segment N { Trace: RightGuide.Top; From: RightGuide.TopRight; To: RightGuide.TopLeft }
- Segment W { Trace: RightGuide.Left; From: RightGuide.TopLeft; To: RightGuide.BottomLeft }
-} }
+ RightGuide.Bottom As S
+ |> RightGuide.Right As E
+ |> RightGuide.Top As N
+ |> RightGuide.Left As W
+ |> Close
+ } }
Struct Composition { Compose SharedBoundaryAdds {
Base Stock { Profile: BaseProfile; From: 0mm; To: 10mm; Role: Stock }
Add Left { Profile: LeftAdd; From: 5mm; To: 10mm; Role: Pad }
diff --git a/fixtures/Regression/ProfileComposition/valid/construction-plane-blind-drill-clearance.firmament b/fixtures/Regression/ProfileComposition/valid/construction-plane-blind-drill-clearance.firmament
index 81d6a7d6..76ee6ac7 100644
--- a/fixtures/Regression/ProfileComposition/valid/construction-plane-blind-drill-clearance.firmament
+++ b/fixtures/Regression/ProfileComposition/valid/construction-plane-blind-drill-clearance.firmament
@@ -8,11 +8,12 @@ Construction Plane PositiveXWorkplane { Trace: SideLayout.PositiveXDatum }
Concept Struct Layout On XY { Rect2 Guide { Center: [0mm, 0mm]; Size: [40mm, 20mm] } }
Profile Stock Using Layout { Loop Outer {
- Segment South { Trace: Guide.Bottom; From: Guide.BottomLeft; To: Guide.BottomRight }
- Segment East { Trace: Guide.Right; From: Guide.BottomRight; To: Guide.TopRight }
- Segment North { Trace: Guide.Top; From: Guide.TopRight; To: Guide.TopLeft }
- Segment West { Trace: Guide.Left; From: Guide.TopLeft; To: Guide.BottomLeft }
-} }
+ Guide.Bottom As South
+ |> Guide.Right As East
+ |> Guide.Top As North
+ |> Guide.Left As West
+ |> Close
+ } }
Struct Composition { Compose SideBlindHost {
Base StockBody { Profile: Stock; From: -10mm; To: 10mm }
Hole<Shaft> SideBlind {
diff --git a/fixtures/Regression/ProfileComposition/valid/construction-plane-blind-drill-mouth-crosses-slab.firmament b/fixtures/Regression/ProfileComposition/valid/construction-plane-blind-drill-mouth-crosses-slab.firmament
index 1151afc5..3ed3df88 100644
--- a/fixtures/Regression/ProfileComposition/valid/construction-plane-blind-drill-mouth-crosses-slab.firmament
+++ b/fixtures/Regression/ProfileComposition/valid/construction-plane-blind-drill-mouth-crosses-slab.firmament
@@ -6,11 +6,12 @@ Concept Struct SideLayout {
Construction Plane PositiveXWorkplane { Trace: SideLayout.PositiveXDatum }
Concept Struct Layout On XY { Rect2 Guide { Center: [0mm, 0mm]; Size: [40mm, 20mm] } }
Profile Stock Using Layout { Loop Outer {
- Segment South { Trace: Guide.Bottom; From: Guide.BottomLeft; To: Guide.BottomRight }
- Segment East { Trace: Guide.Right; From: Guide.BottomRight; To: Guide.TopRight }
- Segment North { Trace: Guide.Top; From: Guide.TopRight; To: Guide.TopLeft }
- Segment West { Trace: Guide.Left; From: Guide.TopLeft; To: Guide.BottomLeft }
-} }
+ Guide.Bottom As South
+ |> Guide.Right As East
+ |> Guide.Top As North
+ |> Guide.Left As West
+ |> Close
+ } }
Struct Composition { Compose SideBlindHost {
Base Lower { Profile: Stock; From: -10mm; To: 0mm }
Add Upper { Profile: Stock; From: 0mm; To: 10mm }
diff --git a/fixtures/Regression/ProfileComposition/valid/raised-pad.firmament b/fixtures/Regression/ProfileComposition/valid/raised-pad.firmament
index 1b9ddf9c..123a6b65 100644
--- a/fixtures/Regression/ProfileComposition/valid/raised-pad.firmament
+++ b/fixtures/Regression/ProfileComposition/valid/raised-pad.firmament
@@ -12,14 +12,20 @@ Concept Struct RaisedPadLayout On XY {
}
Profile Plate Using RaisedPadLayout {
Loop Outer {
- Segment AB { Trace: AB; From: A; To: B } Segment BC { Trace: BC; From: B; To: C }
- Segment CD { Trace: CD; From: C; To: D } Segment DA { Trace: DA; From: D; To: A }
+ AB
+ |> BC
+ |> CD
+ |> DA
+ |> Close
}
}
Profile Pad Using RaisedPadLayout {
Loop Outer {
- Segment EF { Trace: EF; From: E; To: F } Segment FG { Trace: FG; From: F; To: G }
- Segment GH { Trace: GH; From: G; To: H } Segment HE { Trace: HE; From: H; To: E }
+ EF
+ |> FG
+ |> GH
+ |> HE
+ |> Close
}
}
Struct RaisedPad {
diff --git a/fixtures/Regression/ProfileComposition/valid/semantic-capsule-slot-through.firmament b/fixtures/Regression/ProfileComposition/valid/semantic-capsule-slot-through.firmament
index f5477cb8..3c75dcb0 100644
--- a/fixtures/Regression/ProfileComposition/valid/semantic-capsule-slot-through.firmament
+++ b/fixtures/Regression/ProfileComposition/valid/semantic-capsule-slot-through.firmament
@@ -2,11 +2,12 @@ Concept Struct SlotLayout On XY {
Rect2 Stock { Center: [0mm,0mm]; Size: [200mm,100mm] }
}
Profile Plate Using SlotLayout { Loop Outer {
- Segment South { Trace: Stock.Bottom; From: Stock.BottomLeft; To: Stock.BottomRight }
- Segment East { Trace: Stock.Right; From: Stock.BottomRight; To: Stock.TopRight }
- Segment North { Trace: Stock.Top; From: Stock.TopRight; To: Stock.TopLeft }
- Segment West { Trace: Stock.Left; From: Stock.TopLeft; To: Stock.BottomLeft }
-} }
+ Stock.Bottom As South
+ |> Stock.Right As East
+ |> Stock.Top As North
+ |> Stock.Left As West
+ |> Close
+ } }
Struct SlotFixture { Compose SlotBody {
Base Stock { Profile: Plate; From: -10mm; To: 10mm; Role: Stock }
Slot<Capsule> Relief { Center: Point2(0mm,0mm); Direction: Vector2(1,0); Length: 80mm; Width: 40mm; Extent: ThroughAll; Role: ThroughSlot }
diff --git a/fixtures/Regression/ProfileComposition/valid/semantic-rounded-rectangle-slot-through.firmament b/fixtures/Regression/ProfileComposition/valid/semantic-rounded-rectangle-slot-through.firmament
index 6128459d..917fbc31 100644
--- a/fixtures/Regression/ProfileComposition/valid/semantic-rounded-rectangle-slot-through.firmament
+++ b/fixtures/Regression/ProfileComposition/valid/semantic-rounded-rectangle-slot-through.firmament
@@ -1,10 +1,11 @@
Concept Struct SlotLayout On XY { Rect2 Stock { Center: [0mm,0mm]; Size: [200mm,100mm] } }
Profile Plate Using SlotLayout { Loop Outer {
- Segment South { Trace: Stock.Bottom; From: Stock.BottomLeft; To: Stock.BottomRight }
- Segment East { Trace: Stock.Right; From: Stock.BottomRight; To: Stock.TopRight }
- Segment North { Trace: Stock.Top; From: Stock.TopRight; To: Stock.TopLeft }
- Segment West { Trace: Stock.Left; From: Stock.TopLeft; To: Stock.BottomLeft }
-} }
+ Stock.Bottom As South
+ |> Stock.Right As East
+ |> Stock.Top As North
+ |> Stock.Left As West
+ |> Close
+ } }
Struct RoundedSlotFixture { Compose RoundedSlotBody {
Base Stock { Profile: Plate; From: -10mm; To: 10mm; Role: Stock }
Slot<RoundedRectangle> PlusXOpening { Center: Point2(40mm,0mm); Direction: Vector2(1,0); Length: 80mm; Width: 40mm; CornerRadius: 10mm; Extent: ThroughAll; Role: PlusXOpening }
diff --git a/fixtures/Regression/ProfileComposition/valid/semantic-split-compose-chamfer.firmament b/fixtures/Regression/ProfileComposition/valid/semantic-split-compose-chamfer.firmament
index 6ed86643..bf06386b 100644
--- a/fixtures/Regression/ProfileComposition/valid/semantic-split-compose-chamfer.firmament
+++ b/fixtures/Regression/ProfileComposition/valid/semantic-split-compose-chamfer.firmament
@@ -1,17 +1,19 @@
Rect2 BaseGuide { Center: [0mm, 0mm]; Size: [20mm, 10mm] }
Rect2 ExtensionGuide { Center: [5mm, 0mm]; Size: [20mm, 10mm] }
Profile BaseProfile Using ComposeGuide { Loop Outer {
- Segment South { Trace: BaseGuide.Bottom; From: BaseGuide.BottomLeft; To: BaseGuide.BottomRight }
- Segment East { Trace: BaseGuide.Right; From: BaseGuide.BottomRight; To: BaseGuide.TopRight }
- Segment North { Trace: BaseGuide.Top; From: BaseGuide.TopRight; To: BaseGuide.TopLeft }
- Segment West { Trace: BaseGuide.Left; From: BaseGuide.TopLeft; To: BaseGuide.BottomLeft }
-} }
+ BaseGuide.Bottom As South
+ |> BaseGuide.Right As East
+ |> BaseGuide.Top As North
+ |> BaseGuide.Left As West
+ |> Close
+ } }
Profile ExtensionProfile Using ComposeGuide { Loop Outer {
- Segment South { Trace: ExtensionGuide.Bottom; From: ExtensionGuide.BottomLeft; To: ExtensionGuide.BottomRight }
- Segment East { Trace: ExtensionGuide.Right; From: ExtensionGuide.BottomRight; To: ExtensionGuide.TopRight }
- Segment North { Trace: ExtensionGuide.Top; From: ExtensionGuide.TopRight; To: ExtensionGuide.TopLeft }
- Segment West { Trace: ExtensionGuide.Left; From: ExtensionGuide.TopLeft; To: ExtensionGuide.BottomLeft }
-} }
+ ExtensionGuide.Bottom As South
+ |> ExtensionGuide.Right As East
+ |> ExtensionGuide.Top As North
+ |> ExtensionGuide.Left As West
+ |> Close
+ } }
Compose JoinedPlate {
Base Plate { Profile: BaseProfile; From: -5mm; To: 5mm }
Add Extension { Profile: ExtensionProfile; From: -5mm; To: 5mm }
diff --git a/fixtures/Regression/ProfileComposition/valid/semantic-two-slot-plate.firmament b/fixtures/Regression/ProfileComposition/valid/semantic-two-slot-plate.firmament
index c63e8e87..43e67592 100644
--- a/fixtures/Regression/ProfileComposition/valid/semantic-two-slot-plate.firmament
+++ b/fixtures/Regression/ProfileComposition/valid/semantic-two-slot-plate.firmament
@@ -3,11 +3,12 @@ Concept Struct TwoSlotPlateLayout On XY {
Rect2 Stock { Center: [0mm,0mm]; Size: [240mm,120mm] }
}
Profile Plate Using TwoSlotPlateLayout { Loop Outer {
- Segment South { Trace: Stock.Bottom; From: Stock.BottomLeft; To: Stock.BottomRight }
- Segment East { Trace: Stock.Right; From: Stock.BottomRight; To: Stock.TopRight }
- Segment North { Trace: Stock.Top; From: Stock.TopRight; To: Stock.TopLeft }
- Segment West { Trace: Stock.Left; From: Stock.TopLeft; To: Stock.BottomLeft }
-} }
+ Stock.Bottom As South
+ |> Stock.Right As East
+ |> Stock.Top As North
+ |> Stock.Left As West
+ |> Close
+ } }
Struct TwoSlotPlate { Compose TwoSlotPlateBody {
Base Stock { Profile: Plate; From: -10mm; To: 10mm; Role: Plate }
Slot<Capsule> MinusXCapsule { Center: Point2(-60mm,0mm); Direction: Vector2(1,0); Length: 80mm; Width: 40mm; Extent: ThroughAll; Role: MinusXCapsule }
diff --git a/fixtures/Regression/ProfileComposition/valid/shallow-pocket.firmament b/fixtures/Regression/ProfileComposition/valid/shallow-pocket.firmament
index 1abf78c4..1b8a3538 100644
--- a/fixtures/Regression/ProfileComposition/valid/shallow-pocket.firmament
+++ b/fixtures/Regression/ProfileComposition/valid/shallow-pocket.firmament
@@ -4,6 +4,18 @@ Concept Struct PocketLayout On XY {
Line2 AB { From: A; To: B } Line2 BC { From: B; To: C } Line2 CD { From: C; To: D } Line2 DA { From: D; To: A }
Line2 EF { From: E; To: F } Line2 FG { From: F; To: G } Line2 GH { From: G; To: H } Line2 HE { From: H; To: E }
}
-Profile Plate Using PocketLayout { Loop Outer { Segment AB { Trace: AB; From: A; To: B } Segment BC { Trace: BC; From: B; To: C } Segment CD { Trace: CD; From: C; To: D } Segment DA { Trace: DA; From: D; To: A } } }
-Profile Pocket Using PocketLayout { Loop Outer { Segment EF { Trace: EF; From: E; To: F } Segment FG { Trace: FG; From: F; To: G } Segment GH { Trace: GH; From: G; To: H } Segment HE { Trace: HE; From: H; To: E } } }
+Profile Plate Using PocketLayout { Loop Outer {
+ AB
+ |> BC
+ |> CD
+ |> DA
+ |> Close
+ } }
+Profile Pocket Using PocketLayout { Loop Outer {
+ EF
+ |> FG
+ |> GH
+ |> HE
+ |> Close
+ } }
Struct Pocket { Compose Body { Base PrimaryPlate { Profile: Plate; From: 0mm; To: 10mm; Role: Stock } Remove TopPocket { Profile: Pocket; From: 7mm; To: 10mm; Role: Relief } } }
diff --git a/fixtures/Regression/ProfileComposition/valid/through-profile-cut.firmament b/fixtures/Regression/ProfileComposition/valid/through-profile-cut.firmament
index 7d663133..21298c4b 100644
--- a/fixtures/Regression/ProfileComposition/valid/through-profile-cut.firmament
+++ b/fixtures/Regression/ProfileComposition/valid/through-profile-cut.firmament
@@ -4,6 +4,18 @@ Concept Struct ThroughCutLayout On XY {
Line2 AB { From: A; To: B } Line2 BC { From: B; To: C } Line2 CD { From: C; To: D } Line2 DA { From: D; To: A }
Line2 EF { From: E; To: F } Line2 FG { From: F; To: G } Line2 GH { From: G; To: H } Line2 HE { From: H; To: E }
}
-Profile Plate Using ThroughCutLayout { Loop Outer { Segment AB { Trace: AB; From: A; To: B } Segment BC { Trace: BC; From: B; To: C } Segment CD { Trace: CD; From: C; To: D } Segment DA { Trace: DA; From: D; To: A } } }
-Profile Cut Using ThroughCutLayout { Loop Outer { Segment EF { Trace: EF; From: E; To: F } Segment FG { Trace: FG; From: F; To: G } Segment GH { Trace: GH; From: G; To: H } Segment HE { Trace: HE; From: H; To: E } } }
+Profile Plate Using ThroughCutLayout { Loop Outer {
+ AB
+ |> BC
+ |> CD
+ |> DA
+ |> Close
+ } }
+Profile Cut Using ThroughCutLayout { Loop Outer {
+ EF
+ |> FG
+ |> GH
+ |> HE
+ |> Close
+ } }
Struct ThroughCut { Compose Body { Base PrimaryPlate { Profile: Plate; From: 0mm; To: 10mm; Role: Stock } Remove ThroughCut { Profile: Cut; From: 0mm; To: 10mm; Role: Opening } } }