Skip to content

Commit dd1b184

Browse files
PTKuPTKu
authored
Merge pull request #397 from Inxton/396-update-stc-to-v9
Update stc to v9
2 parents 21a703f + 24e5745 commit dd1b184

12 files changed

Lines changed: 94 additions & 84 deletions

File tree

‎src/AXSharp.compiler/src/AXSharp.Compiler/Core/IxNodeVisitor.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,11 @@ void ISemanticNodeVisitor<ICombinedThreeVisitor>.Visit(IMethodDeclaration method
122122
throw new NotSupportedException();
123123
}
124124

125+
public void Visit(IClassMethodDeclaration methodDeclaration, ICombinedThreeVisitor data)
126+
{
127+
throw new NotSupportedException();
128+
}
129+
125130
void ISemanticNodeVisitor<ICombinedThreeVisitor>.Visit(IMethodPrototypeDeclaration methodPrototypeDeclaration,
126131
ICombinedThreeVisitor data)
127132
{

‎src/AXSharp.compiler/src/ixd/Mapper/CodeToYamlMapper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public Item PopulateItem(IMethodDeclaration methodDeclaration)
117117
var item = PopulateItem((IDeclaration)methodDeclaration);
118118
item.Uid = Helpers.Helpers.GetBaseUid(methodDeclaration);
119119
item.Id = Helpers.Helpers.GetBaseUid(methodDeclaration);
120-
item.Parent = methodDeclaration.ContainingClass.FullyQualifiedName;
120+
item.Parent = methodDeclaration.ContainingStructuredType.FullyQualifiedName;
121121
item.Type = "Method";
122122
item.Syntax = new Syntax
123123
{

‎src/AXSharp.compiler/src/ixd/Visitors/MyNodeVisitor.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,11 @@ public void Visit(IMethodDeclaration methodDeclaration, IYamlBuiderVisitor data)
112112
data.CreateMethodYaml(methodDeclaration, this);
113113
}
114114

115+
public void Visit(IClassMethodDeclaration methodDeclaration, IYamlBuiderVisitor data)
116+
{
117+
data.CreateMethodYaml(methodDeclaration, this);
118+
}
119+
115120
public void Visit(IMethodPrototypeDeclaration methodPrototypeDeclaration, IYamlBuiderVisitor data)
116121
{
117122
data.CreateMethodPrototypeYaml(methodPrototypeDeclaration, this);

‎src/apax/apax-lock.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,55 +7,55 @@
77
"name": "s",
88
"version": "0.0.0",
99
"devDependencies": {
10-
"@ax/stc": "8.0.17"
10+
"@ax/stc": "9.1.36"
1111
}
1212
},
1313
"packages": {
1414
"@ax/stc": {
1515
"name": "@ax/stc",
16-
"version": "8.0.17",
17-
"integrity": "sha512-Ym2uWEmfrkhm2Z/ODujUwQOiAwQ2p0fv9hLTJGL+zwYMjAwja71JayMLSOO+cX0gv8VexrxISDa66jouT+XySA==",
18-
"resolved": "https://registry.simatic-ax.siemens.io/@ax/stc/-/stc-8.0.17.tgz",
16+
"version": "9.1.36",
17+
"integrity": "sha512-v1crfIUg8rUVmrhtSTDoZZNub9At2iMiDgR4BK+3SA1VmhO7swGwnff0OkSoteE60kdxN+70AmKJJWlX+11WTA==",
18+
"resolved": "https://registry.simatic-ax.siemens.io/@ax/stc/-/stc-9.1.36.tgz",
1919
"dependencies": {
20-
"@ax/stc-win-x64": "8.0.17",
21-
"@ax/stc-linux-x64": "8.0.17"
20+
"@ax/stc-win-x64": "9.1.36",
21+
"@ax/stc-linux-x64": "9.1.36"
2222
}
2323
},
2424
"@ax/stc-win-x64": {
2525
"name": "@ax/stc-win-x64",
26-
"version": "8.0.17",
27-
"integrity": "sha512-vOnWIY+dLfASN2s7exuy7pQU/KKTp9ej3uMn86vLTXtjF5YUECInNYOM9kY6hQdnJFJH6RirxzbiRJftjvLHuw==",
28-
"resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-win-x64/-/stc-win-x64-8.0.17.tgz",
26+
"version": "9.1.36",
27+
"integrity": "sha512-Ibmdf+eqfe4GzSxeZz3bxW3NStfscNDVtlmjI2enjpmSIybTak3xH4JHpQHJFkJEJqx9aMndue3GFKpPs16ovw==",
28+
"resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-win-x64/-/stc-win-x64-9.1.36.tgz",
2929
"os": [
3030
"win32"
3131
],
3232
"cpu": [
3333
"x64"
3434
],
3535
"dependencies": {
36-
"@ax/st-docs": "8.0.17"
36+
"@ax/st-docs": "9.1.36"
3737
}
3838
},
3939
"@ax/stc-linux-x64": {
4040
"name": "@ax/stc-linux-x64",
41-
"version": "8.0.17",
42-
"integrity": "sha512-BnpkLdkExZ6n6wyKHprrCPfQOu4FK6FTTt8ieVbrjOwABSJxez3ls9GBEpUOJKxqJa05epbR2nIHYoOO1pFKtQ==",
43-
"resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-linux-x64/-/stc-linux-x64-8.0.17.tgz",
41+
"version": "9.1.36",
42+
"integrity": "sha512-mlOpXtZ1V2VZNFRSb8PyqhQpPZ0a2Q3m0J/d0n/s4iIIEaneUON/JtywCTAQdvQJYer5PuKDoZf/dBLlgNRuRQ==",
43+
"resolved": "https://registry.simatic-ax.siemens.io/@ax/stc-linux-x64/-/stc-linux-x64-9.1.36.tgz",
4444
"os": [
4545
"linux"
4646
],
4747
"cpu": [
4848
"x64"
4949
],
5050
"dependencies": {
51-
"@ax/st-docs": "8.0.17"
51+
"@ax/st-docs": "9.1.36"
5252
}
5353
},
5454
"@ax/st-docs": {
5555
"name": "@ax/st-docs",
56-
"version": "8.0.17",
57-
"integrity": "sha512-bvMaT+GcSwF9ahzqI+wHBlCDfASqnJTDHwuBgVuR68u3R9cLaoOLnosw4HBoJRlBxWyooKB9bn+u++jRaekRNg==",
58-
"resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-8.0.17.tgz",
56+
"version": "9.1.36",
57+
"integrity": "sha512-xxUUXzm9VSf7p0yaOKZ+kep2+JDq9eqD2ddGNhysvocLI3SZhDxF693axQpCoJA2PxhpJdut+lXSZkCgNOVIsA==",
58+
"resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-9.1.36.tgz",
5959
"dependencies": {}
6060
}
6161
},

‎src/apax/apax.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ targets:
55
- "1500"
66
- axunit-llvm
77
devDependencies:
8-
"@ax/stc": 8.0.17
8+
"@ax/stc": 9.1.36
99
installStrategy: strict
1010
apaxVersion: 3.1.1

‎src/sanbox/integration/ix-integration-plc/ix/.g/POCO/geolocation.g.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,30 @@
44

55
namespace Pocos
66
{
7-
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Location")]
7+
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Location")]
88
public partial class GeoLocation : AXSharp.Connector.IPlain
99
{
1010
public GeoLocation()
1111
{
1212
}
1313

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

19-
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Logitude [°]")]
19+
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Logitude [°]")]
2020
[AXSharp.Connector.AddedPropertiesAttribute("AttributeMinimum", 0.0f)]
2121
[AXSharp.Connector.AddedPropertiesAttribute("AttributeMaximum", 180.0f)]
2222
public Single Longitude { get; set; }
2323

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

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

30-
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Long descriptor")]
30+
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Long descriptor")]
3131
public string LongDescription { get; set; } = string.Empty;
3232
}
3333
}

‎src/sanbox/integration/ix-integration-plc/ix/.g/POCO/ixcomponent.g.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ public ixcomponent()
1010
{
1111
}
1212

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

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

19-
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My bool")]
19+
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"My bool")]
2020
public Boolean my_bool { get; set; }
2121
}
2222

