Merged
Conversation
Refactored configuration handling by introducing a new approach to merge configurations into a single class. Added loops to create instances of builder types, check their interfaces, and handle exceptions. Introduced a new method `CreateMergedConfigurations` in the `ICombinedThreeVisitor` interface. Enhanced `CsOnlinerConstructorBuilder` to handle various types of variable declarations and initialize members. Updated `CsOnlinerSourceBuilder` and `CsPlainSourceBuilder` to align with the new merged configuration approach. Modified `PragmaExtensions` to use `IStorageDeclaration` instead of `IFieldDeclaration`. Removed `unitsTwinController` class and its members from `configuration.g.cs` and `mixed_access.g.cs`. Updated `units.csproj` to change package versions. Added new configurations in `configuration.st`.
Updated `CreateMergedConfigurations` in `CsOnlinerSourceBuilder.cs` to include additional `using` statements and added a closing brace. Introduced a partial class `unitsTwinController` in `Configurations.g.cs` with new properties. Updated `units.csproj` to reference newer versions of `AXSharp.Abstractions` and `AXSharp.Connector`. Adjusted test cases in `CliProgramTest.cs` to account for an additional output file. Disabled test parallelization in `Usings.cs`. Updated `apax-lock.json` for `@ax/sld` package version change and re-added `@ax/st-docs` package. Removed large blocks of code defining `ix_integration_plcTwinController` and `integratedTwinController` classes in `configuration.g.cs`. Removed multiple properties from `integratedTwinController` class in the `Pocos` namespace, while keeping the `Pokus` class unchanged.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request includes several significant changes to the
AXSharp.compilerproject, primarily focusing on enhancing the configuration and initialization processes. The most important changes include adding methods for creating merged configurations, updating member initialization methods, and modifying configuration declaration methods to support multiple configurations.Enhancements to configuration and initialization processes:
src/AXSharp.compiler/src/AXSharp.Compiler/AXSharpProject.cs: Added a loop to generate merged configurations and handle retries for IO operations in theGeneratemethod.src/AXSharp.compiler/src/AXSharp.Compiler/Core/ICombinedThreeVisitor.cs: Introduced theCreateMergedConfigurationsmethod to theICombinedThreeVisitorinterface.src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerSourceBuilder.cs: Added theCreateMergedConfigurationsmethod to handle merged configurations and updated configuration declaration methods to align with multiple configurations. [1] [2]Updates to member initialization methods:
src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerConstructorBuilder.cs: Modified member initialization methods to handle various types such as arrays, enums, and structured types, and updated theCreatemethods to support new configurations. [1] [2] [3] [4]Other notable changes:
src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Pragmas/PragmaExtensions.cs: Updated theSetPropertiesmethod to useIStorageDeclarationinstead ofIFieldDeclaration.src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/AXSharp.Compiler.CsTests.csproj: Added a new sample configuration file to the test project.