diff --git a/src/AXSharp.compiler/src/AXSharp.Compiler/Core/ICombinedThreeVisitor.cs b/src/AXSharp.compiler/src/AXSharp.Compiler/Core/ICombinedThreeVisitor.cs index 0d1a256f..83bb48e4 100644 --- a/src/AXSharp.compiler/src/AXSharp.Compiler/Core/ICombinedThreeVisitor.cs +++ b/src/AXSharp.compiler/src/AXSharp.Compiler/Core/ICombinedThreeVisitor.cs @@ -262,7 +262,6 @@ public virtual void CreateScalarTypeDeclaration(IScalarTypeDeclaration scalarTyp throw new NotImplementedException(); } - /// /// Creates string type declaration. /// @@ -274,9 +273,16 @@ public virtual void CreateStringTypeDeclaration(IStringTypeDeclaration stringTyp } /// - /// Created array type declaration. + /// Creates array type declaration. /// /// Array type semantics /// Associated visitor. void CreateArrayTypeDeclaration(IArrayTypeDeclaration arrayTypeDeclaration, IxNodeVisitor visitor); + + /// + /// Creates documentation for + /// + /// Documentation comment + /// Associated visitor + void CreateDocComment(IDocComment docComment, ICombinedThreeVisitor data); } \ No newline at end of file diff --git a/src/AXSharp.compiler/src/AXSharp.Compiler/Core/IxNodeVisitor.cs b/src/AXSharp.compiler/src/AXSharp.Compiler/Core/IxNodeVisitor.cs index 6fbf80e8..d7ad3a62 100644 --- a/src/AXSharp.compiler/src/AXSharp.Compiler/Core/IxNodeVisitor.cs +++ b/src/AXSharp.compiler/src/AXSharp.Compiler/Core/IxNodeVisitor.cs @@ -229,6 +229,11 @@ void ISemanticNodeVisitor.Visit(ISemanticTypeAccess seman data.CreateSemanticTypeAccess(semanticTypeAccess, this); } + public void Visit(IDocComment semanticTypeAccess, ICombinedThreeVisitor data) + { + data.CreateDocComment(semanticTypeAccess, data); + } + void ISemanticNodeVisitor.Visit(ISemanticInstructionList instrList, ICombinedThreeVisitor data) { diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Helpers/SemanticsHelpers.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Helpers/SemanticsHelpers.cs index 34f9129c..1dab649c 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Helpers/SemanticsHelpers.cs +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Helpers/SemanticsHelpers.cs @@ -138,4 +138,15 @@ public static bool IsMemberEligibleForConstructor(this IArrayTypeDeclaration arr { return arrayTypeDeclaration.ElementTypeAccess.Type.IsTypeEligibleForTranspile(sourceBuilder); } + + /// + /// Create triple-slash documentation. + /// + /// Documentation comment + /// Source builder + /// + public static string AddDocumentationComment(this IDocComment docComment, ISourceBuilder sourceBuilder) + { + return docComment.Content; + } } \ No newline at end of file diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerConstructorBuilder.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerConstructorBuilder.cs index 4059f233..51c3c09b 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerConstructorBuilder.cs +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerConstructorBuilder.cs @@ -294,4 +294,10 @@ public void AddTypeConstructionParameters(string parametersString) { AddToSource(parametersString); } + + /// + public void CreateDocComment(IDocComment semanticTypeAccess, ICombinedThreeVisitor data) + { + AddToSource(semanticTypeAccess.AddDocumentationComment(SourceBuilder)); + } } \ No newline at end of file diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerMemberBuilder.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerMemberBuilder.cs index 884467c6..967ca34b 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerMemberBuilder.cs +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerMemberBuilder.cs @@ -220,4 +220,10 @@ public static CsOnlinerMemberBuilder Create(IxNodeVisitor visitor, IConfiguratio semantics.Variables.ToList().ForEach(p => p.Accept(visitor, builder)); return builder; } + + /// + public void CreateDocComment(IDocComment semanticTypeAccess, ICombinedThreeVisitor data) + { + AddToSource(semanticTypeAccess.AddDocumentationComment(SourceBuilder)); + } } \ No newline at end of file diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerOnlineToPlainBuilder.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerOnlineToPlainBuilder.cs index 8d64cea5..3916952f 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerOnlineToPlainBuilder.cs +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerOnlineToPlainBuilder.cs @@ -152,4 +152,10 @@ public static CsOnlinerPlainerOnlineToPlainBuilder Create(IxNodeVisitor visitor, builder.AddToSource($"}}"); return builder; } + + /// + public void CreateDocComment(IDocComment semanticTypeAccess, ICombinedThreeVisitor data) + { + AddToSource(semanticTypeAccess.AddDocumentationComment(SourceBuilder)); + } } \ No newline at end of file diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerPlainToOnlineBuilder.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerPlainToOnlineBuilder.cs index fef130d1..52f18072 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerPlainToOnlineBuilder.cs +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerPlainToOnlineBuilder.cs @@ -158,4 +158,10 @@ public static CsOnlinerPlainerPlainToOnlineBuilder Create(IxNodeVisitor visitor, builder.AddToSource($"}}"); return builder; } + + /// + public void CreateDocComment(IDocComment semanticTypeAccess, ICombinedThreeVisitor data) + { + AddToSource(semanticTypeAccess.AddDocumentationComment(SourceBuilder)); + } } \ No newline at end of file diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerPlainToShadowBuilder.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerPlainToShadowBuilder.cs index 82b7af42..7574fa66 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerPlainToShadowBuilder.cs +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerPlainToShadowBuilder.cs @@ -154,5 +154,13 @@ public static CsOnlinerPlainerPlainToShadowBuilder Create(IxNodeVisitor visitor, builder.AddToSource($"}}"); return builder; } + + /// + public void CreateDocComment(IDocComment semanticTypeAccess, ICombinedThreeVisitor data) + { + AddToSource(semanticTypeAccess.AddDocumentationComment(SourceBuilder)); + } } + + } diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerShadowToPlainBuilder.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerShadowToPlainBuilder.cs index 4b871e76..714ada20 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerShadowToPlainBuilder.cs +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerPlainerShadowToPlainBuilder.cs @@ -151,5 +151,11 @@ public static CsOnlinerPlainerShadowToPlainBuilder Create(IxNodeVisitor visitor, builder.AddToSource($"}}"); return builder; } + + /// + public void CreateDocComment(IDocComment semanticTypeAccess, ICombinedThreeVisitor data) + { + AddToSource(semanticTypeAccess.AddDocumentationComment(SourceBuilder)); + } } } diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerSourceBuilder.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerSourceBuilder.cs index 0643c9d4..d7cecc7f 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerSourceBuilder.cs +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerSourceBuilder.cs @@ -309,4 +309,10 @@ private void AddToSource(string token, string separator = " ") { _sourceBuilder.Append($"{token}{separator}"); } + + /// + public void CreateDocComment(IDocComment semanticTypeAccess, ICombinedThreeVisitor data) + { + AddToSource(semanticTypeAccess.AddDocumentationComment(this)); + } } \ No newline at end of file diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Plain/CsPlainSourceBuilder.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Plain/CsPlainSourceBuilder.cs index a5829b95..3d98a56e 100644 --- a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Plain/CsPlainSourceBuilder.cs +++ b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Plain/CsPlainSourceBuilder.cs @@ -325,6 +325,12 @@ public void CreateArrayTypeDeclaration(IArrayTypeDeclaration arrayTypeDeclaratio AddToSource("[]"); } + /// + public void CreateDocComment(IDocComment semanticTypeAccess, ICombinedThreeVisitor data) + { + AddToSource(semanticTypeAccess.AddDocumentationComment(this)); + } + /// public void CreateStringTypeDeclaration(IStringTypeDeclaration stringTypeDeclaration, IxNodeVisitor visitor) { diff --git a/src/AXSharp.compiler/src/ixd/Visitors/MyNodeVisitor.cs b/src/AXSharp.compiler/src/ixd/Visitors/MyNodeVisitor.cs index 51bdc3ac..5b02bf4d 100644 --- a/src/AXSharp.compiler/src/ixd/Visitors/MyNodeVisitor.cs +++ b/src/AXSharp.compiler/src/ixd/Visitors/MyNodeVisitor.cs @@ -191,6 +191,11 @@ public void Visit(ISemanticTypeAccess semanticTypeAccess, IYamlBuiderVisitor dat } + public void Visit(IDocComment semanticTypeAccess, IYamlBuiderVisitor data) + { + throw new NotImplementedException(); + } + public void Visit(ISemanticInstructionList instrList, IYamlBuiderVisitor data) { diff --git a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/Cs/PragmasExtensionsTests.cs b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/Cs/PragmasExtensionsTests.cs index 7b93484d..36f60fdf 100644 --- a/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/Cs/PragmasExtensionsTests.cs +++ b/src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/Cs/PragmasExtensionsTests.cs @@ -16,6 +16,7 @@ using AX.ST.Semantic.Tree; using AX.Text; using AXSharp.Compiler.Cs; +using NSubstitute; using Xunit.Abstractions; namespace AXSharp.Compiler.CsTests; @@ -49,11 +50,18 @@ public void should_get_attribute_source() public void should_declare_property() { var expected = "private string _SomeField;\npublic string SomeField { get => string.IsNullOrEmpty(_SomeField) ? SymbolTail : this.Translate(_SomeField).Interpolate(this); set => _SomeField = value; }"; - var field = new TypeMock("someField", - new ReadOnlyCollection(new IPragma[] - { - new PragmaMock("#ix-prop:public string SomeField") - })); + var field = NSubstitute.Substitute.For(); + field.Name.Returns("someField"); + field.Pragmas.Returns(new ReadOnlyCollection(new IPragma[] + { + new PragmaMock("#ix-prop:public string SomeField") + })); + + //new TypeMock("someField", + // new ReadOnlyCollection(new IPragma[] + // { + // new PragmaMock("#ix-prop:public string SomeField") + // })); var actual = field.DeclareProperties(); @@ -65,11 +73,18 @@ public void should_declare_property() public void should_set_property_string() { var expected = "someField.AttributeName = \"This is name\";"; - var field = new FieldMock("someField", - new ReadOnlyCollection(new IPragma[] - { - new PragmaMock("#ix-set:AttributeName = \"This is name\"") - })); + var field = NSubstitute.Substitute.For(); + field.Name.Returns("someField"); + field.Pragmas.Returns(new ReadOnlyCollection(new IPragma[] + { + new PragmaMock("#ix-set:AttributeName = \"This is name\"") + })); + + //var field = new FieldMock("someField", + // new ReadOnlyCollection(new IPragma[] + // { + // new PragmaMock("#ix-set:AttributeName = \"This is name\"") + // })); var actual = field.SetProperties(); @@ -80,11 +95,18 @@ public void should_set_property_string() public void should_set_property_number() { var expected = "someField.AttributeMinimum = 10.5f;"; - var field = new FieldMock("someField", - new ReadOnlyCollection(new IPragma[] - { - new PragmaMock("#ix-set:AttributeMinimum = 10.5f") - })); + var field = NSubstitute.Substitute.For(); + field.Name.Returns("someField"); + field.Pragmas.Returns(new ReadOnlyCollection(new IPragma[] + { + new PragmaMock("#ix-set:AttributeMinimum = 10.5f") + })); + + //var field = new FieldMock("someField", + // new ReadOnlyCollection(new IPragma[] + // { + // new PragmaMock("#ix-set:AttributeMinimum = 10.5f") + // })); var actual = field.SetProperties(); @@ -116,167 +138,177 @@ public IEnumerable GetDescendentNodes() } } -public class FieldMock : IFieldDeclaration -{ - public FieldMock(string name, IReadOnlyCollection pragmas) - { - Name = name; - Pragmas = pragmas; - } +//public class FieldMock : IFieldDeclaration +//{ +// public FieldMock(string name, IReadOnlyCollection pragmas) +// { +// Name = name; +// Pragmas = pragmas; +// } - public AccessModifier AccessModifier => throw new NotImplementedException(); +// public AccessModifier AccessModifier => throw new NotImplementedException(); - public Section Section => throw new NotImplementedException(); +// public Section Section => throw new NotImplementedException(); - public ISemanticTypeAccess TypeAccess => throw new NotImplementedException(); +// public ISemanticTypeAccess TypeAccess => throw new NotImplementedException(); - public IDirectAccess Address => throw new NotImplementedException(); +// public IDirectAccess Address => throw new NotImplementedException(); - public ISemanticInitializer Initializer => throw new NotImplementedException(); +// public ISemanticInitializer Initializer => throw new NotImplementedException(); - public StorageModifier StorageModifier => throw new NotImplementedException(); +// public StorageModifier StorageModifier => throw new NotImplementedException(); - public bool IsConstant => throw new NotImplementedException(); +// public bool IsConstant => throw new NotImplementedException(); - public bool IsDeclaredConstant => throw new NotImplementedException(); +// public bool IsDeclaredConstant => throw new NotImplementedException(); - public bool IsDeclaredReadOnly => throw new NotImplementedException(); +// public bool IsDeclaredReadOnly => throw new NotImplementedException(); - public ISymbol Symbol => throw new NotImplementedException(); +// public ISymbol Symbol => throw new NotImplementedException(); - public string Name { get; } +// public string Name { get; } - public string FullyQualifiedName => throw new NotImplementedException(); +// public string FullyQualifiedName => throw new NotImplementedException(); - public DeclarationKind Kind => throw new NotImplementedException(); +// public DeclarationKind Kind => throw new NotImplementedException(); - public IScope ContainingScope => throw new NotImplementedException(); +// public IScope ContainingScope => throw new NotImplementedException(); - public INamespaceDeclaration ContainingNamespace => throw new NotImplementedException(); +// public INamespaceDeclaration ContainingNamespace => throw new NotImplementedException(); - public ITypeDeclaration Type => throw new NotImplementedException(); +// public ITypeDeclaration Type => throw new NotImplementedException(); +// public IDocComment DocComment { get; } - public IReadOnlyCollection Pragmas { get; } +// public IReadOnlyCollection Pragmas { get; } - public Location Location => throw new NotImplementedException(); +// public Location Location => throw new NotImplementedException(); - public IEnumerable ChildNodes => throw new NotImplementedException(); +// public IEnumerable ChildNodes => throw new NotImplementedException(); - public void Accept(ISemanticNodeVisitor visitor, T data) - { - throw new NotImplementedException(); - } +// public void Accept(ISemanticNodeVisitor visitor, T data) +// { +// throw new NotImplementedException(); +// } - public bool Equals(IDeclaration? other) - { - throw new NotImplementedException(); - } +// public bool Equals(IDeclaration? other) +// { +// throw new NotImplementedException(); +// } - public IEnumerable GetDescendentNodes() - { - throw new NotImplementedException(); - } -} +// public IEnumerable GetDescendentNodes() +// { +// throw new NotImplementedException(); +// } +//} -public class TypeMock : ITypeDeclaration -{ - public TypeMock(string name, IReadOnlyCollection pragmas) - { - Name = name; - Pragmas = pragmas; - } +//public class TypeMock : ITypeDeclaration +//{ + +// public TypeMock(string name, IReadOnlyCollection pragmas) +// { +// Name = name; +// Pragmas = pragmas; +// } - public IReadOnlyCollection ExtendedTypeAccesses => throw new NotImplementedException(); +// public IReadOnlyCollection ExtendedTypeAccesses => throw new NotImplementedException(); - public IReadOnlyCollection ImplementedInterfaces => throw new NotImplementedException(); +// public IReadOnlyCollection ImplementedInterfaces => throw new NotImplementedException(); - public GenericDataType GenericType => throw new NotImplementedException(); +// public GenericDataType GenericType => throw new NotImplementedException(); - public IScope LocalScope => throw new NotImplementedException(); +// public IScope LocalScope => throw new NotImplementedException(); - public ISemanticInitializer Initializer => throw new NotImplementedException(); +// public ISemanticInitializer Initializer => throw new NotImplementedException(); - public AccessModifier AccessModifier => throw new NotImplementedException(); +// public AccessModifier AccessModifier => throw new NotImplementedException(); - public ulong? BitWidth => throw new NotImplementedException(); +// public ulong? BitWidth => throw new NotImplementedException(); - public ISymbol Symbol => throw new NotImplementedException(); +// public ISymbol Symbol => throw new NotImplementedException(); - public string Name { get; } +// public string Name { get; } - public string FullyQualifiedName => throw new NotImplementedException(); +// public string FullyQualifiedName => throw new NotImplementedException(); - public DeclarationKind Kind => throw new NotImplementedException(); +// public DeclarationKind Kind => throw new NotImplementedException(); - public IScope ContainingScope => throw new NotImplementedException(); +// public IScope ContainingScope => throw new NotImplementedException(); - public INamespaceDeclaration ContainingNamespace => throw new NotImplementedException(); +// public INamespaceDeclaration ContainingNamespace => throw new NotImplementedException(); - public ITypeDeclaration Type => throw new NotImplementedException(); +// public ITypeDeclaration Type => throw new NotImplementedException(); - public IReadOnlyCollection Pragmas { get; } +// public IDocComment DocComment { get; } - public Location Location => throw new NotImplementedException(); - public IEnumerable ChildNodes => throw new NotImplementedException(); +// public IReadOnlyCollection Pragmas { get; } - public void Accept(ISemanticNodeVisitor visitor, T data) - { - throw new NotImplementedException(); - } +// public Location Location => throw new NotImplementedException(); - public bool Equals(IDeclaration? other) - { - throw new NotImplementedException(); - } +// public IEnumerable ChildNodes => throw new NotImplementedException(); - public bool Extends(ITypeDeclaration type) - { - throw new NotImplementedException(); - } +// public void Accept(ISemanticNodeVisitor visitor, T data) +// { +// throw new NotImplementedException(); +// } - public IReadOnlyCollection GetAllExtendedTypes() - { - throw new NotImplementedException(); - } +// public bool Equals(IDeclaration? other) +// { +// throw new NotImplementedException(); +// } - public IReadOnlyCollection GetAllImplementedInterfaces() - { - throw new NotImplementedException(); - } +// public bool Extends(ITypeDeclaration type) +// { +// throw new NotImplementedException(); +// } - public IReadOnlyCollection GetAllImplementedInterfacesUniquely() - { - throw new NotImplementedException(); - } +// public IReadOnlyCollection GetAllExtendedTypes() +// { +// throw new NotImplementedException(); +// } - public IEnumerable GetDescendentNodes() - { - throw new NotImplementedException(); - } +// public IReadOnlyCollection GetAllExtendedTypesUniquely() +// { +// throw new NotImplementedException(); +// } - public T GetLiteralValue(string literal) - { - throw new NotImplementedException(); - } +// public IReadOnlyCollection GetAllImplementedInterfaces() +// { +// throw new NotImplementedException(); +// } - public bool Implements(IInterfaceDeclaration @interface) - { - throw new NotImplementedException(); - } +// public IReadOnlyCollection GetAllImplementedInterfacesUniquely() +// { +// throw new NotImplementedException(); +// } - public bool IsAssignableTo(ITypeDeclaration other) - { - throw new NotImplementedException(); - } +// public IEnumerable GetDescendentNodes() +// { +// throw new NotImplementedException(); +// } - public bool IsEqualType(ITypeDeclaration other) - { - throw new NotImplementedException(); - } +// public T GetLiteralValue(string literal) +// { +// throw new NotImplementedException(); +// } - public bool IsOfGenericType(GenericDataType genericType) - { - throw new NotImplementedException(); - } -} \ No newline at end of file +// public bool Implements(IInterfaceDeclaration @interface) +// { +// throw new NotImplementedException(); +// } + +// public bool IsAssignableTo(ITypeDeclaration other) +// { +// throw new NotImplementedException(); +// } + +// public bool IsEqualType(ITypeDeclaration other) +// { +// throw new NotImplementedException(); +// } + +// public bool IsOfGenericType(GenericDataType genericType) +// { +// throw new NotImplementedException(); +// } +//} \ No newline at end of file diff --git a/src/AXSharp.compiler/tests/AXSharp.CompilerTests/IxProjectTests.cs b/src/AXSharp.compiler/tests/AXSharp.CompilerTests/IxProjectTests.cs index 252e202c..48c490e2 100644 --- a/src/AXSharp.compiler/tests/AXSharp.CompilerTests/IxProjectTests.cs +++ b/src/AXSharp.compiler/tests/AXSharp.CompilerTests/IxProjectTests.cs @@ -354,6 +354,11 @@ public void CreateArrayTypeDeclaration(IArrayTypeDeclaration arrayTypeDeclaratio { } + public void CreateDocComment(IDocComment semanticTypeAccess, ICombinedThreeVisitor data) + { + + } + #endregion } diff --git a/src/apax/apax-lock.json b/src/apax/apax-lock.json index b42c8ca2..acfc93dd 100644 --- a/src/apax/apax-lock.json +++ b/src/apax/apax-lock.json @@ -1,22 +1,22 @@ { "@ax/st-docs": { - "version": "4.2.19", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-4.2.19.tgz", - "integrity": "sha512-cq97rFqA5GNZBY6cRe1DdeK7wFcd2iprpqXSsCUBl6q4DdjQJ2N8X7iefE1tShqo0mhppDXw13NAdLwPoOW+jg==" + "version": "4.5.85", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-4.5.85.tgz", + "integrity": "sha512-4aLjC4bbZyxbRp6ob7YUVkt3vwMaxxi22JGKzJsYOUVYU54I96/GAYrW+U7lod+jWe5Z/pe4LGphFkJwagComg==" }, "@ax/stc": { - "version": "4.2.19", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/stc/-/stc-4.2.19.tgz", - "integrity": "sha512-4FnHt1v+Py3gUC8EMcpUyM7jSrSLGqIkWd8HNYR6pnR306tfUAmHbVgHaJMONvy36UNFr2MtVeF7eTExRPyPcg==", + "version": "4.5.85", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/stc/-/stc-4.5.85.tgz", + "integrity": "sha512-Wx30hkzpbrhG78xyTZwEX2eDQN6bpAl6nMxwuyT0zmEroxrOLDr0/E/glmZLo0pLiL65jWXj9ENHxF3Bp6CrSQ==", "dependencies": { - "@ax/stc-linux-x64": "4.2.19", - "@ax/stc-win-x64": "4.2.19" + "@ax/stc-linux-x64": "4.5.85", + "@ax/stc-win-x64": "4.5.85" } }, "@ax/stc-linux-x64": { - "version": "4.2.19", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-linux-x64/-/stc-linux-x64-4.2.19.tgz", - "integrity": "sha512-YhropZVFunzsSvdbHjMRrEoO0REHrfszyglBibM2GDUkveVZcgs2FhUaqz5a2tdFrs3eTMxwQpVTTEi6iL07KQ==", + "version": "4.5.85", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-linux-x64/-/stc-linux-x64-4.5.85.tgz", + "integrity": "sha512-A4btgQ/72CUB/BHXAEi48dNj1joWeSuIa+xWE2jQiVznEy+U+bVgEAq0NHSn9KoF86qYYV5rPh3qOHUcZ6vCyA==", "os": [ "linux" ], @@ -24,13 +24,13 @@ "x64" ], "dependencies": { - "@ax/st-docs": "4.2.19" + "@ax/st-docs": "4.5.85" } }, "@ax/stc-win-x64": { - "version": "4.2.19", - "resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-win-x64/-/stc-win-x64-4.2.19.tgz", - "integrity": "sha512-ZrWaXdTqzQV0OD9PWmShCHnXhVL9MUK5HDLok4CuxWJhkpKHentuDqOgcUrYnQaPh1L8muHAsbRjTIR9FDg1xw==", + "version": "4.5.85", + "resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-win-x64/-/stc-win-x64-4.5.85.tgz", + "integrity": "sha512-dPXV9fU/h7brIqESqwI9AyJLn1+etSYU9XOEH3b8PaWuom7LnXqZiASxBpA70RPx8N5AFyOJlurK7aVT/E9/OA==", "os": [ "win32" ], @@ -38,7 +38,7 @@ "x64" ], "dependencies": { - "@ax/st-docs": "4.2.19" + "@ax/st-docs": "4.5.85" } } } diff --git a/src/apax/apax.yml b/src/apax/apax.yml index bd86e855..7d52ac9b 100644 --- a/src/apax/apax.yml +++ b/src/apax/apax.yml @@ -5,4 +5,4 @@ targets: - "1500" - axunit-llvm devDependencies: - "@ax/stc": 4.2.19 + "@ax/stc": 4.5.85 diff --git a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/monster.g.cs b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/monster.g.cs index be080800..43753e53 100644 --- a/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/monster.g.cs +++ b/src/sanbox/integration/ix-integration-plc/ix/.g/POCO/monster.g.cs @@ -11,7 +11,7 @@ public partial class MonsterBase : AXSharp.Connector.IPlain public ixcomponent[] ArrayOfIxComponent { get; set; } = new ixcomponent[4]; } - public partial class Monster : MonsterBase, AXSharp.Connector.IPlain + public partial class Monster : MonsterData.MonsterBase, AXSharp.Connector.IPlain { public MonsterData.DriveBase DriveA { get; set; } = new MonsterData.DriveBase(); } diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/moster.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/moster.g.cs index 36ba882c..12f6012d 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/moster.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/moster.g.cs @@ -192,7 +192,7 @@ public AXSharp.Connector.ITwinObject GetParent() public AXSharp.Connector.Localizations.Translator Interpreter => integrated.PlcTranslator.Instance; } - public partial class Monster : MonsterBase + public partial class Monster : MonsterData.MonsterBase { public MonsterData.DriveBase DriveA { get; } diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/realmonster.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/realmonster.g.cs index 11d5ea27..c3eb3529 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/realmonster.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/Onliners/dataswapping/realmonster.g.cs @@ -219,7 +219,7 @@ public AXSharp.Connector.ITwinObject GetParent() public AXSharp.Connector.Localizations.Translator Interpreter => integrated.PlcTranslator.Instance; } - public partial class RealMonster : RealMonsterBase + public partial class RealMonster : RealMonsterData.RealMonsterBase { public RealMonsterData.DriveBaseNested DriveA { get; } diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/moster.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/moster.g.cs index d7340eda..30272016 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/moster.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/moster.g.cs @@ -13,7 +13,7 @@ public partial class MonsterBase : AXSharp.Connector.IPlain public MonsterData.DriveBase[] ArrayOfDrives { get; set; } = new MonsterData.DriveBase[4]; } - public partial class Monster : MonsterBase, AXSharp.Connector.IPlain + public partial class Monster : MonsterData.MonsterBase, AXSharp.Connector.IPlain { public MonsterData.DriveBase DriveA { get; set; } = new MonsterData.DriveBase(); } diff --git a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/realmonster.g.cs b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/realmonster.g.cs index dda27430..963852b1 100644 --- a/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/realmonster.g.cs +++ b/src/tests.integrations/integrated/src/integrated.twin/.g/POCO/dataswapping/realmonster.g.cs @@ -16,7 +16,7 @@ public partial class RealMonsterBase : AXSharp.Connector.IPlain public RealMonsterData.DriveBaseNested[] ArrayOfDrives { get; set; } = new RealMonsterData.DriveBaseNested[4]; } - public partial class RealMonster : RealMonsterBase, AXSharp.Connector.IPlain + public partial class RealMonster : RealMonsterData.RealMonsterBase, AXSharp.Connector.IPlain { public RealMonsterData.DriveBaseNested DriveA { get; set; } = new RealMonsterData.DriveBaseNested(); }