Skip to content

Commit 9d44a49

Browse files
author
sripp
committed
2 parents 93c23f8 + 797cc22 commit 9d44a49

File tree

10 files changed

+250
-81
lines changed

10 files changed

+250
-81
lines changed

‎.github/workflows/dotnet.yml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup .NET
1717
uses: actions/setup-dotnet@v1
1818
with:
19-
dotnet-version: 8.0.x
19+
dotnet-version: 9.0.x
2020

2121
- name: GitVersion
2222
id: gitversion # step id used as reference for output values
@@ -36,11 +36,7 @@ jobs:
3636
run: dotnet build --no-restore
3737
- name: Test
3838
run: dotnet test --no-build --verbosity normal
39-
- name: Publish NuGet
40-
# You may pin to the exact commit or the version.
41-
# uses: brandedoutcast/publish-nuget@c12b8546b67672ee38ac87bea491ac94a587f7cc
42-
uses: brandedoutcast/publish-nuget@v2.5.5
43-
with:
44-
# Filepath of the project to be packaged, relative to root of repository
45-
PROJECT_FILE_PATH: TiaCodegen/DotNetProjects.TiaCodegen.csproj
46-
NUGET_KEY: ${{secrets.NUGET_API_KEY}}
39+
- name: Package
40+
run: dotnet pack -c Debug -o . TiaCodegen/DotNetProjects.TiaCodegen.csproj
41+
- name: Publish
42+
run: dotnet nuget push *.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json

‎.github/workflows/dotnetpull.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Setup .NET
1515
uses: actions/setup-dotnet@v1
1616
with:
17-
dotnet-version: 8.0.x
17+
dotnet-version: 9.0.x
1818
- name: Restore dependencies
1919
run: dotnet restore
2020
- name: Build

‎TiaCodeGen.Tests/SampleTests.cs‎

Lines changed: 129 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ public void ComplexVariableAccessTest1()
390390
var s = new Signal("#A.B.C[#D.E.F, 1]");
391391
s.AddXmlToStringBuilder(1, sb);
392392
var xml = sb.ToString();
393-
Assert.AreEqual("<Access Scope=\"LocalVariable\" UId=\"1\">\r\n<Symbol>\r\n<Component Name=\"A\">\r\n</Component>\r\n<Component Name=\"B\">\r\n</Component>\r\n<Component Name=\"C\">\r\n<Access Scope=\"LocalVariable\">\r\n<Symbol>\r\n<Component Name=\"D\" />\r\n<Component Name=\"E\" />\r\n<Component Name=\"F\" />\r\n</Symbol>\r\n</Access>\r\n<Access Scope=\"LiteralConstant\">\r\n<Constant>\r\n<ConstantType>DInt</ConstantType>\r\n<ConstantValue>1</ConstantValue>\r\n</Constant>\r\n</Access>\r\n</Component>\r\n</Symbol>\r\n</Access>\r\n".Replace("\n","").Replace("\r", ""), xml.Replace("\n", "").Replace("\r", ""));
393+
Assert.AreEqual("<Access Scope=\"LocalVariable\" UId=\"1\">\r\n<Symbol>\r\n<Component Name=\"A\">\r\n</Component>\r\n<Component Name=\"B\">\r\n</Component>\r\n<Component Name=\"C\">\r\n<Access Scope=\"LocalVariable\">\r\n<Symbol>\r\n<Component Name=\"D\" />\r\n<Component Name=\"E\" />\r\n<Component Name=\"F\" />\r\n</Symbol>\r\n</Access>\r\n<Access Scope=\"LiteralConstant\">\r\n<Constant>\r\n<ConstantType>DInt</ConstantType>\r\n<ConstantValue>1</ConstantValue>\r\n</Constant>\r\n</Access>\r\n</Component>\r\n</Symbol>\r\n</Access>\r\n".Replace("\n", "").Replace("\r", ""), xml.Replace("\n", "").Replace("\r", ""));
394394
}
395395

396396
[Test]
@@ -436,5 +436,133 @@ public void SystemFunctionDPXX_DAT()
436436

