Skip to content

add partial initialization methods for Onliners #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PTKu merged 3 commits into from
Mar 8, 2023
Merged

add partial initialization methods for Onliners #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3e1f84
Create draft PR for #117
Brano5 Mar 8, 2023
8fb2caf
Added partial Pre and Post constructors and declarations
Brano5 Mar 8, 2023
646ce85
Repair ixc tests
Brano5 Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/ix.compiler/src/IX.Cs.Compiler/Onliner/CsOnlinerConstructorBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,8 @@ public static CsOnlinerConstructorBuilder Create(IxNodeVisitor visitor, IClassDe
this.@Parent = parent;
HumanReadable = {typeof(Connector.Connector).n()}.CreateHumanReadable(parent.HumanReadable, readableTail);");

builder.AddToSource(@$"PreConstruct(parent, readableTail, symbolTail);");

semantics.Fields.ToList().ForEach(p => p.Accept(visitor, builder));

if (!isExtended)
Expand All @@ -165,6 +167,8 @@ public static CsOnlinerConstructorBuilder Create(IxNodeVisitor visitor, IClassDe
builder.AddToSource("parent.AddKid(this);");
}

builder.AddToSource(@$"PostConstruct(parent, readableTail, symbolTail);");

builder.AddToSource("}");
return builder;
}
Expand All @@ -185,9 +189,11 @@ public static CsOnlinerConstructorBuilder Create(IxNodeVisitor visitor, IStructu
this.@Parent = parent;
HumanReadable = {typeof(Connector.Connector).n()}.CreateHumanReadable(parent.HumanReadable, readableTail);
Symbol = {typeof(Connector.Connector).n()}.CreateSymbol(parent.Symbol, symbolTail);");

semantics.Fields.ToList().ForEach(p => p.Accept(visitor, builder));
builder.AddToSource("parent.AddChild(this);");
builder.AddToSource("parent.AddKid(this);");

builder.AddToSource("}");

return builder;
Expand Down
4 changes: 4 additions & 0 deletions src/ix.compiler/src/IX.Cs.Compiler/Onliner/CsOnlinerMemberBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,10 @@ public static CsOnlinerMemberBuilder Create(IxNodeVisitor visitor, IClassDeclara
var builder = new CsOnlinerMemberBuilder(compilation);
builder.AddToSource(semantics.DeclareProperties());
semantics.Fields.ToList().ForEach(p => p.Accept(visitor, builder));

builder.AddToSource(@$"partial void PreConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
partial void PostConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);");

return builder;
}

Expand Down
8 changes: 8 additions & 0 deletions ...piler/tests/Ix.Compiler.CsTests/samples/units/expected/.g/Onliners/array_declaration.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,23 @@ public partial class array_declaration_class : Ix.Connector.ITwinObject

public ArrayDeclarationSimpleNamespace.some_complex_type[] complex { get; }

partial void PreConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
partial void PostConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
public array_declaration_class(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail)
{
Symbol = Ix.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
this.@SymbolTail = symbolTail;
this.@Connector = parent.GetConnector();
this.@Parent = parent;
HumanReadable = Ix.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
PreConstruct(parent, readableTail, symbolTail);
primitive = new OnlinerInt[100];
Ix.Connector.BuilderHelpers.Arrays.InstantiateArray(primitive, this, "primitive", "primitive", (p, rt, st) => @Connector.ConnectorAdapter.AdapterFactory.CreateINT(p, rt, st));
complex = new ArrayDeclarationSimpleNamespace.some_complex_type[100];
Ix.Connector.BuilderHelpers.Arrays.InstantiateArray(complex, this, "complex", "complex", (p, rt, st) => new ArrayDeclarationSimpleNamespace.some_complex_type(p, rt, st));
parent.AddChild(this);
parent.AddKid(this);
PostConstruct(parent, readableTail, symbolTail);
}

public async Task<Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class> OnlineToPlainAsync()
Expand Down Expand Up @@ -155,15 +159,19 @@ public System.String AttributeName

public partial class some_complex_type : Ix.Connector.ITwinObject
{
partial void PreConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
partial void PostConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
public some_complex_type(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail)
{
Symbol = Ix.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
this.@SymbolTail = symbolTail;
this.@Connector = parent.GetConnector();
this.@Parent = parent;
HumanReadable = Ix.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
PreConstruct(parent, readableTail, symbolTail);
parent.AddChild(this);
parent.AddKid(this);
PostConstruct(parent, readableTail, symbolTail);
}

public async Task<Pocos.ArrayDeclarationSimpleNamespace.some_complex_type> OnlineToPlainAsync()
Expand Down
4 changes: 4 additions & 0 deletions ...er/tests/Ix.Compiler.CsTests/samples/units/expected/.g/Onliners/class_all_primitives.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,16 @@ public partial class class_all_primitives : Ix.Connector.ITwinObject

public OnlinerWString myWSTRING { get; }

partial void PreConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
partial void PostConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
public class_all_primitives(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail)
{
Symbol = Ix.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
this.@SymbolTail = symbolTail;
this.@Connector = parent.GetConnector();
this.@Parent = parent;
HumanReadable = Ix.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
PreConstruct(parent, readableTail, symbolTail);
myBOOL = @Connector.ConnectorAdapter.AdapterFactory.CreateBOOL(this, "myBOOL", "myBOOL");
myBYTE = @Connector.ConnectorAdapter.AdapterFactory.CreateBYTE(this, "myBYTE", "myBYTE");
myWORD = @Connector.ConnectorAdapter.AdapterFactory.CreateWORD(this, "myWORD", "myWORD");
Expand All @@ -80,6 +83,7 @@ public class_all_primitives(Ix.Connector.ITwinObject parent, string readableTail
myWSTRING = @Connector.ConnectorAdapter.AdapterFactory.CreateWSTRING(this, "myWSTRING", "myWSTRING");
parent.AddChild(this);
parent.AddKid(this);
PostConstruct(parent, readableTail, symbolTail);
}

public async Task<Pocos.class_all_primitives> OnlineToPlainAsync()
Expand Down
8 changes: 8 additions & 0 deletions .../Ix.Compiler.CsTests/samples/units/expected/.g/Onliners/class_extended_by_known_type.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@ namespace Simatic.Ax.StateFramework
{
public partial class State1Transition : AbstractState
{
partial void PreConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
partial void PostConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
public State1Transition(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail) : base(parent, readableTail, symbolTail + ".$base")
{
Symbol = Ix.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
PreConstruct(parent, readableTail, symbolTail);
PostConstruct(parent, readableTail, symbolTail);
}

public async Task<Pocos.Simatic.Ax.StateFramework.State1Transition> OnlineToPlainAsync()
Expand Down Expand Up @@ -66,17 +70,21 @@ public partial class AbstractState : Ix.Connector.ITwinObject, IState, IStateMut

public OnlinerString StateName { get; }

partial void PreConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
partial void PostConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
public AbstractState(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail)
{
Symbol = Ix.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
this.@SymbolTail = symbolTail;
this.@Connector = parent.GetConnector();
this.@Parent = parent;
HumanReadable = Ix.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
PreConstruct(parent, readableTail, symbolTail);
StateID = @Connector.ConnectorAdapter.AdapterFactory.CreateINT(this, "StateID", "StateID");
StateName = @Connector.ConnectorAdapter.AdapterFactory.CreateSTRING(this, "StateName", "StateName");
parent.AddChild(this);
parent.AddKid(this);
PostConstruct(parent, readableTail, symbolTail);
}

public async Task<Pocos.Simatic.Ax.StateFramework.AbstractState> OnlineToPlainAsync()
Expand Down
8 changes: 8 additions & 0 deletions ....compiler/tests/Ix.Compiler.CsTests/samples/units/expected/.g/Onliners/class_extends.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@

public partial class Extended : Extendee
{
partial void PreConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
partial void PostConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
public Extended(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail) : base(parent, readableTail, symbolTail + ".$base")
{
Symbol = Ix.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
PreConstruct(parent, readableTail, symbolTail);
PostConstruct(parent, readableTail, symbolTail);
}

public async Task<Pocos.Extended> OnlineToPlainAsync()
Expand Down Expand Up @@ -57,15 +61,19 @@ public void Poll()

public partial class Extendee : Ix.Connector.ITwinObject
{
partial void PreConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
partial void PostConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
public Extendee(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail)
{
Symbol = Ix.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
this.@SymbolTail = symbolTail;
this.@Connector = parent.GetConnector();
this.@Parent = parent;
HumanReadable = Ix.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
PreConstruct(parent, readableTail, symbolTail);
parent.AddChild(this);
parent.AddKid(this);
PostConstruct(parent, readableTail, symbolTail);
}

public async Task<Pocos.Extendee> OnlineToPlainAsync()
Expand Down
8 changes: 8 additions & 0 deletions .../Ix.Compiler.CsTests/samples/units/expected/.g/Onliners/class_extends_and_implements.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@

public partial class ExtendsAndImplements : ExtendeeExtendsAndImplements, IImplementation1, IImplementation2
{
partial void PreConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
partial void PostConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
public ExtendsAndImplements(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail) : base(parent, readableTail, symbolTail + ".$base")
{
Symbol = Ix.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
PreConstruct(parent, readableTail, symbolTail);
PostConstruct(parent, readableTail, symbolTail);
}

public async Task<Pocos.ExtendsAndImplements> OnlineToPlainAsync()
Expand Down Expand Up @@ -57,15 +61,19 @@ public void Poll()

public partial class ExtendeeExtendsAndImplements : Ix.Connector.ITwinObject
{
partial void PreConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
partial void PostConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
public ExtendeeExtendsAndImplements(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail)
{
Symbol = Ix.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
this.@SymbolTail = symbolTail;
this.@Connector = parent.GetConnector();
this.@Parent = parent;
HumanReadable = Ix.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
PreConstruct(parent, readableTail, symbolTail);
parent.AddChild(this);
parent.AddKid(this);
PostConstruct(parent, readableTail, symbolTail);
}

public async Task<Pocos.ExtendeeExtendsAndImplements> OnlineToPlainAsync()
Expand Down
4 changes: 4 additions & 0 deletions ...mpiler/tests/Ix.Compiler.CsTests/samples/units/expected/.g/Onliners/class_implements.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,19 @@

public partial class _NULL_CONTEXT : Ix.Connector.ITwinObject, IContext
{
partial void PreConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
partial void PostConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
public _NULL_CONTEXT(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail)
{
Symbol = Ix.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
this.@SymbolTail = symbolTail;
this.@Connector = parent.GetConnector();
this.@Parent = parent;
HumanReadable = Ix.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
PreConstruct(parent, readableTail, symbolTail);
parent.AddChild(this);
parent.AddKid(this);
PostConstruct(parent, readableTail, symbolTail);
}

public async Task<Pocos._NULL_CONTEXT> OnlineToPlainAsync()
Expand Down
4 changes: 4 additions & 0 deletions ...sts/Ix.Compiler.CsTests/samples/units/expected/.g/Onliners/class_implements_multiple.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,19 @@

public partial class _NULL_CONTEXT_MULTIPLE : Ix.Connector.ITwinObject, IContext_Multiple, IObject_Multiple
{
partial void PreConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
partial void PostConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
public _NULL_CONTEXT_MULTIPLE(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail)
{
Symbol = Ix.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
this.@SymbolTail = symbolTail;
this.@Connector = parent.GetConnector();
this.@Parent = parent;
HumanReadable = Ix.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
PreConstruct(parent, readableTail, symbolTail);
parent.AddChild(this);
parent.AddKid(this);
PostConstruct(parent, readableTail, symbolTail);
}

public async Task<Pocos._NULL_CONTEXT_MULTIPLE> OnlineToPlainAsync()
Expand Down
4 changes: 4 additions & 0 deletions ...compiler/tests/Ix.Compiler.CsTests/samples/units/expected/.g/Onliners/class_internal.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,19 @@

internal partial class ClassWithComplexTypes : Ix.Connector.ITwinObject
{
partial void PreConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
partial void PostConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
public ClassWithComplexTypes(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail)
{
Symbol = Ix.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
this.@SymbolTail = symbolTail;
this.@Connector = parent.GetConnector();
this.@Parent = parent;
HumanReadable = Ix.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
PreConstruct(parent, readableTail, symbolTail);
parent.AddChild(this);
parent.AddKid(this);
PostConstruct(parent, readableTail, symbolTail);
}

public async Task<Pocos.ClassWithComplexTypes> OnlineToPlainAsync()
Expand Down
4 changes: 4 additions & 0 deletions ...ests/Ix.Compiler.CsTests/samples/units/expected/.g/Onliners/class_no_access_modifier.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,19 @@

public partial class NoAccessModifierClass : Ix.Connector.ITwinObject
{
partial void PreConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
partial void PostConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
public NoAccessModifierClass(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail)
{
Symbol = Ix.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
this.@SymbolTail = symbolTail;
this.@Connector = parent.GetConnector();
this.@Parent = parent;
HumanReadable = Ix.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
PreConstruct(parent, readableTail, symbolTail);
parent.AddChild(this);
parent.AddKid(this);
PostConstruct(parent, readableTail, symbolTail);
}

public async Task<Pocos.NoAccessModifierClass> OnlineToPlainAsync()
Expand Down
8 changes: 8 additions & 0 deletions ...ts/Ix.Compiler.CsTests/samples/units/expected/.g/Onliners/class_with_complex_members.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,20 @@ public partial class ClassWithComplexTypes : Ix.Connector.ITwinObject
{
public ClassWithComplexTypesNamespace.ComplexType1 myComplexType { get; }

partial void PreConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
partial void PostConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
public ClassWithComplexTypes(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail)
{
Symbol = Ix.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
this.@SymbolTail = symbolTail;
this.@Connector = parent.GetConnector();
this.@Parent = parent;
HumanReadable = Ix.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
PreConstruct(parent, readableTail, symbolTail);
myComplexType = new ClassWithComplexTypesNamespace.ComplexType1(this, "myComplexType", "myComplexType");
parent.AddChild(this);
parent.AddKid(this);
PostConstruct(parent, readableTail, symbolTail);
}

public async Task<Pocos.ClassWithComplexTypesNamespace.ClassWithComplexTypes> OnlineToPlainAsync()
Expand Down Expand Up @@ -140,15 +144,19 @@ public System.String AttributeName

public partial class ComplexType1 : Ix.Connector.ITwinObject
{
partial void PreConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
partial void PostConstruct(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail);
public ComplexType1(Ix.Connector.ITwinObject parent, string readableTail, string symbolTail)
{
Symbol = Ix.Connector.Connector.CreateSymbol(parent.Symbol, symbolTail);
this.@SymbolTail = symbolTail;
this.@Connector = parent.GetConnector();
this.@Parent = parent;
HumanReadable = Ix.Connector.Connector.CreateHumanReadable(parent.HumanReadable, readableTail);
PreConstruct(parent, readableTail, symbolTail);
parent.AddChild(this);
parent.AddKid(this);
PostConstruct(parent, readableTail, symbolTail);
}

public async Task<Pocos.ClassWithComplexTypesNamespace.ComplexType1> OnlineToPlainAsync()
Expand Down
Loading