Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Improve Firmament guitar feature authoring
Yuechen Lia3b6e9549e47
diff --git a/Aetheris.CLI.Tests/SheetMetalCliTests.cs b/Aetheris.CLI.Tests/SheetMetalCliTests.csindex a4311105..ccf0e3d1 100644--- a/Aetheris.CLI.Tests/SheetMetalCliTests.cs+++ b/Aetheris.CLI.Tests/SheetMetalCliTests.cs@@ -8,6 +8,18 @@ namespace Aetheris.CLI.Tests;public sealed class SheetMetalCliTests{+ [Fact]+ public void SemanticAdmissionErrorsPrintSourceLocationAndExplanation()+ {+ var input=Path.Combine(RepoRoot,"fixtures/Regression/SheetMetalSemantics/layout-unknown-field.firmament");+ var output=new StringWriter();var error=new StringWriter();+ Assert.Equal(1,CliRunner.Run(["validate",input],output,error));+ Assert.Contains(Path.GetFullPath(input),error.ToString(),StringComparison.Ordinal);+ Assert.Matches(@"\([0-9]+,[0-9]+\)",error.ToString());+ Assert.Contains("firmament-v2-canonical-field-unknown",error.ToString(),StringComparison.Ordinal);+ Assert.Contains("Coutn",error.ToString(),StringComparison.Ordinal);+ }+private static readonly string RepoRoot=FindRepoRoot();[Fact]diff --git a/Aetheris.CLI/CliRunner.cs b/Aetheris.CLI/CliRunner.csindex d3e83b5d..4241c0fe 100644--- a/Aetheris.CLI/CliRunner.cs+++ b/Aetheris.CLI/CliRunner.cs@@ -890,7 +890,7 @@ public static class CliRunnerif(!authored.IsSuccess||authored.Part?.FormedBody is null){if(json)stdout.WriteLine(JsonSerializer.Serialize(new{command="build",success=false,input=Path.GetFullPath(sourcePath),domain="SheetMetal",diagnostics=authored.Diagnostics},JsonOptions));- else{stderr.WriteLine("Build failed:");foreach(var d in authored.Diagnostics)stderr.WriteLine($"- [{d.Severity}] {d.Code}: {d.Message}");}+ else{stderr.WriteLine("Build failed:");WriteSheetMetalDiagnostics(authored.Diagnostics,stderr);}return 1;}var semanticPmi=authored.Spec?.Manufacturing.ToStep242SemanticPmi(authored.Part)??[];@@ -960,7 +960,7 @@ public static class CliRunnerstdout.WriteLine($"Sheet Metal: {part.RecognitionStatus} ({report.sourceAuthority})");if(part.Material is not null)stdout.WriteLine($"Material: {part.Material}");stdout.WriteLine($"Thickness: {part.Thickness:G8} mm{(thickness is null?" authored/recovered":$" ± {thickness.Tolerance:G4} mm, {thickness.SourcePairs.Count(p=>p.Admitted)} paired supports")}");stdout.WriteLine($"Regions: {part.Regions.Count} ({part.Regions.Count(r=>r.Kind==SheetRegionKind.Planar)} planar, {part.Regions.Count(r=>r.Kind==SheetRegionKind.CylindricalBend)} cylindrical)");stdout.WriteLine($"Bends: {part.Bends.Count}; cuts: {part.Features.Count}; base: {part.BaseRegionId}");foreach(var bend in part.Bends)stdout.WriteLine($" {bend.StableId}: {bend.BendAngleRadians*180/Math.PI:G5} deg, R{bend.InsideRadius:G6}, {bend.Direction}, {bend.AdjacentRegionA} -> {bend.AdjacentRegionB}");stdout.WriteLine($"Flat pattern: {flat.Status}; MaterialArea={(flat.MaterialArea is { } materialArea?$"{materialArea:G10} mm^2":"unavailable")}; BoundingArea={(flat.BoundingArea is { } boundingArea?$"{boundingArea:G10} mm^2":"unavailable")}; {(flat.Bounds is null?"no bounds":$"{flat.Bounds.Width:G8} x {flat.Bounds.Height:G8} mm")}; K={flat.Policy.KFactor:G4}; hash={flat.DeterministicHash}");if(flatStepOutput is not null)stdout.WriteLine($"STEP: {flatStepOutput}");if(firmamentOutput is not null)stdout.WriteLine($"Firmament: {firmamentOutput}");if(output is not null)stdout.WriteLine($"SVG: {output}");foreach(var d in allDiagnostics)stdout.WriteLine($" [{d.Severity}] {d.Code}: {d.Message}");}return flat.Status is FlatPatternStatus.Unsupported or FlatPatternStatus.Overlapping?2:0;- void WriteFailure(IReadOnlyList<SheetMetalDiagnostic> ds){if(json)stdout.WriteLine(JsonSerializer.Serialize(new{command=$"sheetmetal {operation}",success=false,input,diagnostics=ds},JsonOptions));else foreach(var d in ds)stderr.WriteLine($"[{d.Severity}] {d.Code}: {d.Message}");}+ void WriteFailure(IReadOnlyList<SheetMetalDiagnostic> ds){if(json)stdout.WriteLine(JsonSerializer.Serialize(new{command=$"sheetmetal {operation}",success=false,input,diagnostics=ds},JsonOptions));else WriteSheetMetalDiagnostics(ds,stderr);}}private static int RunSheetMetalRecognize(string[] args, TextWriter stdout, TextWriter stderr)@@ -1032,7 +1032,19 @@ public static class CliRunnerLineArcFullCircle2D circle=>new{center=new{x=circle.Center.X,y=circle.Center.Y},circle.Radius},_=>new{unsupported=curve.GetType().Name}};- private static void WriteSheetMetalDiagnostics(IEnumerable<SheetMetalDiagnostic> diagnostics,TextWriter stderr){foreach(var d in diagnostics)stderr.WriteLine($"[{d.Severity}] {d.Code}: {d.Message}");}+ private static void WriteSheetMetalDiagnostics(IEnumerable<SheetMetalDiagnostic> diagnostics,TextWriter stderr)+ {+ foreach(var diagnostic in diagnostics)+ {+ var file=diagnostic.SourceFile;+ var source=file is not null && File.Exists(file)?File.ReadAllText(file):null;+ var presented=FirmamentBuildAdmissionValidation.Locate(new(diagnostic.Code,diagnostic.Severity.ToString(),diagnostic.Message)+ { SourceSpan=diagnostic.SourceSpan,LocationNote=diagnostic.LocationNote },source,file ?? "unknown");+ var location=diagnostic.SourceSpan is not null && source is not null?$"{file}({presented.Line},{presented.Column}): ":file is not null?$"{file}: ":"";+ var note=diagnostic.LocationNote is { Length:>0 } detail?" "+detail:"";+ stderr.WriteLine($"{location}[{diagnostic.Severity}] {diagnostic.Code}: {diagnostic.Message}{note}");+ }+ }private static int RunSheetMetalRecover(string[] args, TextWriter stdout, TextWriter stderr){@@ -2514,7 +2526,11 @@ Model CanonicalPanel {diagnostics=sheet.Diagnostics};if(json)stdout.WriteLine(JsonSerializer.Serialize(new{sheetMetalValidation=payload},JsonOptions));- else stdout.WriteLine($"Sheet Metal validation: {status} ({payload.summary.fatalDiagnosticCount} fatal, {payload.summary.warningDiagnosticCount} warning)");+ else+ {+ stdout.WriteLine($"Sheet Metal validation: {status} ({payload.summary.fatalDiagnosticCount} fatal, {payload.summary.warningDiagnosticCount} warning)");+ WriteSheetMetalDiagnostics(sheet.Diagnostics,stderr);+ }return sheet.IsSuccess?0:1;}diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/CanonicalStaticAuthoring.cs b/Aetheris.Kernel.Firmament/FirmamentV2/CanonicalStaticAuthoring.csindex 114cbd76..4da4ba08 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/CanonicalStaticAuthoring.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/CanonicalStaticAuthoring.cs@@ -484,6 +484,38 @@ internal static class CanonicalStaticAuthoringreturn new(source, new(recordTypes, arrays, templates.Select(t => new FirmamentV2CanonicalTemplateDecl(t.Name, t.Type, t.Parameter, t.Body, t.Span)).ToArray(), patterns, requires, semanticConstraints, projections, staticRecords, tables, sets, symmetry.Mirrors, symmetry.RadialPatterns, linear.Patterns, linear.Axes, points.Points));}+ // Domain adapters reuse the existing finite Set binder and Pattern materializer.+ // No domain-specific evaluator or repetition engine is introduced here.+ internal static string ExpandDomainPatterns(string source,string ownerType,FirmamentCompileTimeValues scalars,List<string> diagnostics,IReadOnlySet<string> domainResults)+ {+ var syntax=FirmamentSyntaxParser.Parse(source).Document;+ var patterns=FirmamentSyntaxTraversal.Declarations(syntax).Where(d=>d.Type.Name.Text=="Pattern" && d.Clauses.Any(c=>c.Kind==ClauseKind.Over)).ToArray();+ if(patterns.Length==0)return source;+ var catalog=FirmamentV2TemplateExpansion.ReadDataCatalog(source,diagnostics,scalars);+ var types=catalog.Types.ToDictionary(p=>p.Key,p=>new FirmamentV2RecordTypeDecl(p.Key,p.Value.Fields,p.Value.SourceSpan),StringComparer.Ordinal);+ var sets=new Dictionary<string,FirmamentV2StaticSetDecl>(StringComparer.Ordinal);+ foreach(var d in FirmamentSyntaxTraversal.Declarations(syntax).Where(d=>d.Type.Name.Text=="Static" && d.Body is not null && d.Annotation is SpecializationSyntax { Target:ReferenceSyntax { Name.Text:"Set" } }))+ {+ var type=(SpecializationSyntax)d.Annotation!;+ var element=type.Arguments.Count==1?FirmamentSyntaxValues.Reference(type.Arguments[0].Value):null;+ if(d.Name is null || element is null || !IsSupportedSetElementType(element,types)) { diagnostics.Add(Prefix+"set-element-type-unsupported:"+d.Name?.Text);continue; }+ var entries=ParseSetEntries(source,d.Body!.ContentSpan.Start,d.Body.ContentSpan.Start+d.Body.ContentSpan.Length,d.Name.Text,element,types,diagnostics,scalars);+ if(!sets.TryAdd(d.Name.Text,new(d.Name.Text,element,entries,d.Span)))diagnostics.Add(Prefix+"set-duplicate:"+d.Name.Text);+ }+ var changes=new List<(int Start,int Length,string Text)>();+ foreach(var pattern in patterns)+ {+ var parent=FirmamentSyntaxTraversal.Declarations(syntax).FirstOrDefault(d=>d.Body?.Statements.Contains(pattern)==true);+ var name=pattern.Clauses.Count==1?FirmamentSyntaxValues.Reference(pattern.Clauses[0].Value):null;+ if(parent?.Type.Name.Text!=ownerType || pattern.Name is null || pattern.Body is null || pattern.Parameters.Count>0 || pattern.Annotation is not null || pattern.Initializer is not null || pattern.Modifiers.Count>0 || pattern.Occurrence || name is null || !sets.TryGetValue(name,out var set))+ { diagnostics.Add(Prefix+"pattern-source-invalid:"+pattern.Name?.Text+":use an owning "+ownerType+" and a bound named Set");continue; }+ ExpandSetPattern(pattern,set,new Dictionary<string,Template>(),changes,[],diagnostics,domainResults:domainResults);+ }+ if(changes.Sum(c=>(long)c.Text.Length)+source.Length>4*1024*1024){diagnostics.Add(Prefix+"pattern-output-limit");return source;}+ foreach(var change in changes.OrderByDescending(c=>c.Start))source=source.Remove(change.Start,change.Length).Insert(change.Start,change.Text);+ return source;+ }+private static IReadOnlyList<FirmamentV2StaticSetEntry> ParseSetEntries(string source, int start, int end, string setName, string elementType,IReadOnlyDictionary<string, FirmamentV2RecordTypeDecl> recordTypes, List<string> diagnostics, FirmamentCompileTimeValues? scalars = null){@@ -539,7 +571,7 @@ internal static class CanonicalStaticAuthoringprivate static void ExpandSetPattern(DeclarationSyntax pattern, FirmamentV2StaticSetDecl set,IReadOnlyDictionary<string, Template> templates, List<(int Start, int Length, string Text)> changes,- List<FirmamentV2CanonicalPatternDecl> patterns, List<string> diagnostics, string? target = null)+ List<FirmamentV2CanonicalPatternDecl> patterns, List<string> diagnostics, string? target = null, IReadOnlySet<string>? domainResults = null){var patternName = pattern.Name!.Text;if (set.Entries.Count > MaxPatternExpansion) { diagnostics.Add(Prefix + "pattern-expansion-limit:" + patternName + ":" + set.Entries.Count); return; }@@ -557,7 +589,7 @@ internal static class CanonicalStaticAuthoringelse{if (mapping.Value is not DeclarationSyntax declaration || declaration.Body is null || declaration.Name is null- || declaration.Type.Name.Text is not ("Hole" or "Slot" or "Boss" or "Pocket" or "EdgeFinish" or "Panel" or "Section"))+ || declaration.Type.Name.Text is not ("Hole" or "Slot" or "Boss" or "Pocket" or "EdgeFinish" or "Panel" or "Section") && domainResults?.Contains(declaration.Type.Name.Text) != true){ diagnostics.Add(Prefix + "pattern-body-invalid:" + patternName); return; }var substitution = BindSetElement(mapping.Key.Text, entry, diagnostics);if (substitution is null) continue;diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/ClosedBoundary2Authoring.cs b/Aetheris.Kernel.Firmament/FirmamentV2/ClosedBoundary2Authoring.csindex 05b61933..831db180 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/ClosedBoundary2Authoring.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/ClosedBoundary2Authoring.cs@@ -164,7 +164,7 @@ internal static class ClosedBoundary2Authoringreturn source;}- private static bool IsBoundaryType(string type) => type is "Rect2" or "Square2" or "Circle2" or "Ellipse2" or "Slot2"+ internal static bool IsBoundaryType(string type) => type is "Rect2" or "Square2" or "Circle2" or "Ellipse2" or "Slot2"or "RoundedRect2" or "SmoothRoundedRect2" or "Triangle2" or "Polygon2" or "RegularPolygon2";private static IEnumerable<DeclarationSyntax> BoundaryDeclarations(DocumentSyntax syntax) =>diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/ConceptProfileDerivation.cs b/Aetheris.Kernel.Firmament/FirmamentV2/ConceptProfileDerivation.csindex f90b0ffd..278c24be 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/ConceptProfileDerivation.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/ConceptProfileDerivation.cs@@ -9,7 +9,7 @@ namespace Aetheris.Kernel.Firmament.FirmamentV2;internal static class ConceptProfileDerivation{internal static bool TryResolve(string source, string name, HashSet<string> visiting,- List<string> diagnostics, out ResolvedProfile2D? result)+ List<string> diagnostics, out ResolvedProfile2D? result,FirmamentCompileTimeValues? scalars=null){result = null;var profile = Regex.Match(source, $@"\bProfile\s+{Regex.Escape(name)}(?:\s+Using\s+(?<owner>\w+))?\s*\{{");@@ -46,7 +46,7 @@ internal static class ConceptProfileDerivationif (!string.IsNullOrWhiteSpace(remaining.Replace(";", ""))) diagnostics.Add($"concept-profile-fields-invalid:{qualified}");if (from is null || !Regex.IsMatch(from, @"^\w+$") || on is null || !Regex.IsMatch(on, @"^\w+(?:\.\w+)?$")){ diagnostics.Add($"concept-profile-source-invalid:{qualified}:named-profile-and-plane-required"); return true; }- var inherited = ProfileAuthoringParser.ResolveNamedProfileCore(source, from, visiting, out var sourceErrors);+ var inherited = ProfileAuthoringParser.ResolveNamedProfileCore(source, from, visiting, out var sourceErrors,scalars);diagnostics.AddRange(sourceErrors);if (inherited is null) return true;if (inherited.Loops.Count != 1)diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentCompileTimeValues.cs b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentCompileTimeValues.csindex e6cc8068..4068e968 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentCompileTimeValues.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentCompileTimeValues.cs@@ -399,7 +399,10 @@ internal sealed partial class FirmamentCompileTimeValues(string source)internal ExpressionSyntax NominalExpression(ExpressionSyntax expression){- var replacements = FirmamentSyntaxTraversal.Expressions(expression)+ // Object/with bodies contain statements, so expression-only traversal+ // misses their scalar fields. Use the existing complete tree traversal.+ var tree = new DocumentSyntax("inline", [new ExpressionStatementSyntax(expression, expression.Span)], [], expression.Span);+ var replacements = FirmamentSyntaxTraversal.Expressions(tree).Select(FirmamentSyntaxValues.Reference).OfType<string>().Distinct(StringComparer.Ordinal).Where(values.ContainsKey).ToDictionary(name => name,name => FirmamentSyntaxParser.ParseExpression(NominalExpression(name)).Expression!, StringComparer.Ordinal);diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentConcepts.cs b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentConcepts.csindex 544b9a5e..c01f79d2 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentConcepts.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentConcepts.cs@@ -92,6 +92,20 @@ internal sealed class FirmamentConceptsinternal IReadOnlyList<ConceptIrDefinition> Contracts => contracts.Values.ToArray();internal bool HasContract(string name) => declarations.TryGetValue(name, out var d) && !IsPredicate(d);+ internal bool CheckMembers(string name, IReadOnlyDictionary<string, string> members, string owner, FirmamentV2SourceSpan span)+ {+ if (!contracts.TryGetValue(name, out var contract))+ { Add("contract-unresolved", $"'{owner}' claims unknown structural Concept '{name}'.", span); return false; }+ foreach (var member in contract.Members.Values)+ {+ if (!members.TryGetValue(member.Name, out var actual))+ { Add("missing-member", $"'{owner}' does not expose required semantic member '{member.Name}: {member.Type}' from Concept '{name}'.", member.SourceSpan); return false; }+ if (member.Type.IsCollection || actual != member.Type.Name)+ { Add("type-mismatch", $"'{owner}.{member.Name}' exposes '{actual}', but Concept '{name}' requires '{member.Type}'.", member.SourceSpan); return false; }+ }+ return true;+ }+internal void ValidateClaims(){Visit(syntax.Statements);diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentDomainBinding.cs b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentDomainBinding.csnew file mode 100644index 00000000..42ba3044--- /dev/null+++ b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentDomainBinding.cs@@ -0,0 +1,105 @@+using Aetheris.Kernel.Firmament.FirmamentV2.Syntax;++namespace Aetheris.Kernel.Firmament.FirmamentV2;++/// <summary>Domain adapters consume the production expansion and value binder without+/// losing tolerances to nominal substitution or implementing another evaluator.</summary>+public sealed class FirmamentDomainBinding+{+ private readonly FirmamentCompileTimeValues values;+ private readonly FirmamentConcepts concepts;+ private readonly FirmamentSyntaxOrigins origins;+ private readonly FirmamentSyntaxOrigins inputOrigins;+ private readonly bool inputExpanded;+ private readonly DocumentSyntax inputDocument;+ public bool IsExpanded { get; }+ public string Source { get; }+ public DocumentSyntax Document { get; }+ public IReadOnlyList<ConceptIrTemplateInstantiation> Instantiations { get; }+ public IReadOnlyList<FirmamentV2ValidationDiagnostic> Diagnostics => errors.Concat(concepts.Diagnostics.Select(d=>d with+ { SourceFile=Document.SourceFile,SourceSpan=d.SourceSpan is {} span?OriginalSpan(span):null,+ LocationNote=IsExpanded?"Location identifies the original enclosing declaration; the check evaluated expanded values.":d.LocationNote })).ToArray();+ private readonly List<FirmamentV2ValidationDiagnostic> errors = [];++ public FirmamentDomainBinding(string source, string sourceFile, string ownerType, IReadOnlySet<string> domainResults, string? originalSource=null)+ {+ values = new(source);+ var codes = new List<string>();+ var expansion = FirmamentV2TemplateExpansion.Expand(source, codes, values);+ var prepared=expansion?.Source ?? source;+ var features=FirmamentV2FeatureExpansion.Expand(prepared,codes,values,source,domainResults);+ if(features is not null)prepared=features.Source;+ Source=CanonicalStaticAuthoring.ExpandDomainPatterns(prepared,ownerType,values,codes,domainResults);+ Instantiations = expansion?.Instantiations ?? [];+ var syntax = FirmamentSyntaxParser.Parse(Source, sourceFile);+ Document = syntax.Document;+ originalSource ??= source;+ IsExpanded = Source != originalSource;+ inputExpanded=source!=originalSource;+ var original=FirmamentSyntaxParser.Parse(originalSource,sourceFile).Document;+ origins = new(original, Document);+ inputDocument=FirmamentSyntaxParser.Parse(source,sourceFile).Document;+ inputOrigins=new(original,inputDocument);+ errors.AddRange(syntax.Diagnostics.Select(d=>d with { SourceFile=sourceFile,SourceSpan=d.SourceSpan is {} span?OriginalSpan(span):null }));+ errors.AddRange(values.Diagnostics.Select(d=>d with { SourceFile=sourceFile,+ SourceSpan=inputExpanded && d.SourceSpan is {} span?Map(inputOrigins,inputDocument,span):d.SourceSpan,+ LocationNote=inputExpanded?"Input includes expanded library declarations; the location is an original enclosing declaration where available.":d.LocationNote }));+ if(FirmamentSyntaxTraversal.Declarations(Document).Any(OwnsConstruction))+ {+ var construction=ClosedBoundary2Authoring.Expand(Source,codes,values);+ if(construction is not null)codes.AddRange(ProfileAuthoringParser.ValidateConstructionGuides(construction.Source,values.NominalExpression));+ }+ foreach (var code in codes.Where(c => !errors.Any(e => c.StartsWith(e.Code, StringComparison.Ordinal))))+ {+ var presented=FirmamentBuildAdmissionValidation.Locate(new(code,"error",FirmamentInterop.FirmamentV2DiagnosticAdapter.MessageFor(code)),Source,sourceFile);+ errors.Add(presented with { Code=code.Split(':')[0],SourceSpan=presented.SourceSpan is {} span?OriginalSpan(span):null,Stage="Expansion" });+ }+ concepts = new(Source, values);+ }++ public ExpressionSyntax Nominal(ExpressionSyntax expression) => values.NominalExpression(expression);+ public Materializer.ResolvedProfile2D? ResolveProfile(string name,out IReadOnlyList<string> diagnostics) =>+ ProfileAuthoringParser.ResolveNamedProfileCore(Source,name,new(StringComparer.Ordinal),out diagnostics,values);+ public bool OwnsConstruction(DeclarationSyntax declaration) => ClosedBoundary2Authoring.IsBoundaryType(declaration.Type.Name.Text)+ || ProfileAuthoringParser.OwnsConstructionGuide(declaration.Type.Name.Text);+ public bool OwnsProfileData(DeclarationSyntax declaration) => ProfileAuthoringParser.OwnsDeclaration(declaration);+ public bool OwnsData(DeclarationSyntax declaration) => FirmamentDataBinding.NamespaceFor(declaration) is not null;+ public FirmamentV2SourceSpan? OriginalSpan(FirmamentV2SourceSpan span)+ {+ if(!IsExpanded)return span;+ return Map(origins,Document,span);+ }+ private static FirmamentV2SourceSpan? Map(FirmamentSyntaxOrigins mapping,DocumentSyntax document,FirmamentV2SourceSpan span)+ {+ if(mapping.Find(span) is {} exact)return exact;+ foreach(var owner in FirmamentSyntaxTraversal.Declarations(document).Where(d=>d.Span.Start<=span.Start && d.Span.Start+d.Span.Length>=span.Start+span.Length).OrderBy(d=>d.Span.Length))+ if(mapping.Find(owner.Span) is {} enclosing)return enclosing;+ return null;+ }+ public bool TryValue(ExpressionSyntax expression, out FirmamentV2BoundLet value)+ {+ if(!values.TryValue(FirmamentSyntaxValues.Reference(expression) ?? "",out value!))return false;+ value=value with { Origins=value.Origins.Select(origin=>+ {+ var span=inputExpanded?Map(inputOrigins,inputDocument,origin.SourceSpan):origin.SourceSpan;+ return span is null+ ? origin with { SourceFile=Document.SourceFile+"#expanded",LocationNote="Original imported value location is unavailable; span belongs to expanded input." }+ : origin with { SourceFile=Document.SourceFile,SourceSpan=span,+ LocationNote=inputExpanded?"Location identifies the original enclosing compile-time value declaration.":origin.LocationNote };+ }).ToArray() };+ return true;+ }+ public bool CheckRequirement(DeclarationSyntax requirement)+ {+ if(requirement.Name is null || requirement.Initializer is null || requirement.Parameters.Count>0 || requirement.Annotation is not null+ || requirement.Modifiers.Count>0 || requirement.Type.Arguments.Count>0 || requirement.Clauses.Count>0 || requirement.ResultType is not null || requirement.Occurrence)+ {+ errors.Add(new("firmament-concept-requirement-invalid","error","Use Require name => BooleanPredicate without parameters, placement or type annotations.")+ { SourceFile=Document.SourceFile,SourceSpan=OriginalSpan(requirement.Span),Stage="Concept binding" });+ return false;+ }+ return concepts.Check(requirement.Initializer,requirement.Name.Text,requirement.Span);+ }+ public bool CheckContract(string contract, IReadOnlyDictionary<string, string> members, string owner, FirmamentV2SourceSpan span) =>+ concepts.CheckMembers(contract, members, owner, span);+}diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2FeatureExpansion.cs b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2FeatureExpansion.csindex 6936e116..bc742d6b 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2FeatureExpansion.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2FeatureExpansion.cs@@ -39,7 +39,7 @@ internal static class FirmamentV2FeatureExpansion}internal static Result? Expand(string source, List<string> diagnostics, FirmamentCompileTimeValues? scalars = null,- string? originalSource = null)+ string? originalSource = null, IReadOnlySet<string>? domainResults = null){var parsed = FirmamentSyntaxParser.Parse(source);var declarations = FirmamentSyntaxTraversal.Declarations(parsed.Document)@@ -102,7 +102,7 @@ internal static class FirmamentV2FeatureExpansionforeach (var d in declarations){var name = d.Name?.Text ?? "<unnamed>"; var resultType = TypeName(d.ResultType!);- if (!AllowedResult(resultType)) Error(ReturnType + $":{name}:unsupported-{resultType}", $"Feature '{name}' cannot return {resultType}; expected a supported Hole variant, Boss, Pocket, EdgeFinish or Profile.", d.Span, d);+ if (!AllowedResult(resultType) && domainResults?.Contains(resultType) != true) Error(ReturnType + $":{name}:unsupported-{resultType}", $"Feature '{name}' cannot return {resultType}; expected a supported engineering result admitted by its consuming domain.", d.Span, d);var names = new HashSet<string>(StringComparer.Ordinal);foreach (var p in d.Parameters)if (p.Name is null || p.Value is not ReferenceSyntax)diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/ProfileAuthoringParser.cs b/Aetheris.Kernel.Firmament/FirmamentV2/ProfileAuthoringParser.csindex b7e50be2..f3cba264 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/ProfileAuthoringParser.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/ProfileAuthoringParser.cs@@ -51,18 +51,19 @@ public static class ProfileAuthoringParserpublic static ResolvedProfile2D? ResolveNamedProfile(string source, string profileName, out IReadOnlyList<string> reportedDiagnostics)=> ResolveNamedProfileCore(source, profileName, new(StringComparer.Ordinal), out reportedDiagnostics);- internal static ResolvedProfile2D? ResolveNamedProfileCore(string source, string profileName, HashSet<string> visiting, out IReadOnlyList<string> reportedDiagnostics)+ internal static ResolvedProfile2D? ResolveNamedProfileCore(string source, string profileName, HashSet<string> visiting, out IReadOnlyList<string> reportedDiagnostics,+ FirmamentCompileTimeValues? scalars=null){ArgumentNullException.ThrowIfNull(source);ArgumentException.ThrowIfNullOrWhiteSpace(profileName);var diagnostics = new List<string>();if (!visiting.Add(profileName)) { reportedDiagnostics = [$"concept-profile-dependency-cycle:{profileName}"]; return null; }source = ProfileModificationTemplateLibrary.ResolveImports(source);- source = ExpandBuiltInPolygons(source, diagnostics);- var expansion = FirmamentV2TemplateExpansion.Expand(source, diagnostics);+ source = ExpandBuiltInPolygons(source, diagnostics,scalars);+ var expansion = FirmamentV2TemplateExpansion.Expand(source, diagnostics,scalars);if (expansion is not null) source = expansion.Source;- if (ProfileBoundaryAuthoring.TryResolve(source, profileName, visiting, diagnostics, out var derived)- || ConceptProfileDerivation.TryResolve(source, profileName, visiting, diagnostics, out derived))+ if (ProfileBoundaryAuthoring.TryResolve(source, profileName, visiting, diagnostics, out var derived,scalars)+ || ConceptProfileDerivation.TryResolve(source, profileName, visiting, diagnostics, out derived,scalars)){visiting.Remove(profileName);reportedDiagnostics = diagnostics.Distinct(StringComparer.Ordinal).ToArray();@@ -72,7 +73,7 @@ public static class ProfileAuthoringParserif (declaration is null) { reportedDiagnostics = [$"profile-source-missing-profile:{profileName}"]; return null; }var points = new Dictionary<string, (double X, double Y)>(StringComparer.Ordinal);var guides = new Dictionary<string, LineArcProfileCurve2D>(StringComparer.Ordinal);- AddOrdinaryGuides(source, points, guides, diagnostics, applySpans: false);+ AddOrdinaryGuides(source, points, guides, diagnostics, applySpans: false,bind:scalars is null?null:scalars.NominalExpression);var paths = BindPaths(source, points, guides, diagnostics);var plane = ResolveConstructionPlane(source, declaration.Frame, diagnostics);var loops = BindProfileLoops(declaration, paths, points, guides, diagnostics);@@ -244,30 +245,37 @@ public static class ProfileAuthoringParserreturn profiles;}- private static string ExpandBuiltInPolygons(string source, List<string> diagnostics)+ private static string ExpandBuiltInPolygons(string source, List<string> diagnostics,FirmamentCompileTimeValues? scalars=null){// Direct profile/path API consumers use the same AST-position aliases as// whole-document compilation, including remaining compatibility adapters.source = FirmamentSourceSpelling.Normalize(source);- return ClosedBoundary2Authoring.Expand(source, diagnostics)?.Source ?? source;+ return ClosedBoundary2Authoring.Expand(source, diagnostics,scalars)?.Source ?? source;}internal static ConstructionPlane? ResolveNamedConstructionPlane(string source, string frame, List<string> diagnostics)=> ResolveConstructionPlane(source, frame, diagnostics);- private static void AddOrdinaryGuides(string source, Dictionary<string, (double X, double Y)> points, Dictionary<string, LineArcProfileCurve2D> guides, List<string> diagnostics, bool applySpans = true)+ internal static bool OwnsConstructionGuide(string type) => type is "Point2" or "Rect2" or "Line2" or "CubicBezier2" or "Circle2" or "Ellipse2Guide";+ internal static bool OwnsDeclaration(DeclarationSyntax declaration) => OwnsConstructionGuide(declaration.Type.Name.Text)+ || ClosedBoundary2Authoring.IsBoundaryType(declaration.Type.Name.Text)+ || declaration.Type.Name.Text is "Profile" or "Path" or "Span" or "Curve2"+ || declaration.Type.Name.Text=="Plane" && declaration.Modifiers.Any(m=>m.Name.Text=="Construction");++ private static void AddOrdinaryGuides(string source, Dictionary<string, (double X, double Y)> points, Dictionary<string, LineArcProfileCurve2D> guides, List<string> diagnostics, bool applySpans = true,+ Func<ExpressionSyntax,ExpressionSyntax>? bind=null){var declarations = SourceDeclarations(FirmamentSyntaxParser.Parse(source).Document.Statements).Where(d => d.Name is not null && d.Body is not null).ToArray();foreach (var d in declarations.Where(d => d.Type.Name.Text == "Point2")){- var fields = new FirmamentSyntaxFields(d, diagnostics);+ var fields = new FirmamentSyntaxFields(d, diagnostics,bind:bind);if (fields.Vector("Position", "mm", out var xy) && xy.Length == 2) points[d.Name!.Text] = (xy[0], xy[1]);else diagnostics.Add($"profile-layout-point-invalid:{d.Name!.Text}:expected-two-finite-lengths");fields.Complete();}foreach (var d in declarations.Where(d => d.Type.Name.Text == "Rect2")){- var fields = new FirmamentSyntaxFields(d, diagnostics); var name = d.Name!.Text;+ var fields = new FirmamentSyntaxFields(d, diagnostics,bind:bind); var name = d.Name!.Text;fields.Word("Role");if (!fields.Vector("Center", "mm", out var center) || center.Length != 2 || !fields.Vector("Size", "mm", out var size) || size.Length != 2 || size.Any(n => n <= 0)){ diagnostics.Add($"rect2-invalid-size:{name}"); continue; }@@ -283,7 +291,7 @@ public static class ProfileAuthoringParser}foreach (var d in declarations.Where(d => d.Type.Name.Text is "Line2" or "CubicBezier2")){- var fields = new FirmamentSyntaxFields(d, diagnostics); var name = d.Name!.Text;+ var fields = new FirmamentSyntaxFields(d, diagnostics,bind:bind); var name = d.Name!.Text;var a = fields.Word("From"); var b = fields.Word("To");var c1 = d.Type.Name.Text == "CubicBezier2" ? fields.Word("Control1") : null;var c2 = d.Type.Name.Text == "CubicBezier2" ? fields.Word("Control2") : null;@@ -297,7 +305,7 @@ public static class ProfileAuthoringParser}foreach (var d in declarations.Where(d => d.Type.Name.Text is "Circle2" or "Ellipse2Guide")){- var fields = new FirmamentSyntaxFields(d, diagnostics); var name = d.Name!.Text;+ var fields = new FirmamentSyntaxFields(d, diagnostics,bind:bind); var name = d.Name!.Text;var centerName = fields.Word("Center");if (centerName is null || !points.TryGetValue(centerName, out var center)) { diagnostics.Add($"profile-layout-unresolved-circle:{name}"); continue; }if (d.Type.Name.Text == "Circle2")@@ -319,10 +327,10 @@ public static class ProfileAuthoringParserif (applySpans) ApplyGeometricSpans(source, points, guides, diagnostics, addGuides: true);}- internal static IReadOnlyList<string> ValidateConstructionGuides(string source)+ internal static IReadOnlyList<string> ValidateConstructionGuides(string source,Func<ExpressionSyntax,ExpressionSyntax>? bind=null){var diagnostics = new List<string>();- AddOrdinaryGuides(source, new(StringComparer.Ordinal), new(StringComparer.Ordinal), diagnostics, applySpans: false);+ AddOrdinaryGuides(source, new(StringComparer.Ordinal), new(StringComparer.Ordinal), diagnostics, applySpans: false,bind:bind);return diagnostics;}@@ -424,7 +432,9 @@ public static class ProfileAuthoringParser}private static bool IsWorldXyLayout(string source, string frame) =>- Regex.IsMatch(source, $@"\bConcept\s+Struct\s+{Regex.Escape(frame)}\s+On\s+XY\s*\{{", RegexOptions.CultureInvariant);+ FirmamentSyntaxTraversal.Declarations(FirmamentSyntaxParser.Parse(source).Document).Any(d=>+ d.Type.Name.Text=="Struct" && d.Modifiers.Any(m=>m.Name.Text=="Concept") && d.Name?.Text==frame+ && d.Clauses.Count==1 && d.Clauses[0].Kind==ClauseKind.On && FirmamentSyntaxValues.Reference(d.Clauses[0].Value)=="XY");private static IReadOnlyList<string> FindSpanConsumers(string source, string spanName){diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/ProfileBoundaryAuthoring.cs b/Aetheris.Kernel.Firmament/FirmamentV2/ProfileBoundaryAuthoring.csindex 0098ad4e..30f81dc2 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/ProfileBoundaryAuthoring.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/ProfileBoundaryAuthoring.cs@@ -48,7 +48,7 @@ internal static class ProfileBoundaryAuthoringinternal static bool IsDerived(string? body) => body is not null && Regex.IsMatch(WithoutComments(body), @"^\s*From\s*:");internal static bool TryResolve(string source, string name, HashSet<string> visiting,- List<string> diagnostics, out ResolvedProfile2D? result)+ List<string> diagnostics, out ResolvedProfile2D? result,FirmamentCompileTimeValues? scalars=null){result = null;var declaration = Regex.Match(source, $@"\bProfile\s+{Regex.Escape(name)}(?:\s+Using\s+(?<owner>\w+))?\s*\{{");@@ -65,7 +65,7 @@ internal static class ProfileBoundaryAuthoringvar header = Fields(remainder, ["From"], diagnostics, name);if (!header.TryGetValue("From", out var from) || !Regex.IsMatch(from, @"^\w+(?:\.\w+)?$")){ diagnostics.Add($"profile-edit-source-invalid:{name}"); return true; }- var deltas = SemanticProfileDeltaParser.Parse(source);+ var deltas = SemanticProfileDeltaParser.Parse(source,scalars is null?null:scalars.NominalExpression);if (applies.Length > 0) diagnostics.AddRange(deltas.Diagnostics);// Existing edge authoring attaches ProfileDelta implicitly. A derivation// applies only explicitly selected programs, so resolve an unedited seed.@@ -74,7 +74,7 @@ internal static class ProfileBoundaryAuthoringIReadOnlyList<string> seedErrors;var localFrom = from.Contains('.') && from.StartsWith(owner + ".", StringComparison.Ordinal) ? from[(owner.Length + 1)..] : from;if (Regex.IsMatch(seedSource, $@"\bProfile\s+{Regex.Escape(localFrom)}\b"))- seed = ProfileAuthoringParser.ResolveNamedProfileCore(seedSource, localFrom, visiting, out seedErrors);+ seed = ProfileAuthoringParser.ResolveNamedProfileCore(seedSource, localFrom, visiting, out seedErrors,scalars);else{foreach (var delta in Blocks(source, "ProfileDelta").OrderByDescending(b => b.Start))@@ -82,7 +82,7 @@ internal static class ProfileBoundaryAuthoringvar synthetic = "__BoundarySeed_" + name;while (Regex.IsMatch(seedSource, $@"\b{Regex.Escape(synthetic)}\b")) synthetic += "_";seed = ProfileAuthoringParser.ResolveNamedProfileCore(seedSource + $"\nProfile {synthetic} {{ Loop Outer {{ {localFrom} |> TraceLoop }} }}",- synthetic, visiting, out seedErrors);+ synthetic, visiting, out seedErrors,scalars);}diagnostics.AddRange(seedErrors);if (seed is null) return true;diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/SemanticProfileDeltaParser.cs b/Aetheris.Kernel.Firmament/FirmamentV2/SemanticProfileDeltaParser.csindex c8cb4cb1..e42ad914 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/SemanticProfileDeltaParser.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/SemanticProfileDeltaParser.cs@@ -1,5 +1,4 @@-using System.Globalization;-using System.Text.RegularExpressions;+using Aetheris.Kernel.Firmament.FirmamentV2.Syntax;namespace Aetheris.Kernel.Firmament.FirmamentV2;@@ -20,48 +19,65 @@ public sealed record SemanticProfileDeltaParseResult(/// <summary>Parser for the finite, template-friendly ProfileDelta semantic substrate.</summary>public static class SemanticProfileDeltaParser{- private const RegexOptions Rx=RegexOptions.CultureInvariant|RegexOptions.Singleline;- private const string Number=@"[+-]?(?:[0-9]+(?:\.[0-9]*)?|\.[0-9]+)";- public static SemanticProfileDeltaParseResult Parse(string source)+ public static SemanticProfileDeltaParseResult Parse(string source, Func<ExpressionSyntax, ExpressionSyntax>? bind = null)+ => ParseDeclarations(FirmamentSyntaxTraversal.Declarations(FirmamentSyntaxParser.Parse(source).Document)+ .Where(d=>d.Type.Name.Text=="ProfileDelta" && d.Body is not null),bind);++ public static SemanticProfileDeltaParseResult ParseDeclarations(IEnumerable<DeclarationSyntax> declarations, Func<ExpressionSyntax,ExpressionSyntax>? bind=null){var result=new List<ParsedSemanticProfileDelta>();var diagnostics=new List<string>();- foreach(var block in Blocks(source,"ProfileDelta"))+ foreach(var block in declarations){- var id=block.Name;var on=TokenPath(block.Body,"On");- var anchorText=Field(block.Body,"Anchor");var sideText=Token(block.Body,"Side");+ if(block.Type.Name.Text!="ProfileDelta" || block.Name is null || block.Body is null || block.Type.Arguments.Count>0 || block.Modifiers.Count>0)+ { diagnostics.Add("semantic-profile-delta-header-invalid: requires a concrete named ProfileDelta body");continue; }+ var id=block.Name?.Text ?? "<unnamed>";var fields = Fields(block, diagnostics, bind);var on=fields.Reference("On");+ var anchorText=fields.Take("Anchor");var sideText=fields.Reference("Side");if(on is null||anchorText is null||!TryAnchor(anchorText,out var anchor)||sideText is not ("Inward" or "Outward")){diagnostics.Add($"semantic-profile-delta-header-invalid:{id}:requires On, Anchor, and Side");continue;}var side=sideText=="Outward"?1:-1;var levels=new List<SemanticProfileDeltaLevelIr>();- foreach(var level in Blocks(block.Body,"Level"))+ foreach(var level in Children(block,"Level")){- if(!Length(level.Body,"Offset",out var offset)||offset<0)- {diagnostics.Add($"semantic-profile-delta-level-invalid:{id}.{level.Name}");continue;}- levels.Add(new(level.Name,$"{id}.{level.Name}",offset,$"ProfileDelta {id}.Level {level.Name}"));+ var levelFields = Fields(level, diagnostics, bind);+ if(!Measure(levelFields,"Offset",out var offset)||offset<0)+ {diagnostics.Add($"semantic-profile-delta-level-invalid:{id}.{level.Name!.Text}");continue;}+ levelFields.Complete();+ levels.Add(new(level.Name!.Text,$"{id}.{level.Name.Text}",offset,$"ProfileDelta {id}.Level {level.Name.Text}"));}var members=new List<(int Index,SemanticProfileDeltaMemberIr Member)>();- foreach(var member in Blocks(block.Body,"Span"))+ foreach(var member in Children(block,"Span")){- if(!Length(member.Body,"Run",out var run)||Token(member.Body,"At") is not { } at)- {diagnostics.Add($"semantic-profile-delta-span-invalid:{id}.{member.Name}");continue;}- var expose=Token(member.Body,"Expose");var capabilities=List(member.Body,"Capabilities");+ var memberFields = Fields(member, diagnostics, bind);+ if(!Measure(memberFields,"Run",out var run)||memberFields.Reference("At") is not { } at)+ {diagnostics.Add($"semantic-profile-delta-span-invalid:{id}.{member.Name!.Text}");continue;}+ var expose=memberFields.Reference("Expose");var capabilities=List(memberFields.Take("Capabilities"),diagnostics);+ memberFields.Complete();if(expose is not null&&capabilities.Count==0)capabilities=["StableSemanticIdentity"];- members.Add((member.Index,new(member.Name,$"{id}.{member.Name}",SemanticProfileDeltaMemberKind.Span,run,at,- expose is null?null:$"{id}.{expose}",capabilities,$"ProfileDelta {id}.Span {member.Name}")));+ members.Add((member.Span.Start,new(member.Name!.Text,$"{id}.{member.Name.Text}",SemanticProfileDeltaMemberKind.Span,run,at,+ expose is null?null:$"{id}.{expose}",capabilities,$"ProfileDelta {id}.Span {member.Name!.Text}")));}- foreach(var member in Blocks(block.Body,"Transition"))+ foreach(var member in Children(block,"Transition")){- var kindText=Token(member.Body,"Kind");var to=Token(member.Body,"To");+ var memberFields = Fields(member, diagnostics, bind);+ var kindText=memberFields.Reference("Kind");var to=memberFields.Reference("To");var kind=kindText=="Diagonal"?SemanticProfileDeltaMemberKind.Diagonal:kindText=="Step"?SemanticProfileDeltaMemberKind.Step:kindText=="Round"?SemanticProfileDeltaMemberKind.Round:(SemanticProfileDeltaMemberKind?)null;- var hasRun=Length(member.Body,"Run",out var run);- var hasRadius=Length(member.Body,"Radius",out var radius);- var concave=string.Equals(Token(member.Body,"Concave"),"true",StringComparison.OrdinalIgnoreCase);- if(kind is null||to is null||(kind is SemanticProfileDeltaMemberKind.Diagonal or SemanticProfileDeltaMemberKind.Round&&!hasRun)||(kind==SemanticProfileDeltaMemberKind.Step&&hasRun&&Math.Abs(run)>1e-9)||(kind==SemanticProfileDeltaMemberKind.Round&&!hasRadius))- {diagnostics.Add($"semantic-profile-delta-transition-invalid:{id}.{member.Name}");continue;}- members.Add((member.Index,new(member.Name,$"{id}.{member.Name}",kind.Value,kind==SemanticProfileDeltaMemberKind.Step?0:run,to,null,[],- $"ProfileDelta {id}.Transition {member.Name}",kind==SemanticProfileDeltaMemberKind.Round?radius:null,concave)));+ var hasRun=Measure(memberFields,"Run",out var run);+ var hasRadius=Measure(memberFields,"Radius",out var radius);+ var concaveValue=memberFields.Take("Concave");+ var concave=concaveValue is LiteralSyntax { Kind: LiteralKind.Boolean, Raw: "true" };+ if (concaveValue is not null && concaveValue is not LiteralSyntax { Kind: LiteralKind.Boolean }) memberFields.Invalid("Concave");+ memberFields.Complete();+ if(kind is null||to is null|| (kind!=SemanticProfileDeltaMemberKind.Round && (hasRadius || concaveValue is not null)) ||(kind is SemanticProfileDeltaMemberKind.Diagonal or SemanticProfileDeltaMemberKind.Round&&!hasRun)||(kind==SemanticProfileDeltaMemberKind.Step&&hasRun&&Math.Abs(run)>1e-9)||(kind==SemanticProfileDeltaMemberKind.Round&&!hasRadius))+ {diagnostics.Add($"semantic-profile-delta-transition-invalid:{id}.{member.Name!.Text}");continue;}+ members.Add((member.Span.Start,new(member.Name!.Text,$"{id}.{member.Name.Text}",kind.Value,kind==SemanticProfileDeltaMemberKind.Step?0:run,to,null,[],+ $"ProfileDelta {id}.Transition {member.Name!.Text}",kind==SemanticProfileDeltaMemberKind.Round?radius:null,concave)));}+ fields.Complete();+ if (levels.Select(l=>l.Name).Distinct(StringComparer.Ordinal).Count()!=levels.Count)+ { diagnostics.Add($"semantic-profile-delta-level-duplicate:{id}"); continue; }+ if (members.Select(m=>m.Member.Name).Distinct(StringComparer.Ordinal).Count()!=members.Count)+ { diagnostics.Add($"semantic-profile-delta-member-duplicate:{id}"); continue; }var ordered=members.OrderBy(x=>x.Index).Select(x=>x.Member).ToArray();var delta=new SemanticProfileDeltaIr(id,id,anchor,side,levels,ordered,$"ProfileDelta {id}");var exposures=new List<SemanticProfileDeltaExposure>();var cursor=0d;var current=0d;@@ -76,24 +92,36 @@ public static class SemanticProfileDeltaParserreturn new(result,diagnostics);}- private static bool TryAnchor(string text,out SemanticEdgeAnchorIr anchor)+ private static bool Measure(FirmamentSyntaxFields fields,string name,out double value)+ {+ value=0;var expression=fields.Take(name);if(expression is null)return false;+ if(FirmamentSyntaxValues.TryMeasure(expression,"mm",out value))return true;+ fields.Invalid(name);return false;+ }+ private static bool TryAnchor(ExpressionSyntax expression,out SemanticEdgeAnchorIr anchor)+ {+ anchor=new(SemanticEdgeAnchorKind.FromStart,0);+ if (expression is not CallSyntax { Target: ReferenceSyntax kind, Arguments.Count: 1 } call+ || kind.Name.Text is not ("FromStart" or "FromEnd" or "CenteredAt")+ || call.Arguments[0].Name is not null || call.Arguments[0].Default is not null+ || !FirmamentSyntaxValues.TryMeasure(call.Arguments[0].Value,"mm",out var value)) return false;+ anchor=new(Enum.Parse<SemanticEdgeAnchorKind>(kind.Name.Text),value);return true;+ }+ private static IEnumerable<DeclarationSyntax> Children(DeclarationSyntax owner,string type) =>+ owner.Body!.Statements.OfType<DeclarationSyntax>().Where(d=>d.Type.Name.Text==type && d.Name is not null && d.Body is not null);+ private static FirmamentSyntaxFields Fields(DeclarationSyntax owner,List<string> diagnostics,Func<ExpressionSyntax,ExpressionSyntax>? bind){- var match=Regex.Match(text,$@"^(?<kind>FromStart|FromEnd|CenteredAt)\s+(?<v>{Number})mm$",Rx);- anchor=new(SemanticEdgeAnchorKind.FromStart,0);if(!match.Success)return false;- anchor=new(Enum.Parse<SemanticEdgeAnchorKind>(match.Groups["kind"].Value),double.Parse(match.Groups["v"].Value,CultureInfo.InvariantCulture));return true;+ // The program owns these child productions; all other children remain for+ // the field owner to reject. Geometry program validation remains downstream.+ var children = owner.Type.Name.Text == "ProfileDelta" ? new[]{"Level","Span","Transition"} : [];+ return new(owner with { Body = owner.Body! with { Statements = owner.Body.Statements.Where(s =>+ s is not DeclarationSyntax d || !children.Contains(d.Type.Name.Text) || d.Name is null || d.Body is null).ToArray() } },diagnostics,bind:bind);}- private const string FieldEnd=@"\s*(?:;|(?=\r?\n|$)|(?=\s+[A-Za-z_]\w*\s*:))";- private static bool Length(string body,string name,out double value)- {var m=Regex.Match(body,$@"\b{Regex.Escape(name)}\s*:\s*(?<v>{Number})mm{FieldEnd}",Rx);value=m.Success?double.Parse(m.Groups["v"].Value,CultureInfo.InvariantCulture):0;return m.Success&&double.IsFinite(value);}- private static string? Field(string body,string name){var m=Regex.Match(body,$@"\b{Regex.Escape(name)}\s*:\s*(?<v>.+?){FieldEnd}",Rx);return m.Success?m.Groups["v"].Value.Trim():null;}- private static string? Token(string body,string name){var m=Regex.Match(body,$@"\b{Regex.Escape(name)}\s*:\s*(?<v>[A-Za-z_]\w*){FieldEnd}",Rx);return m.Success?m.Groups["v"].Value:null;}- private static string? TokenPath(string body,string name){var m=Regex.Match(body,$@"\b{Regex.Escape(name)}\s*:\s*(?<v>[A-Za-z_]\w*(?:\.[A-Za-z_]\w*)*){FieldEnd}",Rx);return m.Success?m.Groups["v"].Value:null;}- private static IReadOnlyList<string> List(string body,string name){var m=Regex.Match(body,$@"\b{Regex.Escape(name)}\s*:\s*\[(?<v>[^]]*)\]{FieldEnd}",Rx);return m.Success?m.Groups["v"].Value.Split(',',StringSplitOptions.RemoveEmptyEntries|StringSplitOptions.TrimEntries):[];}- private static IReadOnlyList<Block> Blocks(string source,string keyword)+ private static IReadOnlyList<string> List(ExpressionSyntax? value,List<string> diagnostics){- var result=new List<Block>();foreach(Match match in Regex.Matches(source,$@"\b{Regex.Escape(keyword)}\s+(?<name>[A-Za-z_]\w*)\s*\{{",Rx))- {var open=source.IndexOf('{',match.Index);var close=Close(source,open);if(close>open)result.Add(new(match.Groups["name"].Value,source[(open+1)..close],match.Index));}return result;+ if (value is null) return [];+ if (value is SequenceSyntax { Kind: SequenceKind.List } list && list.Items.All(i=>i.Name is null && i.Default is null && FirmamentSyntaxValues.Reference(i.Value) is not null))+ return list.Items.Select(i=>FirmamentSyntaxValues.Reference(i.Value)!).ToArray();+ diagnostics.Add("semantic-profile-delta-capabilities-invalid");return [];}- private static int Close(string source,int open){var depth=0;for(var i=open;i<source.Length;i++){if(source[i]=='{')depth++;else if(source[i]=='}'&&--depth==0)return i;}return -1;}- private sealed record Block(string Name,string Body,int Index);}diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/Syntax/FirmamentDataBinding.cs b/Aetheris.Kernel.Firmament/FirmamentV2/Syntax/FirmamentDataBinding.csindex 8f014c8f..ffea7856 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/Syntax/FirmamentDataBinding.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/Syntax/FirmamentDataBinding.cs@@ -7,6 +7,8 @@ namespace Aetheris.Kernel.Firmament.FirmamentV2.Syntax;/// only after AST lookup, at the existing source boundary to domain adapters.</summary>internal sealed class FirmamentDataBinding{+ internal static string? NamespaceFor(DeclarationSyntax declaration) => declaration.Type.Name.Text is "Record" or "Enum" ? "type"+ : declaration.Type.Name.Text=="Static" || declaration.Type.Name.Text=="Table" && declaration.Modifiers.Any(m=>m.Name.Text=="Static") ? "value" : null;internal sealed record Symbol(string Name, string Identity, string Namespace, string Scope, DeclarationSyntax Declaration);private sealed class Scope(Scope? parent, string identity){@@ -82,8 +84,7 @@ internal sealed class FirmamentDataBindingError("firmament-module-context-required", $"Inventory Record '{name.Text}' requires an Assembly or Scene project loader. Reference this module from a consuming project; it is not an ordinary data Record.", d.Span, name.Text, "Module binding");continue;}- var space = d.Type.Name.Text is "Record" or "Enum" ? "type"- : d.Type.Name.Text == "Static" || d.Type.Name.Text == "Table" && d.Modifiers.Any(m => m.Name.Text == "Static") ? "value" : null;+ var space = NamespaceFor(d);if (space is null) { scope.Values.Add(name.Text); continue; }var table = d.Type.Name.Text == "Table";if (d.HasParameterList || d.Type.Span.Length != d.Type.Name.Span.Length || d.Occurrencediff --git a/Aetheris.Kernel.Firmament/FirmamentV2/Syntax/FirmamentSyntaxParser.cs b/Aetheris.Kernel.Firmament/FirmamentV2/Syntax/FirmamentSyntaxParser.csindex fd0b1906..92355028 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/Syntax/FirmamentSyntaxParser.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/Syntax/FirmamentSyntaxParser.cs@@ -100,6 +100,15 @@ public static class FirmamentSyntaxParser{var name = Identifier(); Expect(":");var value = Expression();+ // Local compatibility production for historical ProfileDelta+ // anchors. Both spellings produce the same call AST.+ if (contexts.TryPeek(out var fieldOwner) && fieldOwner.StartsWith("ProfileDelta ", StringComparison.Ordinal)+ && name.Text is "Anchor" or "anchor" && value is ReferenceSyntax { Name.Text: "FromStart" or "FromEnd" or "CenteredAt" }+ && !LineBreak && !Is(";") && !Is("}"))+ {+ var offset = Expression();+ value = new CallSyntax(value, [new(null, offset, null, offset.Span)], Span(value.Span.Start));+ }if (Take("=")) value = new TypedValueSyntax(value, Expression(), Span(value.Span.Start));return new FieldSyntax(name, value, Span(start));}diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/Syntax/FirmamentSyntaxValues.cs b/Aetheris.Kernel.Firmament/FirmamentV2/Syntax/FirmamentSyntaxValues.csindex fa4fe989..b323af24 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/Syntax/FirmamentSyntaxValues.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/Syntax/FirmamentSyntaxValues.cs@@ -53,7 +53,8 @@ public static class FirmamentSyntaxValues/// <summary>Each semantic owner consumes its actual fields, then closes its scope./// No second field schema or spelling allowlist is maintained here.</summary>-public sealed class FirmamentSyntaxFields(DeclarationSyntax declaration, List<string> diagnostics, string? implicitUnit = null)+public sealed class FirmamentSyntaxFields(DeclarationSyntax declaration, List<string> diagnostics, string? implicitUnit = null,+ Func<ExpressionSyntax, ExpressionSyntax>? bind = null){private readonly HashSet<FieldSyntax> consumed = [];public DeclarationSyntax Declaration => declaration;@@ -62,7 +63,7 @@ public sealed class FirmamentSyntaxFields(DeclarationSyntax declaration, List<stvar fields = declaration.Body?.Statements.OfType<FieldSyntax>().Where(f => SameField(f.Name.Text, name)).ToArray() ?? [];foreach (var field in fields) consumed.Add(field);if (fields.Length > 1) diagnostics.Add($"firmament-v2-field-duplicate:{declaration.Type.Name.Text}:{name}");- return fields.Length == 1 ? fields[0].Value : null;+ return fields.Length == 1 ? bind?.Invoke(fields[0].Value) ?? fields[0].Value : null;}public bool Measure(string name, string unit, out double value) => FirmamentSyntaxValues.TryMeasure(Take(name), unit, out value, implicitUnit);public double Number(string name, string unit, double fallback = double.NaN)diff --git a/Aetheris.SheetMetal.Tests/SheetMetalSemanticSyntaxTests.cs b/Aetheris.SheetMetal.Tests/SheetMetalSemanticSyntaxTests.csnew file mode 100644index 00000000..5b0595ce--- /dev/null+++ b/Aetheris.SheetMetal.Tests/SheetMetalSemanticSyntaxTests.cs@@ -0,0 +1,263 @@+using Aetheris.Kernel.Core.Step242;+using Xunit;++namespace Aetheris.SheetMetal.Tests;++public sealed class SheetMetalSemanticSyntaxTests+{+ private static string Repo+ {+ get+ {+ var directory=new DirectoryInfo(AppContext.BaseDirectory);+ while(directory is not null && !File.Exists(Path.Combine(directory.FullName,"Aetheris.slnx")))directory=directory.Parent;+ return directory!.FullName;+ }+ }+ private static string Source(string name)=>File.ReadAllText(Path.Combine(Repo,"fixtures/Regression/SheetMetalSemantics",name+".firmament"));+ private static SheetMetalAuthoringResult Compile(string name)=>SheetMetalFirmament.Compile(Source(name),name+".firmament");+ private static string Step(SheetMetalAuthoringResult result)+ {+ Assert.True(result.IsSuccess,string.Join('\n',result.Diagnostics.Select(d=>d.Message)));+ var step=Step242Exporter.ExportBody(result.Part!.FormedBody!,result.Spec!.Manufacturing.ToStep242SemanticPmi(result.Part));+ Assert.True(step.IsSuccess);return step.Value;+ }++ [Theory]+ [InlineData("layout-unknown-field","firmament-v2-canonical-field-unknown")]+ [InlineData("layout-unknown-feature-field","firmament-v2-canonical-field-unknown")]+ [InlineData("layout-modern-xz","firmament-v2-placement-unsupported")]+ [InlineData("layout-unknown-statement","firmament-v2-canonical-declaration-unknown")]+ [InlineData("layout-false-require","firmament-concept-requirement-failed")]+ [InlineData("layout-contract-missing","firmament-concept-missing-member")]+ [InlineData("layout-contract-semicolon","firmament-concept-missing-member")]+ [InlineData("layout-extra-unused-pattern","sheetmetal-layout-owner-ambiguous")]+ [InlineData("manufacturing-unknown-pmi","sheetmetal-manufacturing-pmi-invalid")]+ [InlineData("manufacturing-unknown-field","firmament-v2-canonical-field-unknown")]+ [InlineData("manufacturing-negative-tolerance","sheetmetal-manufacturing-pmi-invalid")]+ [InlineData("manufacturing-zero-quantity","sheetmetal-manufacturing-pmi-invalid")]+ [InlineData("manufacturing-unknown-kind","sheetmetal-manufacturing-pmi-invalid")]+ [InlineData("manufacturing-second-pmi","sheetmetal-manufacturing-pmi-invalid")]+ public void IgnoredIntentCannotProduceGeometry(string specimen,string code)+ {+ var result=Compile(specimen);+ Assert.False(result.IsSuccess);Assert.Null(result.Part);+ var diagnostic=Assert.Single(result.Diagnostics.Where(d=>d.Code==code).Take(1));+ Assert.False(string.IsNullOrWhiteSpace(diagnostic.Message));+ Assert.Equal(specimen+".firmament",diagnostic.SourceFile);+ Assert.NotNull(diagnostic.SourceSpan);+ }++ [Theory]+ [InlineData("layout-point2")]+ [InlineData("layout-no-semicolons")]+ [InlineData("layout-suffix-capture")]+ public void ModernPointSpellingAndScopedLookupPreserveBaselineGeometry(string name)+ {+ var original=SheetMetalFirmament.CompileFile(Path.Combine(Repo,"fixtures/Canonical/SheetMetal/semantic-panel.firmament"));+ var modern=Compile(name);+ Assert.Equal(Step(original),Step(modern));+ Assert.Equal(original.FlatPattern!.MaterialArea,modern.FlatPattern!.MaterialArea);+ Assert.Equal(50,Assert.Single(modern.Spec!.SemanticLayout.Patterns).CenterX);+ Assert.Equal(original.Part!.Features.Select(f=>f.StableId),modern.Part!.Features.Select(f=>f.StableId));+ }++ [Fact]+ public void UnnamedPmiPreservesEveryExportedRequirement()+ {+ var original=SheetMetalFirmament.CompileFile(Path.Combine(Repo,"fixtures/InvestorPitch/sheet-metal-bracket.firmament"));+ var modern=Compile("manufacturing-unnamed-pmi");+ Assert.Equal(Step(original),Step(modern));+ var pmi=Step242SemanticPmiInspector.Inspect(Step(modern));+ Assert.Equal(13,pmi.Items.Count);Assert.Equal(2,pmi.GeometricToleranceCount);+ Assert.Contains(pmi.Items,i=>i.Kind=="Position" && i.DatumReferences.SequenceEqual(["A","B"]) && i.GeometricFaceEntityIds.Count==2);+ }++ [Theory]+ [InlineData("manufacturing-comment-in-string")]+ [InlineData("manufacturing-direct-hole-target")]+ [InlineData("manufacturing-typed-dimension")]+ public void FormerBindingGapsBuildThroughTheRealExporter(string name)+ {+ var result=Compile(name);var pmi=Step242SemanticPmiInspector.Inspect(Step(result));+ Assert.True(pmi.Success);Assert.Equal(13,pmi.Items.Count);+ if(name=="manufacturing-direct-hole-target")+ { Assert.Equal(5,result.Part!.Features.Count);Assert.Contains(pmi.Items,i=>i.Target=="Extra" && i.GeometricFaceEntityIds.Count>0); }+ if(name=="manufacturing-comment-in-string")Assert.Equal("CNC // process specification",result.Spec!.Manufacturing.BlankProcess);+ if(name=="manufacturing-typed-dimension")Assert.NotEmpty(result.Spec!.Manufacturing.Dimensions.Single(d=>d.Name=="BaseWidth").DimensionOrigins);+ }++ [Fact]+ public void TypedRecordRequirementsReachGeometryAndExplicitPmi()+ {+ var result=Compile("modern-layout-release");var pmi=Step242SemanticPmiInspector.Inspect(Step(result));+ Assert.Equal(100,result.Spec!.Base.Width);Assert.Equal(2,result.Part!.Features.Count);+ var drill=Assert.Single(pmi.Items,i=>i.Kind=="Diameter");+ Assert.Equal(6,drill.Value);Assert.Equal(0.1,drill.TolerancePlus);Assert.Equal(0.05,drill.ToleranceMinus);Assert.Equal(2,drill.GeometricFaceEntityIds.Count);+ Assert.NotEmpty(result.Spec.Manufacturing.Dimensions.Single(d=>d.Name=="drill").DimensionOrigins);+ Assert.Contains(pmi.Items,i=>i.Text=="Cut before forming // keep this text");+ Assert.Equal("5052-H32 // shop specification",result.Spec.Manufacturing.MaterialSpecification);+ }++ [Fact]+ public void KeyedPatternUsesSharedFeatureExpansionAndStableIdentities()+ {+ var original=Compile("keyed-features");var step=Step(original);+ Assert.Equal(new[]{"mounting.left","mounting.right"},original.Spec!.Cuts.Select(c=>c.Name));+ Assert.Equal(new[]{20d,80d},original.Spec.Cuts.Select(c=>c.X));+ var reordered=SheetMetalFirmament.Compile(Source("keyed-features").Replace("left => Point2(20mm, 30mm)\n right => Point2(80mm, 30mm)","right => Point2(80mm, 30mm)\n left => Point2(20mm, 30mm)",StringComparison.Ordinal));+ Assert.True(reordered.IsSuccess,string.Join('\n',reordered.Diagnostics.Select(d=>d.Message)));+ Assert.Equal(original.Spec.Cuts.OrderBy(c=>c.Name),reordered.Spec!.Cuts.OrderBy(c=>c.Name));+ Assert.Contains(Step242SemanticPmiInspector.Inspect(step).Items,i=>i.Target=="mounting.left" && i.Value==6 && i.GeometricFaceEntityIds.Count==1);+ }++ [Fact]+ public void LegacySlotAndMisleadingRectangleAliasKeepTheirExactCapsule()+ {+ var slot=Compile("layout-slot");var rectangle=Compile("layout-rectangle");+ Assert.Equal(Step(slot),Step(rectangle));+ Assert.Equal(7860.553063332699,slot.FlatPattern!.MaterialArea!.Value,8);+ }++ [Fact]+ public void KeyedCutRecipeUsesTheSharedExactProfileConsumer()+ {+ var result=Compile("keyed-profile-cuts");var pmi=Step242SemanticPmiInspector.Inspect(Step(result));+ Assert.Equal(new[]{"vents.left","vents.right"},result.Spec!.Cuts.Select(c=>c.Name));+ Assert.All(result.Spec.Cuts,c=>Assert.NotNull(c.Profile));+ Assert.Equal(6000-2*(36+9*Math.PI),result.FlatPattern!.MaterialArea!.Value,8);+ Assert.Contains(pmi.Items,i=>i.Target=="vents.left" && i.Kind=="Annotation" && i.GeometricFaceEntityIds.Count>0);+ }++ [Theory]+ [InlineData("count: 2","count: 2; Count: 3")]+ [InlineData("kind: Linear","kind: Linear; Kind: Thickness")]+ [InlineData("on: deck; at: deck.Center","on: deck; at: right")]+ public void DuplicateAliasesAndUnresolvedLayoutValuesReject(string before,string after)+ {+ var result=SheetMetalFirmament.Compile(Source("modern-layout-release").Replace(before,after,StringComparison.Ordinal));+ Assert.False(result.IsSuccess);Assert.Null(result.Part);Assert.NotEmpty(result.Diagnostics);+ }++ [Fact]+ public void ProfileDeltaModernFieldsAndTypedAnchorsPreserveMaterial()+ {+ var legacy=File.ReadAllText(Path.Combine(Repo,"fixtures/Canonical/SheetMetal/profiledelta-remove-area.firmament"));+ var old=SheetMetalFirmament.Compile(legacy);+ var modern=legacy.Replace("Anchor: CenteredAt 50mm;","anchor: CenteredAt(anchorCenter)",StringComparison.Ordinal);+ foreach(var field in new[]{"On","Side","Offset","Kind","To","Run","At"})modern=modern.Replace(field+":",char.ToLowerInvariant(field[0])+field[1..]+":",StringComparison.Ordinal);+ modern="Static anchorCenter: Length = 50mm\n"+modern;+ var result=SheetMetalFirmament.Compile(modern);+ Assert.Equal(Step(old),Step(result));Assert.Equal(old.FlatPattern!.MaterialArea,result.FlatPattern!.MaterialArea);+ var unknown=SheetMetalFirmament.Compile(modern.Replace("run: 15mm;","run: 15mm; ignored: 1mm;",StringComparison.Ordinal));+ Assert.False(unknown.IsSuccess);Assert.Null(unknown.Part);+ var bodyless=SheetMetalFirmament.Compile(legacy+"\nProfileDelta Empty\n");+ Assert.False(bodyless.IsSuccess);Assert.NotEmpty(bodyless.Diagnostics);+ }++ [Fact]+ public void ForwardLocalDatumShadowsAnAlreadyBoundGlobalDatum()+ {+ var source="""+ SheetMetal panel { thickness: 1mm; Base deck { profile: Rectangle { width: 100mm; height: 60mm } } Datum later { on: deck; at: Point2(55mm,30mm) } }+ Concept Struct layout {+ Datum first { on: deck; at: later }+ Datum later { on: deck; at: Point2(50mm,30mm) }+ Pattern holes { on: deck; feature: Circle { diameter: 6mm }; center: first; count: 1; pitch: Vector2(10mm,0mm) }+ }+ """;+ var result=SheetMetalFirmament.Compile(source);Assert.True(result.IsSuccess,string.Join('\n',result.Diagnostics.Select(d=>d.Message)));+ Assert.Equal(50,Assert.Single(result.Spec!.Cuts).X);+ var cyclic=SheetMetalFirmament.Compile(source.Replace("at: Point2(50mm,30mm)","at: first",StringComparison.Ordinal));+ Assert.False(cyclic.IsSuccess);Assert.Null(cyclic.Part);+ }++ [Fact]+ public void ImportsCannotBeIgnoredOrDiscoveredInsideStrings()+ {+ var original=Source("modern-layout-release");+ var unresolved=SheetMetalFirmament.Compile("include \"missing.firmament\"\n"+original);+ Assert.False(unresolved.IsSuccess);Assert.Contains(unresolved.Diagnostics,d=>d.Code=="sheetmetal-module-reference-unresolved");+ var quoted=SheetMetalFirmament.Compile(original.Replace("Laser cut # deburr","Use Profile.Modifications; // literal text",StringComparison.Ordinal));+ Assert.True(quoted.IsSuccess,string.Join('\n',quoted.Diagnostics.Select(d=>d.Message)));+ Assert.Equal("Use Profile.Modifications; // literal text",quoted.Spec!.Manufacturing.BlankProcess);+ }++ [Theory]+ [InlineData("heigth: 5mm")]+ [InlineData("Fillet ignored { radius: 2mm }")]+ public void ExtensionScopesCannotBypassStatementAndFieldAdmission(string extra)+ {+ var result=SheetMetalFirmament.Compile(Source("keyed-features")+"\nExtend SheetMetal keyedPanel { "+extra+" }");+ Assert.False(result.IsSuccess);Assert.Null(result.Part);Assert.NotEmpty(result.Diagnostics);+ }++ [Fact]+ public void OrdinarySharedConstructionRetainsItsOwnFieldAndFrameAdmission()+ {+ var result=Compile("shared-construction-layout");Step(result);+ Assert.Equal(100,result.Spec!.Base.Width);Assert.Equal(6000-9*Math.PI,result.FlatPattern!.MaterialArea!.Value,8);+ var unknown=SheetMetalFirmament.Compile(Source("shared-construction-layout").Replace("size: [width, 60mm]","size: [width, 60mm]; heigth: 3mm",StringComparison.Ordinal));+ Assert.False(unknown.IsSuccess);Assert.Null(unknown.Part);+ Assert.Contains(unknown.Diagnostics,d=>d.Code=="firmament-v2-canonical-field-unknown" && d.SourceSpan is not null);+ }++ [Fact]+ public void ProfileTemplateKeepsTheSharedToleranceEnvironment()+ {+ var source="""+ Static width: Length = 100mm tol 0.25mm+ Template<w: Length> Profile Blank {+ Rect2 boundary { center: [50mm,30mm]; size: [w,60mm] }+ Loop Outer { boundary |> TraceLoop }+ }+ Profile stock = Blank<w: width>+ SheetMetal templated {+ thickness: 1.5mm+ Base deck { profile: stock }+ Pmi { Dimension width { kind: Linear; target: deck; dimension: width } }+ }+ """;+ var result=SheetMetalFirmament.Compile(source);+ var pmi=Step242SemanticPmiInspector.Inspect(Step(result));+ Assert.Equal(100,result.Spec!.Base.Width);Assert.Equal(6000,result.FlatPattern!.MaterialArea!.Value,8);+ Assert.Contains(pmi.Items,i=>i.Value==100 && i.TolerancePlus==0.25);+ }++ [Fact]+ public void ModuleStatementsCloseWithoutDroppingLegacyOwnedCuts()+ {+ const string body="SheetMetal plate { thickness: 1mm; Base deck { profile: Rectangle { width: 100mm; height: 60mm } } ";+ const string hole="Hole mount { on: deck; center: Point2(20mm,30mm); diameter: 6mm }";+ var inside=SheetMetalFirmament.Compile(body+hole+" }");+ var module=SheetMetalFirmament.Compile(body+" }\n"+hole);+ Assert.Equal(Step(inside),Step(module));Assert.Single(module.Part!.Features);+ var ignored=SheetMetalFirmament.Compile(body+" }\nFillet ignored { radius: 2mm }");+ Assert.False(ignored.IsSuccess);Assert.Null(ignored.Part);+ Assert.Contains(ignored.Diagnostics,d=>d.Code=="sheetmetal-statement-unknown" && d.SourceSpan is not null);+ }++ [Fact]+ public void CanonicalTableFamilyRetainsItsDataOwnerAndProfileDelta()+ {+ var result=SheetMetalFirmament.CompileFile(Path.Combine(Repo,"fixtures/Canonical/SheetMetal/profile-delta-tab-family.firmament"));+ Step(result);+ Assert.Equal(32,Assert.Single(result.Spec!.SemanticLayout.ProfileDeltas!).Program.Span);+ }++ [Fact]+ public void SheetScopedTableSelectionFeedsTheSameScalarGeometryBinder()+ {+ var source="""+ Record Stock { width: Length }+ SheetMetal scoped {+ Static Table variants: Stock { width: [80mm,100mm] }+ Static selected = variants[1]+ thickness: 1.5mm+ Base deck { profile: Rectangle { width: selected.width; height: 60mm } }+ }+ """;+ var result=SheetMetalFirmament.Compile(source);Step(result);+ Assert.Equal(100,result.Spec!.Base.Width);Assert.Equal(6000,result.FlatPattern!.MaterialArea!.Value,8);+ }+}diff --git a/Aetheris.SheetMetal/SheetMetalAuthoredLowering.cs b/Aetheris.SheetMetal/SheetMetalAuthoredLowering.csindex e4dc1966..35621f51 100644--- a/Aetheris.SheetMetal/SheetMetalAuthoredLowering.cs+++ b/Aetheris.SheetMetal/SheetMetalAuthoredLowering.cs@@ -1,5 +1,4 @@using System.Diagnostics;-using System.Text.RegularExpressions;using Aetheris.Kernel.Core.Brep;using Aetheris.Kernel.Core.Geometry;using Aetheris.Kernel.Core.Geometry.Curves;@@ -50,36 +49,43 @@ public sealed record SheetMetalConstructionSpec(/// </summary>internal static class AuthoredSheetMetalCompiler{- private const RegexOptions Rx = RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Singleline;-- public static SheetMetalAuthoringResult Compile(string source, string sourcePath)+ public static SheetMetalAuthoringResult Compile(string source, string sourcePath, string? originalSource=null){var parseStarted=Stopwatch.GetTimestamp();var diagnostics = new List<SheetMetalDiagnostic>();- var modelStyleHole = Regex.Match(source, @"\bHole\s*<\s*(?<variant>[A-Za-z_][A-Za-z0-9_]*)\s*>", Rx);- if (modelStyleHole.Success)- return Fail(- $"Sheet Metal does not use the Model-domain `Hole<{modelStyleHole.Groups["variant"].Value}>` form. Declare `Hole <Name> {{ On: <planar-region>; Center: (<x>, <y>); Diameter: <length>; }}`; for example, `Hole Mount {{ On: Base; Center: (20mm, 15mm); Diameter: 6mm; }}`.",- "sheetmetal-hole-domain-syntax");- if (Regex.IsMatch(source, @"\bPmi\s*\{\s*Datum\s+[A-Za-z_]", Rx))- return Fail(- "Sheet Metal PMI does not use the Model-domain `Datum` record or axis-face targets. Add a `Manufacturing <Release> { ... }` block and declare `DatumFeature <Label> { Target: <named-sheet-region>; }` inside `Pmi`; for example, `DatumFeature A { Target: Base; }`.",- "sheetmetal-pmi-domain-syntax");- var syntax = FirmamentSyntaxParser.Parse(source);+ var binding = new FirmamentDomainBinding(source,sourcePath,"SheetMetal",new HashSet<string>(StringComparer.Ordinal) { "Hole","Cut" },originalSource);+ if(binding.Diagnostics.Any(d=>d.Severity is "error" or "fatal"))return new(false,null,null,null,SheetMetalSyntaxDiagnostics.Binding(binding));+ source=binding.Source;+ var unresolvedDirective=binding.Document.Statements.OfType<DirectiveSyntax>().FirstOrDefault(d=>d.Kind!=DirectiveKind.Schema);+ if(unresolvedDirective is not null)return new(false,null,null,null,[SheetMetalSyntaxDiagnostics.At(binding,"sheetmetal-module-reference-unresolved",+ "This sheet module contains an unresolved include/Use directive. Resolve supported domain libraries or load external modules through their owning project loader; imports cannot be ignored.",unresolvedDirective.Span)]);+ foreach(var requirement in binding.Document.Statements.OfType<DeclarationSyntax>().Where(d=>d.Type.Name.Text=="Require" && d.Body is null))+ if(!binding.CheckRequirement(requirement))return new(false,null,null,null,SheetMetalSyntaxDiagnostics.Binding(binding));+ foreach(var statement in binding.Document.Statements)+ {+ if(statement is DirectiveSyntax { Kind:DirectiveKind.Schema })continue;+ if(statement is DeclarationSyntax declaration && (declaration.Type.Name.Text is "SheetMetal" or "Concept" or "Manufacturing" or "Pmi" or "Base" or "Flange" or "Hole" or "Cut"+ || declaration.Type.Name.Text=="Struct" && declaration.Modifiers.Any(m=>m.Name.Text=="Concept")+ || SheetMetalSemanticLayoutParser.OwnsDeclaration(declaration.Type.Name.Text) || binding.OwnsProfileData(declaration) || binding.OwnsData(declaration)))continue;+ return new(false,null,null,null,[SheetMetalSyntaxDiagnostics.At(binding,"sheetmetal-statement-unknown",+ $"Unsupported statement '{(statement as DeclarationSyntax)?.Type.Name.Text ?? "expression"}' in the sheet module. Material operations require a sheet owner; shared construction data keeps its profile/data owner.",statement.Span)]);+ }+ var modelStyleHole=FirmamentSyntaxTraversal.Declarations(binding.Document).FirstOrDefault(d=>d.Type.Name.Text=="Hole" && d.Type.Arguments.Count>0);+ if(modelStyleHole is not null)return new(false,null,null,null,[SheetMetalSyntaxDiagnostics.At(binding,"sheetmetal-hole-domain-syntax",+ $"Sheet Metal holes target planar regions: use Hole {modelStyleHole.Name?.Text ?? "Mount"} {{ on: region; center: Point2(x, y); diameter: length }}. Model-domain Hole<Shaft>/face selectors are not sheet operations.",modelStyleHole.Span)]);+ var modelStyleDatum=FirmamentSyntaxTraversal.Declarations(binding.Document).Where(d=>d.Type.Name.Text=="Pmi")+ .SelectMany(d=>d.Body?.Statements.OfType<DeclarationSyntax>()??[]).FirstOrDefault(d=>d.Type.Name.Text=="Datum");+ if(modelStyleDatum is not null)return new(false,null,null,null,[SheetMetalSyntaxDiagnostics.At(binding,"sheetmetal-pmi-domain-syntax",+ $"Sheet Metal PMI uses DatumFeature {modelStyleDatum.Name?.Text ?? "A"} {{ target: namedRegion }}, rather than Model-domain Datum/axis-face selectors.",modelStyleDatum.Span)]);var syntaxErrors = new List<string>();- var owners = syntax.Document.Statements.OfType<DeclarationSyntax>()+ var owners = binding.Document.Statements.OfType<DeclarationSyntax>().Where(d => d.Type.Name.Text == "SheetMetal" && d.Body is not null && d.Modifiers.Count == 0).ToArray();if (owners.Length != 1) return Fail($"Expected one concrete SheetMetal document; found {owners.Length}.");var owner = owners[0];if (owner.Body is null || owner.Name is null) return Fail("Expected one named SheetMetal document.");var documentName = owner.Name.Text;- // ProfileDelta and semantic-layout declarations retain their domain owners.- // Their syntax is admitted there; this owner closes its actual sheet body.- var bodyErrors = syntax.Diagnostics.Where(d => d.SourceSpan is { } span && span.Start >= owner.Span.Start- && span.Start < owner.Span.Start + owner.Span.Length).ToArray();- if (bodyErrors.Length > 0) return Fail(string.Join("\n", bodyErrors.Select(d => d.Message)), "sheetmetal-syntax-invalid");var root = new FirmamentSyntaxFields(owner with { Annotation = null,- Body = owner.Body with { Statements = owner.Body.Statements.OfType<FieldSyntax>().Cast<StatementSyntax>().ToArray() } }, syntaxErrors);+ Body = owner.Body with { Statements = owner.Body.Statements.OfType<FieldSyntax>().Cast<StatementSyntax>().ToArray() } }, syntaxErrors,bind:binding.Nominal);if (!root.Measure("Thickness", "mm", out var thickness) || thickness <= 0)return Fail("Thickness must be a positive millimetre value.");var material = root.Reference("Material");@@ -87,18 +93,23 @@ internal static class AuthoredSheetMetalCompilerif (!double.IsFinite(k) || k is < 0 or > 1) return Fail("KFactor must be between zero and one.");var legacyBaseValue = root.Take("Base");var intent = root.Reference("Intent");+ var selectedRelease=root.Reference("Manufacturing");+ if(owner.Clauses.Count>0)return Fail("SheetMetal does not admit header placements; its geometry owns named planar regions.","firmament-v2-placement-unsupported");if (intent is not (null or "Authored" or "Reconstructed" or "Manufacturing")- && !syntax.Document.Statements.OfType<DeclarationSyntax>().Any(d => d.Type.Name.Text == "Struct"+ && !binding.Document.Statements.OfType<DeclarationSyntax>().Any(d => d.Type.Name.Text == "Struct"&& d.Modifiers.Any(m => m.Name.Text == "Concept") && d.Name?.Text == intent))return Fail("Intent requires Authored, Reconstructed, Manufacturing or a declared Concept Struct layout.");root.Complete();- foreach (var statement in owner.Body.Statements.Where(s => s is not FieldSyntax))+ var sheetScopes=binding.Document.Statements.OfType<DeclarationSyntax>().Where(d=>d.Type.Name.Text=="SheetMetal" && d.Body is not null).ToArray();+ foreach(var scope in sheetScopes.Where(s=>s!=owner))+ new FirmamentSyntaxFields(scope with { Body=scope.Body! with { Statements=scope.Body.Statements.OfType<FieldSyntax>().Cast<StatementSyntax>().ToArray() } },syntaxErrors).Complete();+ foreach (var statement in sheetScopes.SelectMany(scope=>scope.Body!.Statements).Where(s => s is not FieldSyntax))if (statement is not DeclarationSyntax declaration || !(declaration.Type.Name.Text is "Base" or "Flange" or "Hole" or "Cut" or "Manufacturing" or "Pmi"- || SheetMetalSemanticLayoutParser.OwnsDeclaration(declaration.Type.Name.Text)))+ || SheetMetalSemanticLayoutParser.OwnsDeclaration(declaration.Type.Name.Text) || binding.OwnsProfileData(declaration) || binding.OwnsData(declaration)))syntaxErrors.Add($"sheetmetal-statement-unknown: Unknown statement in SheetMetal '{owner.Name?.Text}': {(statement as DeclarationSyntax)?.Type.Name.Text ?? "expression"}.");var legacyBase = legacyBaseValue is not null;AuthoredSheetBaseSpec? baseSpec;- var bases = Blocks(source, "Base", syntaxErrors);+ var bases = Blocks(binding, "Base", syntaxErrors);if (bases.Count > 1 || legacyBase && bases.Count > 0)return Fail("Declare exactly one Base; do not combine the legacy Base field with a named Base.", "sheetmetal-base-duplicate");if (legacyBaseValue is CallSyntax { Target: ReferenceSyntax { Name.Text: "Rectangle" }, Arguments.Count: 2 } rectangle@@ -109,7 +120,7 @@ internal static class AuthoredSheetMetalCompilerelse{var named = bases.SingleOrDefault();- baseSpec = named is null ? null : SheetMetalProfileBinding.Base(source, named.Name, named.Fields, syntaxErrors);+ baseSpec = named is null ? null : SheetMetalProfileBinding.Base(source, named.Name, named.Fields, syntaxErrors,binding);}if (baseSpec is null || baseSpec.Width <= 0 || baseSpec.Depth <= 0)return Fail(syntaxErrors.Count > 0 ? string.Join("\n", syntaxErrors) : "A positive rectangular base Profile is required.", "sheetmetal-base-profile-invalid");@@ -117,12 +128,10 @@ internal static class AuthoredSheetMetalCompiler// Attachment paths are resolved fully by the semantic-layout pass after// all region dimensions are known. This small pre-scan exists only so// Flange.From capability checking can admit their public member names.- var declaredAttachmentPaths=Blocks(source,"AttachmentPath")- .Select(b=>(Block:b,On:Regex.Match(b.Body,@"\bOn\s*:\s*(?<region>[A-Za-z_][A-Za-z0-9_]*)\.(?<edge>[A-Za-z_][A-Za-z0-9_]*)\s*;",Rx)))- .Where(x=>x.On.Success)- .Select(x=>$"{x.On.Groups["region"].Value}.{x.Block.Name}")- .ToHashSet(StringComparer.OrdinalIgnoreCase);- var deltaDeclarations=SemanticProfileDeltaParser.Parse(source);+ var declaredAttachmentPaths=Blocks(binding,"AttachmentPath")+ .Select(b=>(Block:b,On:b.Fields.Reference("On")?.Split('.')))+ .Where(x=>x.On is { Length:2 }).Select(x=>$"{x.On![0]}.{x.Block.Name}").ToHashSet(StringComparer.Ordinal);+ var deltaDeclarations=SemanticProfileDeltaParser.ParseDeclarations(DeltaDeclarations(binding.Document),binding.Nominal);foreach(var delta in deltaDeclarations.Deltas){var region=delta.OwnerPath.Split('.')[0];@@ -131,7 +140,7 @@ internal static class AuthoredSheetMetalCompiler}var flanges = new List<AuthoredSheetFlangeSpec>();- foreach (var block in Blocks(source, "Flange", syntaxErrors))+ foreach (var block in Blocks(binding, "Flange", syntaxErrors)){var from = Token(block, "From")?.Split('.');var hasLength = Scalar(block, "Length", "mm", out var length) || Scalar(block, "Height", "mm", out length);@@ -204,13 +213,13 @@ internal static class AuthoredSheetMetalCompilerreturn Fail($"Multiple flanges target {duplicate.First().ParentRegion}.{duplicate.First().EdgeName}.", SheetMetalDiagnosticCodes.DuplicateFlange);if (flanges.Select(f => f.Name).Append(baseSpec.Name).Distinct(StringComparer.OrdinalIgnoreCase).Count() != flanges.Count + 1)return Fail("Base and flange names must be unique.", SheetMetalDiagnosticCodes.ImpossibleTopology);- foreach (var extension in syntax.Document.Statements.OfType<DeclarationSyntax>()+ foreach (var extension in binding.Document.Statements.OfType<DeclarationSyntax>().Where(d => d.Type.Name.Text == "SheetMetal" && d.Modifiers.Any(m => m.Name.Text == "Extend")))if (extension.Name?.Text != documentName)return Fail($"Sheet Metal extension targets '{extension.Name?.Text}', but the specialized part is '{documentName}'.", "sheetmetal-extension-target-mismatch");var cuts = new List<AuthoredSheetCutSpec>();- foreach (var block in Blocks(source, "Hole", syntaxErrors))+ foreach (var block in Blocks(binding, "Hole", syntaxErrors)){var on = Token(block, "On");var at = Point(block, "Center");@@ -219,18 +228,18 @@ internal static class AuthoredSheetMetalCompilerblock.Fields.Complete();cuts.Add(new(block.Name, on, SheetFeatureKind.CircularHole, at.Value.X, at.Value.Y, diameter, null, null));}- foreach (var block in Blocks(source, "Cut", syntaxErrors))+ foreach (var block in Blocks(binding, "Cut", syntaxErrors)){- var cut = SheetMetalProfileBinding.Cut(source, block.Name, block.Fields, syntaxErrors);+ var cut = SheetMetalProfileBinding.Cut(source, block.Name, block.Fields, syntaxErrors,binding);if (cut is not null) cuts.Add(cut);}- if (syntaxErrors.Count > 0) return Fail(string.Join("\n", syntaxErrors), "sheetmetal-authoring-invalid");+ if (syntaxErrors.Count > 0) return new(false,null,null,null,SheetMetalSyntaxDiagnostics.Codes(syntaxErrors,binding));var semanticStarted=Stopwatch.GetTimestamp();- var semanticLayout=SheetMetalSemanticLayoutParser.Parse(source,baseSpec,flanges,cuts);+ var semanticLayout=SheetMetalSemanticLayoutParser.Parse(baseSpec,flanges,cuts,binding);var semanticMs=Stopwatch.GetElapsedTime(semanticStarted).TotalMilliseconds;if(!semanticLayout.IsSuccess)return new(false,null,null,null,semanticLayout.Diagnostics);- var manufacturing = SheetMetalManufacturingParser.Parse(source, documentName, baseSpec, flanges, semanticLayout.Layout);+ var manufacturing = SheetMetalManufacturingParser.Parse(binding, documentName, baseSpec, flanges, semanticLayout.Layout, cuts.Concat(semanticLayout.GeneratedCuts).ToArray(), selectedRelease);if(!manufacturing.IsSuccess)return new(false,null,null,null,manufacturing.Diagnostics);cuts.AddRange(semanticLayout.GeneratedCuts);var duplicateCut=cuts.GroupBy(x=>x.Name,StringComparer.Ordinal).FirstOrDefault(x=>x.Count()>1);@@ -241,24 +250,43 @@ internal static class AuthoredSheetMetalCompilerif (owner.Annotation is not null && concept is null) return Fail("SheetMetal requires a named Concept contract after ':'.");var spec = new SheetMetalConstructionSpec(documentName, thickness, material, k, baseSpec, flanges, cuts, authority, legacyBase,concept){ SemanticLayout=semanticLayout.Layout, Manufacturing=manufacturing.Definition };- if(concept is not null&&SheetMetalConceptContracts.Validate(source,spec) is { } conformanceFailure)- return Fail(conformanceFailure.Message,conformanceFailure.Code);+ if(concept is not null)+ {+ var members=new Dictionary<string,string>(StringComparer.Ordinal) { [baseSpec.Name]="SheetRegion",["Flat"]="FlatPattern" };+ foreach(var flange in flanges){ members[flange.Name]="SheetFlange";members[flange.Name+"Bend"]="SheetBend"; }+ foreach(var cut in cuts)members[cut.Name]="SheetCut";+ foreach(var pattern in semanticLayout.Layout.Patterns)members[pattern.Name]="SheetPattern";+ if(!binding.CheckContract(concept,members,documentName,owner.Span))return new(false,null,null,null,SheetMetalSyntaxDiagnostics.Binding(binding));+ }var parseMs=Stopwatch.GetElapsedTime(parseStarted).TotalMilliseconds;var formedStarted=Stopwatch.GetTimestamp();var lowered = AuthoredSheetMetalLowering.Lower(spec, sourcePath);var formedMs=Stopwatch.GetElapsedTime(formedStarted).TotalMilliseconds;if (!lowered.IsSuccess || lowered.Part is null) return new(false, spec, null, null, lowered.Diagnostics);var flatStarted=Stopwatch.GetTimestamp();var flat = SheetMetalFlattener.Flatten(lowered.Part);var flatMs=Stopwatch.GetElapsedTime(flatStarted).TotalMilliseconds;diagnostics.AddRange(lowered.Diagnostics); diagnostics.AddRange(flat.Diagnostics);- return new(flat.Status is not FlatPatternStatus.Unsupported and not FlatPatternStatus.Overlapping, spec, lowered.Part, flat, diagnostics,new(parseMs,formedMs,flatMs,semanticMs));+ return new(flat.Status is not FlatPatternStatus.Unsupported and not FlatPatternStatus.Overlapping, spec, lowered.Part, flat, diagnostics,new(parseMs,formedMs,flatMs,semanticMs)) { TemplateInstantiations=binding.Instantiations };SheetMetalAuthoringResult Fail(string message, string code = "sheetmetal-firmament-invalid") =>- new(false, null, null, null, [new(code, SheetMetalDiagnosticSeverity.Error, message)]);+ new(false, null, null, null, [SheetMetalSyntaxDiagnostics.At(binding,code,message,binding.Document.Statements.OfType<DeclarationSyntax>().FirstOrDefault(d=>d.Type.Name.Text=="SheetMetal")?.Span)]);}- private sealed record Block(string Name, string Body, FirmamentSyntaxFields Fields);- private static IReadOnlyList<Block> Blocks(string source, string keyword, List<string>? diagnostics = null) =>- FirmamentSyntaxTraversal.Declarations(FirmamentSyntaxParser.Parse(source).Document)+ internal static IEnumerable<DeclarationSyntax> DeltaDeclarations(DocumentSyntax document) =>+ document.Statements.OfType<DeclarationSyntax>().Where(d=>d.Type.Name.Text=="ProfileDelta")+ .Concat(document.Statements.OfType<DeclarationSyntax>().Where(d=>d.Type.Name.Text=="SheetMetal" || d.Type.Name.Text=="Struct" && d.Modifiers.Any(m=>m.Name.Text=="Concept"))+ .SelectMany(d=>d.Body?.Statements.OfType<DeclarationSyntax>()??[]).Where(d=>d.Type.Name.Text=="ProfileDelta"));++ private sealed record Block(string Name, FirmamentSyntaxFields Fields);+ private static IReadOnlyList<Block> Blocks(FirmamentDomainBinding binding, string keyword, List<string>? diagnostics = null) =>+ binding.Document.Statements.OfType<DeclarationSyntax>().Where(d=>d.Type.Name.Text=="SheetMetal")+ .SelectMany(d=>d.Body?.Statements.OfType<DeclarationSyntax>()??[])+ .Concat(binding.Document.Statements.OfType<DeclarationSyntax>())+ .Concat(binding.Document.Statements.OfType<DeclarationSyntax>().Where(d=>d.Type.Name.Text=="Struct" && d.Modifiers.Any(m=>m.Name.Text=="Concept"))+ .SelectMany(d=>d.Body?.Statements.OfType<DeclarationSyntax>()??[]).Where(d=>d.Type.Name.Text=="AttachmentPath")).Where(d => d.Type.Name.Text == keyword && d.Name is not null && d.Body is not null)- .Select(d => new Block(d.Name!.Text, source.Substring(d.Body!.ContentSpan.Start, d.Body.ContentSpan.Length),- new(d, diagnostics ?? []))).ToArray();+ .Select(d =>+ {+ var fields=new FirmamentSyntaxFields(d,diagnostics ?? [],bind:binding.Nominal);+ var identity=d.Type.Name.Text is "Hole" or "Cut"?fields.Reference("PatternIdentity"):null;+ return new Block(identity ?? d.Name!.Text,fields);+ }).ToArray();private static bool Scalar(Block block, string name, string? unit, out double value){value = 0;diff --git a/Aetheris.SheetMetal/SheetMetalConceptContracts.cs b/Aetheris.SheetMetal/SheetMetalConceptContracts.csdeleted file mode 100644index 86a5f4e0..00000000--- a/Aetheris.SheetMetal/SheetMetalConceptContracts.cs+++ /dev/null@@ -1,35 +0,0 @@-using System.Text.RegularExpressions;--namespace Aetheris.SheetMetal;--internal static class SheetMetalConceptContracts-{- internal sealed record Failure(string Code,string Message);-- internal static Failure? Validate(string source,SheetMetalConstructionSpec spec)- {- var concept=spec.SatisfiesConcept;- if(string.IsNullOrWhiteSpace(concept))return null;- var declaration=Regex.Match(source,$@"\bConcept\s+{Regex.Escape(concept)}\s*\{{(?<body>[\s\S]*?)\}}",RegexOptions.CultureInvariant);- if(!declaration.Success)return new("firmament-template-unknown-concept-constraint",$"SheetMetal '{spec.Name}' claims unknown Concept '{concept}'.");- var available=new Dictionary<string,string>(StringComparer.Ordinal)- {- [spec.Base.Name]="SheetRegion",- ["Flat"]="FlatPattern"- };- foreach(var flange in spec.Flanges)- {- available[flange.Name]="SheetFlange";- available[flange.Name+"Bend"]="SheetBend";- }- foreach(var cut in spec.Cuts)available[cut.Name]="SheetCut";- foreach(var pattern in spec.SemanticLayout.Patterns)available[pattern.Name]="SheetPattern";- foreach(Match requirement in Regex.Matches(declaration.Groups["body"].Value,@"(?m)^\s*(?<name>[A-Za-z_][A-Za-z0-9_]*)\s*:\s*(?<type>[A-Za-z_][A-Za-z0-9_]*)\s*$",RegexOptions.CultureInvariant))- {- var name=requirement.Groups["name"].Value;var expected=requirement.Groups["type"].Value;- if(!available.TryGetValue(name,out var actual))return new("firmament-concept-missing-member",$"SheetMetal '{spec.Name}' claims to satisfy '{concept}' but does not expose required semantic member '{name}: {expected}'.");- if(!string.Equals(expected,actual,StringComparison.Ordinal))return new("firmament-concept-type-mismatch",$"SheetMetal '{spec.Name}.{name}' exposes '{actual}', but Concept '{concept}' requires '{expected}'.");- }- return null;- }-}diff --git a/Aetheris.SheetMetal/SheetMetalFirmament.cs b/Aetheris.SheetMetal/SheetMetalFirmament.csindex 3097dcbf..3d6deb77 100644--- a/Aetheris.SheetMetal/SheetMetalFirmament.cs+++ b/Aetheris.SheetMetal/SheetMetalFirmament.cs@@ -1,5 +1,6 @@using System.Text.RegularExpressions;using Aetheris.Kernel.Firmament.FirmamentV2;+using Aetheris.Kernel.Firmament.FirmamentV2.Syntax;namespace Aetheris.SheetMetal;@@ -29,9 +30,9 @@ public static class SheetMetalFirmamentpublic static bool LooksLikeSheetMetal(string source){if(source is null)return false;- var clean=Regex.Replace(source,@"//.*?$|#.*?$",string.Empty,RegexOptions.Multiline);- return Regex.IsMatch(clean,@"\bSheetMetal\s+[A-Za-z_]",RegexOptions.IgnoreCase|RegexOptions.CultureInvariant)- ||Regex.IsMatch(clean,@"\bUse\s+SheetMetal\.ProductFamilies\s*;",RegexOptions.IgnoreCase|RegexOptions.CultureInvariant);+ var document=FirmamentSyntaxParser.Parse(source).Document;+ return document.Statements.OfType<DeclarationSyntax>().Any(d=>d.Type.Name.Text=="SheetMetal")+ || document.Statements.OfType<DirectiveSyntax>().Any(d=>d.Kind==DirectiveKind.Use && FirmamentSyntaxValues.Reference(d.Value)=="SheetMetal.ProductFamilies");}public static SheetMetalAuthoringResult CompileFile(string path)@@ -45,36 +46,40 @@ public static class SheetMetalFirmament// including assemblies that defer SheetMetal body materialization.public static string ResolveImports(string source){- if(Regex.IsMatch(source,@"\bUse\s+Profile\.Modifications\s*;",RegexOptions.CultureInvariant))+ var directives=FirmamentSyntaxParser.Parse(source).Document.Statements.OfType<DirectiveSyntax>()+ .Where(d=>d.Kind==DirectiveKind.Use).ToArray();+ var libraries=new List<string>();+ foreach(var directive in directives.OrderByDescending(d=>d.Span.Start)){- source=Regex.Replace(source,@"\bUse\s+Profile\.Modifications\s*;",string.Empty,RegexOptions.CultureInvariant);- source=ProfileModificationTemplateLibrary.Source+Environment.NewLine+source;- }- if(Regex.IsMatch(source,@"\bUse\s+SheetMetal\.ProductFamilies\s*;",RegexOptions.IgnoreCase|RegexOptions.CultureInvariant))- {- source=Regex.Replace(source,@"\bUse\s+SheetMetal\.ProductFamilies\s*;",string.Empty,RegexOptions.IgnoreCase|RegexOptions.CultureInvariant);- source=SheetMetalTemplateLibrary.Source+Environment.NewLine+source;+ var library=FirmamentSyntaxValues.Reference(directive.Value) switch+ {+ "Profile.Modifications"=>ProfileModificationTemplateLibrary.Source,+ "SheetMetal.ProductFamilies"=>SheetMetalTemplateLibrary.Source,+ _=>null+ };+ if(library is null)continue;+ if(!libraries.Contains(library,StringComparer.Ordinal))libraries.Add(library);+ source=source.Remove(directive.Span.Start,directive.Span.Length);}+ if(libraries.Count>0)source=string.Join(Environment.NewLine,libraries)+Environment.NewLine+source;return source;}public static SheetMetalAuthoringResult Compile(string source,string sourcePath="authored.firmament"){ArgumentNullException.ThrowIfNull(source);+ var originalSource=source;source = ResolveImports(source);- IReadOnlyList<ConceptIrTemplateInstantiation> instantiations=[];- if(Regex.IsMatch(source,@"\bTemplate\s*<",RegexOptions.CultureInvariant))- {- var expanded=FirmamentTemplateSourceCompiler.Expand(source,out var templateDiagnostics);- if(expanded is null||templateDiagnostics.Count>0)- return new(false,null,null,null,templateDiagnostics.Select(x=>new SheetMetalDiagnostic(x.Split(':',2)[0],SheetMetalDiagnosticSeverity.Error,x)).ToArray());- source=expanded.ExpandedSource;instantiations=expanded.Instantiations;- }- var clean=Regex.Replace(source,@"//.*?$|#.*?$",string.Empty,RegexOptions.Multiline);+ // Preserve strings and offsets. Recovery retains its historical domain owner;+ // authored source is expanded and bound once by the shared frontend below.+ var cleanChars=source.ToCharArray();+ foreach(var token in FirmamentSyntaxParser.Parse(source).Document.Tokens.Where(t=>t.Kind==SyntaxTokenKind.Comment))+ for(var i=token.Span.Start;i<token.Span.Start+token.Span.Length;i++)if(cleanChars[i] is not ('\r' or '\n'))cleanChars[i]=' ';+ var clean=new string(cleanChars);if(ReconstructedSheetMetalFirmament.IsReconstructed(clean)&&Regex.IsMatch(clean,@"\bEvidenceSource\s*:",Rx))return ReconstructedSheetMetalFirmament.Compile(clean,sourcePath);if(RecoveredSheetMetalFirmament.IsRecovered(clean))return RecoveredSheetMetalFirmament.Compile(clean,sourcePath);- var result=AuthoredSheetMetalCompiler.Compile(clean,sourcePath);- return result with { TemplateInstantiations=instantiations };+ var result=AuthoredSheetMetalCompiler.Compile(clean,sourcePath,originalSource);+ return result;}private static SheetMetalAuthoringResult Failure(string message)=>new(false,null,null,null,[new("sheetmetal-firmament-invalid",SheetMetalDiagnosticSeverity.Error,message)]);diff --git a/Aetheris.SheetMetal/SheetMetalIr.cs b/Aetheris.SheetMetal/SheetMetalIr.csindex dd9e0b0b..28903563 100644--- a/Aetheris.SheetMetal/SheetMetalIr.cs+++ b/Aetheris.SheetMetal/SheetMetalIr.cs@@ -67,7 +67,13 @@ public sealed record SheetMetalDiagnostic(string Code,SheetMetalDiagnosticSeverity Severity,string Message,- IReadOnlyList<int>? SourceFaceIds = null);+ IReadOnlyList<int>? SourceFaceIds = null)+{+ public string? SourceFile { get; init; }+ public FirmamentV2SourceSpan? SourceSpan { get; init; }+ public string? Context { get; init; }+ public string? LocationNote { get; init; }+}public sealed record SheetEvidence(SheetEvidenceKind Kind,diff --git a/Aetheris.SheetMetal/SheetMetalManufacturingDefinition.cs b/Aetheris.SheetMetal/SheetMetalManufacturingDefinition.csindex 3c9990bb..a97d6193 100644--- a/Aetheris.SheetMetal/SheetMetalManufacturingDefinition.cs+++ b/Aetheris.SheetMetal/SheetMetalManufacturingDefinition.cs@@ -1,5 +1,5 @@-using System.Globalization;-using System.Text.RegularExpressions;+using Aetheris.Kernel.Firmament.FirmamentV2;+using Aetheris.Kernel.Firmament.FirmamentV2.Syntax;using Aetheris.Kernel.Core.Geometry;using Aetheris.Kernel.Core.Math;using Aetheris.Kernel.Core.Step242;@@ -16,7 +16,10 @@ public sealed record SheetMetalManufacturingDimension(double Value,double TolerancePlus,double ToleranceMinus,- int? Quantity);+ int? Quantity)+{+ public IReadOnlyList<FirmamentV2ValueOrigin> DimensionOrigins { get; init; } = [];+}public sealed record SheetMetalManufacturingGeometricTolerance(string Name,@@ -177,239 +180,130 @@ internal sealed record SheetMetalManufacturingParseResult(internal static class SheetMetalManufacturingParser{- private const RegexOptions Rx = RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Singleline;- private const string Number = @"[+-]?(?:[0-9]+(?:\.[0-9]*)?|\.[0-9]+)";-- public static SheetMetalManufacturingParseResult Parse(- string source,- string partName,- AuthoredSheetBaseSpec baseSpec,- IReadOnlyList<AuthoredSheetFlangeSpec> flanges,- SheetMetalSemanticLayout semanticLayout)+ public static SheetMetalManufacturingParseResult Parse(FirmamentDomainBinding binding, string partName,+ AuthoredSheetBaseSpec baseSpec, IReadOnlyList<AuthoredSheetFlangeSpec> flanges,+ SheetMetalSemanticLayout layout, IReadOnlyList<AuthoredSheetCutSpec> cuts, string? selectedRelease){- var manufacturing = FindNamedBlock(source, "Manufacturing");- var pmi = FindNamedBlock(source, "Pmi");- if (manufacturing is null && pmi is null)- {- return new(SheetMetalManufacturingDefinition.Empty, []);- }-+ var errors = new List<string>();var diagnostics = new List<SheetMetalDiagnostic>();- if (manufacturing is null)+ var root = binding.Document.Statements.OfType<DeclarationSyntax>().Single(d=>d.Type.Name.Text=="SheetMetal" && d.Modifiers.Count==0);+ var declarations = binding.Document.Statements.Concat(root.Body!.Statements).OfType<DeclarationSyntax>().ToArray();+ var releases=declarations.Where(d=>d.Type.Name.Text=="Manufacturing").ToArray();+ var pmis=declarations.Where(d=>d.Type.Name.Text=="Pmi").ToArray();+ var selected=releases.Where(d=>selectedRelease is null || d.Name?.Text==selectedRelease).ToArray();+ if (selected.Length>1 || selectedRelease is not null && selected.Length!=1)+ Error(root,"Select one declared Manufacturing release with manufacturing: <name>; release ownership is ambiguous or unresolved.");+ if (pmis.Length>1) Error(pmis[1],"Declare one owning Pmi block; multiple blocks cannot be silently selected by source order.");+ var release=selected.Length==1?selected[0]:null;+ var releaseValues=new Dictionary<DeclarationSyntax,SheetMetalManufacturingDefinition>();+ foreach(var item in releases){- diagnostics.Add(Error("A Sheet Metal `Pmi` block requires a `Manufacturing <Release> { ... }` block."));- return new(SheetMetalManufacturingDefinition.Empty, diagnostics);+ var f=new FirmamentSyntaxFields(item,errors,bind:binding.Nominal);+ var material=f.Reference("MaterialSpecification");+ var blank=f.Reference("BlankProcess");var forming=f.Reference("FormingProcess");+ var thickness=PlusMinus(f.Take("ThicknessTolerance"),item);+ var cut=OptionalMeasure(f,"GeneralCutTolerance","mm");+ var formed=OptionalMeasure(f,"GeneralFormedTolerance","mm");+ var angular=OptionalMeasure(f,"GeneralAngularTolerance","deg");+ f.Complete();+ releaseValues[item]=new(item.Name?.Text ?? "unspecified",material,thickness?.Plus,thickness?.Minus,blank,forming,cut,formed,angular,[],[],[],[]);}-- var targets = BuildTargets(partName, baseSpec, flanges, semanticLayout);- var datums = new List<SheetMetalManufacturingDatum>();- var dimensions = new List<SheetMetalManufacturingDimension>();- var tolerances = new List<SheetMetalManufacturingGeometricTolerance>();- var annotations = new List<SheetMetalManufacturingAnnotation>();-- var materialSpecification = Quoted(manufacturing.Value.Body, "MaterialSpecification");- var blankProcess = Quoted(manufacturing.Value.Body, "BlankProcess");- var formingProcess = Quoted(manufacturing.Value.Body, "FormingProcess");- var thicknessTolerance = PlusMinus(manufacturing.Value.Body, "ThicknessTolerance");- var generalCutTolerance = Scalar(manufacturing.Value.Body, "GeneralCutTolerance", "mm");- var generalFormedTolerance = Scalar(manufacturing.Value.Body, "GeneralFormedTolerance", "mm");- var generalAngularTolerance = Scalar(manufacturing.Value.Body, "GeneralAngularTolerance", "deg");-- if (pmi is not null)+ var definition=release is null?SheetMetalManufacturingDefinition.Empty:releaseValues[release];+ var targets = new HashSet<string>(StringComparer.Ordinal) { partName,baseSpec.Name };+ foreach(var flange in flanges) { targets.Add(flange.Name);targets.Add(flange.Name+"Bend"); }+ foreach(var pattern in layout.Patterns) { targets.Add(pattern.Path);foreach(var member in pattern.Members)targets.Add(member); }+ foreach(var cut in cuts)targets.Add(cut.Name);+ var datums=new List<SheetMetalManufacturingDatum>();var dimensions=new List<SheetMetalManufacturingDimension>();+ var tolerances=new List<SheetMetalManufacturingGeometricTolerance>();var annotations=new List<SheetMetalManufacturingAnnotation>();+ foreach(var pmi in pmis.Take(1)){- foreach (var block in ChildBlocks(pmi.Value.Body))+ if(pmi.Body is null) { Error(pmi,"Pmi needs a body.");continue; }+ var header = new FirmamentSyntaxFields(pmi with { Body=pmi.Body with { Statements=[] } },errors);header.Complete();+ var names=new HashSet<string>(StringComparer.Ordinal);+ foreach(var statement in pmi.Body.Statements){- var target = Token(block.Body, "Target");- if (target is null)- {- diagnostics.Add(Error($"PMI '{block.Name}' requires a stable Target."));- continue;- }- if (!targets.Contains(target))+ if(statement is not DeclarationSyntax record || record.Name is null || record.Body is null)+ { Error(statement,"Expected a named DatumFeature, Dimension, Position or Note record in Pmi.");continue; }+ if(!names.Add(record.Name.Text))Error(record,$"PMI name '{record.Name.Text}' is declared more than once.");+ var f=new FirmamentSyntaxFields(record,errors,bind:binding.Nominal);+ var target=SheetMetalSyntaxDiagnostics.Path(f.Take("Target"));+ if(target is null || !targets.Contains(target)) Error(record,$"PMI '{record.Name.Text}' targets unknown Sheet Metal identity '{target ?? "<missing>"}'.");+ switch(record.Type.Name.Text){- diagnostics.Add(Error($"PMI '{block.Name}' targets unknown Sheet Metal identity '{target}'."));- continue;- }-- switch (block.Kind.ToLowerInvariant())- {- case "datumfeature":- if (datums.Any(existing => existing.Label.Equals(block.Name, StringComparison.OrdinalIgnoreCase)))- diagnostics.Add(Error($"Datum label '{block.Name}' is declared more than once."));- else datums.Add(new(block.Name, target));- break;- case "dimension":+ case "DatumFeature":+ if(target is not null)datums.Add(new(record.Name.Text,target));break;+ case "Dimension":{- var kind = Token(block.Body, "Kind");- var value = Scalar(block.Body, "Value", "mm");- var tolerance = PlusMinus(block.Body, "Tolerance");- if (kind is null || value is null || value <= 0 || tolerance is null)+ var kind=f.Reference("Kind");+ if(kind is not ("Thickness" or "Linear" or "Diameter"))Error(record,$"Unsupported Dimension kind '{kind}'. Use Thickness, Linear or Diameter.");+ var rawDimension=f.TakeAll("Dimension");+ var dimension=rawDimension.Count==1?rawDimension[0].Value:null;+ if(rawDimension.Count>1)Error(record,"Duplicate dimension projection.");+ double? nominal=null; (double Plus,double Minus)? tolerance=null;+ IReadOnlyList<FirmamentV2ValueOrigin> origins=[];+ if(dimension is not null){- diagnostics.Add(Error($"Dimension '{block.Name}' requires Kind, positive Value, and PlusMinus tolerance in millimetres."));- break;+ if(record.Body.Statements.OfType<FieldSyntax>().Any(v=>FirmamentSyntaxFields.SameField(v.Name.Text,"Value") || FirmamentSyntaxFields.SameField(v.Name.Text,"Tolerance")))+ Error(record,"dimension: cannot be combined with literal value: or tolerance:.");+ if(!binding.TryValue(dimension,out var bound) || bound.Type!=FirmamentV2PrimitiveType.Length || bound.Tolerance is null)+ Error(record,"dimension: requires a bound toleranced Length from Static or Record data.");+ else { nominal=bound.Value.NumericValue;tolerance=(bound.Tolerance.Plus,bound.Tolerance.Minus);origins=bound.Origins; }}- dimensions.Add(new(block.Name, kind, target, value.Value, tolerance.Value.Plus, tolerance.Value.Minus, Integer(block.Body, "Quantity")));+ else { nominal=OptionalMeasure(f,"Value","mm");tolerance=PlusMinus(f.Take("Tolerance"),record); }+ var quantity=Quantity(f,record);+ if(nominal is null || nominal<=0 || tolerance is null)Error(record,$"Dimension '{record.Name.Text}' requires a positive nominal and nonnegative PlusMinus allowances, or dimension: <typed requirement>.");+ else if(target is not null) dimensions.Add(new(record.Name.Text,kind ?? "",target,nominal.Value,tolerance.Value.Plus,tolerance.Value.Minus,quantity) { DimensionOrigins=origins });break;}- case "position":+ case "Position":{- var value = Scalar(block.Body, "Tolerance", "mm");- var refs = TokenList(block.Body, "DatumRefs");- if (value is null || value <= 0 || refs.Count == 0)- {- diagnostics.Add(Error($"Position '{block.Name}' requires positive Tolerance and DatumRefs."));- break;- }- tolerances.Add(new(block.Name, "Position", target, value.Value, refs, Integer(block.Body, "Quantity")));- break;- }- case "annotation":- {- var text = Quoted(block.Body, "Text");- if (string.IsNullOrWhiteSpace(text)) diagnostics.Add(Error($"Annotation '{block.Name}' requires non-empty Text."));- else annotations.Add(new(block.Name, target, text));+ var tolerance=OptionalMeasure(f,"Tolerance","mm");var refs=List(f.Take("DatumRefs"),record);+ var quantity=Quantity(f,record);+ if(tolerance is null || tolerance<=0 || refs.Count==0)Error(record,$"Position '{record.Name.Text}' requires positive tolerance: and datumRefs:.");+ else if(target is not null)tolerances.Add(new(record.Name.Text,"Position",target,tolerance.Value,refs,quantity));break;}- default:- diagnostics.Add(Error($"Unsupported Sheet Metal PMI record '{block.Kind} {block.Name}'. Supported: DatumFeature, Dimension, Position, Annotation."));- break;+ case "Annotation": case "Note":+ var text=f.Reference("Text");+ if(string.IsNullOrWhiteSpace(text))Error(record,"Note requires nonempty text:.");+ else if(target is not null)annotations.Add(new(record.Name.Text,target,text));break;+ default:Error(record,$"Unsupported Sheet Metal PMI record '{record.Type.Name.Text}'. Supported: DatumFeature, Dimension, Position, Note (legacy Annotation).");break;}+ f.Complete();}}-- var declaredLabels = datums.Select(datum => datum.Label).ToHashSet(StringComparer.OrdinalIgnoreCase);- foreach (var tolerance in tolerances)+ foreach(var position in tolerances)+ foreach(var reference in position.DatumReferences.Where(r=>!datums.Any(d=>d.Label==r)))+ Error(root,$"Position '{position.Name}' references unknown datum '{reference}'.");+ diagnostics.AddRange(SheetMetalSyntaxDiagnostics.Codes(errors,binding));+ return new(definition with { Datums=datums,Dimensions=dimensions,GeometricTolerances=tolerances,Annotations=annotations },diagnostics);++ void Error(StatementSyntax owner,string message)=>diagnostics.Add(SheetMetalSyntaxDiagnostics.At(binding,"sheetmetal-manufacturing-pmi-invalid",message,owner.Span,(owner as DeclarationSyntax)?.Name?.Text));+ double? OptionalMeasure(FirmamentSyntaxFields f,string name,string unit){- foreach (var datumReference in tolerance.DatumReferences.Where(reference => !declaredLabels.Contains(reference)))- diagnostics.Add(Error($"Position '{tolerance.Name}' references unknown datum '{datumReference}'."));+ var expression=f.Take(name);if(expression is null)return null;+ if(FirmamentSyntaxValues.TryMeasure(expression,unit,out var value) && value>=0)return value;+ Error(f.Declaration,$"{name} requires a finite nonnegative {unit} value.");return null;}-- var definition = new SheetMetalManufacturingDefinition(- manufacturing.Value.Name,- materialSpecification,- thicknessTolerance?.Plus,- thicknessTolerance?.Minus,- blankProcess,- formingProcess,- generalCutTolerance,- generalFormedTolerance,- generalAngularTolerance,- datums,- dimensions,- tolerances,- annotations);- return new(definition, diagnostics);- }-- private static HashSet<string> BuildTargets(- string partName,- AuthoredSheetBaseSpec baseSpec,- IReadOnlyList<AuthoredSheetFlangeSpec> flanges,- SheetMetalSemanticLayout layout)- {- var targets = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { partName, baseSpec.Name };- foreach (var flange in flanges)+ (double Plus,double Minus)? PlusMinus(ExpressionSyntax? expression,StatementSyntax owner){- targets.Add(flange.Name);- targets.Add($"{flange.Name}Bend");+ if(expression is null)return null;+ if(expression is CallSyntax { Target:ReferenceSyntax { Name.Text:"PlusMinus" },Arguments.Count:2 } call+ && call.Arguments.All(a=>a.Name is null && a.Default is null)+ && FirmamentSyntaxValues.TryMeasure(call.Arguments[0].Value,"mm",out var plus)+ && FirmamentSyntaxValues.TryMeasure(call.Arguments[1].Value,"mm",out var minus) && plus>=0 && minus>=0)return (plus,minus);+ Error(owner,"PlusMinus requires two finite nonnegative Length allowances in millimetres.");return null;}- foreach (var pattern in layout.Patterns)+ int? Quantity(FirmamentSyntaxFields f,StatementSyntax owner){- targets.Add(pattern.Path);- foreach (var member in pattern.Members) targets.Add(member);+ var expression=f.Take("Quantity");if(expression is null)return null;+ if(FirmamentSyntaxValues.TryMeasure(expression,"",out var number) && number>0 && number<=int.MaxValue && number==Math.Truncate(number))return (int)number;+ Error(owner,"quantity: requires a positive integer.");return null;}- return targets;- }-- private static (string Name, string Body)? FindNamedBlock(string source, string keyword)- {- var match = Regex.Match(source, $@"\b{Regex.Escape(keyword)}\s+(?<name>[A-Za-z_][A-Za-z0-9_]*)\s*\{{", Rx);- return match.Success ? Extract(source, match, match.Groups["name"].Value) : null;- }-- private static IReadOnlyList<(string Kind, string Name, string Body)> ChildBlocks(string source)- {- var result = new List<(string, string, string)>();- var offset = 0;- while (offset < source.Length)- {- var match = Regex.Match(source[offset..], @"\b(?<kind>DatumFeature|Dimension|Position|Annotation)\s+(?<name>[A-Za-z_][A-Za-z0-9_]*)\s*\{", Rx);- if (!match.Success) break;- var absolute = new MatchProxy(match, offset);- var extracted = Extract(source, absolute.Index, absolute.OpenBraceIndex, absolute.Name);- result.Add((match.Groups["kind"].Value, absolute.Name, extracted.Body));- offset = extracted.CloseIndex + 1;- }- return result;- }-- private static (string Name, string Body) Extract(string source, Match match, string name)- {- var open = source.IndexOf('{', match.Index);- var extracted = Extract(source, match.Index, open, name);- return (name, extracted.Body);- }-- private static (string Body, int CloseIndex) Extract(string source, int matchIndex, int open, string name)- {- var depth = 0;- for (var index = open; index < source.Length; index++)+ IReadOnlyList<string> List(ExpressionSyntax? value,StatementSyntax owner){- if (source[index] == '{') depth++;- else if (source[index] == '}' && --depth == 0) return (source[(open + 1)..index], index);+ if(value is SequenceSyntax { Kind:SequenceKind.List } list && list.Items.All(i=>i.Name is null && i.Default is null && FirmamentSyntaxValues.Reference(i.Value) is not null))return list.Items.Select(i=>FirmamentSyntaxValues.Reference(i.Value)!).ToArray();+ Error(owner,"datumRefs: requires a list of declared datum labels.");return [];}- return (source[(open + 1)..], source.Length - 1);- }-- private readonly record struct MatchProxy(int Index, int OpenBraceIndex, string Name)- {- public MatchProxy(Match match, int offset) : this(- offset + match.Index,- offset + match.Index + match.Value.LastIndexOf('{'),- match.Groups["name"].Value) { }}-- private static string? Token(string source, string name)- {- var match = Regex.Match(source, $@"\b{Regex.Escape(name)}\s*:\s*(?<value>[A-Za-z_][A-Za-z0-9_.\[\]]*)\s*;", Rx);- return match.Success ? match.Groups["value"].Value : null;- }-- private static string? Quoted(string source, string name)- {- var match = Regex.Match(source, $@"\b{Regex.Escape(name)}\s*:\s*""(?<value>(?:[^""\\]|\\.)*)""\s*;", Rx);- return match.Success ? Regex.Unescape(match.Groups["value"].Value) : null;- }-- private static double? Scalar(string source, string name, string unit)- {- var match = Regex.Match(source, $@"\b{Regex.Escape(name)}\s*:\s*(?<value>{Number})\s*{Regex.Escape(unit)}\s*;", Rx);- return match.Success ? double.Parse(match.Groups["value"].Value, CultureInfo.InvariantCulture) : null;- }-- private static (double Plus, double Minus)? PlusMinus(string source, string name)- {- var match = Regex.Match(source, $@"\b{Regex.Escape(name)}\s*:\s*PlusMinus\s*\(\s*(?<plus>{Number})\s*mm\s*,\s*(?<minus>{Number})\s*mm\s*\)\s*;", Rx);- if (!match.Success) return null;- return (- double.Parse(match.Groups["plus"].Value, CultureInfo.InvariantCulture),- double.Parse(match.Groups["minus"].Value, CultureInfo.InvariantCulture));- }-- private static int? Integer(string source, string name)- {- var match = Regex.Match(source, $@"\b{Regex.Escape(name)}\s*:\s*(?<value>[0-9]+)\s*;", Rx);- return match.Success ? int.Parse(match.Groups["value"].Value, CultureInfo.InvariantCulture) : null;- }-- private static IReadOnlyList<string> TokenList(string source, string name)- {- var match = Regex.Match(source, $@"\b{Regex.Escape(name)}\s*:\s*\[(?<value>[^\]]*)\]\s*;", Rx);- return match.Success- ? match.Groups["value"].Value.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)- : [];- }-- private static SheetMetalDiagnostic Error(string message) =>- new("sheetmetal-manufacturing-pmi-invalid", SheetMetalDiagnosticSeverity.Error, message);}diff --git a/Aetheris.SheetMetal/SheetMetalProfileBinding.cs b/Aetheris.SheetMetal/SheetMetalProfileBinding.csindex 7cdfa847..6dffb7bf 100644--- a/Aetheris.SheetMetal/SheetMetalProfileBinding.cs+++ b/Aetheris.SheetMetal/SheetMetalProfileBinding.cs@@ -10,7 +10,7 @@ internal static class SheetMetalProfileBinding{private const double Tol = 1e-7;- internal static AuthoredSheetBaseSpec? Base(string source, string name, FirmamentSyntaxFields fields, List<string> errors)+ internal static AuthoredSheetBaseSpec? Base(string source, string name, FirmamentSyntaxFields fields, List<string> errors,FirmamentDomainBinding? binding=null){var value = fields.Take("Profile");var origin = fields.Take("Origin");@@ -25,7 +25,7 @@ internal static class SheetMetalProfileBindingif (FirmamentSyntaxValues.TryMeasure(height, "mm", out var depth)) result = new(name, width, depth) { Origin = offset };dimensions.Complete();}- else if (Resolve(source, value, errors) is { } profile)+ else if (Resolve(source, value, errors,binding) is { } profile){var segments = profile.Loops.Single().Segments;var bounds = Bounds(profile);@@ -41,7 +41,7 @@ internal static class SheetMetalProfileBindingreturn result;}- internal static AuthoredSheetCutSpec? Cut(string source, string name, FirmamentSyntaxFields fields, List<string> errors)+ internal static AuthoredSheetCutSpec? Cut(string source, string name, FirmamentSyntaxFields fields, List<string> errors,FirmamentDomainBinding? binding=null){var on = fields.Word("On");var atValue = fields.Take("At") ?? fields.Take("Center");@@ -67,7 +67,7 @@ internal static class SheetMetalProfileBindingif (legacy != "Circle" && width > 0 && length > 0) return new(name, on, SheetFeatureKind.Slot, at.Value.X, at.Value.Y, null, width, length);errors.Add($"sheetmetal-cut-profile-invalid: Cut '{name}' requires positive profile dimensions."); return null;}- var resolved = Resolve(source, value, errors);+ var resolved = Resolve(source, value, errors,binding);fields.Complete();if (resolved is null) return null;LineArcProfileCurve2D Move(LineArcProfileCurve2D curve) => curve switch@@ -85,11 +85,12 @@ internal static class SheetMetalProfileBindingnull, box.MaxY - box.MinY, box.MaxX - box.MinX) { Profile = profile };}- private static ResolvedProfile2D? Resolve(string source, ExpressionSyntax? value, List<string> errors)+ private static ResolvedProfile2D? Resolve(string source, ExpressionSyntax? value, List<string> errors,FirmamentDomainBinding? binding){var name = FirmamentSyntaxValues.Reference(value);if (name is null) { errors.Add("sheetmetal-profile-reference-required: Declare a named Profile with Rect2, Circle2, Slot2 or an exact line/arc boundary, then reference it."); return null; }- var profile = ProfileAuthoringParser.ResolveNamedProfile(source, name, out var diagnostics);+ IReadOnlyList<string> diagnostics;+ var profile = binding is null?ProfileAuthoringParser.ResolveNamedProfile(source, name, out diagnostics):binding.ResolveProfile(name,out diagnostics);errors.AddRange(diagnostics);if (profile is null) return null;var frame = profile.EffectiveConstructionPlane;diff --git a/Aetheris.SheetMetal/SheetMetalSemanticLayout.cs b/Aetheris.SheetMetal/SheetMetalSemanticLayout.csindex 2cd270e0..9fac6c67 100644--- a/Aetheris.SheetMetal/SheetMetalSemanticLayout.cs+++ b/Aetheris.SheetMetal/SheetMetalSemanticLayout.cs@@ -1,4 +1,4 @@-using System.Globalization;+using Aetheris.Kernel.Firmament.FirmamentV2.Syntax;using System.Text.RegularExpressions;using Aetheris.Kernel.Firmament.FirmamentV2;@@ -52,17 +52,62 @@ internal static class SheetMetalSemanticLayoutParserinternal static bool OwnsDeclaration(string type) => type is "AttachmentPath" or "Datum" or "Tab" or "SteppedNotch"or "CornerProfile" or "Pattern" or "Require" or "ProfileDelta";private const RegexOptions Rx=RegexOptions.IgnoreCase|RegexOptions.CultureInvariant|RegexOptions.Singleline;- private const string Number=@"[+-]?(?:[0-9]+(?:\.[0-9]*)?|\.[0-9]+)";- private sealed record Block(string Keyword,string Name,string Body,int Index,string? Struct);+ private sealed record Block(DeclarationSyntax Syntax, FirmamentSyntaxFields Fields, string? Struct)+ {+ internal string Name => Syntax.Name?.Text ?? FirmamentSyntaxValues.Reference(Syntax.Target) ?? "<unnamed>";+ internal IReadOnlySet<string> DatumNames { get; init; } = new HashSet<string>(StringComparer.Ordinal);+ }private readonly record struct Point2(double X,double Y);internal static SheetMetalSemanticLayoutParseResult Parse(- string source,AuthoredSheetBaseSpec baseSpec,IReadOnlyList<AuthoredSheetFlangeSpec> flanges,- IReadOnlyList<AuthoredSheetCutSpec> authoredCuts)+ AuthoredSheetBaseSpec baseSpec,IReadOnlyList<AuthoredSheetFlangeSpec> flanges,+ IReadOnlyList<AuthoredSheetCutSpec> authoredCuts, FirmamentDomainBinding binding){var diagnostics=new List<SheetMetalDiagnostic>();- var structs=StructBlocks(source);- var structNames=structs.Select(x=>x.Name).Distinct(StringComparer.Ordinal).OrderBy(x=>x,StringComparer.Ordinal).ToArray();+ var errors = new List<string>();+ var blocks = new List<Block>();+ var scopes = binding.Document.Statements.OfType<DeclarationSyntax>()+ .Where(d => d.Type.Name.Text == "SheetMetal" || d.Type.Name.Text == "Struct" && d.Modifiers.Any(m=>m.Name.Text=="Concept")).ToArray();+ var structNames=scopes.Where(d=>d.Type.Name.Text=="Struct").Select(d=>d.Name!.Text).Order(StringComparer.Ordinal).ToArray();+ var materialScopes = scopes.Where(d=>d.Type.Name.Text=="Struct" && d.Body?.Statements.OfType<DeclarationSyntax>().Any(c=>c.Type.Name.Text is "Pattern" or "Tab" or "SteppedNotch" or "CornerProfile" or "ProfileDelta") == true).ToArray();+ var root = scopes.Single(d=>d.Type.Name.Text=="SheetMetal" && !d.Modifiers.Any(m=>m.Name.Text=="Extend"));+ // Historical module-level semantic operations have one unambiguous sheet+ // owner. Keep that compatibility without scanning unrelated nested scopes.+ var module=root with { Type=root.Type with { Name=root.Type.Name with { Text="module" } },+ Body=root.Body! with { Statements=binding.Document.Statements.OfType<DeclarationSyntax>()+ .Where(d=>OwnsDeclaration(d.Type.Name.Text) && d.Type.Name.Text!="ProfileDelta" && !(d.Type.Name.Text=="Require" && d.Body is null)).Cast<StatementSyntax>().ToArray() } };+ scopes=[..scopes,module];+ if (materialScopes.Length>1)+ return Fail("sheetmetal-layout-owner-ambiguous", "Multiple Concept Structs contain material operations. Move material operations into the owning SheetMetal body and keep reusable layout data in Concept Structs; implicit ownership of multiple legacy effect bundles is not admitted.");+ foreach (var scope in scopes)+ {+ if(scope.Body is null || scope.Name is null)+ return Fail("sheetmetal-semantic-scope-invalid","A sheet/layout scope requires a name and body.");+ var children = scope.Body?.Statements.OfType<DeclarationSyntax>().ToArray() ?? [];+ if (scope.Type.Name.Text=="Struct")+ {+ var xy=scope.Clauses.All(c=>c.Kind==ClauseKind.On && FirmamentSyntaxValues.Reference(c.Value)=="XY");+ var fields = new FirmamentSyntaxFields(scope with { Clauses=xy?[]:scope.Clauses, Body=scope.Body! with { Statements=scope.Body.Statements.Where(s=>+ s is not DeclarationSyntax d || !OwnsDeclaration(d.Type.Name.Text) && !binding.OwnsData(d) && !binding.OwnsProfileData(d)).ToArray() } },errors,bind:binding.Nominal);+ fields.Complete();+ }+ foreach (var child in children.Where(d=>OwnsDeclaration(d.Type.Name.Text) && d.Type.Name.Text!="ProfileDelta"))+ {+ if(child.Type.Arguments.Count>0 || child.Modifiers.Count>0)+ return Fail("sheetmetal-semantic-header-invalid",$"{child.Type.Name.Text} does not admit generic arguments or declaration modifiers.");+ if(child.Name is null && child.Target is null)+ return Fail("sheetmetal-semantic-header-invalid",$"{child.Type.Name.Text} requires a stable authored name or corner target.");+ if (child.Type.Name.Text=="Require" && child.Body is null)+ { if (!binding.CheckRequirement(child)) return BindingFailure(); continue; }+ var allowedChildren=child.Type.Name.Text=="CornerProfile" ? new[]{"Chamfer","Cutback","Taper","NotchCorner","Round"} : [];+ var fields = new FirmamentSyntaxFields(child with { Target=null, Body=child.Body is null ? null : child.Body with { Statements=child.Body.Statements.Where(s=>+ s is not DeclarationSyntax d || !allowedChildren.Contains(d.Type.Name.Text)).ToArray() } },errors,bind:binding.Nominal);+ blocks.Add(new(child,fields,scope.Type.Name.Text=="Struct"?scope.Name!.Text:null));+ }+ }+ if (errors.Count>0) return SyntaxFailure();+ var datumNames=blocks.Where(b=>b.Syntax.Type.Name.Text=="Datum").Select(Path).ToHashSet(StringComparer.Ordinal);+ blocks=blocks.Select(b=>b with { DatumNames=datumNames }).ToList();var datums=new List<SheetMetalSemanticDatum>();var tabs=new List<SheetMetalSemanticTab>();var steppedNotches=new List<SheetMetalSemanticSteppedNotch>();@@ -74,22 +119,24 @@ internal static class SheetMetalSemanticLayoutParservar profileDeltas=new List<SheetMetalSemanticProfileDelta>();var attachmentPaths=new List<SheetMetalSemanticAttachmentPath>();- foreach(var block in Blocks(source,"AttachmentPath",structs))+ foreach(var block in blocks.Where(b=>b.Syntax.Type.Name.Text=="AttachmentPath")){- var on=TokenPath(block.Body,"On");+ var on=TokenPath(block,"On");var owner=on is null?Match.Empty:Regex.Match(on,@"^(?<region>[A-Za-z_][A-Za-z0-9_]*)\.(?<edge>Front|Right|Rear|Left|Outer)$",Rx);if(!owner.Success||!regionSizes.TryGetValue(owner.Groups["region"].Value,out var size))return Fail("sheetmetal-attachment-path-owner",$"AttachmentPath '{block.Name}' requires On: <planar-region>.<physical-edge>.");- if(!Scalar(block.Body,"Inset",out var inset)||!Scalar(block.Body,"Span",out var span))+ if(!Scalar(block,"Inset",out var inset)||!Scalar(block,"Span",out var span))return Fail("sheetmetal-attachment-path-properties",$"AttachmentPath '{block.Name}' requires Inset and Span.");- Scalar(block.Body,"SpanOffset",out var spanOffset);- var edge=owner.Groups["edge"].Value;var carrierLength=edge is "Front" or "Rear"?size.Width:edge is "Right" or "Left"?size.Height:size.Width;+ Scalar(block,"SpanOffset",out var spanOffset);+ var authoredEdge=owner.Groups["edge"].Value;+ var edge=char.ToUpperInvariant(authoredEdge[0])+authoredEdge[1..].ToLowerInvariant();+ var carrierLength=edge is "Front" or "Rear"?size.Width:edge is "Right" or "Left"?size.Height:size.Width;var maxInset=edge.Equals("Outer",StringComparison.OrdinalIgnoreCase)?size.Height:edge is "Front" or "Rear"?size.Height:size.Width;if(!double.IsFinite(inset)||inset<0||inset>=maxInset-1e-8)return Fail("sheetmetal-attachment-path-offset",$"AttachmentPath '{block.Name}' Inset must be finite, non-negative, and inside owning region '{owner.Groups["region"].Value}'.");if(!double.IsFinite(span)||span<=0||span>carrierLength+1e-8||Math.Abs(spanOffset)>(carrierLength-span)/2d+1e-8)return Fail("sheetmetal-attachment-path-span",$"AttachmentPath '{block.Name}' Span {span:G9} mm with offset {spanOffset:G9} mm does not fit carrier length {carrierLength:G9} mm.");- var release=Token(block.Body,"Release");var releaseToCarrier=release?.Equals("ToCarrier",StringComparison.OrdinalIgnoreCase)==true;+ var release=Token(block,"Release");var releaseToCarrier=release?.Equals("ToCarrier",StringComparison.OrdinalIgnoreCase)==true;if(inset>1e-8&&!releaseToCarrier)return Fail("sheetmetal-attachment-path-release",$"Inset AttachmentPath '{block.Name}' requires `Release: ToCarrier;` so the owner and child do not describe double material.");if(release is not null&&!releaseToCarrier)@@ -100,7 +147,7 @@ internal static class SheetMetalSemanticLayoutParserreturn Fail("sheetmetal-attachment-path-duplicate",$"Attachment path '{path}' is declared more than once.");attachmentPaths.Add(new(path,region,edge,inset,span,spanOffset,releaseToCarrier));}- var parsedDeltas=SemanticProfileDeltaParser.Parse(source);+ var parsedDeltas=SemanticProfileDeltaParser.ParseDeclarations(AuthoredSheetMetalCompiler.DeltaDeclarations(binding.Document),binding.Nominal);if(!parsedDeltas.IsSuccess)return Fail("sheetmetal-profile-delta-parse",string.Join("; ",parsedDeltas.Diagnostics));foreach(var parsed in parsedDeltas.Deltas){@@ -146,19 +193,28 @@ internal static class SheetMetalSemanticLayoutParserif(attachment is not null)regionSizes[flange.Name]=(attachment.Span,flange.Length);}- foreach(var block in Blocks(source,"Datum",structs))+ var pendingDatums = blocks.Where(b=>b.Syntax.Type.Name.Text=="Datum").ToList();+ if (pendingDatums.Select(Path).Distinct(StringComparer.Ordinal).Count()!=pendingDatums.Count)+ return Fail("sheetmetal-semantic-datum-duplicate","Datum identities must be unique within each layout.");+ // Forward references use the same lexical lookup as consumers; no suffix-first capture.+ while (pendingDatums.Count>0){- var region=Token(block.Body,"On");- if(region is null||!regionSizes.ContainsKey(region))return Fail("sheetmetal-semantic-datum-region",$"Datum '{Path(block)}' references unknown planar region '{region ?? "<missing>"}'.");- if(!TryPointExpression(block.Body,"At",region,regionSizes,datums,out var point,out var reason))return Fail("sheetmetal-semantic-datum-point",$"Datum '{Path(block)}' has invalid At expression: {reason}");- datums.Add(new(Path(block),region,point.X,point.Y,"resolved before exact profile lowering"));+ var resolved=0;string? lastReason=null;+ foreach(var block in pendingDatums.ToArray())+ {+ var region=Token(block,"On");+ if(region is null||!regionSizes.ContainsKey(region))return Fail("sheetmetal-semantic-datum-region",$"Datum '{Path(block)}' references unknown planar region '{region ?? "<missing>"}'.");+ if(!TryPointExpression(block,"At",region,regionSizes,datums,out var point,out var reason)) { lastReason=$"Datum '{Path(block)}': {reason}";continue; }+ datums.Add(new(Path(block),region,point.X,point.Y,"resolved before exact profile lowering"));pendingDatums.Remove(block);resolved++;+ }+ if(resolved==0)return Fail("sheetmetal-semantic-datum-point",lastReason+". Resolve the name in this layout, qualify it, or remove the cyclic reference.");}- foreach(var block in Blocks(source,"Tab",structs))+ foreach(var block in blocks.Where(b=>b.Syntax.Type.Name.Text=="Tab")){- var on=TokenPath(block.Body,"On");var match=on is null?Match.Empty:Regex.Match(on,@"^(?<region>[A-Za-z_][A-Za-z0-9_]*)\.(?<edge>Outer)$",Rx);+ var on=TokenPath(block,"On");var match=on is null?Match.Empty:Regex.Match(on,@"^(?<region>[A-Za-z_][A-Za-z0-9_]*)\.(?<edge>Outer)$",Rx);if(!match.Success||!regionSizes.TryGetValue(match.Groups["region"].Value,out var size))return Fail("sheetmetal-tab-edge",$"Tab '{Path(block)}' requires On: <planar-region>.Outer.");- if(!Scalar(block.Body,"Center",out var center)||!Scalar(block.Body,"Width",out var width)||!Scalar(block.Body,"Extension",out var extension)||width<=0||extension<=0)+ if(!Scalar(block,"Center",out var center)||!Scalar(block,"Width",out var width)||!Scalar(block,"Extension",out var extension)||width<=0||extension<=0)return Fail("sheetmetal-tab-profile",$"Tab '{Path(block)}' requires Center, positive Width, and positive Extension.");if(center-width/2< -1e-8||center+width/2>size.Width+1e-8)return Fail("sheetmetal-tab-outside-edge",$"Tab '{Path(block)}' lies outside '{on}'.");if(tabs.Any(x=>x.Region.Equals(match.Groups["region"].Value,StringComparison.OrdinalIgnoreCase)&¢er-width/2<x.Center+x.Width/2-1e-8&¢er+width/2>x.Center-x.Width/2+1e-8))@@ -166,14 +222,14 @@ internal static class SheetMetalSemanticLayoutParsertabs.Add(new(Path(block),match.Groups["region"].Value,match.Groups["edge"].Value,center,width,extension));}- foreach(var block in Blocks(source,"SteppedNotch",structs))+ foreach(var block in blocks.Where(b=>b.Syntax.Type.Name.Text=="SteppedNotch")){- var on=TokenPath(block.Body,"On");var match=on is null?Match.Empty:Regex.Match(on,@"^(?<region>[A-Za-z_][A-Za-z0-9_]*)\.(?<edge>Outer)$",Rx);+ var on=TokenPath(block,"On");var match=on is null?Match.Empty:Regex.Match(on,@"^(?<region>[A-Za-z_][A-Za-z0-9_]*)\.(?<edge>Outer)$",Rx);if(!match.Success||!regionSizes.TryGetValue(match.Groups["region"].Value,out var size))return Fail("sheetmetal-edge-fragment-owner",$"SteppedNotch '{Path(block)}' requires On: <planar-region>.Outer.");- if(!Scalar(block.Body,"Center",out var center)||!Scalar(block.Body,"Width",out var width)||!Scalar(block.Body,"Depth",out var depth)||- !Scalar(block.Body,"ShoulderDepth",out var shoulder)||!Scalar(block.Body,"OuterChamfer",out var outerChamfer)||!Scalar(block.Body,"InnerChamfer",out var innerChamfer))+ if(!Scalar(block,"Center",out var center)||!Scalar(block,"Width",out var width)||!Scalar(block,"Depth",out var depth)||+ !Scalar(block,"ShoulderDepth",out var shoulder)||!Scalar(block,"OuterChamfer",out var outerChamfer)||!Scalar(block,"InnerChamfer",out var innerChamfer))return Fail("sheetmetal-edge-fragment-properties",$"SteppedNotch '{Path(block)}' requires Center, Width, Depth, ShoulderDepth, OuterChamfer, and InnerChamfer.");- var sideToken=Token(block.Body,"Side");var side=sideToken?.Equals("Outward",StringComparison.OrdinalIgnoreCase)==true?1:sideToken?.Equals("Inward",StringComparison.OrdinalIgnoreCase)==true?-1:0;+ var sideToken=Token(block,"Side");var side=sideToken?.Equals("Outward",StringComparison.OrdinalIgnoreCase)==true?1:sideToken?.Equals("Inward",StringComparison.OrdinalIgnoreCase)==true?-1:0;if(width<=0||depth<=0||shoulder<0||shoulder>=depth||outerChamfer<0||innerChamfer<=0||2*(outerChamfer+innerChamfer)>=width||side==0)return Fail("sheetmetal-edge-fragment-invalid",$"SteppedNotch '{Path(block)}' has impossible dimensions or Side (use Inward/Outward).");if(center-width/2< -1e-8||center+width/2>size.Width+1e-8)return Fail("sheetmetal-edge-fragment-outside",$"SteppedNotch '{Path(block)}' lies outside '{on}'.");@@ -181,47 +237,54 @@ internal static class SheetMetalSemanticLayoutParser}- foreach(var block in CornerBlocks(source,structs))+ foreach(var block in blocks.Where(b=>b.Syntax.Type.Name.Text=="CornerProfile")){var owner=Regex.Match(block.Name,@"^(?<region>[A-Za-z_][A-Za-z0-9_]*)\.(?<corner>RootStart|RootEnd|OuterStart|OuterEnd)$",Rx);if(!owner.Success||!regionSizes.ContainsKey(owner.Groups["region"].Value))return Fail("sheetmetal-corner-owner",$"CornerProfile '{Path(block)}' requires <planar-region>.RootStart, .RootEnd, .OuterStart, or .OuterEnd.");- var operations=Regex.Matches(block.Body,@"\b(?<kind>Chamfer|Cutback|Taper|NotchCorner|Round)\s+(?<name>[A-Za-z_][A-Za-z0-9_]*)\s*\{",Rx).Cast<Match>().ToArray();- if(operations.Length!=1)return Fail("sheetmetal-corner-operation",$"CornerProfile '{Path(block)}' requires exactly one Chamfer, Cutback, Taper, NotchCorner, or Round operation.");- var operation=operations[0];var open=block.Body.IndexOf('{',operation.Index);var close=Close(block.Body,open);var operationBody=close>open?block.Body[(open+1)..close]:string.Empty;- var isRound=operation.Groups["kind"].Value.Equals("Round",StringComparison.OrdinalIgnoreCase);var hasRadius=Scalar(operationBody,"Radius",out var radius);- var hasEqual=Scalar(operationBody,"Setback",out var equal);var hasA=Scalar(operationBody,"SetbackA",out var setbackA);var hasB=Scalar(operationBody,"SetbackB",out var setbackB);+ var operations=block.Syntax.Body?.Statements.OfType<DeclarationSyntax>().Where(d=>d.Type.Name.Text is "Chamfer" or "Cutback" or "Taper" or "NotchCorner" or "Round").ToArray() ?? [];+ if(operations.Length!=1 || operations[0].Name is null || operations[0].Body is null)return Fail("sheetmetal-corner-operation",$"CornerProfile '{Path(block)}' requires exactly one named Chamfer, Cutback, Taper, NotchCorner, or Round operation with a body.");+ var operation=operations[0];var operationBody=new Block(operation,new(operation,errors,bind:binding.Nominal),block.Struct);+ var isRound=operation.Type.Name.Text=="Round";+ var radius=0d;var equal=0d;var setbackA=0d;var setbackB=0d;+ var hasRadius=isRound && Scalar(operationBody,"Radius",out radius);+ var hasEqual=!isRound && Scalar(operationBody,"Setback",out equal);+ var hasA=!isRound && Scalar(operationBody,"SetbackA",out setbackA);var hasB=!isRound && Scalar(operationBody,"SetbackB",out setbackB);+ operationBody.Fields.Complete();if(isRound){hasEqual=hasRadius;equal=radius;}if(!hasA){setbackA=equal;}if(!hasB){setbackB=equal;}- var cornerPath=Path(block);var operationPath=$"{cornerPath}.{operation.Groups["name"].Value}";+ var cornerPath=Path(block);var operationPath=$"{cornerPath}.{operation.Name!.Text}";if((!hasEqual&&(!hasA||!hasB))||setbackA<=0||setbackB<=0)return Fail("sheetmetal-corner-setback",$"Corner operation '{operationPath}' requires positive Setback or SetbackA and SetbackB.");if(corners.Any(x=>x.Region.Equals(owner.Groups["region"].Value,StringComparison.OrdinalIgnoreCase)&&x.Corner.Equals(owner.Groups["corner"].Value,StringComparison.OrdinalIgnoreCase)))return Fail("sheetmetal-corner-duplicate",$"Corner '{owner.Groups["region"].Value}.{owner.Groups["corner"].Value}' is authored more than once.");- corners.Add(new(cornerPath,operationPath,owner.Groups["region"].Value,owner.Groups["corner"].Value,operation.Groups["kind"].Value,setbackA,setbackB));+ corners.Add(new(cornerPath,operationPath,owner.Groups["region"].Value,owner.Groups["corner"].Value,operation.Type.Name.Text,setbackA,setbackB));}- foreach(var block in Blocks(source,"Pattern",structs))+ foreach(var block in blocks.Where(b=>b.Syntax.Type.Name.Text=="Pattern")){- var path=Path(block);var region=Token(block.Body,"On");+ var path=Path(block);var region=Token(block,"On");if(region is null||!regionSizes.ContainsKey(region))return Fail("sheetmetal-semantic-pattern-region",$"Pattern '{path}' references unknown planar region '{region ?? "<missing>"}'.");- if(!Int(block.Body,"Count",out var count)||count<=0||count>1024)return Fail("sheetmetal-semantic-pattern-count",$"Pattern '{path}' requires Count between 1 and 1024.");- if(!Tuple(block.Body,"Pitch",out var pitch))return Fail("sheetmetal-semantic-pattern-pitch",$"Pattern '{path}' requires a two-dimensional Pitch.");- if(!TryPointExpression(block.Body,"Center",region,regionSizes,datums,out var center,out var reason))return Fail("sheetmetal-semantic-pattern-center",$"Pattern '{path}' has invalid Center expression: {reason}");- var circle=Regex.Match(block.Body,$@"\bFeature\s*:\s*(?:Circle|Hole)\s*\{{(?<body>[\s\S]*?)\}}\s*;?",Rx);- var slot=Regex.Match(block.Body,$@"\bFeature\s*:\s*(?:Slot|Rectangle)\s*\{{(?<body>[\s\S]*?)\}}\s*;?",Rx);+ if(!Int(block,"Count",out var count)||count<=0||count>1024)return Fail("sheetmetal-semantic-pattern-count",$"Pattern '{path}' requires Count between 1 and 1024.");+ if(!Tuple(block,"Pitch",out var pitch))return Fail("sheetmetal-semantic-pattern-pitch",$"Pattern '{path}' requires a two-dimensional Pitch.");+ if(!TryPointExpression(block,"Center",region,regionSizes,datums,out var center,out var reason))return Fail("sheetmetal-semantic-pattern-center",$"Pattern '{path}' has invalid Center expression: {reason}");+ var feature=block.Fields.Take("Feature") as ObjectSyntax;+ var featureType=FirmamentSyntaxValues.Reference(feature?.Type);SheetFeatureKind kind;double? diameter=null,width=null,length=null;- if(circle.Success)+ if (feature is null) return Fail("sheetmetal-semantic-pattern-profile",$"Pattern '{path}' requires an inline Circle/Hole or Slot/Rectangle Feature.");+ var featureFields=FirmamentSyntaxFields.Object(feature,path,errors);+ if(featureType is "Circle" or "Hole"){kind=SheetFeatureKind.CircularHole;- if(!Scalar(circle.Groups["body"].Value,"Diameter",out var d)||d<=0)return Fail("sheetmetal-semantic-pattern-profile",$"Circular Pattern '{path}' requires positive Diameter.");+ if(!featureFields.Measure("Diameter","mm",out var d)||d<=0)return Fail("sheetmetal-semantic-pattern-profile",$"Circular Pattern '{path}' requires positive Diameter.");diameter=d;}- else if(slot.Success)+ else if(featureType is "Slot" or "Rectangle"){kind=SheetFeatureKind.Slot;- if(!Scalar(slot.Groups["body"].Value,"Width",out var w)||!Scalar(slot.Groups["body"].Value,"Length",out var l)||w<=0||l<=0)return Fail("sheetmetal-semantic-pattern-profile",$"Slot Pattern '{path}' requires positive Width and Length.");+ if(!featureFields.Measure("Width","mm",out var w)||!featureFields.Measure("Length","mm",out var l)||w<=0||l<=0)return Fail("sheetmetal-semantic-pattern-profile",$"Slot Pattern '{path}' requires positive Width and Length.");width=w;length=l;}- else return Fail("sheetmetal-semantic-pattern-profile",$"Pattern '{path}' requires a Circle/Hole or Slot/Rectangle Feature.");+ else return Fail("sheetmetal-semantic-pattern-profile",$"Pattern '{path}' requires a Circle/Hole or Slot/Rectangle Feature. Use a shared Profile Cut for other shapes.");+ featureFields.Complete();var members=new List<string>();for(var i=0;i<count;i++)@@ -238,9 +301,9 @@ internal static class SheetMetalSemanticLayoutParservar duplicateCut=combinedCuts.GroupBy(x=>x.Name,StringComparer.Ordinal).FirstOrDefault(x=>x.Count()>1);if(duplicateCut is not null)return Fail("sheetmetal-semantic-duplicate-feature",$"Semantic feature path '{duplicateCut.Key}' is declared more than once.");var allCuts=combinedCuts.ToDictionary(x=>x.Name,StringComparer.Ordinal);- foreach(var block in Blocks(source,"Require",structs))+ foreach(var block in blocks.Where(b=>b.Syntax.Type.Name.Text=="Require")){- var path=Path(block);var kindToken=Token(block.Body,"Kind");var members=List(block.Body,"Members");+ var path=Path(block);var kindToken=Token(block,"Kind");var members=List(block,"Members");if(!Enum.TryParse<SheetMetalSemanticConstraintKind>(kindToken,true,out var kind))return Fail("sheetmetal-semantic-constraint-kind",$"Require '{path}' uses unsupported Kind '{kindToken ?? "<missing>"}'. Supported: RequiredMembers, EqualSize, EqualPitch, Mirror.");if(members.Count==0)return Fail("sheetmetal-semantic-constraint-members",$"Require '{path}' must name Members.");var missing=members.Where(x=>!allCuts.ContainsKey(x)).ToArray();@@ -256,17 +319,22 @@ internal static class SheetMetalSemanticLayoutParserif(mismatch is not null)return Fail("sheetmetal-semantic-equal-size",$"Require '{path}' is contradicted by '{mismatch.Name}': feature kind or nominal size differs from '{first.Name}'.");detail=$"{members.Count} members share kind and nominal size";break;case SheetMetalSemanticConstraintKind.EqualPitch:+ if(members.Select(m=>allCuts[m].RegionName).Distinct(StringComparer.Ordinal).Count()!=1)+ return Fail("sheetmetal-semantic-constraint-frame",$"Require '{path}' compares pitch in different region frames; choose members on one owning region.");if(members.Count<2)return Fail("sheetmetal-semantic-equal-pitch",$"Require '{path}' needs at least two Members.");- var axis=Token(block.Body,"Axis");if(axis is not ("X" or "Y" or "x" or "y"))return Fail("sheetmetal-semantic-equal-pitch",$"Require '{path}' needs Axis: X or Axis: Y.");- if(!Scalar(block.Body,"Pitch",out var expectedPitch)||expectedPitch<=0)return Fail("sheetmetal-semantic-equal-pitch",$"Require '{path}' needs positive Pitch.");+ var axis=Token(block,"Axis");if(axis is not ("X" or "Y" or "x" or "y"))return Fail("sheetmetal-semantic-equal-pitch",$"Require '{path}' needs Axis: X or Axis: Y.");+ if(!Scalar(block,"Pitch",out var expectedPitch)||expectedPitch<=0)return Fail("sheetmetal-semantic-equal-pitch",$"Require '{path}' needs positive Pitch.");var coordinates=members.Select(x=>axis.Equals("X",StringComparison.OrdinalIgnoreCase)?allCuts[x].X:allCuts[x].Y).ToArray();for(var i=1;i<coordinates.Length;i++)if(Math.Abs(Math.Abs(coordinates[i]-coordinates[i-1])-expectedPitch)>1e-6)return Fail("sheetmetal-semantic-equal-pitch",$"Require '{path}' declares {expectedPitch:G9} mm pitch, but spacing at member {i} is {Math.Abs(coordinates[i]-coordinates[i-1]):G9} mm.");detail=$"{members.Count} members satisfy {expectedPitch:G9} mm {axis.ToUpperInvariant()} pitch";break;case SheetMetalSemanticConstraintKind.Mirror:if(members.Count!=2)return Fail("sheetmetal-semantic-mirror",$"Require '{path}' needs exactly two Members.");- var about=TokenPath(block.Body,"About");- if(about is null||!TryAxis(about,regionSizes,datums,out var horizontal,out var value))return Fail("sheetmetal-semantic-mirror",$"Require '{path}' needs About: <Region>.CenterX/CenterY or a named Datum path.");+ var about=TokenPath(block,"About");+ var mirrorAxis=Token(block,"Axis");+ if(mirrorAxis is not (null or "X" or "Y"))return Fail("sheetmetal-semantic-mirror",$"Require '{path}' Axis requires X or Y.");+ if(members.Select(m=>allCuts[m].RegionName).Distinct(StringComparer.Ordinal).Count()!=1+ || about is null||!TryAxis(about,block,allCuts[members[0]].RegionName,mirrorAxis,regionSizes,datums,out var horizontal,out var value))return Fail("sheetmetal-semantic-mirror",$"Require '{path}' needs About: <owning-region>.CenterX/CenterY or a scoped Datum on that region; optional Axis selects X/Y for a Datum.");var left=allCuts[members[0]];var right=allCuts[members[1]];var reflected=horizontal?left with { X=2*value-left.X }:left with { Y=2*value-left.Y };if(Math.Abs(reflected.X-right.X)>1e-6||Math.Abs(reflected.Y-right.Y)>1e-6||left.Kind!=right.Kind||!Near(left.Diameter,right.Diameter)||!Near(left.Width,right.Width)||!Near(left.Length,right.Length))return Fail("sheetmetal-semantic-mirror",$"Require '{path}' is contradicted: '{members[1]}' is not the size-preserving mirror of '{members[0]}' about '{about}'.");@@ -276,9 +344,13 @@ internal static class SheetMetalSemanticLayoutParserconstraints.Add(new(path,kind,members,"Satisfied",detail));}+ foreach (var block in blocks) block.Fields.Complete();+ if (errors.Count>0) return SyntaxFailure();return new(true,new(structNames,datums.OrderBy(x=>x.Path,StringComparer.Ordinal).ToArray(),tabs.OrderBy(x=>x.Path,StringComparer.Ordinal).ToArray(),patterns.OrderBy(x=>x.Path,StringComparer.Ordinal).ToArray(),constraints.OrderBy(x=>x.Path,StringComparer.Ordinal).ToArray(),steppedNotches.OrderBy(x=>x.Path,StringComparer.Ordinal).ToArray(),corners.OrderBy(x=>x.CornerPath,StringComparer.Ordinal).ToArray(),attachmentPaths.OrderBy(x=>x.Path,StringComparer.Ordinal).ToArray(),profileDeltas.OrderBy(x=>x.Path,StringComparer.Ordinal).ToArray()),generated,diagnostics);- SheetMetalSemanticLayoutParseResult Fail(string code,string message)=>new(false,SheetMetalSemanticLayout.Empty,[],[new(code,SheetMetalDiagnosticSeverity.Error,message)]);+ SheetMetalSemanticLayoutParseResult Fail(string code,string message)=>new(false,SheetMetalSemanticLayout.Empty,[],[SheetMetalSyntaxDiagnostics.At(binding,code,message,root.Span)]);+ SheetMetalSemanticLayoutParseResult SyntaxFailure()=>new(false,SheetMetalSemanticLayout.Empty,[],SheetMetalSyntaxDiagnostics.Codes(errors,binding));+ SheetMetalSemanticLayoutParseResult BindingFailure()=>new(false,SheetMetalSemanticLayout.Empty,[],SheetMetalSyntaxDiagnostics.Binding(binding));}private static Dictionary<string,(double Width,double Height)> RegionSizes(AuthoredSheetBaseSpec baseSpec,IReadOnlyList<AuthoredSheetFlangeSpec> flanges)@@ -296,57 +368,69 @@ internal static class SheetMetalSemanticLayoutParserreturn result;}- private static bool TryPointExpression(string body,string field,string region,IReadOnlyDictionary<string,(double Width,double Height)> sizes,IReadOnlyList<SheetMetalSemanticDatum> datums,out Point2 point,out string reason)+ private static bool TryPointExpression(Block block,string field,string region,IReadOnlyDictionary<string,(double Width,double Height)> sizes,IReadOnlyList<SheetMetalSemanticDatum> datums,out Point2 point,out string reason){- point=default;reason="expected `(xmm, ymm)`, `<Region>.Center`, or a named Datum path, optionally followed by `+ (dxmm, dymm)`";- var line=Regex.Match(body,$@"\b{Regex.Escape(field)}\s*:\s*(?<v>[^;]+)\s*;",Rx);if(!line.Success)return false;var value=line.Groups["v"].Value.Trim();- if(TupleValue(value,out point))return true;- var reference=Regex.Match(value,$@"^(?<path>[A-Za-z_][A-Za-z0-9_.]*)(?:\s*\+\s*(?<offset>\([^)]*\)))?$",Rx);if(!reference.Success)return false;- var path=reference.Groups["path"].Value;- if(path.EndsWith(".Center",StringComparison.OrdinalIgnoreCase))- {- var target=path[..^7];if(!target.Equals(region,StringComparison.OrdinalIgnoreCase)||!sizes.TryGetValue(target,out var size)){reason=$"'{path}' is not the center of owning region '{region}'";return false;}- point=new(size.Width/2,size.Height/2);- }- else+ return Resolve(block.Fields.Take(field),out point,out reason);+ bool Resolve(ExpressionSyntax? expression,out Point2 value,out string error){- var datum=datums.FirstOrDefault(x=>x.Path.Equals(path,StringComparison.Ordinal)||x.Path.EndsWith("."+path,StringComparison.Ordinal));- if(datum is null||!datum.Region.Equals(region,StringComparison.OrdinalIgnoreCase)){reason=$"unknown datum '{path}' on region '{region}'";return false;}point=new(datum.X,datum.Y);+ value=default;error="expected Point2(x, y), (x, y), a region center or a scoped Datum, optionally plus a Vector2 offset";+ if(TupleValue(expression,out value))return true;+ if(expression is BinarySyntax { Operator: BinaryOperator.Add } sum && Resolve(sum.Left,out var left,out error) && TupleValue(sum.Right,out var right))+ { value=new(left.X+right.X,left.Y+right.Y);return true; }+ var path=FirmamentSyntaxValues.Reference(expression);if(path is null)return false;+ if(path.EndsWith(".Center",StringComparison.Ordinal))+ {+ var target=path[..^7];if(target!=region||!sizes.TryGetValue(target,out var size)){error=$"'{path}' is not the center of owning region '{region}'";return false;}+ value=new(size.Width/2,size.Height/2);return true;+ }+ var datum=ResolveDatum(path,block.Struct,datums,block.DatumNames);+ if(datum is null||datum.Region!=region){error=$"unresolved or ambiguous Datum '{path}' in '{block.Struct ?? "sheet"}' on region '{region}'";return false;}+ value=new(datum.X,datum.Y);return true;}- if(reference.Groups["offset"].Success){if(!TupleValue(reference.Groups["offset"].Value,out var offset))return false;point=new(point.X+offset.X,point.Y+offset.Y);}return true;}-- private static bool TryAxis(string path,IReadOnlyDictionary<string,(double Width,double Height)> sizes,IReadOnlyList<SheetMetalSemanticDatum> datums,out bool xAxis,out double value)+ private static SheetMetalSemanticDatum? ResolveDatum(string path,string? scope,IReadOnlyList<SheetMetalSemanticDatum> datums,IReadOnlySet<string> declared)+ {+ if (!path.Contains('.') && scope is not null && declared.Contains(scope+"."+path)) return datums.SingleOrDefault(d=>d.Path==scope+"."+path);+ var exact=datums.Where(d=>d.Path==path).ToArray();+ return exact.Length==1?exact[0]:null;+ }+ private static bool TryAxis(string path,Block block,string owningRegion,string? axis,IReadOnlyDictionary<string,(double Width,double Height)> sizes,IReadOnlyList<SheetMetalSemanticDatum> datums,out bool xAxis,out double value){xAxis=true;value=0;- if(path.EndsWith(".CenterX",StringComparison.OrdinalIgnoreCase)){var region=path[..^8];if(!sizes.TryGetValue(region,out var size))return false;value=size.Width/2;return true;}- if(path.EndsWith(".CenterY",StringComparison.OrdinalIgnoreCase)){var region=path[..^8];if(!sizes.TryGetValue(region,out var size))return false;xAxis=false;value=size.Height/2;return true;}- var datum=datums.FirstOrDefault(x=>x.Path.Equals(path,StringComparison.Ordinal)||x.Path.EndsWith("."+path,StringComparison.Ordinal));if(datum is null)return false;value=datum.X;return true;+ if(path.EndsWith(".CenterX",StringComparison.Ordinal)){var region=path[..^8];if(region!=owningRegion||!sizes.TryGetValue(region,out var size)||axis=="Y")return false;value=size.Width/2;return true;}+ if(path.EndsWith(".CenterY",StringComparison.Ordinal)){var region=path[..^8];if(region!=owningRegion||!sizes.TryGetValue(region,out var size)||axis=="X")return false;xAxis=false;value=size.Height/2;return true;}+ var datum=ResolveDatum(path,block.Struct,datums,block.DatumNames);if(datum is null||datum.Region!=owningRegion)return false;+ xAxis=axis!="Y";value=xAxis?datum.X:datum.Y;return true;}-- private static IReadOnlyList<Block> StructBlocks(string source)+ private static string Path(Block block)=>block.Struct is null?block.Name:$"{block.Struct}.{block.Name}";+ private static string? Token(Block block,string name)=>block.Fields.Reference(name);+ private static string? TokenPath(Block block,string name)=>Token(block,name);+ private static IReadOnlyList<string> List(Block block,string name){- var result=new List<Block>();foreach(Match match in Regex.Matches(source,@"\bConcept\s+Struct\s+(?<name>[A-Za-z_][A-Za-z0-9_]*)\s*\{",Rx))- {var open=source.IndexOf('{',match.Index);var close=Close(source,open);if(close>open)result.Add(new("Concept Struct",match.Groups["name"].Value,source[(open+1)..close],match.Index,null));}return result;+ var value=block.Fields.Take(name);+ if(value is SequenceSyntax { Kind: SequenceKind.List } list && list.Items.All(i=>i.Name is null && i.Default is null && SheetMetalSyntaxDiagnostics.Path(i.Value) is not null))+ return list.Items.Select(i=>SheetMetalSyntaxDiagnostics.Path(i.Value)!).ToArray();+ if(value is not null)block.Fields.Invalid(name);return [];}- private static IReadOnlyList<Block> Blocks(string source,string keyword,IReadOnlyList<Block> structs)+ private static bool Scalar(Block block,string name,out double value){- var result=new List<Block>();foreach(Match match in Regex.Matches(source,$@"\b{Regex.Escape(keyword)}\s+(?<name>[A-Za-z_][A-Za-z0-9_]*)\s*\{{",Rx))- {var open=source.IndexOf('{',match.Index);var close=Close(source,open);if(close<=open)continue;var owner=structs.Where(x=>match.Index>x.Index&&match.Index<x.Index+x.Body.Length+(source.IndexOf('{',x.Index)-x.Index)+2).OrderByDescending(x=>x.Index).FirstOrDefault()?.Name;result.Add(new(keyword,match.Groups["name"].Value,source[(open+1)..close],match.Index,owner));}return result;+ value=0;var expression=block.Fields.Take(name);if(expression is null)return false;+ if(FirmamentSyntaxValues.TryMeasure(expression,"mm",out value))return true;+ block.Fields.Invalid(name);return false;}- private static IReadOnlyList<Block> CornerBlocks(string source,IReadOnlyList<Block> structs)+ private static bool Int(Block block,string name,out int value){- var result=new List<Block>();foreach(Match match in Regex.Matches(source,@"\bCornerProfile\s+(?<name>[A-Za-z_][A-Za-z0-9_]*\.[A-Za-z_][A-Za-z0-9_]*)\s*\{",Rx))- {var open=source.IndexOf('{',match.Index);var close=Close(source,open);if(close<=open)continue;var owner=structs.Where(x=>match.Index>x.Index&&match.Index<x.Index+x.Body.Length+(source.IndexOf('{',x.Index)-x.Index)+2).OrderByDescending(x=>x.Index).FirstOrDefault()?.Name;result.Add(new("CornerProfile",match.Groups["name"].Value,source[(open+1)..close],match.Index,owner));}return result;+ value=0;var expression=block.Fields.Take(name);+ if(FirmamentSyntaxValues.TryMeasure(expression,"",out var number)&&number>=int.MinValue&&number<=int.MaxValue&&number==Math.Truncate(number)){value=(int)number;return true;}+ if(expression is not null)block.Fields.Invalid(name);return false;+ }+ private static bool Tuple(Block block,string name,out Point2 point)=>TupleValue(block.Fields.Take(name),out point);+ private static bool TupleValue(ExpressionSyntax? expression,out Point2 point)+ {+ point=default;+ if(expression is SequenceSyntax { Kind: SequenceKind.Tuple } tuple) expression=tuple with { Kind=SequenceKind.List };+ if(!FirmamentSyntaxValues.Vector(expression,"mm",out var v)||v.Length!=2)return false;+ point=new(v[0],v[1]);return true;}- private static int Close(string source,int open){var depth=0;for(var i=open;i<source.Length;i++){if(source[i]=='{')depth++;else if(source[i]=='}'&&--depth==0)return i;}return -1;}- private static string Path(Block block)=>block.Struct is null?block.Name:$"{block.Struct}.{block.Name}";- private static string? Token(string text,string name){var m=Regex.Match(text,$@"\b{Regex.Escape(name)}\s*:\s*(?<v>[A-Za-z_][A-Za-z0-9_]*)\s*;",Rx);return m.Success?m.Groups["v"].Value:null;}- private static string? TokenPath(string text,string name){var m=Regex.Match(text,$@"\b{Regex.Escape(name)}\s*:\s*(?<v>[A-Za-z_][A-Za-z0-9_.]*)\s*;",Rx);return m.Success?m.Groups["v"].Value:null;}- private static IReadOnlyList<string> List(string text,string name){var m=Regex.Match(text,$@"\b{Regex.Escape(name)}\s*:\s*\[(?<v>[^]]*)\]\s*;",Rx);return m.Success?m.Groups["v"].Value.Split(',',StringSplitOptions.RemoveEmptyEntries|StringSplitOptions.TrimEntries):[];}- private static bool Scalar(string text,string name,out double value){var m=Regex.Match(text,$@"\b{Regex.Escape(name)}\s*:\s*(?<v>{Number})\s*mm\s*;",Rx);value=m.Success?double.Parse(m.Groups["v"].Value,CultureInfo.InvariantCulture):0;return m.Success;}- private static bool Int(string text,string name,out int value){var m=Regex.Match(text,$@"\b{Regex.Escape(name)}\s*:\s*(?<v>[0-9]+)\s*;",Rx);return int.TryParse(m.Groups["v"].Value,NumberStyles.None,CultureInfo.InvariantCulture,out value);}- private static bool Tuple(string text,string name,out Point2 point){var m=Regex.Match(text,$@"\b{Regex.Escape(name)}\s*:\s*(?<v>\([^;]+\))\s*;",Rx);return TupleValue(m.Groups["v"].Value,out point);}- private static bool TupleValue(string value,out Point2 point){var m=Regex.Match(value,$@"^\s*\(\s*(?<x>{Number})\s*mm\s*,\s*(?<y>{Number})\s*mm\s*\)\s*$",Rx);point=m.Success?new(double.Parse(m.Groups["x"].Value,CultureInfo.InvariantCulture),double.Parse(m.Groups["y"].Value,CultureInfo.InvariantCulture)):default;return m.Success;}private static bool Near(double? a,double? b)=>a is null&&b is null||a is not null&&b is not null&&Math.Abs(a.Value-b.Value)<=1e-9;}diff --git a/Aetheris.SheetMetal/SheetMetalSyntaxDiagnostics.cs b/Aetheris.SheetMetal/SheetMetalSyntaxDiagnostics.csnew file mode 100644index 00000000..5a06e5f7--- /dev/null+++ b/Aetheris.SheetMetal/SheetMetalSyntaxDiagnostics.cs@@ -0,0 +1,46 @@+using Aetheris.Kernel.Firmament.FirmamentV2;+using Aetheris.Kernel.Firmament.FirmamentV2.Syntax;++namespace Aetheris.SheetMetal;++internal static class SheetMetalSyntaxDiagnostics+{+ internal static string? Path(ExpressionSyntax? value) => value switch+ {+ IndexSyntax index when Path(index.Target) is { } target && FirmamentSyntaxValues.TryMeasure(index.Index,"",out var number)+ && number>=0 && number==Math.Truncate(number) => target+"["+number.ToString("0",System.Globalization.CultureInfo.InvariantCulture)+"]",+ _ => FirmamentSyntaxValues.Reference(value)+ };+ internal static SheetMetalDiagnostic At(FirmamentDomainBinding binding,string code,string message,FirmamentV2SourceSpan? span,string? context=null)+ {+ var original=span is {} location?binding.OriginalSpan(location):null;+ return new(code,SheetMetalDiagnosticSeverity.Error,message)+ {+ SourceFile=binding.Document.SourceFile,SourceSpan=original,Context=context,+ LocationNote=binding.IsExpanded ? original is null ? "Expanded source; original-source provenance is unavailable."+ : "Location identifies the original enclosing declaration after expansion." : null+ };+ }+ internal static IReadOnlyList<SheetMetalDiagnostic> Binding(FirmamentDomainBinding binding) => binding.Diagnostics.Select(d=>+ new SheetMetalDiagnostic(d.Code,d.Severity is "warning"?SheetMetalDiagnosticSeverity.Warning:d.Severity is "info"?SheetMetalDiagnosticSeverity.Information:SheetMetalDiagnosticSeverity.Error,d.Message)+ { SourceFile=binding.Document.SourceFile,SourceSpan=d.SourceSpan,Context=d.Target,LocationNote=d.LocationNote }).ToArray();+ internal static IReadOnlyList<SheetMetalDiagnostic> Codes(IEnumerable<string> codes,FirmamentDomainBinding binding) => codes.Distinct(StringComparer.Ordinal).Select(text=>+ {+ var parts=text.Split(':');var code=parts[0];var type=parts.ElementAtOrDefault(1);var field=parts.ElementAtOrDefault(2);+ var owners=FirmamentSyntaxTraversal.Declarations(binding.Document).Where(d=>d.Type.Name.Text==type).ToArray();+ var objects=FirmamentSyntaxTraversal.Expressions(binding.Document).OfType<ObjectSyntax>().Where(o=>FirmamentSyntaxValues.Reference(o.Type)==type).ToArray();+ var fields=owners.SelectMany(d=>d.Body?.Statements.OfType<FieldSyntax>()??[])+ .Concat(objects.SelectMany(o=>o.Body.Statements.OfType<FieldSyntax>()))+ .Where(f=>field is not null && FirmamentSyntaxFields.SameField(f.Name.Text,field)).ToArray();+ var span=fields.Length==1?fields[0].Span:owners.Length==1?owners[0].Span:(FirmamentV2SourceSpan?)null;+ var message=code switch+ {+ FirmamentV2Parser.CanonicalFieldUnknown=>$"Unknown field '{field}' in {type}.",+ "firmament-v2-field-duplicate"=>$"Duplicate field '{field}' in {type}; canonical and compatibility aliases cannot both be supplied.",+ "firmament-v2-field-value-invalid"=>$"Invalid value for field '{field}' in {type}; check its required type and units.",+ FirmamentV2Parser.CanonicalDeclarationUnknown=>$"Unsupported statement or header '{field}' in {type}.",+ _=>text+ };+ return At(binding,code,message,span,type);+ }).ToArray();+}diff --git a/docs/development/FIRMAMENT-LANGUAGE-DECISIONS-2026-10.md b/docs/development/FIRMAMENT-LANGUAGE-DECISIONS-2026-10.mdindex 60a97a76..cc608746 100644--- a/docs/development/FIRMAMENT-LANGUAGE-DECISIONS-2026-10.md+++ b/docs/development/FIRMAMENT-LANGUAGE-DECISIONS-2026-10.md@@ -372,3 +372,28 @@ Regions, mixed finishes and general feature chains remain explicit limitations.Shell and unrelated geometry work from #24 is still deferred. This supersedesthe d05 rejection disposition above only for the newly qualified combination.See [qualification and upstream reconciliation](../release/FIRMAMENT-FILLET-HOLE.md).++## Sheet semantic layout and manufacturing follow-up (2026-10-17)++The [modernization report](FIRMAMENT-SHEET-METAL-SEMANTIC-MANUFACTURING-MODERNIZATION-2026-10.md)+records the production AST migration and every disposition from the preceding+sheet audit. This is an implementation follow-up, not another shadow milestone.++- Layout, structural contracts, manufacturing/PMI and ProfileDelta no longer use+ their old block/field regex readers. Unknown intent and unsupported placements+ reject. Validate and build execute the same sheet compiler.+- Shared scalar Record/Static binding and typed `dimension:` projection preserve+ nominal geometry, allowances and value provenance. Ordinary keyed Set/Pattern+ mapping reuses Feature specialization for sheet Hole/Cut consumers.+- Preserve one legacy layout effect bundle and its identities. Multiple implicit+ bundles reject; new effects belong under the consuming SheetMetal body.+- Preserve legacy capsule/rectangular Slot meanings explicitly; new shared+ Rect2/Slot2 Profiles have their established exact-boundary meanings.+- camelCase fields and PascalCase aliases are admitted by the owning field+ reader; conflicting aliases reject. Prefer call-shaped ProfileDelta anchors,+ unnamed owning Pmi and Note; old anchors, one named top-level Pmi and Annotation+ remain compatibility forms.+- Arbitrary-plane sheet layout, general GD&T, constraint solving and callable+ Boolean-composable domain EqualPitch/Mirror intrinsics remain separate work.+ Legacy domain checks are AST-owned; ordinary predicate/bundle Concepts use the+ common checker. These limits do not grant apparent successful admission.diff --git a/docs/development/FIRMAMENT-SHEET-METAL-SEMANTIC-MANUFACTURING-AUDIT-2026-10.md b/docs/development/FIRMAMENT-SHEET-METAL-SEMANTIC-MANUFACTURING-AUDIT-2026-10.mdnew file mode 100644index 00000000..48fa740f--- /dev/null+++ b/docs/development/FIRMAMENT-SHEET-METAL-SEMANTIC-MANUFACTURING-AUDIT-2026-10.md@@ -0,0 +1,318 @@+# Sheet-metal semantic layout and manufacturing syntax audit++Date: 2026-10-16. Audited revision: `ba81ffda0041b312465d2e2310f99f936616e890`.+Status: audit complete; proposals below are **not implemented**.++This is the original audit snapshot. Subsequent implementation and current+dispositions are recorded in the+[modernization report](FIRMAMENT-SHEET-METAL-SEMANTIC-MANUFACTURING-MODERNIZATION-2026-10.md).++## Conclusion++Converge these frontends through the existing syntax tree and compile-time binder,+while preserving sheet-region semantics and the existing formed/flat/AP242+lowerers. A capitalization pass alone would leave serious admission defects.+Fix ownership, complete consumption and scoped binding before changing examples+to preferred spellings. Do not add another parser, rewrite pass or shadow mode.++This audit changes documentation only. Existing source fixtures, compiler code,+geometry references and public syntax contracts have not been migrated.++## What the language currently means++| Surface | Current owner and meaning | Convergence decision |+| --- | --- | --- |+| Base, Flange, Hole, Cut | Shared AST fields and dimensional values feeding native sheet lowerers | Keep; extend the established seam |+| Named Profile | Shared exact closed-boundary authoring | Keep Rect2/Circle2/Slot2 and exact loops as the boundary vocabulary |+| Layout Datum | Region-local **2D construction point**, not a manufacturing datum | Preserve its role; admit ordinary Point2 expressions through the shared binder |+| Concept Struct | Layout parser scans contained operations globally; containment mainly supplies a name prefix | Make construction data scoped; material effects must belong to a consuming sheet |+| AttachmentPath | Bounded edge segment with inset/span and explicit carrier release | Keep this domain operation; it is not a generic curve or assembly mate |+| Tab / SteppedNotch / CornerProfile | Material edge edits, sometimes written inside a Concept Struct | Keep lowerers; give every effect an explicit sheet owner |+| ProfileDelta | Finite edge program with levels, spans, transitions and exposed capabilities | Keep program/identity model; move syntax and values to shared owners |+| Layout Pattern | Separate centered Count/Pitch feature generator | Preserve legacy geometry; converge repetition onto ordinary Pattern/Feature binding |+| Layout Require | Brace-shaped RequiredMembers/EqualSize/EqualPitch/Mirror checks | Common Boolean Require semantics, with typed domain predicates |+| Structural Concept | Separate line-sensitive sheet contract checker | Common structural-contract binder, supplied with sheet semantic members |+| Manufacturing | First globally found named release/process block | Explicit owning-sheet selection; metadata/default policies remain distinct from geometry |+| Sheet Pmi | First globally found named block; DatumFeature/Dimension/Position/Annotation | Explicit projection bound to owner symbols and admitted export capabilities |++The primary source owners are+`Aetheris.SheetMetal/SheetMetalSemanticLayout.cs`,+`SheetMetalConceptContracts.cs`, `SheetMetalManufacturingDefinition.cs` and+`SheetMetalFirmament.cs`; ProfileDelta parsing lives in+`Aetheris.Kernel.Firmament/FirmamentV2/SemanticProfileDeltaParser.cs`.+The sheet diagnostic record is in `Aetheris.SheetMetal/SheetMetalIr.cs`.++## Executed evidence++Used the repository Release CLI, not an installed global executable. Each of 27+source variants ran through `validate --json`, `build --json`, and+`sheetmetal inspect --json`: 81 invocations. Twenty-one variants were admitted+and six rejected. Validate/build acceptance agreed for all 27. **That agreement+does not prove soundness:** both paths admit the silent omissions below.++Baselines:++- `fixtures/Canonical/SheetMetal/semantic-panel.firmament`: four cuts, three+ regions, one bend, flat material area 7800.022098417826 mm².+- `fixtures/InvestorPitch/sheet-metal-bracket.firmament`: four cuts, three regions,+ one bend, flat material area 13440.493767226479 mm², 13 semantic PMI records.++The following table gives exact edits to those baselines. Layout rows use the+first baseline; manufacturing rows use the second. A means admitted by all three+commands; R means rejected by all three. The two unchanged baselines also count+toward the 27 variants.++| ID | Source edit | Result | Observed behavior / classification |+| --- | --- | --- | --- |+| L01 | Datum `At: Point2(50mm, 30mm);` | R | `sheetmetal-semantic-datum-point`; shared point spelling not supported here |+| L02 | Add `Coutn: 9;` beside Pattern `Count: 4;` | A | Unknown field ignored; identical STEP |+| L03 | Add `Depth: 100mm;` in Pattern's Circle feature | A | Unsupported field ignored; identical STEP |+| L04 | `Concept Struct PanelLayout On XZ {` | A | Placement ignored; identical STEP; generated names lose `PanelLayout.` prefix |+| L05 | Same header using modern lowercase `on XZ` | A | Same placement and identity defect |+| L06 | Add `Fillet ignored { radius: 5mm; }` inside layout | A | Operation omitted; identical STEP |+| L07 | Add `Require impossible => false` inside SheetMetal body | A | False requirement omitted; identical STEP |+| L08 | Replace Concept member `Panel: SheetRegion` with `Missing: SheetRegion` | R | Correct `firmament-concept-missing-member` |+| L09 | Same missing requirement with trailing semicolon | A | Contract member disappears from checker; identical geometry |+| L10 | Prepend `Concept Struct Other { Datum MountingPatternCenter { On: Panel; At: (55mm, 30mm); } }` | A | Existing Pattern binds Other's short name: center moves from (50,30) to (55,30); STEP changes |+| L11 | Remove semicolons after Pattern Count and Pitch | R | Reports missing Count despite authored `Count: 4`; legacy field-reader mismatch |+| L12 | Add an unused Concept Struct with one Circle Pattern, diameter 2mm, center (50mm,40mm), Count 1, Pitch (10mm,0mm), On Panel | A | Extra cut materializes: five cuts; area decreases by π mm² |+| L13 | Replace Circle feature with `Slot { Width: 4mm; Length: 10mm; }`, Count 1 | A | Exact capsule, area 7860.553063332699 mm² |+| L14 | Same as L13 with `Rectangle` instead of `Slot` | A | Byte-identical capsule STEP; Rectangle does not mean rectangular opening here |+| L15 | Lowercase first letters of On/At/Feature/Diameter/Center/Count/Pitch fields | A | Identical STEP; those casing aliases already work |+| M01 | Change `Pmi InvestorBracketPmi {` to `Pmi {` | A | All 13 PMI records disappear, including from exported AP242 |+| M02 | Add `Flatness Ignored { Target: BasePlate; Tolerance: 0.1mm; }` to Pmi | A | Unknown record skipped; still only 13 PMI records |+| M03 | Misspell `GeneralCutTolerance` as `GeneralCutTolerence` | A | Policy becomes null; no unknown-field diagnostic |+| M04 | Replace `PlusMinus(0.12mm, 0.12mm)` with negative arguments | A | Negative allowances retained in inspection and exported AP242 |+| M05 | Replace `Quantity: 2;` with `Quantity: 0;` | A | Zero quantities retained in exported diameter and position records |+| M06 | Replace `Kind: Linear;` with `Kind: Banana;` | A | Arbitrary kind admitted; analyzer reports generic Dimension |+| M07 | Append second named Pmi containing one valid Annotation | A | Second block ignored; 13 records rather than 14 |+| M08 | Put `//` inside quoted BlankProcess text | R | Misleading `sheetmetal-firmament-invalid`: found zero SheetMetal documents |+| M09 | Add valid Hole Extra, then target it in BaseMountDiameter and BaseMountPosition | R | `sheetmetal-manufacturing-pmi-invalid`: unknown identity Extra |+| M10 | Declare `Static plateWidth: Length = 100mm tol 0.25mm`; replace BaseWidth Value/Tolerance with `dimension: plateWidth;` | R | Requires literal Value/PlusMinus; typed projection not admitted |++M09 had an additional control build: the same Hole Extra with original PMI+targets builds successfully and reports five features. This isolates the missing+PMI target registration from hole construction.++Five exported STEP files were independently inspected with `analyze --json`:+manufacturing baseline, unnamed PMI, negative tolerances, zero quantities and+unknown dimension kind. Baseline exports two datums, five dimensions, two+positions and four annotations. The unnamed variant exports zero. Existing+region/pattern datum and position associations are real export capabilities and+must survive modernization; root-owned thickness/notes need not have individual+face associations.++The layout baseline STEP SHA-256 is+`baeea51b9aafa2b0cef29fddfa44934e7eb49e9f67fa8d1338b21e17ebccb4eb`.+L02/L03/L05/L06/L07/L15 produce exactly those same bytes. L10 produces+`f7ff208a9d1b958575bf605510106e3b9af4d5902689ed6fb413dac7d54dba37`.+Unchanged area/topology would not have detected that location change.++Local generated sources, scripts, command JSON and STEP evidence are under+`artifacts/local/sheetmetal-semantics-audit/`. They are ignored development+output, not a committed regression corpus. The table preserves reproduction+edits; implementation should promote the relevant specimens into `fixtures/`.+Typical reproduction commands:++```powershell+dotnet Aetheris.CLI/bin/Release/net10.0/aetheris.dll validate INPUT --json+dotnet Aetheris.CLI/bin/Release/net10.0/aetheris.dll build INPUT --output artifacts/local/audit.step --json+dotnet Aetheris.CLI/bin/Release/net10.0/aetheris.dll sheetmetal inspect INPUT --json+dotnet Aetheris.CLI/bin/Release/net10.0/aetheris.dll analyze artifacts/local/audit.step --json+```++## Root causes and additional source findings++1. Layout `Blocks` scans the whole text. Struct detection requires a bare name+ followed by a brace, so a placement header breaks containment without stopping+ discovery of inner effects. Unknown statements/fields are not consumed or+ rejected. This is a frontend correctness defect, not a missing kernel feature.+2. `TryPointExpression` resolves the first suffix-matching Datum; it does not bind+ the nearest lexical symbol. Datum declarations bind in source order. `TryAxis`+ treats a Datum reference as its X axis; no explicit Y choice is available there.+3. `SheetMetalConceptContracts.Validate` recognizes whole-line members without+ terminators. Ordinary semicolon formatting can bypass the contract.+4. Manufacturing `FindNamedBlock` chooses the first block globally. `ChildBlocks`+ only discovers four known record kinds, so the switch's unsupported-kind+ diagnostic cannot protect unknown kinds. Optional field parsers conflate+ malformed/misspelled fields with absence. Duplicate-field consumption is absent.+5. Manufacturing `BuildTargets` registers part, base, flanges, bends and layout+ Patterns/members; it does not receive ordinary authored cuts. Export association+ code already knows how to find features, but admission cannot reach them.+6. Manufacturing owns another literal-only tolerance/value parser. It does not+ consume the existing typed-tolerance binding/provenance contract. Its target+ matching is case-insensitive, unlike ordinary case-sensitive authored symbols.+7. `SheetMetalFirmament.Compile` strips comments with a string-unaware regex.+ It conditionally invokes shared Template expansion when `Template<...>` is+ present. The resulting direct/expanded-source admission difference requires+ qualification; this audit did not execute a paired Template-trigger witness.+8. `SemanticProfileDeltaParser` still owns case-sensitive PascalCase field readers+ and special whitespace anchors such as `FromStart 0mm`. It has not received+ the Base/Cut AST-field migration. Source inspection only in this audit.+9. Sheet diagnostics carry code/severity/message/source-face IDs, but lack authored+ file/span fields. Tested errors have explanatory messages but no precise+ authoring spans. Expanded-source provenance must be retained at the shared seam.++Source-only findings are not presented as executed regressions. Recovery and+reconstruction are separate evidence-bearing workflows; do not mechanically+reinterpret their source as ordinary authored sheet instructions.++## Proposed language decisions++### One spelling and value system++Use PascalCase constructs/types/domain symbols, camelCase fields and lowercase+connective keywords (`on`, `over`, `with`, `as`). Preserve authored names exactly.+PascalCase field aliases remain explicit compatibility aliases at the owning+schema; conflicting duplicate aliases reject. Semicolons and newlines follow+the common AST rules, never a domain-specific line regex.++Use the shared dimensional evaluator, scoped Record/Static/Table values and+typed tolerances. Admit `Point2(...)` and `Vector2(...)` expressions for layout+coordinates. Old tuples remain compatible where their meaning is unambiguous.+Region-local coordinates retain their owning region/frame; Point2 alone must not+authorize mixing base and flange coordinates. Unsupported `on XZ` rejects until+the domain lowerer can honor it. Do not silently rotate, flatten or default it.++Keep layout `Datum` as a compatibility construction-point declaration initially;+do not introduce a new Datum2 type merely to rename it. Document that it is+different from PMI `DatumFeature`, a manufactured reference feature, and from a+3D DatumFrame. Shared AST binding can distinguish those owners without conflating+their capabilities or inventing a second Point2 implementation.++### Construction data first, material operations under the consumer++A Concept Struct supplies named construction data and semantic paths. A+SheetMetal body owns material edits and repetition. New examples should put+Feature calls, Patterns, Tab/Notch/CornerProfile effects under that consuming+sheet, referring to layout members by normal scoped names. This avoids adding a+new mandatory `layout:` selection mechanism just to compensate for global scans.++Legacy layout-contained effects can remain compatible only through explicit AST+ownership: associate them with their uniquely resolved sheet regions and reject+ambiguous ownership. Merely importing a reusable data declaration must not cut+material. Do not remove this compatibility form before existing canonical+layouts, product families and provenance paths are qualified.++Reuse ordinary `Pattern name over values { value => Recipe(value) }`, named Sets+and named Feature calls; extend the sheet result consumer rather than building+another repeater. Sheet recipes return sheet operations with region targets,+not mechanical `Hole<Shaft>` with face selectors. Keyed values preserve instance+identity independently of declaration order. Legacy Count/Pitch remains a+compatibility producer with its existing centered placement and index identities.+No automatic conversion may recenter a previously accepted family.++Preserve AttachmentPath's span/inset/release safety and ProfileDelta's exposed+capabilities. Keep current CornerProfile target headers for the first migration;+changing their derived IDs is unnecessary. Normalize ProfileDelta anchor calls+to expressions such as `anchor: FromStart(0mm)` through its AST production,+with a local compatibility production for the old whitespace form. This is a+proposal, not currently documented working syntax.++Use the common structural Concept checker with sheet semantic member types.+Use common `Require name => predicate`; the existing four sheet checks become+typed domain predicates with explicit region/axis inputs. Legacy brace Require+records lower into the same checked requirement representation. Do not add a+general geometric constraint solver or silently treat a bare Datum as a Y axis.++### Preserve old shapes; use shared Profiles for new shapes++Never globally alias Rectangle to Slot2. L13/L14's old capsule removes+`10 * 4 + pi * 2² = 52.566370614359... mm²`: its long dimension describes the+straight run. A modern Slot2 with overall length 10 and width 4 removes+`(10 - 4) * 4 + pi * 2² = 36.566370614359... mm²`. A literal 10-by-4 rectangle+removes 40 mm². These are three different shapes.++Retain old semantic Pattern Rectangle/Slot geometry under explicit compatibility+ownership and diagnose the misleading alias as deprecated. New recipes use+named Rect2/Slot2 Profiles through the shared Cut boundary owner. Legacy direct+Cut Slot remains its already documented rectangular compatibility operation.++### Requirements, release policies and PMI have separate jobs++A toleranced compile-time value supplies a nominal to geometry. `Pmi` explicitly+projects that requirement. Manufacturing stores material/process release data+and default allowance policies; it must not silently export every field or turn+a descriptive process string into a dimensional requirement.++Proposed projection fragment, **not supported by today's sheet frontend**:++```firmament+Static plateWidth: Length = 100mm tol 0.25mm+// The sheet Base/Profile consumes plateWidth's nominal value.+Pmi {+ Dimension baseWidth { target: basePlate; kind: Linear; dimension: plateWidth }+}+```++Reuse native PMI's `dimension:` binding and original-value provenance. Retain+legacy Value/PlusMinus pairs with validated nonnegative allowance magnitudes.+Reject contradictory literal and bound-value fields. GeneralCutTolerance is an+allowance policy, not a fake nominal `0mm tol ...` dimension; keep that distinction.+Validate known kinds, units, finite values, positive quantities and datum labels.+Do not silently infer that an authored nominal matches a measurable feature:+target-specific checks must establish what is actually measured.++Make root-contained unnamed Pmi canonical, as in modern Model/Assembly authoring.+Support named top-level Pmi and Manufacturing declarations through explicit+owner binding (a proposed sheet `manufacturing: release` reference selects a+reusable release). Legacy single-root/single-release documents remain unambiguous+compatibility inputs. Duplicate or ambiguous blocks reject; first-global wins+must disappear. PMI should not require a process-release block just to project a+valid engineering requirement. Missing release data is a separate release policy.++Keep DatumFeature for manufactured sheet reference features; retain Position's+existing datum relationships and quantity. Prefer the common Note spelling for+new annotations, retaining Annotation as a local alias. Do not remove working+sheet Position export merely because native Model PMI has a smaller capability+set. A shared syntax does not grant unsupported GD&T across every domain.++Resolve targets from the actual bound domain symbol registry, including authored+cuts, rather than another hand-maintained name collection. Export must preserve+stable IDs and feature/region face associations. Capability rejection must name+the requested record and target at the original source span.++## Implementation order and qualification gate++1. **Honest AST admission:** migrate remaining layout, contract and manufacturing+ production owners to existing syntax nodes. Close unknown/duplicate fields,+ statements, placements and blocks; replace global scans and suffix capture.+ Fix string/comment handling through the existing lexer. Preserve lowerers.+2. **Shared values and projection:** use existing scoped binder for layout+ expressions, structural Concepts, Requirements and typed PMI dimensions;+ preserve source provenance and bind real target symbols. Qualify release/PMI+ ownership and remove the corresponding obsolete readers.+3. **Common repetition and authoring cleanup:** admit sheet Feature results through+ the shared Pattern expansion, preserving old centered/index identities until+ explicit migration. Modernize canonical examples and public syntax only after+ each spelling works. No shadow-only acceptance milestone.++Admission fixes deliberately reject previously ignored invalid intent. Valid+legacy source must preserve formed/flat geometry, cut centers, semantic IDs,+exact material area, bend correspondence and AP242 requirements/associations.+Require validate/build agreement but also assert requested effects and PMI+presence. Keep the negative specimens negative; do not merely match error text.++Promote L02-L10 and M01-M05/M07-M09 first. Add duplicate aliases, ambiguous+ownership, imported unused declarations, wrong units, cross-region references,+forward references and Template/non-Template paired cases. Qualify semantic-panel,+inset-partial-flange, ProfileDelta tab families, the investor manufacturing+bracket and SheetMetal.ProductFamilies, plus modern shared-profile examples.+Compare geometry independently of provenance changes to STEP metadata. Reinspect+AP242 after export. Then run focused suites and both prescribed .NET test lanes,+including the full solution corpus. No full .NET regression suite was rerun for+this documentation-only audit; the CLI probes above are the fresh evidence.++## Deferred scope and decisions++No user decision is required to start the admission repairs. The recommended+choices above are concrete enough for implementation. New arbitrary-plane sheet+layout, general GD&T, a constraint solver and recovered-source modernization+remain separate capability work. Shared Pattern consumption is a bounded+frontend extension, not permission to rebuild the geometry engine.++**Audit outcome: Success.** The implementation boundary is identified, current+failures are reproduced, and the proposed surface separates construction data,+material operations, typed requirements and manufacturing release information.+The existing semantic/manufacturing frontend is **not yet qualified as honest**;+the defects above remain open until implementation and regression qualification.diff --git a/docs/development/FIRMAMENT-SHEET-METAL-SEMANTIC-MANUFACTURING-MODERNIZATION-2026-10.md b/docs/development/FIRMAMENT-SHEET-METAL-SEMANTIC-MANUFACTURING-MODERNIZATION-2026-10.mdnew file mode 100644index 00000000..55cec81d--- /dev/null+++ b/docs/development/FIRMAMENT-SHEET-METAL-SEMANTIC-MANUFACTURING-MODERNIZATION-2026-10.md@@ -0,0 +1,217 @@+# Sheet-metal semantic layout and manufacturing modernization++Implementation: 2026-10-16/17. Basis:+[the source-backed audit](FIRMAMENT-SHEET-METAL-SEMANTIC-MANUFACTURING-AUDIT-2026-10.md)+at `ba81ffda0041b312465d2e2310f99f936616e890`.++## Result and ownership++The authored sheet frontend now consumes the production AST for semantic layout,+structural contracts, manufacturing/PMI and ProfileDelta programs. The previous+layout block/field scans, manufacturing parser scans, and line-regex structural+Concept checker have been removed. Base/Flange/Hole/Cut and the formed/flat and+STEP lowerers remain in place.++`FirmamentDomainBinding` exposes the existing Template/Record/Static scalar+binder, Concept checker, terminal-return Feature specialization and finite Set+Pattern materializer to the sheet adapter. It retains checked tolerance values+for explicit PMI rather than reducing them to nominal strings. It is an executed+production path used by both validate and build, not a shadow parser or separate+validator. CanonicalStaticAuthoring's existing Set-entry binder and Pattern+materializer serve the sheet consumer; no new repetition evaluator was added.++The module resolves its recognized library directives from AST spans. Comment+masking uses lexer tokens, preserving quoted `//` and `#` and source offsets.+Unresolved include/Use directives reject rather than disappearing. Recovery and+reconstruction keep their existing domain authority and lowerers.++Ordinary Point2/2D boundary declarations inside Concept Structs delegate to the+existing construction-guide and closed-boundary owners; the sheet adapter does+not copy their schemas. Shared Profile resolution receives the same bound scalar+environment through derived Profiles and Templates. Lowercase `on XY` uses the+profile owner's AST frame check. Unknown fields in Extend SheetMetal scopes are+also closed, rather than bypassing root admission.++The sheet module closes its top-level statements as well. Known compile-time+data delegates to its owner; unknown material statements cannot disappear outside+the SheetMetal braces. Legacy module-level cuts/semantic operations retain the+single concrete sheet as their explicit compatibility owner, so narrowing scope+does not silently drop previously constructed geometry.++Record/Static/Table ownership comes directly from the shared data binder's+namespace classification. Qualification caught and repaired an adapter omission+for the canonical Static Table tab family; scoped table selections now have their+own geometry witness as well.++## Audit dispositions++| Audit finding | Implemented outcome |+| --- | --- |+| L01 Point2 rejected | Shared dimensional Point2/Vector2 expressions admitted; legacy tuples remain |+| L02/L03 unknown Pattern/feature fields | Field-consumption errors; no geometry |+| L04/L05 XZ silently defaults and changes identities | Unsupported placement rejects |+| L06 ignored Fillet | Unknown layout statement rejects |+| L07 false Boolean Require ignored | Existing Concept/Boolean checker rejects false requirements |+| L08/L09 semicolon bypasses structural Concept | Common typed member contract checked independent of formatting |+| L10 suffix-first Datum capture | Lexical local/exact lookup; foreign layout does not move holes |+| L11 required field terminators | Shared AST separators; newlines admitted |+| L12 extra implicit material bundle | Multiple legacy effect bundles reject as ambiguous |+| L13/L14 Slot/Rectangle capsule mismatch | Explicit geometry compatibility decision; no automatic shape reinterpretation |+| L15 casing differences | camelCase fields plus existing PascalCase aliases; duplicate aliases reject |+| M01 unnamed PMI omitted | One owning unnamed or legacy named Pmi binds and exports all records |+| M02 unknown PMI kind omitted | Unknown record rejects with source context |+| M03 misspelled release field omitted | Unknown field rejects |+| M04 negative tolerance magnitudes | Rejects; no malformed AP242 allowance emitted |+| M05 zero quantity | Rejects; quantity must be a positive integer |+| M06 arbitrary dimension Kind | Thickness/Linear/Diameter admission; unsupported kind rejects |+| M07 later PMI block ignored | Multiple PMI blocks reject |+| M08 comment markers inside strings | Quoted text preserved, including process strings and notes |+| M09 authored Hole absent from PMI targets | Bound authored cuts and generated feature identities admitted as targets |+| M10 typed dimension unsupported | Bound toleranced Length projects nominal, allowances and origins |++Forward Datum references bind before consumers; cycles and unresolved references+reject. Local declarations shadow outer declarations even before their values+have resolved. EqualPitch/Mirror cannot compare coordinates from different region+frames. A Datum-based Mirror can explicitly select `axis: Y`; legacy implicit X+meaning remains compatible.++## Syntax and compatibility decisions++- PascalCase constructs/types/domain symbols; camelCase fields and authored value+ names; common lowercase connective keywords. PascalCase field aliases remain.+- Layout Datum remains a region-local construction point. PMI DatumFeature+ remains a manufactured reference feature. Neither becomes an arbitrary 3D frame.+- New material effects belong under SheetMetal, referring to reusable layout data.+ One legacy effect-containing Concept Struct remains compatible with its old+ identities. Multiple implicit bundles reject; `intent:` is not a selector+ between multiple legacy bundles. This deliberately avoids a new layout loader.+- Ordinary keyed Set/Pattern/Feature authoring supports sheet Hole and Cut result+ consumers. Names such as `mounting.left` survive entry reordering. The old+ centered Count/Pitch Pattern retains its original placement and index identity.+- Legacy semantic Pattern Rectangle/Slot remains its straight-run capsule;+ legacy direct Cut Slot remains rectangular. New Rect2/Slot2 Profiles retain+ their established geometry and overall-length contract. No baseline was rerecorded.+- ProfileDelta prefers `anchor: CenteredAt(50mm)` and equivalent FromStart/FromEnd+ calls. The old whitespace anchor has one local compatibility production in the+ shared parser and produces the same call AST.+- Manufacturing is release/process metadata and allowance policy. A selected+ named release uses `manufacturing: release`; one legacy release is implicit.+ Other reusable release declarations are still field/type checked.+- One root-owned Pmi is canonical. A single named top-level Pmi remains compatible.+ A Manufacturing block is no longer a prerequisite for valid explicit PMI.+- `dimension:` consumes a checked toleranced Length from Static/Record binding.+ Geometry consumes its nominal. Legacy Value/PlusMinus remains supported;+ conflicting literal and typed projections reject. General process allowances+ remain policies rather than invented zero-valued engineering dimensions.+- Note is preferred; Annotation remains an admitted sheet alias. Existing+ DatumFeature/Position export, datum references, quantities and face associations+ are retained. Model-domain Hole<Shaft>/axis-face selectors remain unsupported+ sheet operations and receive concrete repairs using the author's names.++## Diagnostics and provenance++SheetMetalDiagnostic retains its existing positional contract and adds optional+sourceFile, sourceSpan, context and locationNote properties. CLI JSON continues+to serialize structured records. CLI text now presents source file/location,+severity, code and explanation for sheet validate/build/inspection failures.+It uses the existing diagnostic location presenter, not another validator.++AST field closure supplies unknown/duplicate field diagnostics. Shared Concept+binding preserves requirement explanations. Expanded-source diagnostics map back+to original enclosing declarations where possible. Unavailable mappings remain+unavailable with an explicit note; no synthetic 1:1 location is invented. Bound+dimensions retain value-origin receipts; imported origins without a mapping are+identified as expanded input rather than mislabeled original source.++Qualification caught a provenance serialization defect during migration:+interpolating IdentifierSyntax into ProfileDelta receipts embedded source offsets.+The implementation now writes the authored name text, preserving the original+receipt identity and optional-semicolon parity. Two existing CLI diagnostic+tests also caught lost concrete repair examples; those examples were restored.++## Qualification++Tracked evidence is the new `fixtures/Regression/SheetMetalSemantics` corpus,+`SheetMetalSemanticSyntaxTests`, and the source-located CLI test. Its runner calls+the actual repository CLI for validate/build/inspect and reinspects exported STEP.+Generated evidence belongs under ignored `artifacts/local/`.++The new tests assert actual rejection/no Part, geometry/flat material parity,+cut centers, stable identities under Set reordering, Record tolerance origins,+exact Profile cuts and AP242 nominal/allowance/quantity/datum/face associations.+Additional cases cover duplicate aliases, forward references/cycles, quoted+import-looking strings, unresolved directives and modern ProfileDelta anchors.++Final qualification on the completed implementation:++| Check | Result |+| --- | --- |+| Release solution build, serial, compiler server reuse disabled | Passed; 0 errors, 30 existing nullability/WASM SQLite warnings |+| Focused sheet suite | 157/157 |+| Core fast lane, Category != SlowCorpus | 1,076/1,076 |+| Complete solution suite, serial, including corpus tests | 5,368/5,368 across 20 test assemblies; 0 failed/skipped |+| Semantic/manufacturing CLI corpus | 29/29; validate/build/inspect agreement and exported PMI inspection |+| Shared-profile and canonical sheet CLI corpus | 26/26; modern/legacy formed STEP bytes and flat geometry match |+| FrontendX4 authoring corpus | 32/32; chimera/reference topology, bounds and volume qualification retained |+| Final process inventory | No dotnet, aetheris or testhost processes remaining |+| Diff and text checks | git diff --check clean; UTF-8 and newline checks passed |++The FrictionLab project still reports no discovered tests; the 20-assembly total+counts assemblies that executed tests. This pass did not perform a new Helios+browser workflow qualification. It changes no editor-side validator.++Commands used the repository Release CLI. Final logs are in+`artifacts/local/sheetmetal-semantics-audit/accepted-{build,focused,fast,full}.log`+and `accepted-{semantic-cli,profile-cli,x4}.log`. Per-case JSON/STEP evidence is+under `artifacts/local/sheetmetal-semantics/cli`, `sheetmetal-syntax/cli` and+`frontend-x4`. Earlier failing iteration logs remain distinct from these final+accepted runs. No reference geometry or expected.json was rerecorded.++## Code-quality review++- Removed the obsolete sheet structural-contract checker and the migrated+ block/field regex helpers. Admission follows AST ownership and field consumption.+- Retained only bounded semantic-path classification regexes in layout; they do+ not discover statements or decide parser fallback. No whole-document dispatch,+ source macro system or diagnostic-code fatality allowlist was introduced.+- The Hole/Cut result set describes domain capabilities for the existing Feature+ expander. It does not decide severity or create a second field schema.+- Kept mutable binding/consumption state per compilation. No global parser state,+ service, scheduler or persistent runtime host was added.+- Shared construction/profile data delegates to its existing binder and lowerer;+ its scalar environment now crosses the profile-consumer boundary explicitly.+- Validate/build use the same sheet compilation owner. Presentation adds source+ metadata without product-specific validation or changing geometry exporters.+- Documentation, source specimens and generated output follow repository locations.+ Existing geometry references and corpus goldens were not rewritten.++## Explicit remaining limits++This pass does not implement arbitrary-plane sheet bases/layouts, general GD&T,+or a geometric constraint solver. Sheet Feature results are bounded Hole/Cut+consumers; mechanical result capabilities do not automatically become sheet+operations. Modern finite mapping is rooted in the consuming SheetMetal body;+legacy Count/Pitch recipes remain a compatibility producer.++Explicit PMI nominals remain authored requirements. Target binding and exported+face association do not certify that every manually authored nominal equals a+measured BRep dimension. The direct-hole target specimen isolates identity+binding; it is not a manufacturing-release consistency certificate.++The four brace-shaped domain Require checks remain compatible AST-owned checks;+this pass has not introduced callable EqualPitch/Mirror Concept intrinsics for+arbitrary Boolean composition. Ordinary Boolean/predicate/bundle Concepts work+through the shared checker. These distinctions are documented rather than hidden+behind apparent syntax acceptance.++No user decision is needed for these limits. Further capability expansion should+have its own witnesses and lowerer qualification.++## Executive verdict++**Success for this modernization pass.** The audited sheet layout/manufacturing+omissions and contradictions are repaired or have an explicit geometry-preserving+compatibility disposition. The production path now shares AST/value/Concept and+finite Feature/Pattern owners, rejects unsupported intent, preserves diagnostics+and PMI provenance, and retains the qualified canonical geometry. The remaining+capabilities above are explicit limits, not silently admitted requests.diff --git a/docs/public/firmament/pmi.md b/docs/public/firmament/pmi.mdindex 4f27e866..9467ada5 100644--- a/docs/public/firmament/pmi.md+++ b/docs/public/firmament/pmi.md@@ -59,6 +59,22 @@ graphical dimension-label placement is separate. Explicit `value:` andExisting `Require`-based `from:` / `as:` projections continue to mean a checkedsemantic constraint, rather than an implicit export of all Static values.+## Sheet-metal requirements++The authored sheet-metal frontend also admits `dimension:` references to checked+toleranced Length values from Static/Record data. It preserves nominal geometry,+allowances and binding origins. Its `Dimension` kinds are Thickness, Linear and+Diameter; targets are bound sheet regions, bends, parts and cuts, including+Pattern members. `DatumFeature` and `Position` retain the sheet exporter's datum+relationships and geometric associations. Native Model's smaller GD&T capability+set remains unchanged. See [sheet-metal layout and release syntax](sheet-metal.md#layout-requirements-and-release-data)+and the [complete typed example](../../../fixtures/Regression/SheetMetalSemantics/modern-layout-release.firmament).++Use one owning Pmi block. Unknown kinds/fields, missing targets, duplicate blocks,+negative allowance magnitudes and nonpositive quantities reject. Manufacturing+process metadata is optional and does not implicitly create PMI. A successful+export can be inspected with `aetheris analyze file.step --json`.+## Targets and inspectionFor a simple `Hole<Shaft>` constructed in a Box, `face(H.Wall)` names the stable wall output of Hole `H`. It is a semantic role selector, independent of the current BRep face number. `HoleDiameter` accepts it as a target:diff --git a/docs/public/firmament/sheet-metal.md b/docs/public/firmament/sheet-metal.mdindex c7428494..95d9e7e5 100644--- a/docs/public/firmament/sheet-metal.md+++ b/docs/public/firmament/sheet-metal.md@@ -38,9 +38,68 @@ There is no separate sheet-metal sketch language for new named boundaries.Use PascalCase for constructs/types and domain symbols (`Base`, `Rect2`, `Up`,`Rear`), camelCase for fields and authored value names. PascalCase field spellings-remain compatible. Semicolons are optional in Base, Flange, Hole and Cut fields;-newlines can separate fields. Older manufacturing/semantic-layout recipes retain-their documented statement forms and terminators.+remain compatible. Semicolons and newlines separate fields in the sheet,+semantic-layout, ProfileDelta, manufacturing and PMI owners. Unknown fields,+unknown statements, duplicate aliases and unsupported header placements reject.++### Layout, requirements and release data++A layout Datum is a named region-local **construction point**. It is not a PMI+DatumFeature or a 3D DatumFrame. Declare `Datum center { on: deck; at: deck.Center }`+in a Concept Struct, then refer to `layout.center`. `at` admits `Point2(...)`,+legacy tuples, region centers and scoped Datums, optionally plus a `Vector2`+offset. Short names resolve in their layout; forward references work and cycles+reject. Layout `on XZ` is unsupported and rejects rather than producing XY.++Keep reusable construction data in Concept Structs; put material operations in+the consuming SheetMetal body. A single legacy Concept Struct containing sheet+effects remains supported with its existing identities. Multiple implicit effect+bundles reject as ambiguous. `intent:` does not select between several effect+bundles; move those operations into the sheet body.++Sheet fields consume the same checked scalar Static/Record values as mechanical+models. `Require name => predicate` uses the common Boolean/Concept evaluator,+and `SheetMetal name: Contract` checks every structural member regardless of+semicolons. Legacy brace Require records still support RequiredMembers,+EqualSize, EqualPitch and Mirror. Spatial checks require one owning region;+Mirror accepts `axis: X` or `axis: Y` when its `about` names a Datum. Arbitrary+geometric constraint solving is not part of these checks.++Named `Set<Point2>` values and ordinary `Pattern name over points { point =>+Recipe(point) }` use the existing Feature/Pattern expansion. Sheet recipes may+return `Hole` or `Cut`; mechanical `Hole<Shaft>` is a different domain operation.+Generated identities use Pattern/Set keys, such as `mounting.left`, independently+of entry order. See the complete+[keyed recipe example](../../../fixtures/Regression/SheetMetalSemantics/keyed-features.firmament).+The legacy centered Count/Pitch Pattern retains its placement and index IDs.+Its `Slot` and `Rectangle` feature spellings both retain the historical capsule+with a straight-run Length; use shared Rect2/Slot2 Profiles for new boundaries.++`Manufacturing release { ... }` describes material/process data and general+allowance policies. A sheet selects it with `manufacturing: release`. A single+legacy release remains implicitly selectable. Multiple unselected releases+reject; reusable unselected releases are still checked for invalid fields.+An ordinary quoted process string may contain `//` or `#`.++Use one root-contained `Pmi { ... }` for explicit projection. One named top-level+Pmi remains compatible; multiple Pmi blocks reject. PMI does not require a+Manufacturing block. `Dimension width { kind: Linear; target: deck;+dimension: plate.width }` projects a bound toleranced Length; geometry consumes+its nominal. Record/Static origins are retained on the bound dimension. Literal+`value` and `tolerance: PlusMinus(...)` remain compatible but cannot be combined+with `dimension:`. Allowances must be nonnegative, quantities positive integers,+and kinds one of Thickness, Linear or Diameter.++Sheet PMI targets named regions, bends, parts, authored cuts and generated+features. `DatumFeature`, `Position` with `datumRefs`, and `Note` (legacy+`Annotation`) retain their existing AP242 roles and face associations. General+GD&T support is not implied. Check the exported result with `analyze --json`.+The complete [typed layout/release example](../../../fixtures/Regression/SheetMetalSemantics/modern-layout-release.firmament)+uses a Record requirement for both construction and PMI.++ProfileDelta fields use the same AST consumption and dimensional binding.+Prefer `anchor: FromStart(0mm)` / `FromEnd(...)` / `CenteredAt(...)`; the historic+`Anchor: FromStart 0mm` spelling remains a local compatibility production.### Coordinates and capability admission@@ -96,7 +155,7 @@ modifies the wall edge while preserving formed/flat semantic identity.Flat inspection distinguishes `MaterialArea` from `BoundingArea`. `MaterialArea` is exact line/arc integration of the final flat material contour after additive ProfileDelta regions, notches, holes, cutouts, and overlap clipping. `BoundingArea` is only the rectangular nesting envelope. If no validated exact blank contour exists, material area is reported as unavailable rather than reconstructed from feature bookkeeping.-Sheet Metal holes use `Hole Mount { On: Base; Center: (40mm, 20mm); Diameter: 8mm; }`. Model-domain `Hole<Shaft>` is deliberately rejected here with `sheetmetal-hole-domain-syntax`. `On` targets a named planar semantic region (`Base`, a named flange, or a verified exposed region/path), not `face(+Z)`. Manufacturing PMI likewise uses `DatumFeature A { Target: Base; }` inside `Pmi`, together with a named `Manufacturing` block; Model-domain `Datum`/`face(-Z)` syntax is rejected with `sheetmetal-pmi-domain-syntax`.+Sheet Metal holes use `Hole Mount { On: Base; Center: (40mm, 20mm); Diameter: 8mm; }`. Model-domain `Hole<Shaft>` is deliberately rejected here with `sheetmetal-hole-domain-syntax`. `On` targets a named planar semantic region (`Base`, a named flange, or a verified exposed region/path), not `face(+Z)`. Manufacturing PMI likewise uses `DatumFeature A { Target: Base; }` inside `Pmi`; Model-domain `Datum`/`face(-Z)` syntax is rejected with `sheetmetal-pmi-domain-syntax`.The JSON `part.features` count is the number of lowered cuts/openings in `SheetMetalPartIr`; bends are reported separately as `part.bends`. Authoring and imported reconstruction are separate workflows. Commands such as `sheetmetal recognize`, `recover-flat`, and `recover` operate on imported STEP and may be partial; they do not turn arbitrary geometry into authoritative authored intent.diff --git a/docs/public/firmament/syntax.md b/docs/public/firmament/syntax.mdindex ec9597f5..cf96706a 100644--- a/docs/public/firmament/syntax.md+++ b/docs/public/firmament/syntax.md@@ -432,6 +432,15 @@ Cut operations, subject to the sheet owner's rectangular-base and line/arc-cutcapabilities. This brings compact sheet authoring to mechanical profiles whilesharing closure, dimension and unknown-field checking.+[Sheet-metal layout and manufacturing](sheet-metal.md#layout-requirements-and-release-data)+now consume the shared AST and checked scalar Record/Static values. They admit+Point2/Vector2 layout expressions, Boolean Require, structural Concepts and typed+`dimension:` PMI projection, with sheet-specific target/capability admission.+Ordinary keyed Pattern/Feature mapping can produce sheet Hole/Cut results. This+shares frontend semantics while retaining the sheet region and bend lowerers;+it does not make mechanical face selectors or arbitrary-plane sheet operations+interchangeable with sheet region references.+**Complete file — a profile extruded from Z = 0 to 12mm:**```firmamentdiff --git a/fixtures/Regression/SheetMetalSemantics/README.md b/fixtures/Regression/SheetMetalSemantics/README.mdnew file mode 100644index 00000000..208283c2--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/README.md@@ -0,0 +1,33 @@+# Sheet-metal semantic/manufacturing admission corpus++These specimens preserve the 2026-10-16 audit's failing intent. Do not edit a+negative case to make it pass. The expected change is in its production owner.+The audit report under `docs/development/` records the original outcomes.++Run `python fixtures/Regression/SheetMetalSemantics/run.py` after building the+Release CLI. It checks validate/build agreement, structured errors, inspection,+and exported AP242 records. Output goes to ignored `artifacts/local/`.++Negative cases retain ignored fields/operations, unsupported XZ placement, a false+Require, missing structural members (with and without semicolons), ambiguous+legacy layout effects, unknown PMI, misspelled release fields, negative allowances,+zero quantities, unknown dimension kinds and duplicate PMI blocks.++Positive compatibility cases retain original geometry for Point2/tuple spellings,+newline fields, lexical Datum resolution, unnamed PMI and legacy Slot/Rectangle+capsules. Former manufacturing limitations now admit quoted comment markers,+authored-hole PMI targets and typed dimension binding.++`modern-layout-release.firmament` demonstrates scoped layout, Record tolerances,+Concept checks, process metadata and explicit PMI. `keyed-features.firmament` and+`keyed-profile-cuts.firmament` exercise the ordinary Set/Feature/Pattern owners+feeding the existing sheet Hole/Cut consumers. The companion .NET tests assert+geometry, centers, stable IDs, exact area, binding origins and AP242 associations.++`shared-construction-layout.firmament` checks that ordinary Point2/Rect2 design+data and a lowercase XY frame retain the shared Profile owner and scalar values.++Multiple implicit legacy effect bundles reject; selecting one with `intent:` is+not implemented. Put new material operations in the consuming SheetMetal body.+The misleading legacy Pattern Rectangle alias remains a capsule for geometry+compatibility. It is not a spelling recommendation for new rectangular cuts.diff --git a/fixtures/Regression/SheetMetalSemantics/keyed-features.firmament b/fixtures/Regression/SheetMetalSemantics/keyed-features.firmamentnew file mode 100644index 00000000..149790b8--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/keyed-features.firmament@@ -0,0 +1,16 @@+Static drillDiameter: Length = 6mm tol 0.1mm+Static mounts: Set<Point2> {+ left => Point2(20mm, 30mm)+ right => Point2(80mm, 30mm)+}+Feature Drill(center: Point2, diameter: Length) -> Hole {+ return Hole { on: deck; center: center; diameter: diameter }+}+SheetMetal keyedPanel {+ thickness: 1.5mm+ Base deck { profile: Rectangle { width: 100mm; height: 60mm } }+ Pattern mounting over mounts { point => Drill(center: point, diameter: drillDiameter) }+ Pmi {+ Dimension leftDrill { kind: Diameter; target: mounting.left; dimension: drillDiameter }+ }+}diff --git a/fixtures/Regression/SheetMetalSemantics/keyed-profile-cuts.firmament b/fixtures/Regression/SheetMetalSemantics/keyed-profile-cuts.firmamentnew file mode 100644index 00000000..c7f78154--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/keyed-profile-cuts.firmament@@ -0,0 +1,14 @@+Profile opening = Slot2 { center: [0mm, 0mm]; length: 12mm; width: 6mm }+Static locations: Set<Point2> {+ left => Point2(20mm, 30mm)+ right => Point2(80mm, 30mm)+}+Feature Vent(center: Point2) -> Cut {+ return Cut { on: deck; profile: opening; at: center }+}+SheetMetal ventPanel {+ thickness: 1.5mm+ Base deck { profile: Rectangle { width: 100mm; height: 60mm } }+ Pattern vents over locations { point => Vent(point) }+ Pmi { Note leftVent { target: vents.left; text: "Exact shared Slot2 boundary" } }+}diff --git a/fixtures/Regression/SheetMetalSemantics/layout-contract-missing.firmament b/fixtures/Regression/SheetMetalSemantics/layout-contract-missing.firmamentnew file mode 100644index 00000000..94c9fcd8--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/layout-contract-missing.firmament@@ -0,0 +1,23 @@+Concept SemanticPanelIntent {+ Missing: SheetRegion+ MountingHoles: SheetPattern+ Flat: FlatPattern+}++Concept Struct PanelLayout {+ Datum MountingPatternCenter { On: Panel; At: Panel.Center; }+ Pattern MountingHoles {+ On: Panel;+ Feature: Circle { Diameter: 6mm; };+ Center: MountingPatternCenter;+ Count: 4;+ Pitch: (20mm, 0mm);+ }+}++SheetMetal SemanticPanel : SemanticPanelIntent {+ Thickness: 1.5mm;+ KFactor: 0.42;+ Base Panel { Profile: Rectangle { Width: 100mm; Height: 60mm; }; }+ Flange RearLip { From: Panel.Rear; Height: 15mm; Angle: 90deg; Radius: 2mm; Direction: Up; }+}diff --git a/fixtures/Regression/SheetMetalSemantics/layout-contract-semicolon.firmament b/fixtures/Regression/SheetMetalSemantics/layout-contract-semicolon.firmamentnew file mode 100644index 00000000..316658e7--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/layout-contract-semicolon.firmament@@ -0,0 +1,23 @@+Concept SemanticPanelIntent {+ Missing: SheetRegion;+ MountingHoles: SheetPattern+ Flat: FlatPattern+}++Concept Struct PanelLayout {+ Datum MountingPatternCenter { On: Panel; At: Panel.Center; }+ Pattern MountingHoles {+ On: Panel;+ Feature: Circle { Diameter: 6mm; };+ Center: MountingPatternCenter;+ Count: 4;+ Pitch: (20mm, 0mm);+ }+}++SheetMetal SemanticPanel : SemanticPanelIntent {+ Thickness: 1.5mm;+ KFactor: 0.42;+ Base Panel { Profile: Rectangle { Width: 100mm; Height: 60mm; }; }+ Flange RearLip { From: Panel.Rear; Height: 15mm; Angle: 90deg; Radius: 2mm; Direction: Up; }+}diff --git a/fixtures/Regression/SheetMetalSemantics/layout-extra-unused-pattern.firmament b/fixtures/Regression/SheetMetalSemantics/layout-extra-unused-pattern.firmamentnew file mode 100644index 00000000..ead399f1--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/layout-extra-unused-pattern.firmament@@ -0,0 +1,24 @@+Concept SemanticPanelIntent {+ Panel: SheetRegion+ MountingHoles: SheetPattern+ Flat: FlatPattern+}++Concept Struct PanelLayout {+ Datum MountingPatternCenter { On: Panel; At: Panel.Center; }+ Pattern MountingHoles {+ On: Panel;+ Feature: Circle { Diameter: 6mm; };+ Center: MountingPatternCenter;+ Count: 4;+ Pitch: (20mm, 0mm);+ }+}++Concept Struct Unused { Pattern Extra { On: Panel; Feature: Circle { Diameter: 2mm; }; Center: (50mm, 40mm); Count: 1; Pitch: (10mm, 0mm); } }+SheetMetal SemanticPanel : SemanticPanelIntent {+ Thickness: 1.5mm;+ KFactor: 0.42;+ Base Panel { Profile: Rectangle { Width: 100mm; Height: 60mm; }; }+ Flange RearLip { From: Panel.Rear; Height: 15mm; Angle: 90deg; Radius: 2mm; Direction: Up; }+}diff --git a/fixtures/Regression/SheetMetalSemantics/layout-false-require.firmament b/fixtures/Regression/SheetMetalSemantics/layout-false-require.firmamentnew file mode 100644index 00000000..b8509b04--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/layout-false-require.firmament@@ -0,0 +1,24 @@+Concept SemanticPanelIntent {+ Panel: SheetRegion+ MountingHoles: SheetPattern+ Flat: FlatPattern+}++Concept Struct PanelLayout {+ Datum MountingPatternCenter { On: Panel; At: Panel.Center; }+ Pattern MountingHoles {+ On: Panel;+ Feature: Circle { Diameter: 6mm; };+ Center: MountingPatternCenter;+ Count: 4;+ Pitch: (20mm, 0mm);+ }+}++SheetMetal SemanticPanel : SemanticPanelIntent {+ Require impossible => false+ Thickness: 1.5mm;+ KFactor: 0.42;+ Base Panel { Profile: Rectangle { Width: 100mm; Height: 60mm; }; }+ Flange RearLip { From: Panel.Rear; Height: 15mm; Angle: 90deg; Radius: 2mm; Direction: Up; }+}diff --git a/fixtures/Regression/SheetMetalSemantics/layout-modern-xz.firmament b/fixtures/Regression/SheetMetalSemantics/layout-modern-xz.firmamentnew file mode 100644index 00000000..8df507d2--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/layout-modern-xz.firmament@@ -0,0 +1,23 @@+Concept SemanticPanelIntent {+ Panel: SheetRegion+ MountingHoles: SheetPattern+ Flat: FlatPattern+}++Concept Struct PanelLayout on XZ {+ Datum MountingPatternCenter { On: Panel; At: Panel.Center; }+ Pattern MountingHoles {+ On: Panel;+ Feature: Circle { Diameter: 6mm; };+ Center: MountingPatternCenter;+ Count: 4;+ Pitch: (20mm, 0mm);+ }+}++SheetMetal SemanticPanel : SemanticPanelIntent {+ Thickness: 1.5mm;+ KFactor: 0.42;+ Base Panel { Profile: Rectangle { Width: 100mm; Height: 60mm; }; }+ Flange RearLip { From: Panel.Rear; Height: 15mm; Angle: 90deg; Radius: 2mm; Direction: Up; }+}diff --git a/fixtures/Regression/SheetMetalSemantics/layout-no-semicolons.firmament b/fixtures/Regression/SheetMetalSemantics/layout-no-semicolons.firmamentnew file mode 100644index 00000000..a786067b--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/layout-no-semicolons.firmament@@ -0,0 +1,23 @@+Concept SemanticPanelIntent {+ Panel: SheetRegion+ MountingHoles: SheetPattern+ Flat: FlatPattern+}++Concept Struct PanelLayout {+ Datum MountingPatternCenter { On: Panel; At: Panel.Center; }+ Pattern MountingHoles {+ On: Panel;+ Feature: Circle { Diameter: 6mm; };+ Center: MountingPatternCenter;+ Count: 4+ Pitch: (20mm, 0mm)+ }+}++SheetMetal SemanticPanel : SemanticPanelIntent {+ Thickness: 1.5mm;+ KFactor: 0.42;+ Base Panel { Profile: Rectangle { Width: 100mm; Height: 60mm; }; }+ Flange RearLip { From: Panel.Rear; Height: 15mm; Angle: 90deg; Radius: 2mm; Direction: Up; }+}diff --git a/fixtures/Regression/SheetMetalSemantics/layout-point2.firmament b/fixtures/Regression/SheetMetalSemantics/layout-point2.firmamentnew file mode 100644index 00000000..4a9c3fe3--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/layout-point2.firmament@@ -0,0 +1,23 @@+Concept SemanticPanelIntent {+ Panel: SheetRegion+ MountingHoles: SheetPattern+ Flat: FlatPattern+}++Concept Struct PanelLayout {+ Datum MountingPatternCenter { On: Panel; At: Point2(50mm, 30mm); }+ Pattern MountingHoles {+ On: Panel;+ Feature: Circle { Diameter: 6mm; };+ Center: MountingPatternCenter;+ Count: 4;+ Pitch: (20mm, 0mm);+ }+}++SheetMetal SemanticPanel : SemanticPanelIntent {+ Thickness: 1.5mm;+ KFactor: 0.42;+ Base Panel { Profile: Rectangle { Width: 100mm; Height: 60mm; }; }+ Flange RearLip { From: Panel.Rear; Height: 15mm; Angle: 90deg; Radius: 2mm; Direction: Up; }+}diff --git a/fixtures/Regression/SheetMetalSemantics/layout-rectangle.firmament b/fixtures/Regression/SheetMetalSemantics/layout-rectangle.firmamentnew file mode 100644index 00000000..d31bcf32--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/layout-rectangle.firmament@@ -0,0 +1,23 @@+Concept SemanticPanelIntent {+ Panel: SheetRegion+ MountingHoles: SheetPattern+ Flat: FlatPattern+}++Concept Struct PanelLayout {+ Datum MountingPatternCenter { On: Panel; At: Panel.Center; }+ Pattern MountingHoles {+ On: Panel;+ Feature: Rectangle { Width: 4mm; Length: 10mm; };+ Center: MountingPatternCenter;+ Count: 1;+ Pitch: (20mm, 0mm);+ }+}++SheetMetal SemanticPanel : SemanticPanelIntent {+ Thickness: 1.5mm;+ KFactor: 0.42;+ Base Panel { Profile: Rectangle { Width: 100mm; Height: 60mm; }; }+ Flange RearLip { From: Panel.Rear; Height: 15mm; Angle: 90deg; Radius: 2mm; Direction: Up; }+}diff --git a/fixtures/Regression/SheetMetalSemantics/layout-slot.firmament b/fixtures/Regression/SheetMetalSemantics/layout-slot.firmamentnew file mode 100644index 00000000..d1a6f760--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/layout-slot.firmament@@ -0,0 +1,23 @@+Concept SemanticPanelIntent {+ Panel: SheetRegion+ MountingHoles: SheetPattern+ Flat: FlatPattern+}++Concept Struct PanelLayout {+ Datum MountingPatternCenter { On: Panel; At: Panel.Center; }+ Pattern MountingHoles {+ On: Panel;+ Feature: Slot { Width: 4mm; Length: 10mm; };+ Center: MountingPatternCenter;+ Count: 1;+ Pitch: (20mm, 0mm);+ }+}++SheetMetal SemanticPanel : SemanticPanelIntent {+ Thickness: 1.5mm;+ KFactor: 0.42;+ Base Panel { Profile: Rectangle { Width: 100mm; Height: 60mm; }; }+ Flange RearLip { From: Panel.Rear; Height: 15mm; Angle: 90deg; Radius: 2mm; Direction: Up; }+}diff --git a/fixtures/Regression/SheetMetalSemantics/layout-suffix-capture.firmament b/fixtures/Regression/SheetMetalSemantics/layout-suffix-capture.firmamentnew file mode 100644index 00000000..33485ab3--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/layout-suffix-capture.firmament@@ -0,0 +1,24 @@+Concept Struct Other { Datum MountingPatternCenter { On: Panel; At: (55mm, 30mm); } }+Concept SemanticPanelIntent {+ Panel: SheetRegion+ MountingHoles: SheetPattern+ Flat: FlatPattern+}++Concept Struct PanelLayout {+ Datum MountingPatternCenter { On: Panel; At: Panel.Center; }+ Pattern MountingHoles {+ On: Panel;+ Feature: Circle { Diameter: 6mm; };+ Center: MountingPatternCenter;+ Count: 4;+ Pitch: (20mm, 0mm);+ }+}++SheetMetal SemanticPanel : SemanticPanelIntent {+ Thickness: 1.5mm;+ KFactor: 0.42;+ Base Panel { Profile: Rectangle { Width: 100mm; Height: 60mm; }; }+ Flange RearLip { From: Panel.Rear; Height: 15mm; Angle: 90deg; Radius: 2mm; Direction: Up; }+}diff --git a/fixtures/Regression/SheetMetalSemantics/layout-unknown-feature-field.firmament b/fixtures/Regression/SheetMetalSemantics/layout-unknown-feature-field.firmamentnew file mode 100644index 00000000..5c38ffa7--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/layout-unknown-feature-field.firmament@@ -0,0 +1,23 @@+Concept SemanticPanelIntent {+ Panel: SheetRegion+ MountingHoles: SheetPattern+ Flat: FlatPattern+}++Concept Struct PanelLayout {+ Datum MountingPatternCenter { On: Panel; At: Panel.Center; }+ Pattern MountingHoles {+ On: Panel;+ Feature: Circle { Diameter: 6mm; Depth: 100mm; };+ Center: MountingPatternCenter;+ Count: 4;+ Pitch: (20mm, 0mm);+ }+}++SheetMetal SemanticPanel : SemanticPanelIntent {+ Thickness: 1.5mm;+ KFactor: 0.42;+ Base Panel { Profile: Rectangle { Width: 100mm; Height: 60mm; }; }+ Flange RearLip { From: Panel.Rear; Height: 15mm; Angle: 90deg; Radius: 2mm; Direction: Up; }+}diff --git a/fixtures/Regression/SheetMetalSemantics/layout-unknown-field.firmament b/fixtures/Regression/SheetMetalSemantics/layout-unknown-field.firmamentnew file mode 100644index 00000000..66eb3526--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/layout-unknown-field.firmament@@ -0,0 +1,23 @@+Concept SemanticPanelIntent {+ Panel: SheetRegion+ MountingHoles: SheetPattern+ Flat: FlatPattern+}++Concept Struct PanelLayout {+ Datum MountingPatternCenter { On: Panel; At: Panel.Center; }+ Pattern MountingHoles {+ On: Panel;+ Feature: Circle { Diameter: 6mm; };+ Center: MountingPatternCenter;+ Count: 4; Coutn: 9;+ Pitch: (20mm, 0mm);+ }+}++SheetMetal SemanticPanel : SemanticPanelIntent {+ Thickness: 1.5mm;+ KFactor: 0.42;+ Base Panel { Profile: Rectangle { Width: 100mm; Height: 60mm; }; }+ Flange RearLip { From: Panel.Rear; Height: 15mm; Angle: 90deg; Radius: 2mm; Direction: Up; }+}diff --git a/fixtures/Regression/SheetMetalSemantics/layout-unknown-statement.firmament b/fixtures/Regression/SheetMetalSemantics/layout-unknown-statement.firmamentnew file mode 100644index 00000000..2a20b951--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/layout-unknown-statement.firmament@@ -0,0 +1,23 @@+Concept SemanticPanelIntent {+ Panel: SheetRegion+ MountingHoles: SheetPattern+ Flat: FlatPattern+}++Concept Struct PanelLayout { Fillet ignored { radius: 5mm; }+ Datum MountingPatternCenter { On: Panel; At: Panel.Center; }+ Pattern MountingHoles {+ On: Panel;+ Feature: Circle { Diameter: 6mm; };+ Center: MountingPatternCenter;+ Count: 4;+ Pitch: (20mm, 0mm);+ }+}++SheetMetal SemanticPanel : SemanticPanelIntent {+ Thickness: 1.5mm;+ KFactor: 0.42;+ Base Panel { Profile: Rectangle { Width: 100mm; Height: 60mm; }; }+ Flange RearLip { From: Panel.Rear; Height: 15mm; Angle: 90deg; Radius: 2mm; Direction: Up; }+}diff --git a/fixtures/Regression/SheetMetalSemantics/manufacturing-comment-in-string.firmament b/fixtures/Regression/SheetMetalSemantics/manufacturing-comment-in-string.firmamentnew file mode 100644index 00000000..3d28a22a--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/manufacturing-comment-in-string.firmament@@ -0,0 +1,76 @@+// Investor demonstration: manufacturing-authoritative 5052-H32 formed bracket.+// The prompt is intentionally terse; the assumptions below remain explicit review items.++Concept Struct InvestorBracketLayout {+ Datum BaseMountCenter { On: BasePlate; At: (50mm, 25mm); }+ Datum UprightMountCenter { On: Upright; At: (50mm, 25mm); }++ Pattern BaseMountPattern {+ On: BasePlate;+ Feature: Circle { Diameter: 6.6mm; };+ Center: BaseMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }++ Pattern UprightMountPattern {+ On: Upright;+ Feature: Circle { Diameter: 6.6mm; };+ Center: UprightMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }+}++Manufacturing InvestorBracketRelease {+ MaterialSpecification: "ASTM B209 5052-H32 aluminium sheet, mill finish";+ ThicknessTolerance: PlusMinus(0.12mm, 0.12mm);+ BlankProcess: "CNC // process specification";+ FormingProcess: "CNC press brake; 3 mm inside radius tooling; K-factor 0.42";+ GeneralCutTolerance: 0.25mm;+ GeneralFormedTolerance: 0.5mm;+ GeneralAngularTolerance: 1deg;+}++Pmi InvestorBracketPmi {+ DatumFeature A { Target: BasePlate; }+ DatumFeature B { Target: Upright; }++ Dimension SheetThickness { Kind: Thickness; Target: InvestorBracket; Value: 2mm; Tolerance: PlusMinus(0.12mm, 0.12mm); }+ Dimension BaseWidth { Kind: Linear; Target: BasePlate; Value: 100mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseDepth { Kind: Linear; Target: BasePlate; Value: 70mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.BaseMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 2; }+ Dimension UprightMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.UprightMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 2; }++ Position BaseMountPosition { Target: InvestorBracketLayout.BaseMountPattern; Tolerance: 0.30mm; DatumRefs: [A, B]; Quantity: 2; }+ Position UprightMountPosition { Target: InvestorBracketLayout.UprightMountPattern; Tolerance: 0.40mm; DatumRefs: [A, B]; Quantity: 2; }++ Annotation MaterialAndFinish { Target: InvestorBracket; Text: "ASTM B209 5052-H32 aluminium sheet, 2.0 +/-0.12 mm, mill finish."; }+ Annotation CutAndDeburr { Target: InvestorBracket; Text: "Cut before forming. Remove burrs and sharp edges; break edges 0.2-0.5 mm."; }+ Annotation Forming { Target: UprightBend; Text: "Form to 90 +/-1 degree with 3 mm inside radius; reject visible cracking."; }+ Annotation CounterboreReview { Target: InvestorBracketLayout.UprightMountPattern; Text: "Counterbores are intentionally not applied to 2 mm sheet. Confirm fastener head strategy; use washers, countersink-qualified tooling, or captive hardware as appropriate."; }+}++SheetMetal InvestorBracket {+ Intent: Manufacturing;+ Thickness: 2mm;+ KFactor: 0.42;+ Material: "ASTM B209 5052-H32 aluminium sheet";++ Base BasePlate {+ Profile: Rectangle { Width: 100mm; Height: 70mm; };+ }++ Flange Upright {+ From: BasePlate.Rear;+ Height: 60mm;+ Angle: 90deg;+ Radius: 3mm;+ Direction: Up;+ StartTermination: Rounded;+ StartTerminationRadius: 2mm;+ EndTermination: Rounded;+ EndTerminationRadius: 2mm;+ }++}diff --git a/fixtures/Regression/SheetMetalSemantics/manufacturing-direct-hole-target.firmament b/fixtures/Regression/SheetMetalSemantics/manufacturing-direct-hole-target.firmamentnew file mode 100644index 00000000..f98c2239--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/manufacturing-direct-hole-target.firmament@@ -0,0 +1,76 @@+// Investor demonstration: manufacturing-authoritative 5052-H32 formed bracket.+// The prompt is intentionally terse; the assumptions below remain explicit review items.++Concept Struct InvestorBracketLayout {+ Datum BaseMountCenter { On: BasePlate; At: (50mm, 25mm); }+ Datum UprightMountCenter { On: Upright; At: (50mm, 25mm); }++ Pattern BaseMountPattern {+ On: BasePlate;+ Feature: Circle { Diameter: 6.6mm; };+ Center: BaseMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }++ Pattern UprightMountPattern {+ On: Upright;+ Feature: Circle { Diameter: 6.6mm; };+ Center: UprightMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }+}++Manufacturing InvestorBracketRelease {+ MaterialSpecification: "ASTM B209 5052-H32 aluminium sheet, mill finish";+ ThicknessTolerance: PlusMinus(0.12mm, 0.12mm);+ BlankProcess: "CNC laser cut or CNC punch; cut all holes before forming";+ FormingProcess: "CNC press brake; 3 mm inside radius tooling; K-factor 0.42";+ GeneralCutTolerance: 0.25mm;+ GeneralFormedTolerance: 0.5mm;+ GeneralAngularTolerance: 1deg;+}++Pmi InvestorBracketPmi {+ DatumFeature A { Target: BasePlate; }+ DatumFeature B { Target: Upright; }++ Dimension SheetThickness { Kind: Thickness; Target: InvestorBracket; Value: 2mm; Tolerance: PlusMinus(0.12mm, 0.12mm); }+ Dimension BaseWidth { Kind: Linear; Target: BasePlate; Value: 100mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseDepth { Kind: Linear; Target: BasePlate; Value: 70mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseMountDiameter { Kind: Diameter; Target: Extra; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 2; }+ Dimension UprightMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.UprightMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 2; }++ Position BaseMountPosition { Target: Extra; Tolerance: 0.30mm; DatumRefs: [A, B]; Quantity: 2; }+ Position UprightMountPosition { Target: InvestorBracketLayout.UprightMountPattern; Tolerance: 0.40mm; DatumRefs: [A, B]; Quantity: 2; }++ Annotation MaterialAndFinish { Target: InvestorBracket; Text: "ASTM B209 5052-H32 aluminium sheet, 2.0 +/-0.12 mm, mill finish."; }+ Annotation CutAndDeburr { Target: InvestorBracket; Text: "Cut before forming. Remove burrs and sharp edges; break edges 0.2-0.5 mm."; }+ Annotation Forming { Target: UprightBend; Text: "Form to 90 +/-1 degree with 3 mm inside radius; reject visible cracking."; }+ Annotation CounterboreReview { Target: InvestorBracketLayout.UprightMountPattern; Text: "Counterbores are intentionally not applied to 2 mm sheet. Confirm fastener head strategy; use washers, countersink-qualified tooling, or captive hardware as appropriate."; }+}++SheetMetal InvestorBracket {+ Intent: Manufacturing;+ Thickness: 2mm; Hole Extra { on: BasePlate; center: Point2(50mm, 45mm); diameter: 3mm; }+ KFactor: 0.42;+ Material: "ASTM B209 5052-H32 aluminium sheet";++ Base BasePlate {+ Profile: Rectangle { Width: 100mm; Height: 70mm; };+ }++ Flange Upright {+ From: BasePlate.Rear;+ Height: 60mm;+ Angle: 90deg;+ Radius: 3mm;+ Direction: Up;+ StartTermination: Rounded;+ StartTerminationRadius: 2mm;+ EndTermination: Rounded;+ EndTerminationRadius: 2mm;+ }++}diff --git a/fixtures/Regression/SheetMetalSemantics/manufacturing-negative-tolerance.firmament b/fixtures/Regression/SheetMetalSemantics/manufacturing-negative-tolerance.firmamentnew file mode 100644index 00000000..c8bfe245--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/manufacturing-negative-tolerance.firmament@@ -0,0 +1,76 @@+// Investor demonstration: manufacturing-authoritative 5052-H32 formed bracket.+// The prompt is intentionally terse; the assumptions below remain explicit review items.++Concept Struct InvestorBracketLayout {+ Datum BaseMountCenter { On: BasePlate; At: (50mm, 25mm); }+ Datum UprightMountCenter { On: Upright; At: (50mm, 25mm); }++ Pattern BaseMountPattern {+ On: BasePlate;+ Feature: Circle { Diameter: 6.6mm; };+ Center: BaseMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }++ Pattern UprightMountPattern {+ On: Upright;+ Feature: Circle { Diameter: 6.6mm; };+ Center: UprightMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }+}++Manufacturing InvestorBracketRelease {+ MaterialSpecification: "ASTM B209 5052-H32 aluminium sheet, mill finish";+ ThicknessTolerance: PlusMinus(-0.12mm, -0.12mm);+ BlankProcess: "CNC laser cut or CNC punch; cut all holes before forming";+ FormingProcess: "CNC press brake; 3 mm inside radius tooling; K-factor 0.42";+ GeneralCutTolerance: 0.25mm;+ GeneralFormedTolerance: 0.5mm;+ GeneralAngularTolerance: 1deg;+}++Pmi InvestorBracketPmi {+ DatumFeature A { Target: BasePlate; }+ DatumFeature B { Target: Upright; }++ Dimension SheetThickness { Kind: Thickness; Target: InvestorBracket; Value: 2mm; Tolerance: PlusMinus(-0.12mm, -0.12mm); }+ Dimension BaseWidth { Kind: Linear; Target: BasePlate; Value: 100mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseDepth { Kind: Linear; Target: BasePlate; Value: 70mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.BaseMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 2; }+ Dimension UprightMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.UprightMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 2; }++ Position BaseMountPosition { Target: InvestorBracketLayout.BaseMountPattern; Tolerance: 0.30mm; DatumRefs: [A, B]; Quantity: 2; }+ Position UprightMountPosition { Target: InvestorBracketLayout.UprightMountPattern; Tolerance: 0.40mm; DatumRefs: [A, B]; Quantity: 2; }++ Annotation MaterialAndFinish { Target: InvestorBracket; Text: "ASTM B209 5052-H32 aluminium sheet, 2.0 +/-0.12 mm, mill finish."; }+ Annotation CutAndDeburr { Target: InvestorBracket; Text: "Cut before forming. Remove burrs and sharp edges; break edges 0.2-0.5 mm."; }+ Annotation Forming { Target: UprightBend; Text: "Form to 90 +/-1 degree with 3 mm inside radius; reject visible cracking."; }+ Annotation CounterboreReview { Target: InvestorBracketLayout.UprightMountPattern; Text: "Counterbores are intentionally not applied to 2 mm sheet. Confirm fastener head strategy; use washers, countersink-qualified tooling, or captive hardware as appropriate."; }+}++SheetMetal InvestorBracket {+ Intent: Manufacturing;+ Thickness: 2mm;+ KFactor: 0.42;+ Material: "ASTM B209 5052-H32 aluminium sheet";++ Base BasePlate {+ Profile: Rectangle { Width: 100mm; Height: 70mm; };+ }++ Flange Upright {+ From: BasePlate.Rear;+ Height: 60mm;+ Angle: 90deg;+ Radius: 3mm;+ Direction: Up;+ StartTermination: Rounded;+ StartTerminationRadius: 2mm;+ EndTermination: Rounded;+ EndTerminationRadius: 2mm;+ }++}diff --git a/fixtures/Regression/SheetMetalSemantics/manufacturing-second-pmi.firmament b/fixtures/Regression/SheetMetalSemantics/manufacturing-second-pmi.firmamentnew file mode 100644index 00000000..e2dbe9cd--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/manufacturing-second-pmi.firmament@@ -0,0 +1,78 @@+// Investor demonstration: manufacturing-authoritative 5052-H32 formed bracket.+// The prompt is intentionally terse; the assumptions below remain explicit review items.++Concept Struct InvestorBracketLayout {+ Datum BaseMountCenter { On: BasePlate; At: (50mm, 25mm); }+ Datum UprightMountCenter { On: Upright; At: (50mm, 25mm); }++ Pattern BaseMountPattern {+ On: BasePlate;+ Feature: Circle { Diameter: 6.6mm; };+ Center: BaseMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }++ Pattern UprightMountPattern {+ On: Upright;+ Feature: Circle { Diameter: 6.6mm; };+ Center: UprightMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }+}++Manufacturing InvestorBracketRelease {+ MaterialSpecification: "ASTM B209 5052-H32 aluminium sheet, mill finish";+ ThicknessTolerance: PlusMinus(0.12mm, 0.12mm);+ BlankProcess: "CNC laser cut or CNC punch; cut all holes before forming";+ FormingProcess: "CNC press brake; 3 mm inside radius tooling; K-factor 0.42";+ GeneralCutTolerance: 0.25mm;+ GeneralFormedTolerance: 0.5mm;+ GeneralAngularTolerance: 1deg;+}++Pmi InvestorBracketPmi {+ DatumFeature A { Target: BasePlate; }+ DatumFeature B { Target: Upright; }++ Dimension SheetThickness { Kind: Thickness; Target: InvestorBracket; Value: 2mm; Tolerance: PlusMinus(0.12mm, 0.12mm); }+ Dimension BaseWidth { Kind: Linear; Target: BasePlate; Value: 100mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseDepth { Kind: Linear; Target: BasePlate; Value: 70mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.BaseMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 2; }+ Dimension UprightMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.UprightMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 2; }++ Position BaseMountPosition { Target: InvestorBracketLayout.BaseMountPattern; Tolerance: 0.30mm; DatumRefs: [A, B]; Quantity: 2; }+ Position UprightMountPosition { Target: InvestorBracketLayout.UprightMountPattern; Tolerance: 0.40mm; DatumRefs: [A, B]; Quantity: 2; }++ Annotation MaterialAndFinish { Target: InvestorBracket; Text: "ASTM B209 5052-H32 aluminium sheet, 2.0 +/-0.12 mm, mill finish."; }+ Annotation CutAndDeburr { Target: InvestorBracket; Text: "Cut before forming. Remove burrs and sharp edges; break edges 0.2-0.5 mm."; }+ Annotation Forming { Target: UprightBend; Text: "Form to 90 +/-1 degree with 3 mm inside radius; reject visible cracking."; }+ Annotation CounterboreReview { Target: InvestorBracketLayout.UprightMountPattern; Text: "Counterbores are intentionally not applied to 2 mm sheet. Confirm fastener head strategy; use washers, countersink-qualified tooling, or captive hardware as appropriate."; }+}++SheetMetal InvestorBracket {+ Intent: Manufacturing;+ Thickness: 2mm;+ KFactor: 0.42;+ Material: "ASTM B209 5052-H32 aluminium sheet";++ Base BasePlate {+ Profile: Rectangle { Width: 100mm; Height: 70mm; };+ }++ Flange Upright {+ From: BasePlate.Rear;+ Height: 60mm;+ Angle: 90deg;+ Radius: 3mm;+ Direction: Up;+ StartTermination: Rounded;+ StartTerminationRadius: 2mm;+ EndTermination: Rounded;+ EndTerminationRadius: 2mm;+ }++}++Pmi Second { Annotation Extra { Target: InvestorBracket; Text: "Must survive"; } }diff --git a/fixtures/Regression/SheetMetalSemantics/manufacturing-typed-dimension.firmament b/fixtures/Regression/SheetMetalSemantics/manufacturing-typed-dimension.firmamentnew file mode 100644index 00000000..3ef426dd--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/manufacturing-typed-dimension.firmament@@ -0,0 +1,77 @@+// Investor demonstration: manufacturing-authoritative 5052-H32 formed bracket.+// The prompt is intentionally terse; the assumptions below remain explicit review items.++Concept Struct InvestorBracketLayout {+ Datum BaseMountCenter { On: BasePlate; At: (50mm, 25mm); }+ Datum UprightMountCenter { On: Upright; At: (50mm, 25mm); }++ Pattern BaseMountPattern {+ On: BasePlate;+ Feature: Circle { Diameter: 6.6mm; };+ Center: BaseMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }++ Pattern UprightMountPattern {+ On: Upright;+ Feature: Circle { Diameter: 6.6mm; };+ Center: UprightMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }+}++Static plateWidth: Length = 100mm tol 0.25mm+Manufacturing InvestorBracketRelease {+ MaterialSpecification: "ASTM B209 5052-H32 aluminium sheet, mill finish";+ ThicknessTolerance: PlusMinus(0.12mm, 0.12mm);+ BlankProcess: "CNC laser cut or CNC punch; cut all holes before forming";+ FormingProcess: "CNC press brake; 3 mm inside radius tooling; K-factor 0.42";+ GeneralCutTolerance: 0.25mm;+ GeneralFormedTolerance: 0.5mm;+ GeneralAngularTolerance: 1deg;+}++Pmi InvestorBracketPmi {+ DatumFeature A { Target: BasePlate; }+ DatumFeature B { Target: Upright; }++ Dimension SheetThickness { Kind: Thickness; Target: InvestorBracket; Value: 2mm; Tolerance: PlusMinus(0.12mm, 0.12mm); }+ Dimension BaseWidth { Kind: Linear; Target: BasePlate; dimension: plateWidth; }+ Dimension BaseDepth { Kind: Linear; Target: BasePlate; Value: 70mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.BaseMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 2; }+ Dimension UprightMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.UprightMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 2; }++ Position BaseMountPosition { Target: InvestorBracketLayout.BaseMountPattern; Tolerance: 0.30mm; DatumRefs: [A, B]; Quantity: 2; }+ Position UprightMountPosition { Target: InvestorBracketLayout.UprightMountPattern; Tolerance: 0.40mm; DatumRefs: [A, B]; Quantity: 2; }++ Annotation MaterialAndFinish { Target: InvestorBracket; Text: "ASTM B209 5052-H32 aluminium sheet, 2.0 +/-0.12 mm, mill finish."; }+ Annotation CutAndDeburr { Target: InvestorBracket; Text: "Cut before forming. Remove burrs and sharp edges; break edges 0.2-0.5 mm."; }+ Annotation Forming { Target: UprightBend; Text: "Form to 90 +/-1 degree with 3 mm inside radius; reject visible cracking."; }+ Annotation CounterboreReview { Target: InvestorBracketLayout.UprightMountPattern; Text: "Counterbores are intentionally not applied to 2 mm sheet. Confirm fastener head strategy; use washers, countersink-qualified tooling, or captive hardware as appropriate."; }+}++SheetMetal InvestorBracket {+ Intent: Manufacturing;+ Thickness: 2mm;+ KFactor: 0.42;+ Material: "ASTM B209 5052-H32 aluminium sheet";++ Base BasePlate {+ Profile: Rectangle { Width: 100mm; Height: 70mm; };+ }++ Flange Upright {+ From: BasePlate.Rear;+ Height: 60mm;+ Angle: 90deg;+ Radius: 3mm;+ Direction: Up;+ StartTermination: Rounded;+ StartTerminationRadius: 2mm;+ EndTermination: Rounded;+ EndTerminationRadius: 2mm;+ }++}diff --git a/fixtures/Regression/SheetMetalSemantics/manufacturing-unknown-field.firmament b/fixtures/Regression/SheetMetalSemantics/manufacturing-unknown-field.firmamentnew file mode 100644index 00000000..f59b4d62--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/manufacturing-unknown-field.firmament@@ -0,0 +1,76 @@+// Investor demonstration: manufacturing-authoritative 5052-H32 formed bracket.+// The prompt is intentionally terse; the assumptions below remain explicit review items.++Concept Struct InvestorBracketLayout {+ Datum BaseMountCenter { On: BasePlate; At: (50mm, 25mm); }+ Datum UprightMountCenter { On: Upright; At: (50mm, 25mm); }++ Pattern BaseMountPattern {+ On: BasePlate;+ Feature: Circle { Diameter: 6.6mm; };+ Center: BaseMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }++ Pattern UprightMountPattern {+ On: Upright;+ Feature: Circle { Diameter: 6.6mm; };+ Center: UprightMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }+}++Manufacturing InvestorBracketRelease {+ MaterialSpecification: "ASTM B209 5052-H32 aluminium sheet, mill finish";+ ThicknessTolerance: PlusMinus(0.12mm, 0.12mm);+ BlankProcess: "CNC laser cut or CNC punch; cut all holes before forming";+ FormingProcess: "CNC press brake; 3 mm inside radius tooling; K-factor 0.42";+ GeneralCutTolerence: 0.25mm;+ GeneralFormedTolerance: 0.5mm;+ GeneralAngularTolerance: 1deg;+}++Pmi InvestorBracketPmi {+ DatumFeature A { Target: BasePlate; }+ DatumFeature B { Target: Upright; }++ Dimension SheetThickness { Kind: Thickness; Target: InvestorBracket; Value: 2mm; Tolerance: PlusMinus(0.12mm, 0.12mm); }+ Dimension BaseWidth { Kind: Linear; Target: BasePlate; Value: 100mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseDepth { Kind: Linear; Target: BasePlate; Value: 70mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.BaseMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 2; }+ Dimension UprightMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.UprightMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 2; }++ Position BaseMountPosition { Target: InvestorBracketLayout.BaseMountPattern; Tolerance: 0.30mm; DatumRefs: [A, B]; Quantity: 2; }+ Position UprightMountPosition { Target: InvestorBracketLayout.UprightMountPattern; Tolerance: 0.40mm; DatumRefs: [A, B]; Quantity: 2; }++ Annotation MaterialAndFinish { Target: InvestorBracket; Text: "ASTM B209 5052-H32 aluminium sheet, 2.0 +/-0.12 mm, mill finish."; }+ Annotation CutAndDeburr { Target: InvestorBracket; Text: "Cut before forming. Remove burrs and sharp edges; break edges 0.2-0.5 mm."; }+ Annotation Forming { Target: UprightBend; Text: "Form to 90 +/-1 degree with 3 mm inside radius; reject visible cracking."; }+ Annotation CounterboreReview { Target: InvestorBracketLayout.UprightMountPattern; Text: "Counterbores are intentionally not applied to 2 mm sheet. Confirm fastener head strategy; use washers, countersink-qualified tooling, or captive hardware as appropriate."; }+}++SheetMetal InvestorBracket {+ Intent: Manufacturing;+ Thickness: 2mm;+ KFactor: 0.42;+ Material: "ASTM B209 5052-H32 aluminium sheet";++ Base BasePlate {+ Profile: Rectangle { Width: 100mm; Height: 70mm; };+ }++ Flange Upright {+ From: BasePlate.Rear;+ Height: 60mm;+ Angle: 90deg;+ Radius: 3mm;+ Direction: Up;+ StartTermination: Rounded;+ StartTerminationRadius: 2mm;+ EndTermination: Rounded;+ EndTerminationRadius: 2mm;+ }++}diff --git a/fixtures/Regression/SheetMetalSemantics/manufacturing-unknown-kind.firmament b/fixtures/Regression/SheetMetalSemantics/manufacturing-unknown-kind.firmamentnew file mode 100644index 00000000..8e7b943e--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/manufacturing-unknown-kind.firmament@@ -0,0 +1,76 @@+// Investor demonstration: manufacturing-authoritative 5052-H32 formed bracket.+// The prompt is intentionally terse; the assumptions below remain explicit review items.++Concept Struct InvestorBracketLayout {+ Datum BaseMountCenter { On: BasePlate; At: (50mm, 25mm); }+ Datum UprightMountCenter { On: Upright; At: (50mm, 25mm); }++ Pattern BaseMountPattern {+ On: BasePlate;+ Feature: Circle { Diameter: 6.6mm; };+ Center: BaseMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }++ Pattern UprightMountPattern {+ On: Upright;+ Feature: Circle { Diameter: 6.6mm; };+ Center: UprightMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }+}++Manufacturing InvestorBracketRelease {+ MaterialSpecification: "ASTM B209 5052-H32 aluminium sheet, mill finish";+ ThicknessTolerance: PlusMinus(0.12mm, 0.12mm);+ BlankProcess: "CNC laser cut or CNC punch; cut all holes before forming";+ FormingProcess: "CNC press brake; 3 mm inside radius tooling; K-factor 0.42";+ GeneralCutTolerance: 0.25mm;+ GeneralFormedTolerance: 0.5mm;+ GeneralAngularTolerance: 1deg;+}++Pmi InvestorBracketPmi {+ DatumFeature A { Target: BasePlate; }+ DatumFeature B { Target: Upright; }++ Dimension SheetThickness { Kind: Thickness; Target: InvestorBracket; Value: 2mm; Tolerance: PlusMinus(0.12mm, 0.12mm); }+ Dimension BaseWidth { Kind: Banana; Target: BasePlate; Value: 100mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseDepth { Kind: Banana; Target: BasePlate; Value: 70mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.BaseMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 2; }+ Dimension UprightMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.UprightMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 2; }++ Position BaseMountPosition { Target: InvestorBracketLayout.BaseMountPattern; Tolerance: 0.30mm; DatumRefs: [A, B]; Quantity: 2; }+ Position UprightMountPosition { Target: InvestorBracketLayout.UprightMountPattern; Tolerance: 0.40mm; DatumRefs: [A, B]; Quantity: 2; }++ Annotation MaterialAndFinish { Target: InvestorBracket; Text: "ASTM B209 5052-H32 aluminium sheet, 2.0 +/-0.12 mm, mill finish."; }+ Annotation CutAndDeburr { Target: InvestorBracket; Text: "Cut before forming. Remove burrs and sharp edges; break edges 0.2-0.5 mm."; }+ Annotation Forming { Target: UprightBend; Text: "Form to 90 +/-1 degree with 3 mm inside radius; reject visible cracking."; }+ Annotation CounterboreReview { Target: InvestorBracketLayout.UprightMountPattern; Text: "Counterbores are intentionally not applied to 2 mm sheet. Confirm fastener head strategy; use washers, countersink-qualified tooling, or captive hardware as appropriate."; }+}++SheetMetal InvestorBracket {+ Intent: Manufacturing;+ Thickness: 2mm;+ KFactor: 0.42;+ Material: "ASTM B209 5052-H32 aluminium sheet";++ Base BasePlate {+ Profile: Rectangle { Width: 100mm; Height: 70mm; };+ }++ Flange Upright {+ From: BasePlate.Rear;+ Height: 60mm;+ Angle: 90deg;+ Radius: 3mm;+ Direction: Up;+ StartTermination: Rounded;+ StartTerminationRadius: 2mm;+ EndTermination: Rounded;+ EndTerminationRadius: 2mm;+ }++}diff --git a/fixtures/Regression/SheetMetalSemantics/manufacturing-unknown-pmi.firmament b/fixtures/Regression/SheetMetalSemantics/manufacturing-unknown-pmi.firmamentnew file mode 100644index 00000000..785d8115--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/manufacturing-unknown-pmi.firmament@@ -0,0 +1,76 @@+// Investor demonstration: manufacturing-authoritative 5052-H32 formed bracket.+// The prompt is intentionally terse; the assumptions below remain explicit review items.++Concept Struct InvestorBracketLayout {+ Datum BaseMountCenter { On: BasePlate; At: (50mm, 25mm); }+ Datum UprightMountCenter { On: Upright; At: (50mm, 25mm); }++ Pattern BaseMountPattern {+ On: BasePlate;+ Feature: Circle { Diameter: 6.6mm; };+ Center: BaseMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }++ Pattern UprightMountPattern {+ On: Upright;+ Feature: Circle { Diameter: 6.6mm; };+ Center: UprightMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }+}++Manufacturing InvestorBracketRelease {+ MaterialSpecification: "ASTM B209 5052-H32 aluminium sheet, mill finish";+ ThicknessTolerance: PlusMinus(0.12mm, 0.12mm);+ BlankProcess: "CNC laser cut or CNC punch; cut all holes before forming";+ FormingProcess: "CNC press brake; 3 mm inside radius tooling; K-factor 0.42";+ GeneralCutTolerance: 0.25mm;+ GeneralFormedTolerance: 0.5mm;+ GeneralAngularTolerance: 1deg;+}++Pmi InvestorBracketPmi { Flatness Ignored { Target: BasePlate; Tolerance: 0.1mm; }+ DatumFeature A { Target: BasePlate; }+ DatumFeature B { Target: Upright; }++ Dimension SheetThickness { Kind: Thickness; Target: InvestorBracket; Value: 2mm; Tolerance: PlusMinus(0.12mm, 0.12mm); }+ Dimension BaseWidth { Kind: Linear; Target: BasePlate; Value: 100mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseDepth { Kind: Linear; Target: BasePlate; Value: 70mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.BaseMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 2; }+ Dimension UprightMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.UprightMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 2; }++ Position BaseMountPosition { Target: InvestorBracketLayout.BaseMountPattern; Tolerance: 0.30mm; DatumRefs: [A, B]; Quantity: 2; }+ Position UprightMountPosition { Target: InvestorBracketLayout.UprightMountPattern; Tolerance: 0.40mm; DatumRefs: [A, B]; Quantity: 2; }++ Annotation MaterialAndFinish { Target: InvestorBracket; Text: "ASTM B209 5052-H32 aluminium sheet, 2.0 +/-0.12 mm, mill finish."; }+ Annotation CutAndDeburr { Target: InvestorBracket; Text: "Cut before forming. Remove burrs and sharp edges; break edges 0.2-0.5 mm."; }+ Annotation Forming { Target: UprightBend; Text: "Form to 90 +/-1 degree with 3 mm inside radius; reject visible cracking."; }+ Annotation CounterboreReview { Target: InvestorBracketLayout.UprightMountPattern; Text: "Counterbores are intentionally not applied to 2 mm sheet. Confirm fastener head strategy; use washers, countersink-qualified tooling, or captive hardware as appropriate."; }+}++SheetMetal InvestorBracket {+ Intent: Manufacturing;+ Thickness: 2mm;+ KFactor: 0.42;+ Material: "ASTM B209 5052-H32 aluminium sheet";++ Base BasePlate {+ Profile: Rectangle { Width: 100mm; Height: 70mm; };+ }++ Flange Upright {+ From: BasePlate.Rear;+ Height: 60mm;+ Angle: 90deg;+ Radius: 3mm;+ Direction: Up;+ StartTermination: Rounded;+ StartTerminationRadius: 2mm;+ EndTermination: Rounded;+ EndTerminationRadius: 2mm;+ }++}diff --git a/fixtures/Regression/SheetMetalSemantics/manufacturing-unnamed-pmi.firmament b/fixtures/Regression/SheetMetalSemantics/manufacturing-unnamed-pmi.firmamentnew file mode 100644index 00000000..95b90ba0--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/manufacturing-unnamed-pmi.firmament@@ -0,0 +1,76 @@+// Investor demonstration: manufacturing-authoritative 5052-H32 formed bracket.+// The prompt is intentionally terse; the assumptions below remain explicit review items.++Concept Struct InvestorBracketLayout {+ Datum BaseMountCenter { On: BasePlate; At: (50mm, 25mm); }+ Datum UprightMountCenter { On: Upright; At: (50mm, 25mm); }++ Pattern BaseMountPattern {+ On: BasePlate;+ Feature: Circle { Diameter: 6.6mm; };+ Center: BaseMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }++ Pattern UprightMountPattern {+ On: Upright;+ Feature: Circle { Diameter: 6.6mm; };+ Center: UprightMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }+}++Manufacturing InvestorBracketRelease {+ MaterialSpecification: "ASTM B209 5052-H32 aluminium sheet, mill finish";+ ThicknessTolerance: PlusMinus(0.12mm, 0.12mm);+ BlankProcess: "CNC laser cut or CNC punch; cut all holes before forming";+ FormingProcess: "CNC press brake; 3 mm inside radius tooling; K-factor 0.42";+ GeneralCutTolerance: 0.25mm;+ GeneralFormedTolerance: 0.5mm;+ GeneralAngularTolerance: 1deg;+}++Pmi {+ DatumFeature A { Target: BasePlate; }+ DatumFeature B { Target: Upright; }++ Dimension SheetThickness { Kind: Thickness; Target: InvestorBracket; Value: 2mm; Tolerance: PlusMinus(0.12mm, 0.12mm); }+ Dimension BaseWidth { Kind: Linear; Target: BasePlate; Value: 100mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseDepth { Kind: Linear; Target: BasePlate; Value: 70mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.BaseMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 2; }+ Dimension UprightMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.UprightMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 2; }++ Position BaseMountPosition { Target: InvestorBracketLayout.BaseMountPattern; Tolerance: 0.30mm; DatumRefs: [A, B]; Quantity: 2; }+ Position UprightMountPosition { Target: InvestorBracketLayout.UprightMountPattern; Tolerance: 0.40mm; DatumRefs: [A, B]; Quantity: 2; }++ Annotation MaterialAndFinish { Target: InvestorBracket; Text: "ASTM B209 5052-H32 aluminium sheet, 2.0 +/-0.12 mm, mill finish."; }+ Annotation CutAndDeburr { Target: InvestorBracket; Text: "Cut before forming. Remove burrs and sharp edges; break edges 0.2-0.5 mm."; }+ Annotation Forming { Target: UprightBend; Text: "Form to 90 +/-1 degree with 3 mm inside radius; reject visible cracking."; }+ Annotation CounterboreReview { Target: InvestorBracketLayout.UprightMountPattern; Text: "Counterbores are intentionally not applied to 2 mm sheet. Confirm fastener head strategy; use washers, countersink-qualified tooling, or captive hardware as appropriate."; }+}++SheetMetal InvestorBracket {+ Intent: Manufacturing;+ Thickness: 2mm;+ KFactor: 0.42;+ Material: "ASTM B209 5052-H32 aluminium sheet";++ Base BasePlate {+ Profile: Rectangle { Width: 100mm; Height: 70mm; };+ }++ Flange Upright {+ From: BasePlate.Rear;+ Height: 60mm;+ Angle: 90deg;+ Radius: 3mm;+ Direction: Up;+ StartTermination: Rounded;+ StartTerminationRadius: 2mm;+ EndTermination: Rounded;+ EndTerminationRadius: 2mm;+ }++}diff --git a/fixtures/Regression/SheetMetalSemantics/manufacturing-zero-quantity.firmament b/fixtures/Regression/SheetMetalSemantics/manufacturing-zero-quantity.firmamentnew file mode 100644index 00000000..6da96ea6--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/manufacturing-zero-quantity.firmament@@ -0,0 +1,76 @@+// Investor demonstration: manufacturing-authoritative 5052-H32 formed bracket.+// The prompt is intentionally terse; the assumptions below remain explicit review items.++Concept Struct InvestorBracketLayout {+ Datum BaseMountCenter { On: BasePlate; At: (50mm, 25mm); }+ Datum UprightMountCenter { On: Upright; At: (50mm, 25mm); }++ Pattern BaseMountPattern {+ On: BasePlate;+ Feature: Circle { Diameter: 6.6mm; };+ Center: BaseMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }++ Pattern UprightMountPattern {+ On: Upright;+ Feature: Circle { Diameter: 6.6mm; };+ Center: UprightMountCenter;+ Count: 2;+ Pitch: (50mm, 0mm);+ }+}++Manufacturing InvestorBracketRelease {+ MaterialSpecification: "ASTM B209 5052-H32 aluminium sheet, mill finish";+ ThicknessTolerance: PlusMinus(0.12mm, 0.12mm);+ BlankProcess: "CNC laser cut or CNC punch; cut all holes before forming";+ FormingProcess: "CNC press brake; 3 mm inside radius tooling; K-factor 0.42";+ GeneralCutTolerance: 0.25mm;+ GeneralFormedTolerance: 0.5mm;+ GeneralAngularTolerance: 1deg;+}++Pmi InvestorBracketPmi {+ DatumFeature A { Target: BasePlate; }+ DatumFeature B { Target: Upright; }++ Dimension SheetThickness { Kind: Thickness; Target: InvestorBracket; Value: 2mm; Tolerance: PlusMinus(0.12mm, 0.12mm); }+ Dimension BaseWidth { Kind: Linear; Target: BasePlate; Value: 100mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseDepth { Kind: Linear; Target: BasePlate; Value: 70mm; Tolerance: PlusMinus(0.25mm, 0.25mm); }+ Dimension BaseMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.BaseMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 0; }+ Dimension UprightMountDiameter { Kind: Diameter; Target: InvestorBracketLayout.UprightMountPattern; Value: 6.6mm; Tolerance: PlusMinus(0.10mm, 0.10mm); Quantity: 0; }++ Position BaseMountPosition { Target: InvestorBracketLayout.BaseMountPattern; Tolerance: 0.30mm; DatumRefs: [A, B]; Quantity: 0; }+ Position UprightMountPosition { Target: InvestorBracketLayout.UprightMountPattern; Tolerance: 0.40mm; DatumRefs: [A, B]; Quantity: 0; }++ Annotation MaterialAndFinish { Target: InvestorBracket; Text: "ASTM B209 5052-H32 aluminium sheet, 2.0 +/-0.12 mm, mill finish."; }+ Annotation CutAndDeburr { Target: InvestorBracket; Text: "Cut before forming. Remove burrs and sharp edges; break edges 0.2-0.5 mm."; }+ Annotation Forming { Target: UprightBend; Text: "Form to 90 +/-1 degree with 3 mm inside radius; reject visible cracking."; }+ Annotation CounterboreReview { Target: InvestorBracketLayout.UprightMountPattern; Text: "Counterbores are intentionally not applied to 2 mm sheet. Confirm fastener head strategy; use washers, countersink-qualified tooling, or captive hardware as appropriate."; }+}++SheetMetal InvestorBracket {+ Intent: Manufacturing;+ Thickness: 2mm;+ KFactor: 0.42;+ Material: "ASTM B209 5052-H32 aluminium sheet";++ Base BasePlate {+ Profile: Rectangle { Width: 100mm; Height: 70mm; };+ }++ Flange Upright {+ From: BasePlate.Rear;+ Height: 60mm;+ Angle: 90deg;+ Radius: 3mm;+ Direction: Up;+ StartTermination: Rounded;+ StartTerminationRadius: 2mm;+ EndTermination: Rounded;+ EndTerminationRadius: 2mm;+ }++}diff --git a/fixtures/Regression/SheetMetalSemantics/modern-layout-release.firmament b/fixtures/Regression/SheetMetalSemantics/modern-layout-release.firmamentnew file mode 100644index 00000000..f7788cfc--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/modern-layout-release.firmament@@ -0,0 +1,44 @@+Record PlateSpec {+ width: Length+ depth: Length+ thickness: Length+ drillDiameter: Length+}+Static plate: PlateSpec {+ width: 100mm tol 0.25mm+ depth: 60mm+ thickness: 1.5mm tol 0.12mm+ drillDiameter: 6mm tol +0.10mm -0.05mm+}+Concept PanelContract { deck: SheetRegion; Flat: FlatPattern; }+Concept Positive(width: Length) => width > 0mm+Concept Struct layout {+ Datum center { on: deck; at: deck.Center }+ Datum left { on: deck; at: center + Vector2(-20mm, 0mm) }+}+Manufacturing release {+ materialSpecification: "5052-H32 // shop specification"+ blankProcess: "Laser cut # deburr"+ generalCutTolerance: 0.25mm+}+SheetMetal modernPanel: PanelContract {+ manufacturing: release+ thickness: plate.thickness+ Base deck { profile: Rectangle { width: plate.width; height: plate.depth } }+ Flange lip { from: deck.Rear; length: 15mm; angle: 90deg; insideRadius: 2mm }+ Require positive => Positive(plate.width)+ Pattern holes {+ on: deck+ feature: Circle { diameter: plate.drillDiameter }+ center: layout.left+ count: 2+ pitch: Vector2(40mm, 0mm)+ }+ Pmi {+ DatumFeature A { target: deck }+ Dimension width { kind: Linear; target: deck; dimension: plate.width }+ Dimension drill { kind: Diameter; target: holes; dimension: plate.drillDiameter; quantity: 2 }+ Position drillPosition { target: holes; tolerance: 0.3mm; datumRefs: [A]; quantity: 2 }+ Note finish { target: modernPanel; text: "Cut before forming // keep this text" }+ }+}diff --git a/fixtures/Regression/SheetMetalSemantics/module-legacy-cut.firmament b/fixtures/Regression/SheetMetalSemantics/module-legacy-cut.firmamentnew file mode 100644index 00000000..bc3aa17b--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/module-legacy-cut.firmament@@ -0,0 +1,6 @@+SheetMetal plate {+ thickness: 1mm+ Base deck { profile: Rectangle { width: 100mm; height: 60mm } }+}+// Legacy module-level operation: one concrete sheet owns this cut.+Hole mount { on: deck; center: Point2(20mm, 30mm); diameter: 6mm }diff --git a/fixtures/Regression/SheetMetalSemantics/module-unknown-statement.firmament b/fixtures/Regression/SheetMetalSemantics/module-unknown-statement.firmamentnew file mode 100644index 00000000..6ec4c662--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/module-unknown-statement.firmament@@ -0,0 +1,5 @@+SheetMetal plate {+ thickness: 1mm+ Base deck { profile: Rectangle { width: 100mm; height: 60mm } }+}+Fillet ignored { radius: 2mm }diff --git a/fixtures/Regression/SheetMetalSemantics/run.py b/fixtures/Regression/SheetMetalSemantics/run.pynew file mode 100644index 00000000..72cb6f05--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/run.py@@ -0,0 +1,72 @@+"""Real CLI admission and AP242 qualification; never records replacement goldens."""+import json+from pathlib import Path+import subprocess+++def main():+ corpus = Path(__file__).resolve().parent+ repo = corpus.parents[2]+ output = repo / "artifacts/local/sheetmetal-semantics/cli"+ output.mkdir(parents=True, exist_ok=True)+ cli = repo / "Aetheris.CLI/bin/Release/net10.0/aetheris.dll"+ rejected = {+ "layout-unknown-field", "layout-unknown-feature-field", "layout-modern-xz",+ "layout-unknown-statement", "layout-false-require", "layout-contract-missing",+ "layout-contract-semicolon", "layout-extra-unused-pattern", "manufacturing-unknown-pmi",+ "manufacturing-unknown-field", "manufacturing-negative-tolerance",+ "manufacturing-zero-quantity", "manufacturing-unknown-kind", "manufacturing-second-pmi",+ "module-unknown-statement",+ }++ def invoke(*args):+ process = subprocess.run(["dotnet", str(cli), *map(str, args), "--json"], cwd=repo,+ capture_output=True, text=True, encoding="utf-8", timeout=120)+ try:+ return process.returncode, json.loads(process.stdout)+ except ValueError as error:+ raise RuntimeError(process.stdout + process.stderr) from error++ rows = []+ for source in sorted(corpus.glob("*.firmament")):+ name = source.stem+ expected = name not in rejected+ step = output / (name + ".step")+ validation_code, validation = invoke("validate", source)+ build_code, build = invoke("build", source, "--output", step)+ inspect_code, inspection = invoke("sheetmetal", "inspect", source)+ passed = (validation_code == 0) == (build_code == 0) == (inspect_code == 0) == expected+ evidence = dict(validation=validation, build=build, inspection=inspection)+ if not expected:+ diagnostics = validation.get("sheetMetalValidation", {}).get("diagnostics", [])+ passed &= bool(diagnostics) and all(isinstance(d, dict) and d.get("code") and+ d.get("message") and d.get("severity") for d in diagnostics)+ passed &= any(d.get("sourceFile") and d.get("sourceSpan") for d in diagnostics)+ passed &= build.get("success") is False and inspection.get("success") is False+ else:+ analysis_code, analysis = invoke("analyze", step)+ evidence["analysis"] = analysis+ passed &= analysis_code == 0 and build.get("success") is True+ items = analysis.get("semanticPmi", {}).get("items", [])+ if name.startswith("manufacturing-"):+ passed &= len(items) == 13+ if name == "modern-layout-release":+ passed &= len(items) == 5+ passed &= any(i.get("kind") == "Diameter" and i.get("value") == 6 and+ i.get("toleranceMinus") == 0.05 and len(i.get("geometricFaceEntityIds", [])) == 2 for i in items)+ if name == "keyed-features":+ passed &= any(i.get("target") == "mounting.left" and i.get("value") == 6 for i in items)+ if name == "keyed-profile-cuts":+ passed &= any(i.get("target") == "vents.left" and i.get("text") for i in items)+ if name == "layout-suffix-capture":+ passed &= inspection["sheetMetal"]["semanticLayout"]["patterns"][0]["centerX"] == 50+ (output / (name + ".json")).write_text(json.dumps(evidence, indent=2) + "\n", encoding="utf-8")+ rows.append(dict(name=name, expected=expected, passed=bool(passed)))+ print(("PASS " if passed else "FAIL ") + name, flush=True)+ (output / "results.json").write_text(json.dumps(rows, indent=2) + "\n", encoding="utf-8")+ print(f"{sum(row['passed'] for row in rows)}/{len(rows)} cases")+ return 0 if all(row["passed"] for row in rows) else 1+++if __name__ == "__main__":+ raise SystemExit(main())diff --git a/fixtures/Regression/SheetMetalSemantics/shared-construction-layout.firmament b/fixtures/Regression/SheetMetalSemantics/shared-construction-layout.firmamentnew file mode 100644index 00000000..8105550f--- /dev/null+++ b/fixtures/Regression/SheetMetalSemantics/shared-construction-layout.firmament@@ -0,0 +1,11 @@+Static width: Length = 100mm+Concept Struct layout on XY {+ Rect2 blank { center: [50mm, 30mm]; size: [width, 60mm] }+ Point2 witness { position: [20mm, 30mm] }+}+Profile stock using layout { Loop Outer { blank |> TraceLoop } }+SheetMetal sharedLayout {+ thickness: 1.5mm+ Base deck { profile: stock }+ Hole mount { on: deck; center: Point2(20mm, 30mm); diameter: 6mm }+}