Skip to content

Update stc to v9 #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PTKu merged 2 commits into from
Apr 2, 2025
Merged

Update stc to v9 #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea2a8d1
Create draft PR for #396
PTKu Mar 28, 2025
24e5745
Updates to stc v9
PTKu Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/AXSharp.compiler/src/AXSharp.Compiler/Core/IxNodeVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@ void ISemanticNodeVisitor<ICombinedThreeVisitor>.Visit(IMethodDeclaration method
throw new NotSupportedException();
}

public void Visit(IClassMethodDeclaration methodDeclaration, ICombinedThreeVisitor data)
{
throw new NotSupportedException();
}

void ISemanticNodeVisitor<ICombinedThreeVisitor>.Visit(IMethodPrototypeDeclaration methodPrototypeDeclaration,
ICombinedThreeVisitor data)
{
Expand Down
2 changes: 1 addition & 1 deletion src/AXSharp.compiler/src/ixd/Mapper/CodeToYamlMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public Item PopulateItem(IMethodDeclaration methodDeclaration)
var item = PopulateItem((IDeclaration)methodDeclaration);
item.Uid = Helpers.Helpers.GetBaseUid(methodDeclaration);
item.Id = Helpers.Helpers.GetBaseUid(methodDeclaration);
item.Parent = methodDeclaration.ContainingClass.FullyQualifiedName;
item.Parent = methodDeclaration.ContainingStructuredType.FullyQualifiedName;
item.Type = "Method";
item.Syntax = new Syntax
{
Expand Down
5 changes: 5 additions & 0 deletions src/AXSharp.compiler/src/ixd/Visitors/MyNodeVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ public void Visit(IMethodDeclaration methodDeclaration, IYamlBuiderVisitor data)
data.CreateMethodYaml(methodDeclaration, this);
}

public void Visit(IClassMethodDeclaration methodDeclaration, IYamlBuiderVisitor data)
{
data.CreateMethodYaml(methodDeclaration, this);
}

public void Visit(IMethodPrototypeDeclaration methodPrototypeDeclaration, IYamlBuiderVisitor data)
{
data.CreateMethodPrototypeYaml(methodPrototypeDeclaration, this);
Expand Down
34 changes: 17 additions & 17 deletions src/apax/apax-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,55 +7,55 @@
"name": "s",
"version": "0.0.0",
"devDependencies": {
"@ax/stc": "8.0.17"
"@ax/stc": "9.1.36"
}
},
"packages": {
"@ax/stc": {
"name": "@ax/stc",
"version": "8.0.17",
"integrity": "sha512-Ym2uWEmfrkhm2Z/ODujUwQOiAwQ2p0fv9hLTJGL+zwYMjAwja71JayMLSOO+cX0gv8VexrxISDa66jouT+XySA==",
"resolved": "https://registry.simatic-ax.siemens.io/@ax/stc/-/stc-8.0.17.tgz",
"version": "9.1.36",
"integrity": "sha512-v1crfIUg8rUVmrhtSTDoZZNub9At2iMiDgR4BK+3SA1VmhO7swGwnff0OkSoteE60kdxN+70AmKJJWlX+11WTA==",
"resolved": "https://registry.simatic-ax.siemens.io/@ax/stc/-/stc-9.1.36.tgz",
"dependencies": {
"@ax/stc-win-x64": "8.0.17",
"@ax/stc-linux-x64": "8.0.17"
"@ax/stc-win-x64": "9.1.36",
"@ax/stc-linux-x64": "9.1.36"
}
},
"@ax/stc-win-x64": {
"name": "@ax/stc-win-x64",
"version": "8.0.17",
"integrity": "sha512-vOnWIY+dLfASN2s7exuy7pQU/KKTp9ej3uMn86vLTXtjF5YUECInNYOM9kY6hQdnJFJH6RirxzbiRJftjvLHuw==",
"resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-win-x64/-/stc-win-x64-8.0.17.tgz",
"version": "9.1.36",
"integrity": "sha512-Ibmdf+eqfe4GzSxeZz3bxW3NStfscNDVtlmjI2enjpmSIybTak3xH4JHpQHJFkJEJqx9aMndue3GFKpPs16ovw==",
"resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-win-x64/-/stc-win-x64-9.1.36.tgz",
"os": [
"win32"
],
"cpu": [
"x64"
],
"dependencies": {
"@ax/st-docs": "8.0.17"
"@ax/st-docs": "9.1.36"
}
},
"@ax/stc-linux-x64": {
"name": "@ax/stc-linux-x64",
"version": "8.0.17",
"integrity": "sha512-BnpkLdkExZ6n6wyKHprrCPfQOu4FK6FTTt8ieVbrjOwABSJxez3ls9GBEpUOJKxqJa05epbR2nIHYoOO1pFKtQ==",
"resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-linux-x64/-/stc-linux-x64-8.0.17.tgz",
"version": "9.1.36",
"integrity": "sha512-mlOpXtZ1V2VZNFRSb8PyqhQpPZ0a2Q3m0J/d0n/s4iIIEaneUON/JtywCTAQdvQJYer5PuKDoZf/dBLlgNRuRQ==",
"resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-linux-x64/-/stc-linux-x64-9.1.36.tgz",
"os": [
"linux"
],
"cpu": [
"x64"
],
"dependencies": {
"@ax/st-docs": "8.0.17"
"@ax/st-docs": "9.1.36"
}
},
"@ax/st-docs": {
"name": "@ax/st-docs",
"version": "8.0.17",
"integrity": "sha512-bvMaT+GcSwF9ahzqI+wHBlCDfASqnJTDHwuBgVuR68u3R9cLaoOLnosw4HBoJRlBxWyooKB9bn+u++jRaekRNg==",
"resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-8.0.17.tgz",
"version": "9.1.36",
"integrity": "sha512-xxUUXzm9VSf7p0yaOKZ+kep2+JDq9eqD2ddGNhysvocLI3SZhDxF693axQpCoJA2PxhpJdut+lXSZkCgNOVIsA==",
"resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-9.1.36.tgz",
"dependencies": {}
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/apax/apax.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ targets:
- "1500"
- axunit-llvm
devDependencies:
"@ax/stc": 8.0.17
"@ax/stc": 9.1.36
installStrategy: strict
apaxVersion: 3.1.1
12 changes: 6 additions & 6 deletions src/sanbox/integration/ix-integration-plc/ix/.g/POCO/geolocation.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,30 @@

namespace Pocos
{
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Location")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Location")]
public partial class GeoLocation : AXSharp.Connector.IPlain
{
public GeoLocation()
{
}

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Latitude [°]")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Latitude [°]")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeMinimum", -90.0f)]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeMaximum", 90.0f)]
public Single Latitude { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Logitude [°]")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Logitude [°]")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeMinimum", 0.0f)]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeMaximum", 180.0f)]
public Single Longitude { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Altitude [m]")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Altitude [m]")]
public Single Altitude { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Short descriptor")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Short descriptor")]
public string Description { get; set; } = string.Empty;

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Long descriptor")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Long descriptor")]
public string LongDescription { get; set; } = string.Empty;
}
}
18 changes: 9 additions & 9 deletions src/sanbox/integration/ix-integration-plc/ix/.g/POCO/ixcomponent.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ public ixcomponent()
{
}

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My integer")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"My integer")]
public Int16 my_int { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My string")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"My string")]
public string my_string { get; set; } = string.Empty;

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My bool")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"My bool")]
public Boolean my_bool { get; set; }
}

