Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Add canonical grammar diagnostics and profile boundary admission
Yuechen Licb3fdd9b5b1f
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentV2CanonicalAdvancedGrammarTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentV2CanonicalAdvancedGrammarTests.csindex d9ebfb7c..4611cf94 100644--- a/Aetheris.Kernel.Firmament.Tests/FirmamentV2CanonicalAdvancedGrammarTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentV2CanonicalAdvancedGrammarTests.cs@@ -285,4 +285,66 @@ public sealed class FirmamentV2CanonicalAdvancedGrammarTestsAssert.True(compose.IsSuccess, string.Join(Environment.NewLine, compose.Diagnostics));Assert.Equal("Body", Assert.Single(compose.Document!.Composes!).Name);}++ [Fact]+ public void CanonicalMultiRectProfileComposeFixture_IsDiscoverableAndBuilds()+ {+ var path = Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, "../../../../fixtures/FirmamentV2/Canonical/valid/profile-compose-l-bracket.firmament"));+ var parse = FirmamentV2Parser.Parse(File.ReadAllText(path));+ var output = Path.Combine(Path.GetTempPath(), "aetheris-l-profile-" + Guid.NewGuid().ToString("N") + ".step");+ try+ {+ Assert.True(parse.IsSuccess, string.Join(Environment.NewLine, parse.Diagnostics));+ Assert.Equal("BracketBody", Assert.Single(parse.Document!.Composes!).Name);+ var build = FirmamentBuildAndExport.Run(path, output);+ Assert.True(build.IsSuccess, string.Join(Environment.NewLine, build.Diagnostics.Select(diagnostic => diagnostic.Message)));+ }+ finally+ {+ if (File.Exists(output)) File.Delete(output);+ }+ }++ [Fact]+ public void ProfileComposePolygonEdgeFinish_ReportsHostAdmissionInsteadOfMissingSemanticSource()+ {+ var path = Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, "../../../../fixtures/FirmamentV2/Canonical/invalid/profile-compose-l-bracket-edgefinish-unsupported.firmament"));+ var output = Path.Combine(Path.GetTempPath(), "aetheris-l-profile-finish-" + Guid.NewGuid().ToString("N") + ".step");+ try+ {+ var parse = FirmamentV2Parser.Parse(File.ReadAllText(path));+ Assert.False(parse.IsSuccess);+ Assert.Contains(FirmamentV2Parser.EdgeFinishProfileComposeBoundaryUnsupported, parse.Diagnostics);+ var build = FirmamentBuildAndExport.Run(path, output);+ Assert.False(build.IsSuccess);+ var diagnostic = Assert.Single(build.Diagnostics);+ Assert.Contains(FirmamentBuildAndExport.EdgeFinishProfileComposeBoundaryUnsupported, diagnostic.Message, StringComparison.Ordinal);+ Assert.DoesNotContain("SemanticSourceNotFound", diagnostic.Message, StringComparison.Ordinal);+ }+ finally+ {+ if (File.Exists(output)) File.Delete(output);+ }+ }++ [Fact]+ public void ProfileCoordinateEndpoint_ReportsNamedPointDiagnosticBeforeLoopValidation()+ {+ var parse = FirmamentV2Parser.Parse("""+ Model RawEndpoint {+ Units: mm+ Concept Struct Layout On XY { Rect2 Stock { Center: [0mm, 0mm]; Size: [20mm, 10mm] } }+ Profile Plate Using Layout { Loop Outer {+ Segment South { Trace: Stock.Bottom; From: [0mm, -5mm]; 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 }+ } }+ Struct Body { Extrude Plate { Profile: Plate; From: 0mm; To: 1mm } }+ }+ """);++ Assert.False(parse.IsSuccess);+ Assert.Contains(ProfileAuthoringParser.SegmentEndpointMustReferenceNamedPoint + ":South:From", parse.Diagnostics);+ }}diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentV2CanonicalConstructSafetyTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentV2CanonicalConstructSafetyTests.csnew file mode 100644index 00000000..8bd7a8f1--- /dev/null+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentV2CanonicalConstructSafetyTests.cs@@ -0,0 +1,102 @@+using Aetheris.Kernel.Firmament.FirmamentV2;++namespace Aetheris.Kernel.Firmament.Tests;++public sealed class FirmamentV2CanonicalConstructSafetyTests+{+ [Theory]+ [InlineData("PmiX")]+ [InlineData("EdgFinish")]+ [InlineData("Replce")]+ [InlineData("Recgonize")]+ [InlineData("Templat")]+ [InlineData("Constructon")]+ public void CanonicalTopLevelUnknownBlock_IsNeverSilentlyDiscarded(string keyword)+ {+ var parse = FirmamentV2Parser.Parse("Model UnknownConstruct {\n"+ + " Units: mm\n"+ + " Box Base { Size: [10mm, 10mm, 10mm] }\n"+ + " " + keyword + " Example { }\n}");++ Assert.False(parse.IsSuccess);+ Assert.Equal(FirmamentV2ParseDisposition.RecognizedInvalid, parse.Disposition);+ Assert.Contains(FirmamentV2Parser.CanonicalDeclarationUnknown + ":" + keyword, parse.Diagnostics);+ }++ [Fact]+ public void CompatibilityOnlyCanonicalSpelling_ReportsItsExplicitPortStatus()+ {+ var parse = FirmamentV2Parser.Parse("""+ Model CompatibilityOnly {+ Units: mm+ Box Base { Size: [10mm, 10mm, 10mm] }+ Solid OldShape { }+ }+ """);++ Assert.False(parse.IsSuccess);+ Assert.Contains(FirmamentV2Parser.CanonicalConstructNotYetSupported + ":Solid", parse.Diagnostics);+ }++ [Fact]+ public void CanonicalPmi_NormalizesAndBindsThroughTheExistingPmiRecords()+ {+ var parse = FirmamentV2Parser.Parse("""+ Model PmiPart {+ Units: mm+ Box Base { Size: [40mm, 30mm, 10mm] }+ Modify Base { Hole<Shaft> Mount { On: +Z Center: Point2(0mm, 0mm) Diameter: 8mm End: ThroughAll } }+ Pmi {+ Datum A { Target: face(+Z) }+ HoleDiameter MountCallout { Target: Mount Value: 8mm Tolerance: PlusMinus(0.05mm, 0.02mm) DatumRefs: [A] }+ }+ }+ """);++ Assert.True(parse.IsSuccess, string.Join(Environment.NewLine, parse.Diagnostics));+ var records = parse.Document!.PmiBlock!.Records;+ Assert.Equal(2, records.Count);+ var callout = Assert.Single(parse.Document.BoundPmi!.Dimensions);+ Assert.Equal("Mount", callout.Targets.Single());+ Assert.Equal("A", callout.DatumRefs.Single());+ Assert.Equal(0.05d, callout.DimensionTolerance!.Plus);+ Assert.Equal(0.02d, callout.DimensionTolerance.Minus);+ }++ [Fact]+ public void CanonicalPmiFixture_BuildsExportsAndReimportsAp242Pmi()+ {+ var fixture = Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, "../../../../fixtures/FirmamentV2/Canonical/valid/box-hole-pmi.firmament"));+ var output = Path.Combine(Path.GetTempPath(), "aetheris-canonical-pmi-" + Guid.NewGuid().ToString("N") + ".step");+ try+ {+ var build = FirmamentBuildAndExport.Run(fixture, output);+ Assert.True(build.IsSuccess, string.Join(Environment.NewLine, build.Diagnostics.Select(diagnostic => diagnostic.Message)));+ var step = File.ReadAllText(output);+ Assert.Contains("firmament-datum:A", step, StringComparison.Ordinal);+ Assert.Contains("diameter_tolerance:Base.Mount", step, StringComparison.Ordinal);+ var reimport = Aetheris.Kernel.Core.Step242.Step242Importer.ImportBody(step);+ Assert.True(reimport.IsSuccess, string.Join(Environment.NewLine, reimport.Diagnostics.Select(diagnostic => diagnostic.Message)));+ }+ finally+ {+ if (File.Exists(output)) File.Delete(output);+ }+ }++ [Theory]+ [InlineData("Tolerence")]+ [InlineData("DatumRef")]+ [InlineData("Targt")]+ [InlineData("Valu")]+ public void CanonicalPmi_UnknownFieldFailsSpecifically(string field)+ {+ var parse = FirmamentV2Parser.Parse("Model BadPmi {\n"+ + " Units: mm\n"+ + " Box Base { Size: [10mm, 10mm, 10mm] }\n"+ + " Pmi { Datum A { Target: face(+Z) " + field + ": 1mm } }\n}");++ Assert.False(parse.IsSuccess);+ Assert.Contains(FirmamentV2Parser.PmiUnknownField, parse.Diagnostics);+ }+}diff --git a/Aetheris.Kernel.Firmament/FirmamentBuildAndExport.cs b/Aetheris.Kernel.Firmament/FirmamentBuildAndExport.csindex 033d8d68..4027c02e 100644--- a/Aetheris.Kernel.Firmament/FirmamentBuildAndExport.cs+++ b/Aetheris.Kernel.Firmament/FirmamentBuildAndExport.cs@@ -22,6 +22,7 @@ namespace Aetheris.Kernel.Firmament;public static class FirmamentBuildAndExport{+ public const string EdgeFinishProfileComposeBoundaryUnsupported = "EdgeFinishProfileComposeBoundaryUnsupported";private enum ExportRouteDisposition { Declined, Failed, Succeeded }private sealed record ExportRouteResult(string Route, ExportRouteDisposition Disposition, KernelResult<FirmamentStepExportResult>? Artifact = null){@@ -243,6 +244,9 @@ public static class FirmamentBuildAndExportKernelResult<FirmamentStepExportResult> Fail(string code) => KernelResult<FirmamentStepExportResult>.Failure([new Kernel.Core.Diagnostics.KernelDiagnostic(Kernel.Core.Diagnostics.KernelDiagnosticCode.ValidationFailed, Kernel.Core.Diagnostics.KernelDiagnosticSeverity.Error, code, "FirmamentV2.ComposeSemanticSelection")]);if (emitted.Body is null || emitted.Correspondence is null) return Fail("MissingCorrespondenceEvidence");+ var composedCurves = stack.Slabs.MaxBy(s => s.To)!.Region.Outer.Loops.Single().Segments.Select(segment => segment.Geometry).ToArray();+ if (!IsAdmittedPrimitiveBoundary(composedCurves))+ return Fail($"{EdgeFinishProfileComposeBoundaryUnsupported}:host={stack.Feature.Name}:construction=Compose:face=+Z:target=Boundary:supported=primitive-box-or-explicit-semantic-chain:Profile/Compose polygon-boundary materialization is not implemented.");var selections = SemanticSelectionSourceParser.Parse(source, parsed.Profiles.Values.First(), stack.Feature.Name, out var diagnostics);if (diagnostics.Count != 0 || selections.Count != 1) return Fail(diagnostics.FirstOrDefault() ?? "SemanticSourceNotFound");var selection = SemanticTopologySelectionResolver.Resolve(emitted.Body, emitted.Correspondence, selections[0]);@@ -273,6 +277,8 @@ public static class FirmamentBuildAndExportKernelResult<FirmamentStepExportResult> Fail(string code) => KernelResult<FirmamentStepExportResult>.Failure([new Kernel.Core.Diagnostics.KernelDiagnostic(Kernel.Core.Diagnostics.KernelDiagnosticCode.ValidationFailed, Kernel.Core.Diagnostics.KernelDiagnosticSeverity.Error, code, "FirmamentV2.SemanticSelection")]);if (emitted.Body is null || emitted.Correspondence is null) return Fail("NoMaterializedDescendants");+ if (!IsAdmittedPrimitiveBoundary(profile.Loops.Single().Segments.Select(segment => segment.Geometry).ToArray()))+ return Fail($"{EdgeFinishProfileComposeBoundaryUnsupported}:host={profile.Name}:construction=Profile:face=+Z:target=Boundary:supported=primitive-box-or-explicit-semantic-chain:Profile/Compose polygon-boundary materialization is not implemented.");var selections = SemanticSelectionSourceParser.Parse(source, profile, profile.Name, out var selectionDiagnostics);if (selectionDiagnostics.Count > 0 || selections.Count != 1) return Fail(selectionDiagnostics.FirstOrDefault() ?? "SemanticSourceNotFound");var selection = SemanticTopologySelectionResolver.Resolve(emitted.Body, emitted.Correspondence, selections[0]);@@ -299,6 +305,11 @@ public static class FirmamentBuildAndExportreturn KernelResult<FirmamentStepExportResult>.Success(new FirmamentStepExportResult(step.Value, compiled.Feature.FeatureId, 0, "semantic-profile-edge-finish", "source-grounded-top-boundary-chamfer"));}+ private static bool IsAdmittedPrimitiveBoundary(IReadOnlyList<LineArcProfileCurve2D> curves) =>+ curves.Count == 4+ && curves.All(curve => curve is LineArcLineSegment2D)+ && curves.Cast<LineArcLineSegment2D>().All(line => Math.Abs(line.Start.X - line.End.X) < 1e-9 || Math.Abs(line.Start.Y - line.End.Y) < 1e-9);+private static KernelResult<FirmamentStepExportResult>? TryExportV2StandaloneCubicLattice(FirmamentV2Document document){var fills = document.StandaloneLatticeFills ?? [];diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Parser.cs b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Parser.csindex dcc05058..a04ab95c 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Parser.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Parser.cs@@ -68,6 +68,9 @@ public static class FirmamentV2Parserpublic const string CanonicalPoint2Invalid = "firmament-v2-canonical-point2-invalid";public const string CanonicalModifyMalformed = "firmament-v2-canonical-modify-malformed";public const string CanonicalDeclarationUnrecognized = "firmament-v2-canonical-declaration-unrecognized";+ public const string CanonicalDeclarationUnknown = "firmament-v2-canonical-declaration-unknown";+ public const string CanonicalConstructNotYetSupported = "firmament-v2-canonical-construct-not-yet-supported";+ public const string EdgeFinishProfileComposeBoundaryUnsupported = "EdgeFinishProfileComposeBoundaryUnsupported";public const string CanonicalFieldUnknown = "firmament-v2-canonical-field-unknown";public const string SelectionMalformed = "firmament-v2-selection-malformed";public const string SelectionDuplicateName = "firmament-v2-selection-duplicate-name";@@ -86,6 +89,9 @@ public static class FirmamentV2Parserpublic const string LetDuplicateName = "firmament-v2-let-duplicate-name";public const string LetUnknownType = "firmament-v2-let-unknown-type";public const string LetTypeMismatch = "firmament-v2-let-type-mismatch";+ // Alias retained inside the compact fatal-diagnostic switch below; both+ // spellings denote the same public diagnostic.+ private const string LetMismatch = LetTypeMismatch;public const string LetInvalidLiteral = "firmament-v2-let-invalid-literal";public const string LetUnitMismatch = "firmament-v2-let-unit-mismatch";public const string LetLiteralOnly = "firmament-v2-let-literal-only";@@ -244,7 +250,8 @@ public static class FirmamentV2Parserprivate static readonly Regex ReplaceHeaderRegex = new("\\breplace\\s+(?<target>[A-Za-z_][A-Za-z0-9_]*\\.region\\(\"[A-Za-z_][A-Za-z0-9_]*\"\\))\\s+with\\s+(?<kind>[A-Za-z_][A-Za-z0-9_]*(?:\\s*<\\s*[A-Za-z_][A-Za-z0-9_]*\\s*>)?)\\s+(?<name>[A-Za-z_][A-Za-z0-9_]*)\\s*\\{", RegexOptions.CultureInvariant);private static readonly Regex OnRegex = new("\\bon\\s*:\\s*(?<target>[A-Za-z_][A-Za-z0-9_]*\\.face\\(\"#[0-9]+\"\\)|face\\([^)]+\\)|[A-Za-z_][A-Za-z0-9_]*)", RegexOptions.CultureInvariant);private static readonly Regex HostSizeRegex = new(@"\bhostSize\s*:\s*\[(?<values>[^\]]*)\]", RegexOptions.CultureInvariant | RegexOptions.Singleline);- private static readonly Regex PmiHeaderRegex = new(@"\bpmi\s*\{", RegexOptions.CultureInvariant);+ // Pmi is canonical; lowercase pmi remains a bounded compatibility spelling.+ private static readonly Regex PmiHeaderRegex = new(@"\b(?:Pmi|pmi)\s*\{", RegexOptions.CultureInvariant);private static readonly Regex PmiEntryHeaderRegex = new(@"\b(?<kind>[A-Za-z_][A-Za-z0-9_]*)\s+(?<name>[A-Za-z_][A-Za-z0-9_]*)\s*\{", RegexOptions.CultureInvariant);private static readonly Regex TargetRegex = new(@"\btarget\s*:\s*(?<target>[A-Za-z_][A-Za-z0-9_]*\.(?:face|region)\(""[#A-Za-z0-9_]+""\)|[A-Za-z_][A-Za-z0-9_]*\.[A-Za-z_][A-Za-z0-9_]*\([^)]*\)|face\([^)]+\)|[A-Za-z_][A-Za-z0-9_]*)", RegexOptions.CultureInvariant);private static readonly Regex ImportedFaceTargetRegex = new("^(?<body>[A-Za-z_][A-Za-z0-9_]*)\\.face\\(\\\"(?<entity>#[0-9]+)\\\"\\)$", RegexOptions.CultureInvariant);@@ -311,6 +318,12 @@ public static class FirmamentV2Parser// an author must select for ordinary mechanical work.if (CanonicalModelRegex.IsMatch(source)){+ var declarationDiagnostics = ScanCanonicalTopLevelDeclarations(source);+ if (declarationDiagnostics.Count > 0)+ {+ diagnostics.AddRange(declarationDiagnostics);+ return Recognized(CanonicalFailure(diagnostics, CanonicalDocumentMalformed));+ }var parsed = Recognized(ContainsCanonicalAdvancedDeclaration(source)? ParseCanonicalAdvancedDocument(source, diagnostics, templateExpansion.Instantiations): ParseCanonicalDocument(source, diagnostics, sourceDirectory));@@ -857,6 +870,54 @@ public static class FirmamentV2Parserprivate static bool ContainsCanonicalAdvancedDeclaration(string source) =>Regex.IsMatch(source, @"\b(?:Concept|Struct|Construction\s+Plane|Profile|Compose|Selection|Template|Enum|Pattern|Require|Match)\b", RegexOptions.CultureInvariant);+ /// <summary>+ /// Canonical roots have one owner for every declaration-shaped block. This+ /// deliberately scans only brace-depth zero, so fields and feature blocks+ /// retain their more specific parsers and diagnostics.+ /// </summary>+ private static IReadOnlyList<string> ScanCanonicalTopLevelDeclarations(string source)+ {+ var model = CanonicalModelRegex.Match(source);+ var rootOpen = model.Success ? source.IndexOf('{', model.Index) : -1;+ var rootClose = rootOpen < 0 ? -1 : FindMatchingBrace(source, rootOpen);+ if (rootClose < 0) return [];++ var known = new HashSet<string>(StringComparer.Ordinal)+ {+ "Box", "Cylinder", "RoundedBox", "Frustum", "Concept", "Struct", "Construction", "Profile", "Compose", "EdgeFinish",+ "Record", "Static", "Template", "Selection", "InlineStep", "Recognize", "Replace", "Pmi", "Modify", "Match", "Require"+ };+ var compatibilityOnly = new HashSet<string>(StringComparer.Ordinal)+ {+ "Solid", "Let", "Fill", "Manufacturing", "Feature", "Expose"+ };+ var diagnostics = new List<string>();+ var header = new Regex(@"(?m)^\s*(?<keyword>[A-Za-z_][A-Za-z0-9_]*)(?:\s*<[^{}>]+>)?(?:\s+[A-Za-z_][A-Za-z0-9_]*){0,4}\s*\{", RegexOptions.CultureInvariant);+ foreach (Match candidate in header.Matches(source[(rootOpen + 1)..rootClose]))+ {+ var absolute = rootOpen + 1 + candidate.Index;+ if (BraceDepth(source, rootOpen + 1, absolute) != 0) continue;+ var keyword = candidate.Groups["keyword"].Value;+ if (known.Contains(keyword)) continue;+ diagnostics.Add((compatibilityOnly.Contains(keyword) ? CanonicalConstructNotYetSupported : CanonicalDeclarationUnknown) + ":" + keyword);+ }+ return diagnostics.Distinct(StringComparer.Ordinal).ToArray();+ }++ private static int BraceDepth(string source, int start, int end)+ {+ var depth = 0;+ var quoted = false;+ for (var index = start; index < end; index++)+ {+ if (source[index] == '"' && (index == 0 || source[index - 1] != '\\')) quoted = !quoted;+ if (quoted) continue;+ if (source[index] == '{') depth++;+ else if (source[index] == '}') depth--;+ }+ return depth;+ }+/// <summary>/// Parser-owned canonical admission for advanced declarations. The existing/// production profile and section-stack readers remain semantic adapters; this@@ -895,12 +956,28 @@ public static class FirmamentV2Parserdiagnostics.AddRange(compositionSelectionDiagnostics);return CanonicalFailure(diagnostics, CanonicalDocumentMalformed);}+ var compositionSolids = new Dictionary<string, FirmamentV2SolidBinding>(StringComparer.Ordinal)+ {+ [feature.Name] = new FirmamentV2SolidBinding(feature.Name, "Compose", new FirmamentV2AdvancedMaterialRecord("Compose"))+ };+ var (compositionPmi, compositionPmiBlock, compositionBoundPmi) = ParsePmi(+ source, compositionSolids, [], [], [], [], diagnostics, (feature.ShaftHoles ?? []).Select(hole => hole.Name));+ if (Regex.IsMatch(body, @"\bEdgeFinish\b", RegexOptions.CultureInvariant)+ && composition.Profiles.Values.Any(profile => profile.Loops.Single().Segments.Count != 4))+ {+ diagnostics.Add($"{EdgeFinishProfileComposeBoundaryUnsupported}:host={feature.Name}:construction=Compose:face=+Z:target=Boundary:supported=primitive-box-or-explicit-semantic-chain:Profile/Compose polygon-boundary materialization is not implemented.");+ return CanonicalFailure(diagnostics, EdgeFinishProfileComposeBoundaryUnsupported);+ }+ if (diagnostics.Any(IsFatalDiagnosticCode)) return CanonicalFailure(diagnostics, CanonicalDocumentMalformed);var document = new FirmamentV2Document(model.Groups["name"].Value,"mm",[new FirmamentV2SolidBinding(feature.Name, "Compose", new FirmamentV2AdvancedMaterialRecord("Compose"))],Profiles: composition.Profiles.Values.Select(profile => new FirmamentV2ProfileDecl(profile.Name, profile.EffectiveConstructionPlane.StableId, profile.LocalStartDepth ?? 0d, profile.LocalEndDepth ?? 0d, new(0, 0))).ToArray(),Composes: [new FirmamentV2ComposeDecl(feature.Name, feature.Operations.Select(operation => operation.Name).ToArray(), new(0, body.Length))],+ Pmi: compositionPmi,+ PmiBlock: compositionPmiBlock,+ BoundPmi: compositionBoundPmi,Selections: compositionSelections);diagnostics.Add("firmament-v2-unified-canonical-advanced-parsed");diagnostics.Add("firmament-v2-profile-compose-adapted");@@ -926,11 +1003,26 @@ public static class FirmamentV2Parserdiagnostics.AddRange(profileSelectionDiagnostics);return CanonicalFailure(diagnostics, CanonicalDocumentMalformed);}+ var profileSolids = new Dictionary<string, FirmamentV2SolidBinding>(StringComparer.Ordinal)+ {+ [resolved.Name] = new FirmamentV2SolidBinding(resolved.Name, "Profile", new FirmamentV2AdvancedMaterialRecord("Profile"))+ };+ var (profilePmi, profilePmiBlock, profileBoundPmi) = ParsePmi(source, profileSolids, [], [], [], [], diagnostics);+ if (Regex.IsMatch(body, @"\bEdgeFinish\b", RegexOptions.CultureInvariant)+ && resolved.Loops.Single().Segments.Count != 4)+ {+ diagnostics.Add($"{EdgeFinishProfileComposeBoundaryUnsupported}:host={resolved.Name}:construction=Profile:face=+Z:target=Boundary:supported=primitive-box-or-explicit-semantic-chain:Profile/Compose polygon-boundary materialization is not implemented.");+ return CanonicalFailure(diagnostics, EdgeFinishProfileComposeBoundaryUnsupported);+ }+ if (diagnostics.Any(IsFatalDiagnosticCode)) return CanonicalFailure(diagnostics, CanonicalDocumentMalformed);var document = new FirmamentV2Document(model.Groups["name"].Value,"mm",[new FirmamentV2SolidBinding(resolved.Name, "Profile", new FirmamentV2AdvancedMaterialRecord("Profile"))],Profiles: [new FirmamentV2ProfileDecl(resolved.Name, resolved.EffectiveConstructionPlane.StableId, resolved.LocalStartDepth ?? 0d, resolved.LocalEndDepth ?? profile.Height, new(0, body.Length))],+ Pmi: profilePmi,+ PmiBlock: profilePmiBlock,+ BoundPmi: profileBoundPmi,Selections: profileSelections);diagnostics.Add("firmament-v2-unified-canonical-advanced-parsed");diagnostics.Add("firmament-v2-profile-adapted");@@ -1110,13 +1202,14 @@ public static class FirmamentV2Parservar recognizedRegions = ParseCanonicalRecognizedRegions(body, byName, diagnostics);var replacements = ParseCanonicalReplacements(body, byName, recognizedRegions, diagnostics);+ var (pmi, pmiBlock, boundPmi) = ParsePmi(source, byName, modifies, recognizedRegions, [], [], diagnostics);if (diagnostics.Any(IsFatalDiagnosticCode) || diagnostics.Contains(CanonicalDeclarationUnrecognized) || diagnostics.Contains(CanonicalFieldUnknown))return CanonicalFailure(diagnostics, CanonicalDeclarationUnrecognized);diagnostics.Add("firmament-v2-unified-canonical-parsed");diagnostics.Add("firmament-v2-parse-succeeded");diagnostics.Sort(StringComparer.Ordinal);- return FirmamentV2ParseResult.Success(new FirmamentV2Document(model.Groups["name"].Value, "mm", solids, modifies, RecognizedRegions: recognizedRegions, Replacements: replacements), diagnostics.Distinct(StringComparer.Ordinal).ToArray());+ return FirmamentV2ParseResult.Success(new FirmamentV2Document(model.Groups["name"].Value, "mm", solids, modifies, Pmi: pmi, RecognizedRegions: recognizedRegions, Replacements: replacements, PmiBlock: pmiBlock, BoundPmi: boundPmi), diagnostics.Distinct(StringComparer.Ordinal).ToArray());}private static FirmamentV2PrimitiveRecord? ParseCanonicalPrimitive(string type, string body, List<string> diagnostics)@@ -1632,7 +1725,7 @@ public static class FirmamentV2Parser|| code.StartsWith(ConceptIrResolver.PointProjectionUnsupported, StringComparison.Ordinal)|| code.StartsWith("firmament-static-", StringComparison.Ordinal);- public static bool IsFatalDiagnosticCode(string code) => IsConceptFatalDiagnostic(code) || code is UnknownConstructionPolicy or PrimitiveDoesNotSatisfyHollowConstructible or WallThicknessRequired or WallThicknessMustBePositive or UnsupportedOpening or MultipleOpeningsNotSupported or Phase3EdgeFinishSyntaxInvalid or PrimitiveFieldMissing or PrimitiveFieldUnknown or PrimitiveFieldInvalid or MissingModel or MissingUnits or MissingSolid or UnsupportedConstruct or UnknownRecordType or BoxMissingSize or BoxSizeArity or DegenerateDimension or NameUnresolved or DuplicateName or WithRequiresRecord or WithRequiresBoxRecord or WithFieldNotFound or WithFieldTypeMismatch or WithForwardReference or WithDerivedRecordInvalid or ExposeBlockUnsupported or ExposeRequiresBoxRecord or ExposeAliasDuplicate or ExposeAliasInvalid or SelectorUnsupported or SelectorAxisInvalid or SelectorSubselectorUnsupported or FatArrowOutsideExpose or RawBackendIdReferenceForbidden or ModifyTargetUnresolved or ModifyTargetNotSolid or RegionUnsupported or RegionAttachmentSelectorUnsupported or CutUnsupported or CutToolUnsupported or CylinderRadiusMissing or CylinderRadiusInvalid or CylinderRadiusNotFinite or ThroughSelectorUnsupported or AliasUnresolved or AliasRefTypeUnsupported or SideHoleAliasMustResolveToFace or SideHoleAliasResolvesToUnsupportedFace or SideHoleOnlyPlusXMinusXSupported or SideHoleRouteUnsupported or SideHoleSameFaceUnsupported or SideHoleAxisNotYetSupported or SideHoleRadiusExceedsClearance or CylinderCenterInvalid or CylinderCenterArityInvalid or CylinderCenterNotFinite or SideHoleCenterExceedsClearance or HoleVariantUnknown or HoleEntryFaceMissing or HoleCenterMissing or HoleShaftMissing or HoleEndMissing or HoleDiameterInvalid or HoleDepthInvalid or HoleCounterboreInvalid or HoleCountersinkInvalid or PmiKindUnknown or PmiTargetMissing or PmiTargetUnresolved or PmiDiameterInvalid or PmiDuplicateName or InlineStepUnknownBody or InlineStepUnknownFace or PmiImportedTargetNotFace or PmiImportedTargetRequiresCanonicalStep or PmiInvalidImportedTarget or InlineStepPathMissing or InlineStepPathInvalid or InlineStepFileMissing or InlineStepRequiresCanonical or UnknownRecognitionBody or UnknownRecognitionFace or DuplicateRegion or UnknownRecognitionRegion or InvalidRecognitionKind or InvalidRecognitionConfidence or PmiRecognizedRegionKindMismatch or UnknownReplacementBody or UnknownReplacementRegion or ReplacementKindMismatch or ReplacementFaceUnresolved or ReplacementUnsupportedKind or ReplacementVerificationFailed or ReplacementRadiusInvalid or ReplacementEndUnsupported or LetDuplicateName or LetUnknownType or LetTypeMismatch or LetInvalidLiteral or LetUnitMismatch or LetLiteralOnly or LetRecordDuplicateName or LetRecordDuplicateField or LetReferenceUnknownRecord or LetReferenceUnknownField or LetReferenceNonRecord or LetReferenceRecordUsedAsValue or ExpressionUnknownSymbol or ExpressionUnknownRecord or ExpressionUnknownField or ExpressionRecordUsedAsValue or ExpressionScalarUsedAsRecord or ExpressionTypeMismatch or ExpressionInvalidOperator or ExpressionDivisionByZero or ExpressionCycle or ExpressionUnsupported or ToleranceInvalidType or ToleranceUnitMismatch or ToleranceInvalidLiteral or ToleranceNegativeBilateral or ToleranceMissingMinus or ToleranceMissingPlus or ToleranceUnsupported or RecognitionEvidenceRadiusInvalid or RecognitionEvidenceSurfaceFamilyUnknown or RecognitionEvidenceAxisInvalid or SemanticProposalKindMismatch or SemanticProposalRadiusInvalid or SemanticProposalTargetUnresolved or SemanticProposalEndUnsupported or ConceptUnknownFamily or ConceptUnknownConcept or ConceptMissingRequiredField or ConceptUnknownField or ConceptDuplicateField or ConceptFieldTypeMismatch or ConceptInvalidTarget or ConceptDescriptorUnavailable or PmiDuplicateBlock or PmiDuplicateRecord or PmiDuplicateDatum or PmiUnknownRecordKind or PmiMissingRequiredField or PmiUnknownField or PmiDuplicateField or PmiInvalidTarget or PmiUnknownDatum or PmiDimensionTypeMismatch or PmiDimensionMissingTolerance or PmiToleranceTypeMismatch or StandaloneFillRegionRequired or UnsupportedStandaloneFillPattern or InvalidCellCount or CellSizeMustBePositive or StrutRadiusMustBePositive or NodeRadiusMustBePositive or MaterialBoundsMismatch or StandaloneFillMultipleUnsupported;+ public static bool IsFatalDiagnosticCode(string code) => code.StartsWith(CanonicalDeclarationUnknown + ":", StringComparison.Ordinal) || code.StartsWith(CanonicalConstructNotYetSupported + ":", StringComparison.Ordinal) || code.StartsWith(EdgeFinishProfileComposeBoundaryUnsupported, StringComparison.Ordinal) || IsConceptFatalDiagnostic(code) || code is UnknownConstructionPolicy or PrimitiveDoesNotSatisfyHollowConstructible or WallThicknessRequired or WallThicknessMustBePositive or UnsupportedOpening or MultipleOpeningsNotSupported or Phase3EdgeFinishSyntaxInvalid or PrimitiveFieldMissing or PrimitiveFieldUnknown or PrimitiveFieldInvalid or MissingModel or MissingUnits or MissingSolid or UnsupportedConstruct or UnknownRecordType or BoxMissingSize or BoxSizeArity or DegenerateDimension or NameUnresolved or DuplicateName or WithRequiresRecord or WithRequiresBoxRecord or WithFieldNotFound or WithFieldTypeMismatch or WithForwardReference or WithDerivedRecordInvalid or ExposeBlockUnsupported or ExposeRequiresBoxRecord or ExposeAliasDuplicate or ExposeAliasInvalid or SelectorUnsupported or SelectorAxisInvalid or SelectorSubselectorUnsupported or FatArrowOutsideExpose or RawBackendIdReferenceForbidden or ModifyTargetUnresolved or ModifyTargetNotSolid or RegionUnsupported or RegionAttachmentSelectorUnsupported or CutUnsupported or CutToolUnsupported or CylinderRadiusMissing or CylinderRadiusInvalid or CylinderRadiusNotFinite or ThroughSelectorUnsupported or AliasUnresolved or AliasRefTypeUnsupported or SideHoleAliasMustResolveToFace or SideHoleAliasResolvesToUnsupportedFace or SideHoleOnlyPlusXMinusXSupported or SideHoleRouteUnsupported or SideHoleSameFaceUnsupported or SideHoleAxisNotYetSupported or SideHoleRadiusExceedsClearance or CylinderCenterInvalid or CylinderCenterArityInvalid or CylinderCenterNotFinite or SideHoleCenterExceedsClearance or HoleVariantUnknown or HoleEntryFaceMissing or HoleCenterMissing or HoleShaftMissing or HoleEndMissing or HoleDiameterInvalid or HoleDepthInvalid or HoleCounterboreInvalid or HoleCountersinkInvalid or PmiKindUnknown or PmiTargetMissing or PmiTargetUnresolved or PmiDiameterInvalid or PmiDuplicateName or InlineStepUnknownBody or InlineStepUnknownFace or PmiImportedTargetNotFace or PmiImportedTargetRequiresCanonicalStep or PmiInvalidImportedTarget or InlineStepPathMissing or InlineStepPathInvalid or InlineStepFileMissing or InlineStepRequiresCanonical or UnknownRecognitionBody or UnknownRecognitionFace or DuplicateRegion or UnknownRecognitionRegion or InvalidRecognitionKind or InvalidRecognitionConfidence or PmiRecognizedRegionKindMismatch or UnknownReplacementBody or UnknownReplacementRegion or ReplacementKindMismatch or ReplacementFaceUnresolved or ReplacementUnsupportedKind or ReplacementVerificationFailed or ReplacementRadiusInvalid or ReplacementEndUnsupported or LetDuplicateName or LetUnknownType or LetMismatch or LetInvalidLiteral or LetUnitMismatch or LetLiteralOnly or LetRecordDuplicateName or LetRecordDuplicateField or LetReferenceUnknownRecord or LetReferenceUnknownField or LetReferenceNonRecord or LetReferenceRecordUsedAsValue or ExpressionUnknownSymbol or ExpressionUnknownRecord or ExpressionUnknownField or ExpressionRecordUsedAsValue or ExpressionScalarUsedAsRecord or ExpressionTypeMismatch or ExpressionInvalidOperator or ExpressionDivisionByZero or ExpressionCycle or ExpressionUnsupported or ToleranceInvalidType or ToleranceUnitMismatch or ToleranceInvalidLiteral or ToleranceNegativeBilateral or ToleranceMissingMinus or ToleranceMissingPlus or ToleranceUnsupported or RecognitionEvidenceRadiusInvalid or RecognitionEvidenceSurfaceFamilyUnknown or RecognitionEvidenceAxisInvalid or SemanticProposalKindMismatch or SemanticProposalRadiusInvalid or SemanticProposalTargetUnresolved or SemanticProposalEndUnsupported or ConceptUnknownFamily or ConceptUnknownConcept or ConceptMissingRequiredField or ConceptUnknownField or ConceptDuplicateField or ConceptFieldTypeMismatch or ConceptInvalidTarget or ConceptDescriptorUnavailable or PmiDuplicateBlock or PmiDuplicateRecord or PmiDuplicateDatum or PmiUnknownRecordKind or PmiMissingRequiredField or PmiUnknownField or PmiDuplicateField or PmiInvalidTarget or PmiUnknownDatum or PmiDimensionTypeMismatch or PmiDimensionMissingTolerance or PmiToleranceTypeMismatch or StandaloneFillRegionRequired or UnsupportedStandaloneFillPattern or InvalidCellCount or CellSizeMustBePositive or StrutRadiusMustBePositive or NodeRadiusMustBePositive or MaterialBoundsMismatch or StandaloneFillMultipleUnsupported;private static IReadOnlyList<FirmamentV2Exposure> ParseExposures(string body, List<string> diagnostics){@@ -2384,7 +2477,8 @@ public static class FirmamentV2ParserIReadOnlyList<FirmamentV2RecognizedRegion> recognizedRegions,IReadOnlyList<FirmamentV2BoundLet> boundLets,IReadOnlyList<FirmamentV2BoundLetRecord> boundLetRecords,- List<string> diagnostics)+ List<string> diagnostics,+ IEnumerable<string>? additionalHoleNames = null){var matches = PmiHeaderRegex.Matches(source);if (matches.Count == 0) return ([], null, null);@@ -2402,13 +2496,13 @@ public static class FirmamentV2Parservar knownDatums = new HashSet<string>(StringComparer.Ordinal);var letMap = boundLets.ToDictionary(l => l.Name, StringComparer.Ordinal);var recordMap = boundLetRecords.ToDictionary(r => r.Name, StringComparer.Ordinal);- var holeNames = modifyBlocks.SelectMany(m => m.SemanticHoles).Select(h => h.Name).ToHashSet(StringComparer.Ordinal);+ var holeNames = modifyBlocks.SelectMany(m => m.SemanticHoles).Select(h => h.Name).Concat(additionalHoleNames ?? []).ToHashSet(StringComparer.Ordinal);var regionByTarget = recognizedRegions.ToDictionary(r => r.TargetSource, r => r, StringComparer.Ordinal);var aliases = solids.Values.SelectMany(s => s.Box?.Exposures ?? []).Select(e => e.Alias).ToHashSet(StringComparer.Ordinal);foreach (Match em in PmiEntryHeaderRegex.Matches(body)){- var kindRaw = em.Groups["kind"].Value;+ var kindRaw = NormalizePmiKind(em.Groups["kind"].Value);var name = em.Groups["name"].Value;if (!TryPmiKind(kindRaw, out var kind)) { diagnostics.Add(PmiUnknownRecordKind); diagnostics.Add(PmiKindUnknown); continue; }if (kind == FirmamentV2PmiKind.DatumPlane && !datumLabels.Add(name)) { diagnostics.Add(PmiDuplicateDatum); }@@ -2436,12 +2530,17 @@ public static class FirmamentV2Parserprivate static Dictionary<string, FirmamentV2PmiField> ParsePmiFields(string body, int baseOffset, List<string> diagnostics){var fields = new Dictionary<string, FirmamentV2PmiField>(StringComparer.Ordinal);- var fieldRegex = new Regex(@"(?<name>targetA|targetB|target|dimension|value|diameter|tolerance|datum)\s*:\s*(?<value>.*?)(?=\s+(?:targetA|targetB|target|dimension|value|diameter|tolerance|datum)\s*:|$)", RegexOptions.CultureInvariant | RegexOptions.Singleline);+ // Capture every field first. A whitelist-only capture silently lost+ // misspellings such as Tolerence, precisely what canonical PMI must not do.+ var fieldRegex = new Regex(@"(?<name>[A-Za-z_][A-Za-z0-9_]*)\s*:\s*(?<value>.*?)(?=\s+[A-Za-z_][A-Za-z0-9_]*\s*:|$)", RegexOptions.CultureInvariant | RegexOptions.Singleline);foreach (Match m in fieldRegex.Matches(body)){- var n = m.Groups["name"].Value;+ var n = NormalizePmiField(m.Groups["name"].Value);var v = m.Groups["value"].Value.Trim();if (v.EndsWith("}", StringComparison.Ordinal)) v = v[..^1].Trim();+ if (string.Equals(m.Groups["name"].Value, "DatumRefs", StringComparison.Ordinal)+ && v.StartsWith("[", StringComparison.Ordinal) && v.EndsWith("]", StringComparison.Ordinal))+ v = v[1..^1].Trim();if (fields.ContainsKey(n)) { diagnostics.Add(PmiDuplicateField); continue; }fields[n] = new(n, v, new FirmamentV2SourceSpan(baseOffset + m.Index, m.Length), null);}@@ -2449,12 +2548,38 @@ public static class FirmamentV2Parserreturn fields;}+ private static string NormalizePmiKind(string raw) => raw switch+ {+ "Datum" => "datum",+ "HoleDiameter" => "diameter",+ "Distance" => "distance",+ "Flatness" => "flatness",+ "Parallel" => "parallel",+ "Perpendicular" => "perpendicular",+ "Coplanar" => "coplanar",+ _ => raw+ };++ private static string NormalizePmiField(string raw) => raw switch+ {+ "Target" => "target",+ "TargetA" => "targetA",+ "TargetB" => "targetB",+ "Dimension" => "dimension",+ "Value" => "value",+ "Diameter" => "diameter",+ "Tolerance" => "tolerance",+ "Datum" => "datum",+ "DatumRefs" => "datum",+ _ => raw+ };+private static bool TryPmiKind(string raw, out FirmamentV2PmiKind kind) { kind = raw switch { "diameter"=>FirmamentV2PmiKind.HoleDiameter, "datum"=>FirmamentV2PmiKind.DatumPlane, "distance"=>FirmamentV2PmiKind.Distance, "flatness"=>FirmamentV2PmiKind.Flatness, "parallel"=>FirmamentV2PmiKind.Parallel, "perpendicular"=>FirmamentV2PmiKind.Perpendicular, "coplanar"=>FirmamentV2PmiKind.Coplanar, _=>default }; return raw is "diameter" or "datum" or "distance" or "flatness" or "parallel" or "perpendicular" or "coplanar"; }private static void ValidatePmiFieldSet(string kind, string name, IReadOnlyDictionary<string,FirmamentV2PmiField> fields, List<string> diagnostics){string[] required = kind switch { "datum"=>["target"], "diameter"=> fields.ContainsKey("dimension") ? ["target","dimension"] : fields.ContainsKey("diameter") ? ["target","diameter"] : ["target","value"], "distance"=>["targetA","targetB","dimension"], "flatness"=>["target","tolerance"], "parallel" or "perpendicular" or "coplanar"=>["target","datum","tolerance"], _=>[] };- var allowed = required.Concat(kind=="diameter"?["tolerance","diameter","value","dimension"]:[]).ToHashSet(StringComparer.Ordinal);+ var allowed = required.Concat(kind=="diameter"?["tolerance","diameter","value","dimension","datum"]:[]).ToHashSet(StringComparer.Ordinal);foreach (var r in required) if (!fields.ContainsKey(r)) diagnostics.Add(PmiMissingRequiredField);foreach (var f in fields.Keys) if (!allowed.Contains(f)) diagnostics.Add(PmiUnknownField);}@@ -2479,13 +2604,28 @@ public static class FirmamentV2Parser{ if (Field(r,"tolerance") is string t && TryParsePmiLength(NormalizePmiLengthLiteral(t), diagnostics, out var lit)) ctlTol=lit; else diagnostics.Add(PmiToleranceTypeMismatch); }if (r.Kind is FirmamentV2PmiKind.Parallel or FirmamentV2PmiKind.Perpendicular or FirmamentV2PmiKind.Coplanar){ var d=Field(r,"datum"); if (d is null || !datums.Contains(d)) diagnostics.Add(PmiUnknownDatum); else datumRefs.Add(d); }+ if (r.Kind == FirmamentV2PmiKind.HoleDiameter && Field(r,"datum") is string datum)+ { if (!datums.Contains(datum)) diagnostics.Add(PmiUnknownDatum); else datumRefs.Add(datum); }bound=new(r.Kind,r.Name,targets,dim,dimTol,ctlTol,datumRefs,r.SourceSpan); return !diagnostics.Any(x=>x.StartsWith("firmament-v2-pmi-",StringComparison.Ordinal) && x is not PmiUnsupported);}private static string? Field(FirmamentV2PmiRecord r,string name)=>r.Fields.TryGetValue(name,out var f)?f.Source:null;private static FirmamentV2BoundLet? ResolveBoundLet(string s,IReadOnlyDictionary<string,FirmamentV2BoundLet> lets,IReadOnlyDictionary<string,FirmamentV2BoundLetRecord> records){var m=DottedReferenceRegex.Match(s); if(m.Success&&records.TryGetValue(m.Groups["record"].Value,out var rec)&&rec.Fields.TryGetValue(m.Groups["field"].Value,out var f))return f; return lets.TryGetValue(s,out var l)?l:null;}private static string NormalizePmiLengthLiteral(string s) => Regex.Replace(s.Trim(), @"(?<=\d)\s+(?=mm$)", "", RegexOptions.CultureInvariant);private static bool TryParsePmiLength(string s,List<string> d,out FirmamentV2LiteralValue lit){lit=null!; var v=ParseLetLiteral(FirmamentV2PrimitiveType.Length,s,d); if(v is null){d.Add(PmiToleranceTypeMismatch); return false;} if(v.NumericValue is < 0){ d.Add(PmiDiameterInvalid); return false; } lit=v; return true;}- private static bool TryParseToleranceLiteral(string s,List<string>d,out FirmamentV2Tolerance tol){tol=null!; var t=ParseTolerance(FirmamentV2PrimitiveType.Length,s,d); if(t is null){d.Add(PmiToleranceTypeMismatch); return false;} tol=t; return true;}+ private static bool TryParseToleranceLiteral(string s,List<string>d,out FirmamentV2Tolerance tol)+ {+ tol=null!;+ var plusMinus = Regex.Match(s, @"^PlusMinus\(\s*(?<plus>[-+]?\d+(?:\.\d+)?)mm\s*,\s*(?<minus>[-+]?\d+(?:\.\d+)?)mm\s*\)$", RegexOptions.CultureInvariant);+ if (plusMinus.Success)+ {+ var plus = double.Parse(plusMinus.Groups["plus"].Value, CultureInfo.InvariantCulture);+ var minus = double.Parse(plusMinus.Groups["minus"].Value, CultureInfo.InvariantCulture);+ if (plus < 0 || minus < 0) { d.Add(PmiToleranceTypeMismatch); return false; }+ tol = new(FirmamentV2ToleranceKind.Asymmetric, plus, minus, "mm", FirmamentV2PrimitiveType.Length, new(0, s.Length));+ return true;+ }+ var t=ParseTolerance(FirmamentV2PrimitiveType.Length,s,d); if(t is null){d.Add(PmiToleranceTypeMismatch); return false;} tol=t; return true;+ }private static void ValidateTarget(string target,FirmamentV2PmiKind kind,Dictionary<string,FirmamentV2SolidBinding> solids,IReadOnlyDictionary<string,FirmamentV2RecognizedRegion> regions,HashSet<string> aliases,HashSet<string> holeNames,List<string> diagnostics){ if (TryValidateImportedFaceTarget(target, solids, diagnostics)) return; if (RecognizedRegionTargetRegex.IsMatch(target)){ var m=RecognizedRegionTargetRegex.Match(target); var body=m.Groups["body"].Value; if(regions.TryGetValue(target,out var region)){ if((kind==FirmamentV2PmiKind.HoleDiameter&®ion.Kind!="holeShaft") || (kind==FirmamentV2PmiKind.DatumPlane&®ion.Kind!="datumPlane")) diagnostics.Add(PmiRecognizedRegionKindMismatch); } else if(regions.Values.Any(r=>r.BodyName==body) || diagnostics.Contains(UnknownRecognitionFace)) diagnostics.Add(UnknownRecognitionRegion); return;} if(aliases.Contains(target)||FaceSelectorRegex.IsMatch(target)||holeNames.Contains(target))return; if(!target.Contains(".region(",StringComparison.Ordinal)) { diagnostics.Add(PmiInvalidTarget); diagnostics.Add(PmiTargetUnresolved); } }diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/ProfileAuthoringParser.cs b/Aetheris.Kernel.Firmament/FirmamentV2/ProfileAuthoringParser.csindex f15e3301..0841b1eb 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/ProfileAuthoringParser.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/ProfileAuthoringParser.cs@@ -7,6 +7,7 @@ namespace Aetheris.Kernel.Firmament.FirmamentV2;/// <summary>Bounded parser for the first scaffold-referenced profile source route.</summary>public static class ProfileAuthoringParser{+ public const string SegmentEndpointMustReferenceNamedPoint = "ProfileSegmentEndpointMustReferenceNamedPoint";private static readonly Regex Point = new(@"\bPoint2\s+(?<n>\w+)\s*\{\s*Position\s*:\s*(?:\[|Point2\s*\()\s*(?<x>[-+.\d]+)mm\s*,\s*(?<y>[-+.\d]+)mm\s*(?:\]|\))", RegexOptions.Singleline);private static readonly Regex Line = new(@"\bLine2\s+(?<n>\w+)\s*\{\s*From\s*:\s*(?<a>\w+)\s*;?\s*To\s*:\s*(?<b>\w+)", RegexOptions.Singleline);private static readonly Regex Circle = new(@"\bCircle2\s+(?<n>\w+)\s*\{\s*Center\s*:\s*(?<c>\w+)\s*;?\s*Radius\s*:\s*(?<r>[-+.\d]+)mm", RegexOptions.Singleline);@@ -49,6 +50,8 @@ public static class ProfileAuthoringParservar circles=new Dictionary<string,((double X,double Y) C,double R)>(StringComparer.Ordinal);foreach(Match m in Circle.Matches(source)){if(!pts.TryGetValue(m.Groups["c"].Value,out var c))d.Add($"profile-layout-unresolved-circle:{m.Groups["n"].Value}");else circles[m.Groups["n"].Value]=(c,N(m,"r"));}var segments=new List<ResolvedProfileSegment2D>();+ foreach (Match rawSegment in Regex.Matches(h.Groups["body"].Value, @"\bSegment\s+(?<name>\w+)\s*\{[\s\S]*?\b(?<endpoint>From|To)\s*:\s*(?<value>\[[^\]]*\]|Point2\s*\([^)]*\))", RegexOptions.CultureInvariant))+ d.Add($"{SegmentEndpointMustReferenceNamedPoint}:{rawSegment.Groups["name"].Value}:{rawSegment.Groups["endpoint"].Value}");foreach(Match m in Segment.Matches(h.Groups["body"].Value)){ var n=m.Groups["n"].Value; if(!pts.TryGetValue(m.Groups["from"].Value,out var a)||!pts.TryGetValue(m.Groups["to"].Value,out var b)){d.Add($"profile-segment-unresolved:{n}");continue;} var trace=m.Groups["trace"].Value; LineArcProfileCurve2D? g=null;if(lines.TryGetValue(trace,out var line)){if(!OnLine(a,line)||!OnLine(b,line))d.Add($"profile-endpoint-not-on-guide:{n}:{trace}"); g=new LineArcLineSegment2D(a,b);}diff --git a/Aetheris.Kernel.Firmament/Materializer/PrismaticProfileComposition.cs b/Aetheris.Kernel.Firmament/Materializer/PrismaticProfileComposition.csindex 7ef901f3..3ed68ce3 100644--- a/Aetheris.Kernel.Firmament/Materializer/PrismaticProfileComposition.cs+++ b/Aetheris.Kernel.Firmament/Materializer/PrismaticProfileComposition.cs@@ -72,6 +72,7 @@ public sealed record PrismaticProfileCompositionParseResult(/// </summary>public static class PrismaticProfileCompositionParser{+ public const string SegmentEndpointMustReferenceNamedPoint = "ProfileSegmentEndpointMustReferenceNamedPoint";private static readonly Regex Point = new(@"\bPoint2\s+(?<n>\w+)\s*\{\s*Position\s*:\s*(?:\[|Point2\s*\()\s*(?<x>[-+.\d]+)mm\s*,\s*(?<y>[-+.\d]+)mm\s*(?:\]|\))", RegexOptions.Singleline | RegexOptions.CultureInvariant);private static readonly Regex Line = new(@"\bLine2\s+(?<n>\w+)\s*\{\s*From\s*:\s*(?<a>\w+)\s*;?\s*To\s*:\s*(?<b>\w+)", RegexOptions.Singleline | RegexOptions.CultureInvariant);private static readonly Regex Circle = new(@"\bCircle2\s+(?<n>\w+)\s*\{\s*Center\s*:\s*(?<c>\w+)\s*;?\s*Radius\s*:\s*(?<r>[-+.\d]+)mm", RegexOptions.Singleline | RegexOptions.CultureInvariant);@@ -138,6 +139,8 @@ public static class PrismaticProfileCompositionParser{var body = Block(source, header.Index + header.Length - 1);if (body is null) { diagnostics.Add($"compose-profile-unclosed:{header.Groups["n"].Value}"); continue; }+ foreach (Match rawSegment in Regex.Matches(body, @"\bSegment\s+(?<name>\w+)\s*\{[\s\S]*?\b(?<endpoint>From|To)\s*:\s*(?<value>\[[^\]]*\]|Point2\s*\([^)]*\))", RegexOptions.CultureInvariant))+ diagnostics.Add($"{SegmentEndpointMustReferenceNamedPoint}:{rawSegment.Groups["name"].Value}:{rawSegment.Groups["endpoint"].Value}");var segments = new List<ResolvedProfileSegment2D>();foreach (Match match in Segment.Matches(body)){diff --git a/docs/firmament/canonical-construct-safety-pmi-x5.md b/docs/firmament/canonical-construct-safety-pmi-x5.mdnew file mode 100644index 00000000..819a39ce--- /dev/null+++ b/docs/firmament/canonical-construct-safety-pmi-x5.md@@ -0,0 +1,53 @@+# CANONICAL-CONSTRUCT-SAFETY-PMI-X5++Round 3 established a useful Profile/Compose CNC route, but also exposed a+language-integrity hole: an unclaimed canonical block could be skipped without+diagnostic, and `Pmi` was only reachable through the lowercase compatibility+reader.++## Declaration safety++Canonical root scanning now inspects declaration-shaped blocks at root brace+depth only. Claimed declarations continue to use their owning parser; nested+fields and nested feature blocks are therefore left to their specific+diagnostics. An unclaimed block reports+`firmament-v2-canonical-declaration-unknown:<Keyword>`. A known+compatibility-only top-level family reports+`firmament-v2-canonical-construct-not-yet-supported:<Keyword>`.++| V2 declaration family | Status |+| --- | --- |+| Units, Box, Cylinder, RoundedBox, Frustum, Modify, InlineStep | canonical |+| Concept/Struct, Construction Plane, Profile, Compose, Selection | canonical |+| Record, Static, Template, Pattern, Require, Match | canonical bounded static route |+| Recognize, Replace | canonical |+| Pmi | canonical and normalized through the existing V2 PMI records |+| Solid, Let, Fill, Manufacturing, Feature, Expose | compatibility-only or separately scoped; canonical root reports explicit port status |++The scanner intentionally does not claim nested `EdgeFinish`, `Hole`, PMI+records, or fields: those must retain their specialized diagnostics.++## PMI++Canonical `Pmi`, `Datum`, `HoleDiameter`, `Target`, `Value`, `Tolerance`, and+`DatumRefs` normalize to `FirmamentV2PmiRecord` and+`FirmamentV2BoundPmiRecord`. No duplicate lowering exists. Existing PMI target+binding validates semantic hole IDs and admitted face selectors; the AP242+exporter consumes the bound values and tolerance.++The canonical production fixture is+`fixtures/FirmamentV2/Canonical/valid/box-hole-pmi.firmament`.++## Profile authoring and EdgeFinish admission++`fixtures/FirmamentV2/Canonical/valid/profile-compose-l-bracket.firmament`+shows a six-segment L loop from two `Rect2` guides and one named `Point2`.+`Segment.From` and `Segment.To` must be named points (including named Rect2+corners); literal coordinates produce+`ProfileSegmentEndpointMustReferenceNamedPoint`.++The paired invalid fixture records the current honest limitation:+`EdgeFinishProfileComposeBoundaryUnsupported`. The semantic boundary exists,+but arbitrary Profile/Compose polygon-boundary chamfer and fillet+materialization remains deferred. Primitive rectangular and explicitly+admitted semantic-chain routes remain unchanged.diff --git a/docs/firmament/v2-canonical-authoring.md b/docs/firmament/v2-canonical-authoring.mdindex f8b0b3a4..783e0acb 100644--- a/docs/firmament/v2-canonical-authoring.md+++ b/docs/firmament/v2-canonical-authoring.md@@ -51,6 +51,13 @@ Model Bracket {- A shaft hole uses `On`, `Center`, `Diameter`, and `End`. `End: ThroughAll` is the simple through-hole; `End: Blind <depth>mm` is the canonical blind spelling.- An edge finish uses `Face`, `Target`, `Kind`, and either `Distance` (chamfer) or `Radius` (fillet).+### PMI++`Pmi` is a canonical top-level block. Use PascalCase record and field names;+it binds to semantic features rather than raw topology IDs. See+[PMI authoring](v2-pmi-authoring.md) for the complete `Datum` plus+`HoleDiameter` example and tolerance syntax.+The currently proven low-ceremony production shape is one Box, one top-face ThroughAll shaft Hole, and one disjoint `+Z Boundary Chamfer`. It routes to `CombinedHoleEdgeFinish`, then authoritative STEP export and STEP reimport verification.## Advanced declarations in the same document@@ -146,6 +153,22 @@ Profile-guide `Point2` and `Rect2` declarations accept typed `Point2(x, y)`literals, including values substituted from a static record. Bracketcoordinates remain accepted for existing fixtures during migration.+### Non-rectangular Profile composition++`Segment.From` and `Segment.To` reference named points only: a declared+`Point2` or a named `Rect2` corner such as `Guide.TopLeft`. Coordinate literals+are not endpoints. A segment traces the infinite `Line2` or Rect2-side+support, so aligned named points can be collinear even when they are not the+guide's original endpoints. Close the loop and use counter-clockwise winding.++The multi-guide L example is+`fixtures/FirmamentV2/Canonical/valid/profile-compose-l-bracket.firmament`.+It uses two overlapping `Rect2` guides plus a named notch point. The valid+fixture intentionally has no EdgeFinish: arbitrary Profile/Compose polygon+boundary chamfer and fillet materialization is not yet admitted. Such a finish+reports `EdgeFinishProfileComposeBoundaryUnsupported`, rather than a missing+semantic source; see the paired invalid fixture.+## Canonical examples- `fixtures/FirmamentV2/Canonical/valid/bare-box.firmament`@@ -156,6 +179,8 @@ coordinates remain accepted for existing fixtures during migration.- `fixtures/FirmamentV2/Canonical/valid/box-hole-chamfer.firmament`- `fixtures/FirmamentV2/Canonical/valid/profile-line-extrusion.firmament`- `fixtures/FirmamentV2/Canonical/valid/profile-compose-base.firmament`+- `fixtures/FirmamentV2/Canonical/valid/profile-compose-l-bracket.firmament`+- `fixtures/FirmamentV2/Canonical/valid/box-hole-pmi.firmament`- `fixtures/FirmamentV2/Canonical/valid/semantic-slot-capsule.firmament`- `fixtures/FirmamentV2/Canonical/valid/semantic-slot-rounded-rectangle.firmament`- `fixtures/FirmamentV2/Canonical/valid/semantic-selection-chamfer.firmament`diff --git a/docs/firmament/v2-pmi-authoring.md b/docs/firmament/v2-pmi-authoring.mdnew file mode 100644index 00000000..2f623351--- /dev/null+++ b/docs/firmament/v2-pmi-authoring.md@@ -0,0 +1,29 @@+# Firmament V2 PMI authoring++`Pmi` is a canonical top-level declaration. Its records normalize into the+same V2 PMI AST, binding, validation report, and AP242 export path as the+lowercase compatibility adapter. New source should use the PascalCase form.++```firmament+Pmi {+ Datum A { Target: face(+Z) }+ HoleDiameter MountDiameter {+ Target: Mount+ Value: 8mm+ Tolerance: PlusMinus(0.05mm, 0.02mm)+ DatumRefs: [A]+ }+}+```++`Target` names a semantic hole feature or an admitted face selector; it is not+a raw topology identifier. `HoleDiameter` accepts `Value` (or the existing+`Dimension` compatibility form), and its tolerance may be `PlusMinus(plus,+minus)`. `DatumRefs` is the canonical single-datum reference spelling for the+currently supported dimensional callout route.++Unknown kinds, targets, and fields are fatal typed diagnostics. In particular,+use `Tolerance`, `DatumRefs`, `Target`, and `Value` exactly; misspellings are+not ignored. See+`fixtures/FirmamentV2/Canonical/valid/box-hole-pmi.firmament` for an+exportable example.diff --git a/fixtures/FirmamentV2/Canonical/invalid/profile-compose-l-bracket-edgefinish-unsupported.firmament b/fixtures/FirmamentV2/Canonical/invalid/profile-compose-l-bracket-edgefinish-unsupported.firmamentnew file mode 100644index 00000000..b26ba548--- /dev/null+++ b/fixtures/FirmamentV2/Canonical/invalid/profile-compose-l-bracket-edgefinish-unsupported.firmament@@ -0,0 +1,18 @@+Model ProfileComposeLBracketFinish {+ Units: mm+ Concept Struct Layout On XY {+ Rect2 Horizontal { Center: [0mm, -10mm]; Size: [80mm, 20mm] }+ Rect2 Vertical { Center: [-30mm, 10mm]; Size: [20mm, 60mm] }+ Point2 Notch { Position: [-20mm, 0mm] }+ }+ Profile Bracket Using Layout { Loop Outer {+ Segment South { Trace: Horizontal.Bottom; From: Horizontal.BottomLeft; To: Horizontal.BottomRight }+ Segment East { Trace: Horizontal.Right; From: Horizontal.BottomRight; To: Horizontal.TopRight }+ Segment Inner { Trace: Horizontal.Top; From: Horizontal.TopRight; To: Notch }+ Segment Upright { Trace: Vertical.Right; From: Notch; To: Vertical.TopRight }+ Segment North { Trace: Vertical.Top; From: Vertical.TopRight; To: Vertical.TopLeft }+ Segment West { Trace: Vertical.Left; From: Vertical.TopLeft; To: Horizontal.BottomLeft }+ } }+ Struct BracketBody { Compose BracketBody { Base Stock { Profile: Bracket; From: 0mm; To: 12mm; Role: Stock } } }+ EdgeFinish TopBreak { Face: +Z Target: Boundary Kind: Chamfer Distance: 1mm }+}diff --git a/fixtures/FirmamentV2/Canonical/valid/box-hole-pmi.firmament b/fixtures/FirmamentV2/Canonical/valid/box-hole-pmi.firmamentnew file mode 100644index 00000000..000cfc20--- /dev/null+++ b/fixtures/FirmamentV2/Canonical/valid/box-hole-pmi.firmament@@ -0,0 +1,22 @@+Model CanonicalPmiMount {+ Units: mm++ Box Base { Size: [80mm, 50mm, 12mm] }+ Modify Base {+ Hole<Shaft> Mount {+ On: +Z+ Center: Point2(0mm, 0mm)+ Diameter: 8mm+ End: ThroughAll+ }+ }+ Pmi {+ Datum A { Target: face(+Z) }+ HoleDiameter MountDiameter {+ Target: Mount+ Value: 8mm+ Tolerance: PlusMinus(0.05mm, 0.02mm)+ DatumRefs: [A]+ }+ }+}diff --git a/fixtures/FirmamentV2/Canonical/valid/profile-compose-l-bracket.firmament b/fixtures/FirmamentV2/Canonical/valid/profile-compose-l-bracket.firmamentnew file mode 100644index 00000000..fcaf65aa--- /dev/null+++ b/fixtures/FirmamentV2/Canonical/valid/profile-compose-l-bracket.firmament@@ -0,0 +1,26 @@+Model ProfileComposeLBracket {+ Units: mm++ // Two guides deliberately overlap. The named Notch point and the Rect2+ // corners form a six-segment counter-clockwise L boundary.+ Concept Struct Layout On XY {+ Rect2 Horizontal { Center: [0mm, -10mm]; Size: [80mm, 20mm] }+ Rect2 Vertical { Center: [-30mm, 10mm]; Size: [20mm, 60mm] }+ Point2 Notch { Position: [-20mm, 0mm] }+ }++ Profile Bracket Using Layout { Loop Outer {+ Segment South { Trace: Horizontal.Bottom; From: Horizontal.BottomLeft; To: Horizontal.BottomRight }+ Segment East { Trace: Horizontal.Right; From: Horizontal.BottomRight; To: Horizontal.TopRight }+ Segment Inner { Trace: Horizontal.Top; From: Horizontal.TopRight; To: Notch }+ Segment Upright { Trace: Vertical.Right; From: Notch; To: Vertical.TopRight }+ Segment North { Trace: Vertical.Top; From: Vertical.TopRight; To: Vertical.TopLeft }+ Segment West { Trace: Vertical.Left; From: Vertical.TopLeft; To: Horizontal.BottomLeft }+ } }++ Struct BracketBody {+ Compose BracketBody {+ Base Stock { Profile: Bracket; From: 0mm; To: 12mm; Role: Stock }+ }+ }+}