@@ -28,13 +28,13 @@ public ixcomponent()
2828
{
2929
}
3030

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

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

37-
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My bool")]
37+
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"My bool")]
3838
public Boolean my_bool { get; set; }
3939
}
4040
}
@@ -47,13 +47,13 @@ public ixcomponent()
4747
{
4848
}
4949

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

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

56-
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "My bool")]
56+
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"My bool")]
5757
public Boolean my_bool { get; set; }
5858
}
5959
}

‎src/sanbox/integration/ix-integration-plc/ix/.g/POCO/measurement.g.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ public Measurement()
1212
{
1313
}
1414

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

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

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

24-
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Measurement Result")]
24+
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Measurement Result")]
2525
public Int16 Result { get; set; }
2626
}
2727

@@ -31,16 +31,16 @@ public Measurements()
3131
{
3232
}
3333

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

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

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

43-
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", "Tabs")]
43+
[AXSharp.Connector.AddedPropertiesAttribute("AttributeName", @"Tabs")]
4444
public MeasurementExample.Measurement measurement_tabs { get; set; } = new MeasurementExample.Measurement();
4545
}
4646
}

‎src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/border.g.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,40 @@ public border()
1010
{
1111
}
1212

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

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

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

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

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

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

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

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

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

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

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

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

‎src/sanbox/integration/ix-integration-plc/ix/.g/POCO/test/groupbox.g.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,40 @@ public groupbox()
1010
{
1111
}
1212

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

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

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

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

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

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

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

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

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

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

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

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

0 commit comments

Comments
 (0)