Expand All @@ -28,13 +28,13 @@ public ixcomponent()
{
}

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My integer")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"My integer")]
public Int16 my_int { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My string")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"My string")]
public string my_string { get; set; } = string.Empty;

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My bool")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"My bool")]
public Boolean my_bool { get; set; }
}
}
Expand All @@ -47,13 +47,13 @@ public ixcomponent()
{
}

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My integer")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"My integer")]
public Int16 my_int { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My string")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"My string")]
public string my_string { get; set; } = string.Empty;

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My bool")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"My bool")]
public Boolean my_bool { get; set; }
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/sanbox/integration/ix-integration-plc/ix/.g/POCO/measurement.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ public Measurement()
{
}

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Minimum")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Minimum")]
public Single Min { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Measured")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Measured")]
public Single Acquired { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Maximum")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Maximum")]
public Single Max { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Measurement Result")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Measurement Result")]
public Int16 Result { get; set; }
}

Expand All @@ -31,16 +31,16 @@ public Measurements()
{
}

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Stack panel")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Stack panel")]
public MeasurementExample.Measurement measurement_stack { get; set; } = new MeasurementExample.Measurement();

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Wrap panel")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Wrap panel")]
public MeasurementExample.Measurement measurement_wrap { get; set; } = new MeasurementExample.Measurement();

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Grid")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Grid")]
public MeasurementExample.Measurement measurement_grid { get; set; } = new MeasurementExample.Measurement();

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Tabs")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Tabs")]
public MeasurementExample.Measurement measurement_tabs { get; set; } = new MeasurementExample.Measurement();
}
}
Expand Down
24 changes: 12 additions & 12 deletions src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/border.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,40 @@ public border()
{
}

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#Integer From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#Integer From PLC#>")]
public Int16 testInteger { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#UInteger From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#UInteger From PLC#>")]
public Int16 testUInteger { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#STRING From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#STRING From PLC#>")]
public string testString { get; set; } = string.Empty;

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#WORD From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#WORD From PLC#>")]
public UInt16 testWord { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#BYTE From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#BYTE From PLC#>")]
public Byte testByte { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#REAL From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#REAL From PLC#>")]
public Single testReal { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#LREAL From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#LREAL From PLC#>")]
public Double testLReal { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#BOOL From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#BOOL From PLC#>")]
public Boolean testBool { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#DATE From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#DATE From PLC#>")]
public DateOnly TestDate { get; set; } = new DateOnly(1970, 1, 1);

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#DATE_AND_TIME From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#DATE_AND_TIME From PLC#>")]
public DateTime TestDateTime { get; set; } = new DateTime(1970, 1, 1);

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#TIME_OF_DAY From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#TIME_OF_DAY From PLC#>")]
public TimeSpan TestTimeOfDay { get; set; } = default(TimeSpan);

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#ENUM Station status#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#ENUM Station status#>")]
public global::enumStationStatus Status { get; set; }
}
}
24 changes: 12 additions & 12 deletions src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/groupbox.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,40 @@ public groupbox()
{
}

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#Integer From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#Integer From PLC#>")]
public Int16 testInteger { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#UInteger From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#UInteger From PLC#>")]
public Int16 testUInteger { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#STRING From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#STRING From PLC#>")]
public string testString { get; set; } = string.Empty;

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#WORD From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#WORD From PLC#>")]
public UInt16 testWord { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#BYTE From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#BYTE From PLC#>")]
public Byte testByte { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#REAL From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#REAL From PLC#>")]
public Single testReal { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#LREAL From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#LREAL From PLC#>")]
public Double testLReal { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#BOOL From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#BOOL From PLC#>")]
public Boolean testBool { get; set; }

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#DATE From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#DATE From PLC#>")]
public DateOnly TestDate { get; set; } = new DateOnly(1970, 1, 1);

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#DATE_AND_TIME From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#DATE_AND_TIME From PLC#>")]
public DateTime TestDateTime { get; set; } = new DateTime(1970, 1, 1);

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#TIME_OF_DAY From PLC#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#TIME_OF_DAY From PLC#>")]
public TimeSpan TestTimeOfDay { get; set; } = default(TimeSpan);

[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "<#ENUM Station status#>")]
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"<#ENUM Station status#>")]
public global::enumStationStatus Status { get; set; }
}
}
Loading