Skip to content

[NEW-FEATURE] POCO object should implement IPlain or IPOCO interface and respective swapping methods #148

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 4 commits into from
Apr 3, 2023
Merged

[NEW-FEATURE] POCO object should implement IPlain or IPOCO interface and respective swapping methods #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9da0b41
Create draft PR for #145
PTKu Apr 1, 2023
5d53b33
add IPlain interface to POCO types
PTKu Apr 1, 2023
a67d776
adds unit tests
PTKu Apr 3, 2023
b36c465
add in-code documentation in IPlainExtensions
PTKu Apr 3, 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
23 changes: 15 additions & 8 deletions src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Plain/CsPlainSourceBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,24 @@ public void CreateClassDeclaration(IClassDeclarationSyntax classDeclarationSynta
classDeclarationSyntax.UsingDirectives.ToList().ForEach(p => p.Visit(visitor, this));
AddToSource($"{classDeclaration.AccessModifier.Transform()}partial class {classDeclaration.Name}");

if (Compilation.GetSemanticTree().Types
.Any(p => p.FullyQualifiedName == classDeclaration.ExtendedType?.Type.FullyQualifiedName))
AddToSource($": {classDeclarationSyntax.BaseClassName.FullyQualifiedIdentifier}");
var isExtended = Compilation.GetSemanticTree().Types
.Any(p => p.FullyQualifiedName == classDeclaration.ExtendedType?.Type.FullyQualifiedName);

AddToSource(classDeclarationSyntax.ImplementsList != null && classDeclarationSyntax.BaseClassName != null
if (isExtended)
AddToSource($" : {classDeclarationSyntax.BaseClassName.FullyQualifiedIdentifier}");



AddToSource(isExtended ? ", AXSharp.Connector.IPlain" : ": AXSharp.Connector.IPlain");

AddToSource(classDeclarationSyntax.ImplementsList != null
? ", "
: string.Empty);
AddToSource(classDeclarationSyntax.ImplementsList != null && classDeclarationSyntax.BaseClassName == null
? " : "
: string.Empty);
: "");

classDeclarationSyntax.ImplementsList?.Visit(visitor, this);



AddToSource("{");
classDeclarationSyntax.UsingDirectives.ToList().ForEach(p => p.Visit(visitor, this));
classDeclaration.Fields.ToList().ForEach(p => p.Accept(visitor, this));
Expand Down
4 changes: 2 additions & 2 deletions ...iler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/array_declaration.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ namespace Pocos
{
namespace ArrayDeclarationSimpleNamespace
{
public partial class array_declaration_class
public partial class array_declaration_class : AXSharp.Connector.IPlain
{
public Int16[] primitive { get; set; } = new Int16[100];
public ArrayDeclarationSimpleNamespace.some_complex_type[] complex { get; set; } = new ArrayDeclarationSimpleNamespace.some_complex_type[100];
}

public partial class some_complex_type
public partial class some_complex_type : AXSharp.Connector.IPlain
{
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...r/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_all_primitives.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Pocos
{
public partial class class_all_primitives
public partial class class_all_primitives : AXSharp.Connector.IPlain
{
public Boolean myBOOL { get; set; }

Expand Down
4 changes: 2 additions & 2 deletions ...AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extended_by_known_type.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ namespace Pocos
{
namespace Simatic.Ax.StateFramework
{
public partial class State1Transition : AbstractState
public partial class State1Transition : AbstractState, AXSharp.Connector.IPlain
{
}
}

namespace Simatic.Ax.StateFramework
{
public partial class AbstractState : IState, IStateMuteable
public partial class AbstractState : AXSharp.Connector.IPlain, IState, IStateMuteable
{
public Int16 StateID { get; set; }

Expand Down
4 changes: 2 additions & 2 deletions ...compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extends.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace Pocos
{
public partial class Extended : Extendee
public partial class Extended : Extendee, AXSharp.Connector.IPlain
{
}

public partial class Extendee
public partial class Extendee : AXSharp.Connector.IPlain
{
}
}
4 changes: 2 additions & 2 deletions ...AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_extends_and_implements.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace Pocos
{
public partial class ExtendsAndImplements : ExtendeeExtendsAndImplements, IImplementation1, IImplementation2
public partial class ExtendsAndImplements : ExtendeeExtendsAndImplements, AXSharp.Connector.IPlain, IImplementation1, IImplementation2
{
}

public partial class ExtendeeExtendsAndImplements
public partial class ExtendeeExtendsAndImplements : AXSharp.Connector.IPlain
{
}

Expand Down
2 changes: 1 addition & 1 deletion ...piler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_implements.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Pocos
{
public partial class _NULL_CONTEXT : IContext
public partial class _NULL_CONTEXT : AXSharp.Connector.IPlain, IContext
{
}

Expand Down
2 changes: 1 addition & 1 deletion ...ts/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_implements_multiple.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Pocos
{
public partial class _NULL_CONTEXT_MULTIPLE : IContext_Multiple, IObject_Multiple
public partial class _NULL_CONTEXT_MULTIPLE : AXSharp.Connector.IPlain, IContext_Multiple, IObject_Multiple
{
}

Expand Down
2 changes: 1 addition & 1 deletion ...ompiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_internal.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Pocos
{
internal partial class ClassWithComplexTypes
internal partial class ClassWithComplexTypes : AXSharp.Connector.IPlain
{
}
}
2 changes: 1 addition & 1 deletion ...sts/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_no_access_modifier.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Pocos
{
public partial class NoAccessModifierClass
public partial class NoAccessModifierClass : AXSharp.Connector.IPlain
{
}
}
4 changes: 2 additions & 2 deletions ...s/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_complex_members.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ namespace Pocos
{
namespace ClassWithComplexTypesNamespace
{
public partial class ClassWithComplexTypes
public partial class ClassWithComplexTypes : AXSharp.Connector.IPlain
{
public ClassWithComplexTypesNamespace.ComplexType1 myComplexType { get; set; } = new ClassWithComplexTypesNamespace.ComplexType1();
}

public partial class ComplexType1
public partial class ComplexType1 : AXSharp.Connector.IPlain
{
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...XSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_non_public_members.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ namespace Pocos
{
namespace ClassWithNonTraspilableMemberssNamespace
{
public partial class ClassWithNonTraspilableMembers
public partial class ClassWithNonTraspilableMembers : AXSharp.Connector.IPlain
{
public ClassWithNonTraspilableMemberssNamespace.ComplexType1 myComplexType { get; set; } = new ClassWithNonTraspilableMemberssNamespace.ComplexType1();
}

public partial class ComplexType1
public partial class ComplexType1 : AXSharp.Connector.IPlain
{
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...ler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_pragmas.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ namespace Pocos
{
namespace ClassWithPragmasNamespace
{
public partial class ClassWithPragmas
public partial class ClassWithPragmas : AXSharp.Connector.IPlain
{
public ClassWithPragmasNamespace.ComplexType1 myComplexType { get; set; } = new ClassWithPragmasNamespace.ComplexType1();
}

public partial class ComplexType1
public partial class ComplexType1 : AXSharp.Connector.IPlain
{
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_primitive_members.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace Pocos
{
namespace ClassWithPrimitiveTypesNamespace
{
public partial class ClassWithPrimitiveTypes
public partial class ClassWithPrimitiveTypes : AXSharp.Connector.IPlain
{
public Boolean myBOOL { get; set; }

Expand Down
2 changes: 1 addition & 1 deletion .../AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/class_with_using_directives.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Pocos
using SimpleQualifiedNamespace.Qualified;
using HelloLevelOne.HelloLevelTwo;

internal partial class ClassWithUsingDirectives
internal partial class ClassWithUsingDirectives : AXSharp.Connector.IPlain
{
using SimpleFirstLevelNamespace ; using SimpleQualifiedNamespace . Qualified ; using HelloLevelOne . HelloLevelTwo ;

Expand Down
14 changes: 7 additions & 7 deletions ...tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/compileromitsattribute.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ namespace Pocos
{
namespace CompilerOmmits
{
public partial class ClassWithArrays
public partial class ClassWithArrays : AXSharp.Connector.IPlain
{
public CompilerOmmits.Complex _must_be_omitted_in_onliner { get; set; } = new CompilerOmmits.Complex();
public Byte[] _primitive { get; set; } = new Byte[11];
}

public partial class Complex
public partial class Complex : AXSharp.Connector.IPlain
{
public string HelloString { get; set; } = string.Empty;
public UInt64 Id { get; set; }
Expand All @@ -19,7 +19,7 @@ public partial class Complex

namespace Enums
{
public partial class ClassWithEnums
public partial class ClassWithEnums : AXSharp.Connector.IPlain
{
public global::Enums.Colors colors { get; set; }

Expand All @@ -29,13 +29,13 @@ public partial class ClassWithEnums

namespace misc
{
public partial class VariousMembers
public partial class VariousMembers : AXSharp.Connector.IPlain
{
public misc.SomeClass _SomeClass { get; set; } = new misc.SomeClass();
public misc.Motor _Motor { get; set; } = new misc.Motor();
}

public partial class SomeClass
public partial class SomeClass : AXSharp.Connector.IPlain
{
public string SomeClassVariable { get; set; } = string.Empty;
}
Expand All @@ -54,13 +54,13 @@ public partial class Vehicle

namespace UnknownArraysShouldNotBeTraspiled
{
public partial class ClassWithArrays
public partial class ClassWithArrays : AXSharp.Connector.IPlain
{
public UnknownArraysShouldNotBeTraspiled.Complex[] _complexKnown { get; set; } = new UnknownArraysShouldNotBeTraspiled.Complex[11];
public Byte[] _primitive { get; set; } = new Byte[11];
}

public partial class Complex
public partial class Complex : AXSharp.Connector.IPlain
{
public string HelloString { get; set; } = string.Empty;
public UInt64 Id { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion ...compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/configuration.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public partial class units
public Boolean _must_be_omitted_in_onliner { get; set; }
}

public partial class ComplexForConfig
public partial class ComplexForConfig : AXSharp.Connector.IPlain
{
public Boolean myBOOL { get; set; }

Expand Down
4 changes: 2 additions & 2 deletions ....compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/makereadonce.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ namespace Pocos
{
namespace makereadonce
{
public partial class MembersWithMakeReadOnce
public partial class MembersWithMakeReadOnce : AXSharp.Connector.IPlain
{
public string makeReadOnceMember { get; set; } = string.Empty;
public string someOtherMember { get; set; } = string.Empty;
public makereadonce.ComplexMember makeReadComplexMember { get; set; } = new makereadonce.ComplexMember();
public makereadonce.ComplexMember someotherComplexMember { get; set; } = new makereadonce.ComplexMember();
}

public partial class ComplexMember
public partial class ComplexMember : AXSharp.Connector.IPlain
{
public string someMember { get; set; } = string.Empty;
public string someOtherMember { get; set; } = string.Empty;
Expand Down
4 changes: 2 additions & 2 deletions ....compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/makereadonly.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ namespace Pocos
{
namespace makereadonly
{
public partial class MembersWithMakeReadOnly
public partial class MembersWithMakeReadOnly : AXSharp.Connector.IPlain
{
public string makeReadOnceMember { get; set; } = string.Empty;
public string someOtherMember { get; set; } = string.Empty;
public makereadonly.ComplexMember makeReadComplexMember { get; set; } = new makereadonly.ComplexMember();
public makereadonly.ComplexMember someotherComplexMember { get; set; } = new makereadonly.ComplexMember();
}

public partial class ComplexMember
public partial class ComplexMember : AXSharp.Connector.IPlain
{
public string someMember { get; set; } = string.Empty;
public string someOtherMember { get; set; } = string.Empty;
Expand Down
10 changes: 5 additions & 5 deletions src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/misc.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace Pocos
{
namespace Enums
{
public partial class ClassWithEnums
public partial class ClassWithEnums : AXSharp.Connector.IPlain
{
public global::Enums.Colors colors { get; set; }

Expand All @@ -14,13 +14,13 @@ public partial class ClassWithEnums

namespace misc
{
public partial class VariousMembers
public partial class VariousMembers : AXSharp.Connector.IPlain
{
public misc.SomeClass _SomeClass { get; set; } = new misc.SomeClass();
public misc.Motor _Motor { get; set; } = new misc.Motor();
}

public partial class SomeClass
public partial class SomeClass : AXSharp.Connector.IPlain
{
public string SomeClassVariable { get; set; } = string.Empty;
}
Expand All @@ -39,13 +39,13 @@ public partial class Vehicle

namespace UnknownArraysShouldNotBeTraspiled
{
public partial class ClassWithArrays
public partial class ClassWithArrays : AXSharp.Connector.IPlain
{
public UnknownArraysShouldNotBeTraspiled.Complex[] _complexKnown { get; set; } = new UnknownArraysShouldNotBeTraspiled.Complex[11];
public Byte[] _primitive { get; set; } = new Byte[11];
}

public partial class Complex
public partial class Complex : AXSharp.Connector.IPlain
{
public string HelloString { get; set; } = string.Empty;
public UInt64 Id { get; set; }
Expand Down
4 changes: 2 additions & 2 deletions ...compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/ref_to_simple.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ namespace Pocos
{
namespace RefToSimple
{
public partial class ref_to_simple
public partial class ref_to_simple : AXSharp.Connector.IPlain
{
}

public partial class referenced
public partial class referenced : AXSharp.Connector.IPlain
{
public Int16 b { get; set; }
}
Expand Down
2 changes: 1 addition & 1 deletion ...ler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/simple_empty_class.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Pocos
{
public partial class simple_class
public partial class simple_class : AXSharp.Connector.IPlain
{
}
}
2 changes: 1 addition & 1 deletion ....Compiler.CsTests/samples/units/expected/.g/POCO/simple_empty_class_within_namespace.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace Pocos
{
namespace sampleNamespace
{
public partial class simple_empty_class_within_namespace
public partial class simple_empty_class_within_namespace : AXSharp.Connector.IPlain
{
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...iler/tests/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_named_values.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace Pocos
{
namespace NamedValuesNamespace
{
public partial class using_type_named_values
public partial class using_type_named_values : AXSharp.Connector.IPlain
{
public Int16 LColors { get; set; }
}
Expand Down
2 changes: 1 addition & 1 deletion ...s/AXSharp.Compiler.CsTests/samples/units/expected/.g/POCO/type_named_values_literals.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace Pocos
{
namespace Simatic.Ax.StateFramework
{
public partial class using_type_named_values
public partial class using_type_named_values : AXSharp.Connector.IPlain
{
public UInt16 LColors { get; set; }
}
Expand Down
Loading