Merge pull request #15 from dotnetprojects/complSign

jogibear9988 · web-flow · commit 49db7e4e32d9 · 2023-05-05T19:42:34.000+02:00
fix complex symbols
diff --git a/TiaCodeGen.Tests/SampleTests.cs b/TiaCodeGen.Tests/SampleTests.cs
@@ -346,7 +346,7 @@ public void ComplexVariableAccessTest1()
             var s = new Signal("#A.B.C[#D.E.F, 1]");
             s.AddXmlToStringBuilder(1, sb);
             var xml = sb.ToString();
-            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<Access Scope=\"LiteralConstant\">\r\n<Constant>\r\n<ConstantType>DInt</ConstantType>\r\n<ConstantValue>1</ConstantValue>\r\n</Constant>\r\n</Access>\r\n</Symbol>\r\n</Access>\r\n</Component>\r\n</Symbol>\r\n</Access>\r\n".Replace("\n","").Replace("\r", ""), xml.Replace("\n", "").Replace("\r", ""));
+            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", ""));
         }
 
         [Test]
diff --git a/TiaCodegen/Commands/Signals/Signal.cs b/TiaCodegen/Commands/Signals/Signal.cs
@@ -350,6 +350,7 @@ public void AddXmlToStringBuilder(ulong id, StringBuilder sb)
                             sb.AppendLine("<Access Scope=\"" + accessType + "\">");
                             sb.AppendLine("<Symbol>");
                             sb.AppendLine("<Component Name=\"" + p1 + "\" />");
+                            bool noClose = false;
                             while (p1 != null)
                             {
                                 i++;
@@ -361,14 +362,16 @@ public void AddXmlToStringBuilder(ulong id, StringBuilder sb)
                                     foreach (var p in innerParts.Skip(1))
                                     {
                                         var pNe = p.Trim();
-                                        bool close = false;
                                         if (pNe.Contains("]"))
                                         {
                                             pNe = pNe.Substring(0, pNe.Length - 1);
-                                            close = true;
                                         }
                                         if (int.TryParse(pNe, out _))
                                         {
+                                            noClose = true;
+                                            sb.AppendLine("</Symbol>");
+                                            sb.AppendLine("</Access>");
+
                                             sb.AppendLine("<Access Scope=\"LiteralConstant\">");
                                             sb.AppendLine("<Constant>");
                                             sb.AppendLine("<ConstantType>DInt</ConstantType>");
@@ -408,8 +411,11 @@ public void AddXmlToStringBuilder(ulong id, StringBuilder sb)
                                         sb.AppendLine("<Component Name=\"" + p1 + "\" />");
                                 }
                             }
-                            sb.AppendLine("</Symbol>");
-                            sb.AppendLine("</Access>");
+                            if (!noClose)
+                            {
+                                sb.AppendLine("</Symbol>");
+                                sb.AppendLine("</Access>");
+                            }
                         }
                         else
                         {

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ public void ComplexVariableAccessTest1()`
`346`	`346`	`var s = new Signal("#A.B.C[#D.E.F, 1]");`
`347`	`347`	`s.AddXmlToStringBuilder(1, sb);`
`348`	`348`	`var xml = sb.ToString();`
`349`		- 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<Access Scope=\"LiteralConstant\">\r\n<Constant>\r\n<ConstantType>DInt</ConstantType>\r\n<ConstantValue>1</ConstantValue>\r\n</Constant>\r\n</Access>\r\n</Symbol>\r\n</Access>\r\n</Component>\r\n</Symbol>\r\n</Access>\r\n".Replace("\n","").Replace("\r", ""), xml.Replace("\n", "").Replace("\r", ""));
	`349`	+ 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", ""));
`350`	`350`	`}`
`351`	`351`
`352`	`352`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -350,6 +350,7 @@ public void AddXmlToStringBuilder(ulong id, StringBuilder sb)`
`350`	`350`	`sb.AppendLine("<Access Scope=\"" + accessType + "\">");`
`351`	`351`	`sb.AppendLine("<Symbol>");`
`352`	`352`	`sb.AppendLine("<Component Name=\"" + p1 + "\" />");`
	`353`	`+ bool noClose = false;`
`353`	`354`	`while (p1 != null)`
`354`	`355`	`{`
`355`	`356`	`i++;`
`@@ -361,14 +362,16 @@ public void AddXmlToStringBuilder(ulong id, StringBuilder sb)`
`361`	`362`	`foreach (var p in innerParts.Skip(1))`
`362`	`363`	`{`
`363`	`364`	`var pNe = p.Trim();`
`364`		`- bool close = false;`
`365`	`365`	`if (pNe.Contains("]"))`
`366`	`366`	`{`
`367`	`367`	`pNe = pNe.Substring(0, pNe.Length - 1);`
`368`		`- close = true;`
`369`	`368`	`}`
`370`	`369`	`if (int.TryParse(pNe, out _))`
`371`	`370`	`{`
	`371`	`+ noClose = true;`
	`372`	`+ sb.AppendLine("</Symbol>");`
	`373`	`+ sb.AppendLine("</Access>");`
	`374`	`+`
`372`	`375`	`sb.AppendLine("<Access Scope=\"LiteralConstant\">");`
`373`	`376`	`sb.AppendLine("<Constant>");`
`374`	`377`	`sb.AppendLine("<ConstantType>DInt</ConstantType>");`
`@@ -408,8 +411,11 @@ public void AddXmlToStringBuilder(ulong id, StringBuilder sb)`
`408`	`411`	`sb.AppendLine("<Component Name=\"" + p1 + "\" />");`
`409`	`412`	`}`
`410`	`413`	`}`
`411`		`- sb.AppendLine("</Symbol>");`
`412`		`- sb.AppendLine("</Access>");`
	`414`	`+ if (!noClose)`
	`415`	`+ {`
	`416`	`+ sb.AppendLine("</Symbol>");`
	`417`	`+ sb.AppendLine("</Access>");`
	`418`	`+ }`
`413`	`419`	`}`
`414`	`420`	`else`
`415`	`421`	`{`