feat!: add Submodel
#682
Merged
feat!: add Submodel
#682
Conversation
This file contains 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
Add `Submodel`, and refactor `Model` to be a wrapper over `Submodel`. This commit is part of on-going work to add lexical scope to Conjure Oxide and is a follow up to 8636432 (feat!: add parent symbol tables (#680), 2025-02-17). DETAILS A `Submodel` represents a particular scope and holds the symbol-table and constraints tree for that scope. This commit refactors `Model` to be a wrapper over `Submodel`, and removes methods operating on constraints and the symbol table from `Model`, placing them in `Submodel` instead. A `Model` can be borrowed as a `Submodel` using `as_submodel()` and `as_submodel_mut()`. The language semantics of a top level model and a sub-model are identical, so treating it as `Submodel` in most cases is valid. `Model` is a separate type than `Submodel` for the following reasons: + It will hold global-only information in the future, such as dominance constraints. + It holds a pointer to the context. + We need special initialisation and de-serialisation logic for the top level model that we do not want for `Submodel`. See `SerdeModel`.
niklasdewally
force-pushed
the
nik/scoping/add-submodel
branch
from
8ea0b91 to
4149f04
Compare
Code and Documentation Coverage ReportDocumentation CoverageThis PR: conjure_core: 3% with examples, 55% documented -- 8/128/245 Main: conjure_core: 3% with examples, 55% documented -- 8/145/271 View full documentation coverage for main, this PR Code Coverage SummaryThis PR: Detailed Report Main: Detailed Report Coverage Main & PR Coverage ChangeFunctions coverage changed by -0.30% and covered lines changed by 7
Branches... coverage: No comparison data available |
ozgurakgun
approved these changes
Feb 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add
Submodel, and refactorModelto be a wrapper overSubmodel.This commit is part of on-going work to add lexical scope to Conjure
Oxide and is a follow up to 8636432 (feat!: add parent symbol tables
(#680), 2025-02-17).
DETAILS
A
Submodelrepresents a particular scope and holds the symbol-tableand constraints tree for that scope.
This commit refactors
Modelto be a wrapper overSubmodel, andremoves methods operating on constraints and the symbol table from
Model, placing them inSubmodelinstead. AModelcan be borrowed asa
Submodelusingas_submodel()andas_submodel_mut().The language semantics of a top level model and a sub-model are
identical, so treating it as
Submodelin most cases is valid.Modelis a separate type thanSubmodelfor the following reasons:It will hold global-only information in the future, such as dominance
constraints.
It holds a pointer to the context.
We need special initialisation and de-serialisation logic for the
top level model that we do not want for
Submodel. SeeSerdeModel.