Merge pull request #14 from dotnetprojects/complSign

fix for complex signals

Author: jogibear9988

TiaCodeGen.Tests/SampleTests.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Text;
 using TiaCodegen.Blocks;
 using TiaCodegen.Commands;
 using TiaCodegen.Commands.Coils;
@@ -337,5 +338,25 @@ public void PeripheryFixedSignal()
             block.Interface = TestInterface;
             var xml = block.GetCode();
         }
+
+        [Test]
+        public void ComplexVariableAccessTest1()
+        {
+            var sb = new StringBuilder();
+            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", ""));
+        }
+
+        [Test]
+        public void ComplexVariableAccessTest2()
+        {
+            var sb = new StringBuilder();
+            var s = new Signal("#A.B.C[#D.E.F, #G.H.I]");
+            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</Symbol>\r\n</Access>\r\n<Access Scope=\"LocalVariable\">\r\n<Symbol>\r\n<Component Name=\"G\" />\r\n<Component Name=\"H\" />\r\n<Component Name=\"I\" />\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", ""));
+        }
     }
 }

TiaCodegen/Commands/Signals/Signal.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
+using TiaCodegen.Commands.Comparisons;
 using TiaCodegen.Enums;
 using TiaCodegen.Interfaces;
 
@@ -352,13 +354,59 @@ public void AddXmlToStringBuilder(ulong id, StringBuilder sb)
                             {
                                 i++;
                                 p1 = Unescape(Escape(LocalName).Split('.')[i]);
-                                if (p1.Contains("]"))
+                                if (p1.Contains(","))
                                 {
-                                    sb.AppendLine("<Component Name=\"" + p1.Substring(0, p1.Length - 1) + "\" />");
-                                    p1 = null;
+                                    var innerParts = p1.Split(',');
+                                    sb.AppendLine("<Component Name=\"" + innerParts[0] + "\" />");
+                                    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 _))
+                                        {
+                                            sb.AppendLine("<Access Scope=\"LiteralConstant\">");
+                                            sb.AppendLine("<Constant>");
+                                            sb.AppendLine("<ConstantType>DInt</ConstantType>");
+                                            sb.AppendLine("<ConstantValue>" + pNe + "</ConstantValue>");
+                                            sb.AppendLine("</Constant>");
+                                            sb.AppendLine("</Access>");
+                                        }
+                                        else
+                                        {
+                                            sb.AppendLine("</Symbol>");
+                                            sb.AppendLine("</Access>");
+
+                                            var accessTypePne = "GlobalVariable";
+                                            if (pNe[0] == '#')
+                                            {
+                                                pNe = pNe.Substring(1);
+                                                accessTypePne = "LocalVariable";
+                                            }
+                                            sb.AppendLine("<Access Scope=\"" + accessTypePne + "\">");
+                                            sb.AppendLine("<Symbol>");
+                                            sb.AppendLine("<Component Name=\"" + pNe + "\" />");
+                                        }
+                                    }
+                                    if (p1.Contains("]"))
+                                    {
+                                        p1 = null;
+                                    }
                                 }
                                 else
-                                    sb.AppendLine("<Component Name=\"" + p1 + "\" />");
+                                {
+                                    if (p1.Contains("]"))
+                                    {
+                                        sb.AppendLine("<Component Name=\"" + p1.Substring(0, p1.Length - 1) + "\" />");
+                                        p1 = null;
+                                    }
+                                    else
+                                        sb.AppendLine("<Component Name=\"" + p1 + "\" />");
+                                }
                             }
                             sb.AppendLine("</Symbol>");
                             sb.AppendLine("</Access>");
@@ -387,10 +435,10 @@ public void AddXmlToStringBuilder(ulong id, StringBuilder sb)
                     }
                     sb.AppendLine("</Component>");
                 }
-                if (this is FixedPeripherySignal)
-                    sb.AppendLine("<Address Area=\"PeripheryInput\" Type=\"Bool\" BitOffset=\"0\" Informative=\"true\" />");
-                else
-                    sb.AppendLine("<Address Area=\"None\" Type=\"Bool\" BlockNumber=\"0\" BitOffset=\"0\" Informative=\"true\" />");
+                //if (this is FixedPeripherySignal)
+                //    sb.AppendLine("<Address Area=\"PeripheryInput\" Type=\"Bool\" BitOffset=\"0\" Informative=\"true\" />");
+                //else
+                //    sb.AppendLine("<Address Area=\"None\" Type=\"Bool\" BlockNumber=\"0\" BitOffset=\"0\" Informative=\"true\" />");
                 sb.AppendLine("</Symbol>");
                 sb.AppendLine("</Access>");
             }