Merge pull request #395 from Inxton/394-bugixc-does-not-transpile-plainer-fields-when-eligible

[BUG]ixc does not transpile plainer fields when eligible

Author: PTKu

src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Plain/CsPlainSourceBuilder.cs

@@ -119,7 +119,7 @@ public void CreateFieldDeclaration(IFieldDeclaration fieldDeclaration, IxNodeVis
         if (eligibility.isEligible)
         {           
             AddToSource(fieldDeclaration.Pragmas.AddedPropertiesAsAttributes());
-            switch (fieldDeclaration.Type)
+            switch (eligibility.eligibleType)
             {
                 case IArrayTypeDeclaration arrayType:
                     var arrayEligibility = arrayType.IsEligibleForTranspile(this);
@@ -142,19 +142,19 @@ public void CreateFieldDeclaration(IFieldDeclaration fieldDeclaration, IxNodeVis
                     }
                     break;
                 case IStringTypeDeclaration:
-                    AddPropertyDeclaration(fieldDeclaration, visitor);
+                    AddPropertyDeclaration(fieldDeclaration, fieldDeclaration, visitor);
                     AddToSource(" = string.Empty;");
                     break;
                 case INamedValueTypeDeclaration namedValueType:
-                    AddPropertyDeclaration(fieldDeclaration, visitor);
+                    AddPropertyDeclaration(fieldDeclaration, fieldDeclaration, visitor);
                     break;
                 case IScalarTypeDeclaration scalar:
-                    AddPropertyDeclaration(fieldDeclaration, visitor);
+                    AddPropertyDeclaration(fieldDeclaration, fieldDeclaration, visitor);
                     AddToSource(scalar.CreateScalarInitializer(this.Project?.CompilerOptions?.TargetPlatfromMoniker));                                        
                     break;
                 case IReferenceTypeDeclaration d:
                 case IStructuredTypeDeclaration s:
-                    AddPropertyDeclaration(fieldDeclaration, visitor);
+                    AddPropertyDeclaration(fieldDeclaration, eligibility.eligibleType, visitor);
                     AddToSource(" = new ");
                     eligibility.eligibleType.Accept(visitor, this);
                     //fieldDeclaration.Type.Accept(visitor, this);
@@ -164,7 +164,7 @@ public void CreateFieldDeclaration(IFieldDeclaration fieldDeclaration, IxNodeVis
         }
     }
 
-    private void AddPropertyDeclaration(IDeclaration fieldDeclaration, IxNodeVisitor visitor)
+    private void AddPropertyDeclaration(IDeclaration fieldDeclaration, IDeclaration eligibleType,  IxNodeVisitor visitor)
     {
         fieldDeclaration.Pragmas.AddAttributes();
         switch (fieldDeclaration)
@@ -176,7 +176,7 @@ private void AddPropertyDeclaration(IDeclaration fieldDeclaration, IxNodeVisitor
                 AddToSource($"public");
                 break;
         }
-        fieldDeclaration.Type.Accept(visitor, this);
+        eligibleType.Type.Accept(visitor, this);
         AddToSource($" {fieldDeclaration.Name}");
         AddToSource("{get; set;}");
     }
@@ -309,19 +309,19 @@ public void CreateVariableDeclaration(IVariableDeclaration fieldDeclaration, IxN
                     }
                     break;
                 case IStringTypeDeclaration:
-                    AddPropertyDeclaration(fieldDeclaration, visitor);
+                    AddPropertyDeclaration(fieldDeclaration, fieldDeclaration, visitor);
                     AddToSource(" = string.Empty;");
                     break;
                 case INamedValueTypeDeclaration namedValueType:
-                    AddPropertyDeclaration(fieldDeclaration, visitor);
+                    AddPropertyDeclaration(fieldDeclaration, fieldDeclaration.Type, visitor);
                     break;
                 case IScalarTypeDeclaration scalar:
-                    AddPropertyDeclaration(fieldDeclaration, visitor);
+                    AddPropertyDeclaration(fieldDeclaration, fieldDeclaration, visitor);
                     AddToSource(scalar.CreateScalarInitializer(this.Project?.CompilerOptions?.TargetPlatfromMoniker));
                     break;
                 case IReferenceTypeDeclaration d:
                 case IStructuredTypeDeclaration s:
-                    AddPropertyDeclaration(fieldDeclaration, visitor);                    
+                    AddPropertyDeclaration(fieldDeclaration, fieldDeclaration.Type, visitor);                    
                     AddToSource(" = new ");
                     eligibility.eligibleType.Accept(visitor, this);
                     //fieldDeclaration.Type.Accept(visitor, this);

src/AXSharp.compiler/src/ixc/Properties/launchSettings.json

@@ -8,8 +8,12 @@
       "commandName": "Project",
       "workingDirectory": "c:\\W\\Develop\\gh\\inxton\\axopen\\src\\integrations\\ctrl\\"
     },
+    "axopen-integration_plc": {
+      "commandName": "Project",
+      "workingDirectory": "C:\\W\\Develop\\gh\\inxton\\simatic-ax\\axopen.templates\\axopen\\src\\integrations\\app"
+    },
     "ixc-simple-template": {
-      "commandName": "Project",     
+      "commandName": "Project",
       "workingDirectory": "C:\\W\\Develop\\gh\\inxton\\simatic-ax\\axopen.templates\\axopen.template.simple\\ax"
     },
     "ixc-template-ref": {