Structured type (#322)

* Added Pre and PostConstruct in StructuredType * Repaired test --------- Co-authored-by: Peter Kurhajec <[email protected]>
ix-ax · Jun 28, 2024 · b910690 · b910690
1 parent e9e1e9e
commit b910690
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 0 deletions.
diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerConstructorBuilder.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerConstructorBuilder.cs
@@ -201,10 +201,14 @@ public static CsOnlinerConstructorBuilder Create(IxNodeVisitor visitor, IStructu
 			HumanReadable = {typeof(Connector.Connector).n()}.CreateHumanReadable(parent.HumanReadable, readableTail);
             Symbol = {typeof(Connector.Connector).n()}.CreateSymbol(parent.Symbol, symbolTail);");
 
+        builder.AddToSource(@$"PreConstruct(parent, readableTail, symbolTail);");
+
         semantics.Fields.ToList().ForEach(p => p.Accept(visitor, builder));
         builder.AddToSource("parent.AddChild(this);");
         builder.AddToSource("parent.AddKid(this);");
 
+        builder.AddToSource(@$"PostConstruct(parent, readableTail, symbolTail);");
+
         builder.AddToSource("}");
 
         return builder;

diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerMemberBuilder.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerMemberBuilder.cs
@@ -196,6 +196,10 @@ public static CsOnlinerMemberBuilder Create(IxNodeVisitor visitor, IStructuredTy
         var builder = new CsOnlinerMemberBuilder(sourceBuilder);
         builder.AddToSource(semantics.DeclareProperties());
         semantics.Fields.ToList().ForEach(p => p.Accept(visitor, builder));
+
+        builder.AddToSource(@$"partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
+            partial void PostConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);");
+
         return builder;
     }
 

diff --git a/...s/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/compileromitsattribute.g.cs b/...s/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/compileromitsattribute.g.cs
@@ -1157,16 +1157,20 @@ public partial class Motor : AXSharp.Connector.ITwinObject
     {
         public OnlinerBool isRunning { get; }
 
+        partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
+        partial void PostConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
         public Motor(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail)
         {
             this.@SymbolTail = symbolTail;
             this.@Connector = parent.GetConnector();
             this.@Parent = parent;
             HumanReadable = AXSharp.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
             Symbol = AXSharp.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
+            PreConstruct(parent, readableTail, symbolTail);
             isRunning = @Connector.ConnectorAdapter.AdapterFactory.CreateBOOL(this, "isRunning", "isRunning");
             parent.AddChild(this);
             parent.AddKid(this);
+            PostConstruct(parent, readableTail, symbolTail);
         }
 
         public async virtual Task<T> OnlineToPlain<T>()
@@ -1363,17 +1367,21 @@ public partial class Vehicle : AXSharp.Connector.ITwinObject
 
         public OnlinerInt displacement { get; }
 
+        partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
+        partial void PostConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
         public Vehicle(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail)
         {
             this.@SymbolTail = symbolTail;
             this.@Connector = parent.GetConnector();
             this.@Parent = parent;
             HumanReadable = AXSharp.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
             Symbol = AXSharp.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
+            PreConstruct(parent, readableTail, symbolTail);
             m = new misc.Motor(this, "m", "m");
             displacement = @Connector.ConnectorAdapter.AdapterFactory.CreateINT(this, "displacement", "displacement");
             parent.AddChild(this);
             parent.AddKid(this);
+            PostConstruct(parent, readableTail, symbolTail);
         }
 
         public async virtual Task<T> OnlineToPlain<T>()

diff --git a/...iler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/configuration.g.cs b/...iler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/configuration.g.cs
@@ -867,16 +867,20 @@ public partial class Motor : AXSharp.Connector.ITwinObject
 {
     public OnlinerBool isRunning { get; }
 
+    partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
+    partial void PostConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
     public Motor(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail)
     {
         this.@SymbolTail = symbolTail;
         this.@Connector = parent.GetConnector();
         this.@Parent = parent;
         HumanReadable = AXSharp.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
         Symbol = AXSharp.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
+        PreConstruct(parent, readableTail, symbolTail);
         isRunning = @Connector.ConnectorAdapter.AdapterFactory.CreateBOOL(this, "isRunning", "isRunning");
         parent.AddChild(this);
         parent.AddKid(this);
+        PostConstruct(parent, readableTail, symbolTail);
     }
 
     public async virtual Task<T> OnlineToPlain<T>()
@@ -1073,17 +1077,21 @@ public partial class Vehicle : AXSharp.Connector.ITwinObject
 
     public OnlinerInt displacement { get; }
 
+    partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
+    partial void PostConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
     public Vehicle(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail)
     {
         this.@SymbolTail = symbolTail;
         this.@Connector = parent.GetConnector();
         this.@Parent = parent;
         HumanReadable = AXSharp.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
         Symbol = AXSharp.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
+        PreConstruct(parent, readableTail, symbolTail);
         m = new Motor(this, "m", "m");
         displacement = @Connector.ConnectorAdapter.AdapterFactory.CreateINT(this, "displacement", "displacement");
         parent.AddChild(this);
         parent.AddKid(this);
+        PostConstruct(parent, readableTail, symbolTail);
     }
 
     public async virtual Task<T> OnlineToPlain<T>()

diff --git a/...harp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/misc.g.cs b/...harp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/misc.g.cs
@@ -705,16 +705,20 @@ public partial class Motor : AXSharp.Connector.ITwinObject
     {
         public OnlinerBool isRunning { get; }
 
+        partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
+        partial void PostConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
         public Motor(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail)
         {
             this.@SymbolTail = symbolTail;
             this.@Connector = parent.GetConnector();
             this.@Parent = parent;
             HumanReadable = AXSharp.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
             Symbol = AXSharp.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
+            PreConstruct(parent, readableTail, symbolTail);
             isRunning = @Connector.ConnectorAdapter.AdapterFactory.CreateBOOL(this, "isRunning", "isRunning");
             parent.AddChild(this);
             parent.AddKid(this);
+            PostConstruct(parent, readableTail, symbolTail);
         }
 
         public async virtual Task<T> OnlineToPlain<T>()
@@ -911,17 +915,21 @@ public partial class Vehicle : AXSharp.Connector.ITwinObject
 
         public OnlinerInt displacement { get; }
 
+        partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
+        partial void PostConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
         public Vehicle(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail)
         {
             this.@SymbolTail = symbolTail;
             this.@Connector = parent.GetConnector();
             this.@Parent = parent;
             HumanReadable = AXSharp.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
             Symbol = AXSharp.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
+            PreConstruct(parent, readableTail, symbolTail);
             m = new misc.Motor(this, "m", "m");
             displacement = @Connector.ConnectorAdapter.AdapterFactory.CreateINT(this, "displacement", "displacement");
             parent.AddChild(this);
             parent.AddKid(this);
+            PostConstruct(parent, readableTail, symbolTail);
         }
 
         public async virtual Task<T> OnlineToPlain<T>()

diff --git a/...piler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/mixed_access.g.cs b/...piler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/mixed_access.g.cs
@@ -261,16 +261,20 @@ public partial class struct1 : AXSharp.Connector.ITwinObject
 {
     public struct2 s2 { get; }
 
+    partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
+    partial void PostConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
     public struct1(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail)
     {
         this.@SymbolTail = symbolTail;
         this.@Connector = parent.GetConnector();
         this.@Parent = parent;
         HumanReadable = AXSharp.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
         Symbol = AXSharp.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
+        PreConstruct(parent, readableTail, symbolTail);
         s2 = new struct2(this, "s2", "s2");
         parent.AddChild(this);
         parent.AddKid(this);
+        PostConstruct(parent, readableTail, symbolTail);
     }
 
     public async virtual Task<T> OnlineToPlain<T>()
@@ -471,16 +475,20 @@ public partial class struct2 : AXSharp.Connector.ITwinObject
 {
     public struct3 s3 { get; }
 
+    partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
+    partial void PostConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
     public struct2(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail)
     {
         this.@SymbolTail = symbolTail;
         this.@Connector = parent.GetConnector();
         this.@Parent = parent;
         HumanReadable = AXSharp.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
         Symbol = AXSharp.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
+        PreConstruct(parent, readableTail, symbolTail);
         s3 = new struct3(this, "s3", "s3");
         parent.AddChild(this);
         parent.AddKid(this);
+        PostConstruct(parent, readableTail, symbolTail);
     }
 
     public async virtual Task<T> OnlineToPlain<T>()
@@ -681,16 +689,20 @@ public partial class struct3 : AXSharp.Connector.ITwinObject
 {
     public struct4 s4 { get; }
 
+    partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
+    partial void PostConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
     public struct3(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail)
     {
         this.@SymbolTail = symbolTail;
         this.@Connector = parent.GetConnector();
         this.@Parent = parent;
         HumanReadable = AXSharp.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
         Symbol = AXSharp.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
+        PreConstruct(parent, readableTail, symbolTail);
         s4 = new struct4(this, "s4", "s4");
         parent.AddChild(this);
         parent.AddKid(this);
+        PostConstruct(parent, readableTail, symbolTail);
     }
 
     public async virtual Task<T> OnlineToPlain<T>()
@@ -891,16 +903,20 @@ public partial class struct4 : AXSharp.Connector.ITwinObject
 {
     public OnlinerInt s5 { get; }
 
+    partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
+    partial void PostConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
     public struct4(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail)
     {
         this.@SymbolTail = symbolTail;
         this.@Connector = parent.GetConnector();
         this.@Parent = parent;
         HumanReadable = AXSharp.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
         Symbol = AXSharp.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
+        PreConstruct(parent, readableTail, symbolTail);
         s5 = @Connector.ConnectorAdapter.AdapterFactory.CreateINT(this, "s5", "s5");
         parent.AddChild(this);
         parent.AddKid(this);
+        PostConstruct(parent, readableTail, symbolTail);
     }
 
     public async virtual Task<T> OnlineToPlain<T>()

diff --git a/...iler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/struct_simple.g.cs b/...iler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/struct_simple.g.cs
@@ -8,16 +8,20 @@ public partial class Motor : AXSharp.Connector.ITwinObject
 {
     public OnlinerBool isRunning { get; }
 
+    partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
+    partial void PostConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
     public Motor(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail)
     {
         this.@SymbolTail = symbolTail;
         this.@Connector = parent.GetConnector();
         this.@Parent = parent;
         HumanReadable = AXSharp.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
         Symbol = AXSharp.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
+        PreConstruct(parent, readableTail, symbolTail);
         isRunning = @Connector.ConnectorAdapter.AdapterFactory.CreateBOOL(this, "isRunning", "isRunning");
         parent.AddChild(this);
         parent.AddKid(this);
+        PostConstruct(parent, readableTail, symbolTail);
     }
 
     public async virtual Task<T> OnlineToPlain<T>()
@@ -214,17 +218,21 @@ public partial class Vehicle : AXSharp.Connector.ITwinObject
 
     public OnlinerInt displacement { get; }
 
+    partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
+    partial void PostConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
     public Vehicle(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail)
     {
         this.@SymbolTail = symbolTail;
         this.@Connector = parent.GetConnector();
         this.@Parent = parent;
         HumanReadable = AXSharp.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
         Symbol = AXSharp.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
+        PreConstruct(parent, readableTail, symbolTail);
         m = new Motor(this, "m", "m");
         displacement = @Connector.ConnectorAdapter.AdapterFactory.CreateINT(this, "displacement", "displacement");
         parent.AddChild(this);
         parent.AddKid(this);
+        PostConstruct(parent, readableTail, symbolTail);
     }
 
     public async virtual Task<T> OnlineToPlain<T>()

diff --git a/...Sharp.Compiler.CsTests/samples/units/expected/.g/Onliners/types_with_name_attributes.g.cs b/...Sharp.Compiler.CsTests/samples/units/expected/.g/Onliners/types_with_name_attributes.g.cs
@@ -11,16 +11,20 @@ public partial class Motor : AXSharp.Connector.ITwinObject
     {
         public OnlinerBool isRunning { get; }
 
+        partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
+        partial void PostConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
         public Motor(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail)
         {
             this.@SymbolTail = symbolTail;
             this.@Connector = parent.GetConnector();
             this.@Parent = parent;
             HumanReadable = AXSharp.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
             Symbol = AXSharp.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
+            PreConstruct(parent, readableTail, symbolTail);
             isRunning = @Connector.ConnectorAdapter.AdapterFactory.CreateBOOL(this, "isRunning", "isRunning");
             parent.AddChild(this);
             parent.AddKid(this);
+            PostConstruct(parent, readableTail, symbolTail);
         }
 
         public async virtual Task<T> OnlineToPlain<T>()
@@ -217,17 +221,21 @@ public partial class Vehicle : AXSharp.Connector.ITwinObject
 
         public OnlinerInt displacement { get; }
 
+        partial void PreConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
+        partial void PostConstruct(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail);
         public Vehicle(AXSharp.Connector.ITwinObject parent, string readableTail, string symbolTail)
         {
             this.@SymbolTail = symbolTail;
             this.@Connector = parent.GetConnector();
             this.@Parent = parent;
             HumanReadable = AXSharp.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
             Symbol = AXSharp.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
+            PreConstruct(parent, readableTail, symbolTail);
             m = new TypeWithNameAttributes.Motor(this, "m", "m");
             displacement = @Connector.ConnectorAdapter.AdapterFactory.CreateINT(this, "displacement", "displacement");
             parent.AddChild(this);
             parent.AddKid(this);
+            PostConstruct(parent, readableTail, symbolTail);
         }
 
         public async virtual Task<T> OnlineToPlain<T>()