437437
//Assert.AreEqual("<Access Scope=\"LocalVariable\" UId=\"1\">\r\n<Symbol>\r\n<Component Name=\"A\">\r\n</Component>\r\n<Component Name=\"B\">\r\n</Component>\r\n<Component Name=\"C\">\r\n<Access Scope=\"LocalVariable\">\r\n<Symbol>\r\n<Component Name=\"D\" />\r\n<Component Name=\"E\" />\r\n<Component Name=\"F\" />\r\n</Symbol>\r\n</Access>\r\n<Access Scope=\"LiteralConstant\">\r\n<Constant>\r\n<ConstantType>DInt</ConstantType>\r\n<ConstantValue>1</ConstantValue>\r\n</Constant>\r\n</Access>\r\n</Component>\r\n</Symbol>\r\n</Access>\r\n".Replace("\n", "").Replace("\r", ""), xml.Replace("\n", "").Replace("\r", ""));
438438
}
439+
440+
[Test]
441+
public void ComplexOr()
442+
{
443+
var codeblock = new CodeBlock() { Safety = false };
444+
445+
var nw = new Network("T1", "T1");
446+
447+
nw.Add(
448+
new Coil(
449+
new Signal("Test11"),
450+
new Or(
451+
new And(
452+
new Signal("Test1"),
453+
new Or(
454+
new And(
455+
new Signal("Test2"),
456+
new Or(
457+
new Signal("Test3"),
458+
new Signal("Test4")
459+
)
460+
{ DebugInfo = "aaa" }
461+
),
462+
new Signal("Test5")
463+
)
464+
{ DebugInfo = "bbb" }
465+
),
466+
new And(
467+
new Signal("Test6"),
468+
new Or(
469+
new And(
470+
new Signal("Test7"),
471+
new Or(
472+
new Signal("Test8"),
473+
new Signal("Test9")
474+
)
475+
{ DebugInfo = "ccc" }
476+
),
477+
new Signal("Test10")
478+
)
479+
{ DebugInfo = "ddd" }
480+
)
481+
)
482+
{ DebugInfo = "eee" }
483+
)
484+
);
485+
codeblock.Add(nw);
486+
487+
var block = new Block("Test", "blabla", codeblock);
488+
block.Interface = TestInterface;
489+
var xml = block.GetCode();
490+
}
491+
492+
[Test]
493+
public void ComplexOr2()
494+
{
495+
var codeblock = new CodeBlock() { Safety = false };
496+
497+
var nw = new Network("T1", "T1");
498+
499+
nw.Add(
500+
new Coil(
501+
new Signal("Test11"),
502+
new Or(
503+
new Signal("Test12"),
504+
new Or(
505+
new And(
506+
new Signal("Test1"),
507+
new Or(
508+
new And(
509+
new Signal("Test2"),
510+
new Or(
511+
new Signal("Test3"),
512+
new Signal("Test4")
513+
)
514+
),
515+
new Signal("Test5")
516+
)
517+
),
518+
new And(
519+
new Signal("Test6"),
520+
new Or(
521+
new And(
522+
new Signal("Test7"),
523+
new Or(
524+
new Signal("Test8"),
525+
new Signal("Test9")
526+
)
527+
),
528+
new Signal("Test10")
529+
)
530+
)
531+
)
532+
)
533+
)
534+
);
535+
codeblock.Add(nw);
536+
537+
var block = new Block("Test", "blabla", codeblock);
538+
block.Interface = TestInterface;
539+
var xml = block.GetCode();
540+
}
541+
542+
543+
[Test]
544+
public void Complex3()
545+
{
546+
var codeblock = new CodeBlock() { Safety = false };
547+
548+
var nw = new Network("T1", "T1");
549+
550+
nw.Add(
551+
new Coil(
552+
new Signal("Test11"),
553+
new And(
554+
new Signal("Test1"),
555+
new Or(
556+
new Signal("Test2")
557+
)
558+
)
559+
)
560+
);
561+
codeblock.Add(nw);
562+
563+
var block = new Block("Test", "blabla", codeblock);
564+
block.Interface = TestInterface;
565+
var xml = block.GetCode();
566+
}
439567
}
440568
}

‎TiaCodeGen.Tests/TiaCodeGen.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎TiaCodegen.sln‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎TiaCodegen.slnx‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Solution>
2+
<Folder Name="/.github/" />
3+
<Folder Name="/.github/workflows/">
4+
<File Path=".github/workflows/dotnet.yml" />
5+
<File Path=".github/workflows/dotnetpull.yml" />
6+
</Folder>
7+
<Project Path="TiaCodeGen.Tests/TiaCodeGen.Tests.csproj" />
8+
<Project Path="TiaCodegen/DotNetProjects.TiaCodegen.csproj" />
9+
</Solution>

‎TiaCodegen/Blocks/Block.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public virtual string GetBlockHeader(ref int id)
5656
<MemoryLayout>Optimized</MemoryLayout>
5757
<Name>{Name}</Name>
5858
{(Number != 0 ? "<Number>" + Number + "</Number>" : "")}
59+
<Namespace />
5960
<ProgrammingLanguage>LAD</ProgrammingLanguage>
6061
</AttributeList>
6162
<ObjectList>";

0 commit comments

Comments
 (0)