Fix some found issues by reviewer

antoineatstariongroup · antoineatstariongroup · commit eeafb02f979f · 2026-04-30T11:43:00.000+02:00
diff --git a/SysML2.NET.CodeGenerator/HandleBarHelpers/RulesHelper.cs b/SysML2.NET.CodeGenerator/HandleBarHelpers/RulesHelper.cs
@@ -1727,6 +1727,34 @@ private static void ProcessUnitypedAlternativesWithOneElement(EncodedTextWriter
                         variableName = $"{cursorToUse.CursorVariableName}.Current";
                     }
 
+                    // Detect degenerate switch: if the first non-default case type is a supertype
+                    // of the generating class, it will always match, making subsequent cases unreachable.
+                    // This happens when alternatives like (SuperclassingPart | ConjugationPart) both
+                    // target ancestor types of the POCO — the discriminator should be cursor-based,
+                    // not POCO-type-based. Fall back to HandCoded in this case.
+                    var generatingClass = ruleGenerationContext.NamedElementToGenerate as IClass;
+
+                    if (variableName == "poco" && generatingClass != null)
+                    {
+                        var firstNonDefault = mappedNonTerminalElements.FirstOrDefault(x =>
+                            defaultElement.RuleElement == null || x.RuleElement != defaultElement.RuleElement);
+
+                        if (firstNonDefault.UmlClass != null
+                            && firstNonDefault.UmlClass != generatingClass
+                            && generatingClass.QueryAllGeneralClassifiers().Contains(firstNonDefault.UmlClass)
+                            && !whenGuards.Any())
+                        {
+                            var handCodedRuleName = alternatives.ElementAt(0).TextualNotationRule?.RuleName ?? "Unknown";
+
+                            if (ruleGenerationContext.EmittedHandCodedCalls.Add(handCodedRuleName))
+                            {
+                                writer.WriteSafeString($"Build{handCodedRuleName}HandCoded({ruleGenerationContext.CurrentVariableName ?? "poco"}, cursorCache, stringBuilder);");
+                            }
+
+                            break;
+                        }
+                    }
+
                     writer.WriteSafeString($"switch({variableName}){Environment.NewLine}");
                     writer.WriteSafeString("{");
 
@@ -2236,7 +2264,7 @@ private static void ProcessRuleElement(EncodedTextWriter writer, IClass umlClass
                         ProcessAlternatives(writer, umlClass, groupElement.Alternatives, ruleGenerationContext);
                     }
 
-                    if (!groupElement.IsOptional && !ruleGenerationContext.IsNextElementNewLineTerminal())
+                    if (!groupElement.IsOptional && !ruleGenerationContext.IsNextElementNewLineTerminal() && !ruleGenerationContext.IsLastElement())
                     {
                         writer.WriteSafeString($"{Environment.NewLine}stringBuilder.Append(' ');");
                     }
@@ -2355,7 +2383,7 @@ private static void ProcessAssignmentElement(EncodedTextWriter writer, IClass um
                         {
                             if (assignmentElement.Value is TerminalElement terminalElement)
                             {
-                                if (!isPartOfMultipleAlternative && assignmentElement.Container is not GroupElement)
+                                if (!isPartOfMultipleAlternative && assignmentElement.Container is not GroupElement {IsOptional:true})
                                 {
                                     writer.WriteSafeString($"if({targetProperty.QueryIfStatementContentForNonEmpty("poco")}){Environment.NewLine}");
                                     writer.WriteSafeString($"{{{Environment.NewLine}");
@@ -2621,10 +2649,60 @@ private static void EmitCollectionNonTerminalLoop(EncodedTextWriter writer, ICla
                         // e.g., CalculationBodyItem* ResultExpressionMember → while (current is not IResultExpressionMembership)
                         var whileTypeExclusion = ResolveCollectionWhileTypeCondition(cursorVariableName, umlClass, referencedRule, ruleGenerationContext);
 
-                        // Build the full while condition: merged pattern to avoid "merge into pattern" warnings
-                        var whileCondition = string.IsNullOrWhiteSpace(whileTypeExclusion)
-                            ? $"{cursorVariableName}.Current != null"
-                            : whileTypeExclusion;
+                        // Build the full while condition: merged pattern to avoid "merge into pattern" warnings.
+                        // When no sibling-based type exclusion is available, use a positive type guard
+                        // based on the collection item's assignment target type to prevent consuming
+                        // elements belonging to subsequent grammar segments (unbounded cursor drain).
+                        string whileCondition;
+
+                        if (!string.IsNullOrWhiteSpace(whileTypeExclusion))
+                        {
+                            whileCondition = whileTypeExclusion;
+                        }
+                        else
+                        {
+                            // Try to resolve a positive type guard from the referenced rule's assignment targets.
+                            // Only apply the guard when ALL alternatives are pure += assignments (no bare
+                            // NonTerminal or Group elements that could match different cursor types).
+                            var allElements = referencedRule?.Alternatives.SelectMany(alt => alt.Elements).ToList();
+                            var hasNonAssignmentElements = allElements?.Any(element =>
+                                element is NonTerminalElement or GroupElement) == true;
+
+                            List<string> assignmentTargetTypes = null;
+
+                            if (!hasNonAssignmentElements)
+                            {
+                                assignmentTargetTypes = allElements?
+                                    .OfType<AssignmentElement>()
+                                    .Where(assignmentElement => assignmentElement.Operator == "+=" && assignmentElement.Value is NonTerminalElement)
+                                    .Select(assignmentElement =>
+                                    {
+                                        var valueNonTerminal = (NonTerminalElement)assignmentElement.Value;
+                                        var refRule = ruleGenerationContext.AllRules.SingleOrDefault(x => x.RuleName == valueNonTerminal.Name);
+                                        var targetName = refRule != null ? (refRule.TargetElementName ?? refRule.RuleName) : null;
+
+                                        if (targetName != null)
+                                        {
+                                            var targetClass = umlClass.Cache.Values.OfType<INamedElement>().SingleOrDefault(x => x.Name == targetName) as IClass;
+                                            return targetClass?.QueryFullyQualifiedTypeName();
+                                        }
+
+                                        return null;
+                                    })
+                                    .Where(typeName => typeName != null)
+                                    .Distinct()
+                                    .ToList();
+                            }
+
+                            if (assignmentTargetTypes?.Count == 1)
+                            {
+                                whileCondition = $"{cursorVariableName}.Current != null && {cursorVariableName}.Current is {assignmentTargetTypes[0]}";
+                            }
+                            else
+                            {
+                                whileCondition = $"{cursorVariableName}.Current != null";
+                            }
+                        }
 
                         if (perItemCall != null)
                         {
diff --git a/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/ClassifierTextualNotationBuilder.cs b/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/ClassifierTextualNotationBuilder.cs
@@ -110,16 +110,7 @@ public static void BuildClassifierDeclaration(SysML2.NET.Core.POCO.Core.Classifi
                 stringBuilder.Append(' ');
             }
 
-            switch (poco)
-            {
-                case SysML2.NET.Core.POCO.Core.Types.IType pocoType:
-                    TypeTextualNotationBuilder.BuildConjugationPart(pocoType, cursorCache, stringBuilder);
-                    break;
-                default:
-                    BuildSuperclassingPart(poco, cursorCache, stringBuilder);
-                    break;
-            }
-
+            BuildClassifierDeclarationHandCoded(poco, cursorCache, stringBuilder);
             while (ownedRelationshipCursor.Current != null)
             {
                 TypeTextualNotationBuilder.BuildTypeRelationshipPart(poco, cursorCache, stringBuilder);
diff --git a/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/DefinitionTextualNotationBuilder.cs b/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/DefinitionTextualNotationBuilder.cs
@@ -73,7 +73,7 @@ public static void BuildDefinitionPrefix(SysML2.NET.Core.POCO.Systems.Definition
                 SharedTextualNotationBuilder.BuildBasicDefinitionPrefix(poco, cursorCache, stringBuilder);
             }
             var ownedRelationshipCursor = cursorCache.GetOrCreateCursor(poco.Id, "ownedRelationship", poco.OwnedRelationship);
-            while (ownedRelationshipCursor.Current != null)
+            while (ownedRelationshipCursor.Current != null && ownedRelationshipCursor.Current is SysML2.NET.Core.POCO.Root.Namespaces.IOwningMembership)
             {
                 BuildDefinitionExtensionKeyword(poco, cursorCache, stringBuilder);
             }
diff --git a/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/FeatureTextualNotationBuilder.cs b/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/FeatureTextualNotationBuilder.cs
@@ -352,7 +352,6 @@ public static void BuildOwnedFeatureChain(SysML2.NET.Core.POCO.Core.Features.IFe
                 ownedRelationshipCursor.Move();
 
             }
-            stringBuilder.Append(' ');
 
         }
 
@@ -730,7 +729,6 @@ public static void BuildChainingPart(SysML2.NET.Core.POCO.Core.Features.IFeature
             {
                 BuildFeatureChain(poco, cursorCache, stringBuilder);
             }
-            stringBuilder.Append(' ');
 
         }
 
@@ -840,7 +838,6 @@ public static void BuildFeatureChain(SysML2.NET.Core.POCO.Core.Features.IFeature
                 ownedRelationshipCursor.Move();
 
             }
-            stringBuilder.Append(' ');
 
         }
 
diff --git a/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/LibraryPackageTextualNotationBuilder.cs b/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/LibraryPackageTextualNotationBuilder.cs
@@ -44,7 +44,10 @@ public static partial class LibraryPackageTextualNotationBuilder
         public static void BuildLibraryPackage(SysML2.NET.Core.POCO.Kernel.Packages.ILibraryPackage poco, ICursorCache cursorCache, StringBuilder stringBuilder)
         {
             var ownedRelationshipCursor = cursorCache.GetOrCreateCursor(poco.Id, "ownedRelationship", poco.OwnedRelationship);
-            stringBuilder.Append(" standard ");
+            if (poco.IsStandard)
+            {
+                stringBuilder.Append(" standard ");
+            }
 
             stringBuilder.Append(' ');
             stringBuilder.Append("library ");
diff --git a/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/MetadataFeatureTextualNotationBuilder.cs b/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/MetadataFeatureTextualNotationBuilder.cs
@@ -74,7 +74,6 @@ public static void BuildMetadataFeatureDeclaration(SysML2.NET.Core.POCO.Kernel.M
                 ElementTextualNotationBuilder.BuildIdentification(poco, cursorCache, stringBuilder);
                 stringBuilder.Append(":");
                 stringBuilder.Append(' ');
-                stringBuilder.Append(' ');
             }
 
 
diff --git a/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/MetadataUsageTextualNotationBuilder.cs b/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/MetadataUsageTextualNotationBuilder.cs
@@ -74,7 +74,6 @@ public static void BuildMetadataUsageDeclaration(SysML2.NET.Core.POCO.Systems.Me
                 ElementTextualNotationBuilder.BuildIdentification(poco, cursorCache, stringBuilder);
                 stringBuilder.Append(":");
                 stringBuilder.Append(' ');
-                stringBuilder.Append(' ');
             }
 
 
diff --git a/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/OccurrenceDefinitionTextualNotationBuilder.cs b/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/OccurrenceDefinitionTextualNotationBuilder.cs
@@ -67,7 +67,7 @@ public static void BuildOccurrenceDefinitionPrefix(SysML2.NET.Core.POCO.Systems.
                 stringBuilder.Append(' ');
             }
 
-            while (ownedRelationshipCursor.Current != null)
+            while (ownedRelationshipCursor.Current != null && ownedRelationshipCursor.Current is SysML2.NET.Core.POCO.Root.Namespaces.IOwningMembership)
             {
                 DefinitionTextualNotationBuilder.BuildDefinitionExtensionKeyword(poco, cursorCache, stringBuilder);
             }
diff --git a/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/OccurrenceUsageTextualNotationBuilder.cs b/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/OccurrenceUsageTextualNotationBuilder.cs
@@ -60,7 +60,7 @@ public static void BuildOccurrenceUsagePrefix(SysML2.NET.Core.POCO.Systems.Occur
             }
 
             var ownedRelationshipCursor = cursorCache.GetOrCreateCursor(poco.Id, "ownedRelationship", poco.OwnedRelationship);
-            while (ownedRelationshipCursor.Current != null)
+            while (ownedRelationshipCursor.Current != null && ownedRelationshipCursor.Current is SysML2.NET.Core.POCO.Root.Namespaces.IOwningMembership)
             {
                 UsageTextualNotationBuilder.BuildUsageExtensionKeyword(poco, cursorCache, stringBuilder);
             }
@@ -147,7 +147,7 @@ public static void BuildControlNodePrefix(SysML2.NET.Core.POCO.Systems.Occurrenc
             }
 
             var ownedRelationshipCursor = cursorCache.GetOrCreateCursor(poco.Id, "ownedRelationship", poco.OwnedRelationship);
-            while (ownedRelationshipCursor.Current != null)
+            while (ownedRelationshipCursor.Current != null && ownedRelationshipCursor.Current is SysML2.NET.Core.POCO.Root.Namespaces.IOwningMembership)
             {
                 UsageTextualNotationBuilder.BuildUsageExtensionKeyword(poco, cursorCache, stringBuilder);
             }
diff --git a/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/OwningMembershipTextualNotationBuilder.cs b/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/OwningMembershipTextualNotationBuilder.cs
@@ -83,7 +83,6 @@ public static void BuildPackageMember(SysML2.NET.Core.POCO.Root.Namespaces.IOwni
                 ownedRelatedElementCursor.Move();
             }
 
-            stringBuilder.Append(' ');
 
         }
 
diff --git a/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/PackageTextualNotationBuilder.cs b/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/PackageTextualNotationBuilder.cs
@@ -141,7 +141,6 @@ public static void BuildFilterPackage(SysML2.NET.Core.POCO.Kernel.Packages.IPack
                 ownedRelationshipCursor.Move();
 
             }
-            stringBuilder.Append(' ');
 
         }
 
diff --git a/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/SatisfyRequirementUsageTextualNotationBuilder.cs b/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/SatisfyRequirementUsageTextualNotationBuilder.cs
@@ -46,7 +46,10 @@ public static void BuildSatisfyRequirementUsage(SysML2.NET.Core.POCO.Systems.Req
             var ownedRelationshipCursor = cursorCache.GetOrCreateCursor(poco.Id, "ownedRelationship", poco.OwnedRelationship);
             OccurrenceUsageTextualNotationBuilder.BuildOccurrenceUsagePrefix(poco, cursorCache, stringBuilder);
             stringBuilder.Append("assert ");
-            stringBuilder.Append(" not ");
+            if (poco.IsNegated)
+            {
+                stringBuilder.Append(" not ");
+            }
 
             stringBuilder.Append(' ');
             stringBuilder.Append("satisfy ");
diff --git a/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/UsageTextualNotationBuilder.cs b/SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/UsageTextualNotationBuilder.cs
@@ -204,7 +204,7 @@ public static void BuildUsagePrefix(SysML2.NET.Core.POCO.Systems.DefinitionAndUs
         {
             BuildUnextendedUsagePrefix(poco, cursorCache, stringBuilder);
             var ownedRelationshipCursor = cursorCache.GetOrCreateCursor(poco.Id, "ownedRelationship", poco.OwnedRelationship);
-            while (ownedRelationshipCursor.Current != null)
+            while (ownedRelationshipCursor.Current != null && ownedRelationshipCursor.Current is SysML2.NET.Core.POCO.Root.Namespaces.IOwningMembership)
             {
                 BuildUsageExtensionKeyword(poco, cursorCache, stringBuilder);
             }
diff --git a/SysML2.NET/TextualNotation/ClassifierTextualNotationBuilder.cs b/SysML2.NET/TextualNotation/ClassifierTextualNotationBuilder.cs
@@ -0,0 +1,78 @@
+// -------------------------------------------------------------------------------------------------
+// <copyright file="ClassifierTextualNotationBuilder.cs" company="Starion Group S.A.">
+//
+//   Copyright 2022-2026 Starion Group S.A.
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+//
+// </copyright>
+// ------------------------------------------------------------------------------------------------
+
+namespace SysML2.NET.TextualNotation
+{
+    using System.Text;
+
+    using SysML2.NET.Core.POCO.Core.Classifiers;
+    using SysML2.NET.Core.POCO.Core.Types;
+
+    /// <summary>
+    /// Hand-coded part of the <see cref="ClassifierTextualNotationBuilder" />
+    /// </summary>
+    public static partial class ClassifierTextualNotationBuilder
+    {
+        /// <summary>
+        /// Builds the Textual Notation string for the rule ClassifierDeclaration.
+        /// <para>Handles the <c>(SuperclassingPart | ConjugationPart)+ TypeRelationshipPart*</c>
+        /// portion that the auto-gen cannot produce correctly (it generates a degenerate switch
+        /// on <c>poco</c> type where <c>case IType</c> always matches since <c>IClassifier : IType</c>,
+        /// making the <c>default:</c> arm with <c>BuildSuperclassingPart</c> unreachable).</para>
+        /// <para>The discriminator must be cursor-element-based:
+        /// <c>ISubclassification</c> → SuperclassingPart,
+        /// <c>IConjugation</c> → ConjugationPart.</para>
+        /// </summary>
+        /// <param name="poco">The <see cref="IClassifier" /> from which the rule should be built</param>
+        /// <param name="cursorCache">The <see cref="ICursorCache" /> used to get access to CursorCollection for the current <paramref name="poco"/></param>
+        /// <param name="stringBuilder">The <see cref="StringBuilder" /> that contains the entire textual notation</param>
+        /// <remarks>
+        /// ClassifierDeclaration : Classifier =
+        ///     (isSufficient ?= 'all')? Identification (OwnedMultiplicity)?
+        ///     (SuperclassingPart | ConjugationPart)+ TypeRelationshipPart*
+        ///
+        /// The auto-gen handles isSufficient, Identification, and OwnedMultiplicity.
+        /// This HandCoded method handles: (SuperclassingPart | ConjugationPart)+ TypeRelationshipPart*
+        /// </remarks>
+        private static void BuildClassifierDeclarationHandCoded(IClassifier poco, ICursorCache cursorCache, StringBuilder stringBuilder)
+        {
+            var ownedRelationshipCursor = cursorCache.GetOrCreateCursor(poco.Id, "ownedRelationship", poco.OwnedRelationship);
+
+            // (SuperclassingPart | ConjugationPart)+ — dispatch on cursor element type
+            while (ownedRelationshipCursor.Current is ISubclassification or IConjugation)
+            {
+                if (ownedRelationshipCursor.Current is ISubclassification)
+                {
+                    BuildSuperclassingPart(poco, cursorCache, stringBuilder);
+                }
+                else
+                {
+                    TypeTextualNotationBuilder.BuildConjugationPart(poco, cursorCache, stringBuilder);
+                }
+            }
+
+            // TypeRelationshipPart* — zero or more
+            while (ownedRelationshipCursor.Current is IDisjoining or IUnioning or IIntersecting or IDifferencing)
+            {
+                TypeTextualNotationBuilder.BuildTypeRelationshipPart(poco, cursorCache, stringBuilder);
+            }
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public static void BuildDefinitionPrefix(SysML2.NET.Core.POCO.Systems.Definition`
`73`	`73`	`SharedTextualNotationBuilder.BuildBasicDefinitionPrefix(poco, cursorCache, stringBuilder);`
`74`	`74`	`}`
`75`	`75`	`var ownedRelationshipCursor = cursorCache.GetOrCreateCursor(poco.Id, "ownedRelationship", poco.OwnedRelationship);`
`76`		`- while (ownedRelationshipCursor.Current != null)`
	`76`	`+ while (ownedRelationshipCursor.Current != null && ownedRelationshipCursor.Current is SysML2.NET.Core.POCO.Root.Namespaces.IOwningMembership)`
`77`	`77`	`{`
`78`	`78`	`BuildDefinitionExtensionKeyword(poco, cursorCache, stringBuilder);`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,6 @@ public static void BuildOwnedFeatureChain(SysML2.NET.Core.POCO.Core.Features.IFe`
`352`	`352`	`ownedRelationshipCursor.Move();`
`353`	`353`
`354`	`354`	`}`
`355`		`- stringBuilder.Append(' ');`
`356`	`355`
`357`	`356`	`}`
`358`	`357`
`@@ -730,7 +729,6 @@ public static void BuildChainingPart(SysML2.NET.Core.POCO.Core.Features.IFeature`
`730`	`729`	`{`
`731`	`730`	`BuildFeatureChain(poco, cursorCache, stringBuilder);`
`732`	`731`	`}`
`733`		`- stringBuilder.Append(' ');`
`734`	`732`
`735`	`733`	`}`
`736`	`734`
`@@ -840,7 +838,6 @@ public static void BuildFeatureChain(SysML2.NET.Core.POCO.Core.Features.IFeature`
`840`	`838`	`ownedRelationshipCursor.Move();`
`841`	`839`
`842`	`840`	`}`
`843`		`- stringBuilder.Append(' ');`
`844`	`841`
`845`	`842`	`}`
`846`	`843`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,6 @@ public static void BuildMetadataFeatureDeclaration(SysML2.NET.Core.POCO.Kernel.M`
`74`	`74`	`ElementTextualNotationBuilder.BuildIdentification(poco, cursorCache, stringBuilder);`
`75`	`75`	`stringBuilder.Append(":");`
`76`	`76`	`stringBuilder.Append(' ');`
`77`		`- stringBuilder.Append(' ');`
`78`	`77`	`}`
`79`	`78`
`80`	`79`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public static void BuildOccurrenceDefinitionPrefix(SysML2.NET.Core.POCO.Systems.`
`67`	`67`	`stringBuilder.Append(' ');`
`68`	`68`	`}`
`69`	`69`
`70`		`- while (ownedRelationshipCursor.Current != null)`
	`70`	`+ while (ownedRelationshipCursor.Current != null && ownedRelationshipCursor.Current is SysML2.NET.Core.POCO.Root.Namespaces.IOwningMembership)`
`71`	`71`	`{`
`72`	`72`	`DefinitionTextualNotationBuilder.BuildDefinitionExtensionKeyword(poco, cursorCache, stringBuilder);`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public static void BuildOccurrenceUsagePrefix(SysML2.NET.Core.POCO.Systems.Occur`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`var ownedRelationshipCursor = cursorCache.GetOrCreateCursor(poco.Id, "ownedRelationship", poco.OwnedRelationship);`
`63`		`- while (ownedRelationshipCursor.Current != null)`
	`63`	`+ while (ownedRelationshipCursor.Current != null && ownedRelationshipCursor.Current is SysML2.NET.Core.POCO.Root.Namespaces.IOwningMembership)`
`64`	`64`	`{`
`65`	`65`	`UsageTextualNotationBuilder.BuildUsageExtensionKeyword(poco, cursorCache, stringBuilder);`
`66`	`66`	`}`
`@@ -147,7 +147,7 @@ public static void BuildControlNodePrefix(SysML2.NET.Core.POCO.Systems.Occurrenc`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`var ownedRelationshipCursor = cursorCache.GetOrCreateCursor(poco.Id, "ownedRelationship", poco.OwnedRelationship);`
`150`		`- while (ownedRelationshipCursor.Current != null)`
	`150`	`+ while (ownedRelationshipCursor.Current != null && ownedRelationshipCursor.Current is SysML2.NET.Core.POCO.Root.Namespaces.IOwningMembership)`
`151`	`151`	`{`
`152`	`152`	`UsageTextualNotationBuilder.BuildUsageExtensionKeyword(poco, cursorCache, stringBuilder);`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,6 @@ public static void BuildPackageMember(SysML2.NET.Core.POCO.Root.Namespaces.IOwni`
`83`	`83`	`ownedRelatedElementCursor.Move();`
`84`	`84`	`}`
`85`	`85`
`86`		`- stringBuilder.Append(' ');`
`87`	`86`
`88`	`87`	`}`
`89`	`88`