Preserve clause ordering of requires and ensures when internalisig rules in booster
#4037
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
goodlyrottenapple
requested review from
jberthold and
geo2a
and removed request for
jberthold
jberthold
approved these changes
Aug 19, 2024
There was a problem hiding this comment.
One detail:
I suggest to remove all old code related to aliases for rule LHSs (and probably all code about aliases in general)- in a follow-up PR. #3775 states that aliases were only used for rule LHSs, and they were removed from the front-end a while back
| , ensures = rhs.constraints | ||
| { lhs | ||
| , rhs | ||
| , requires = mempty |
There was a problem hiding this comment.
I think we are somehow losing the requires clause on the track here ... but this whole function should be dead code anyway so we'd rather remove the alias business altogether than fix this.
Comment on lines
-1384
to
-1390
| // rule `<generatedTop>`(`<T>`(`<k>`(inj{Pgm,KItem}(`int_;__IMP-SYNTAX_Pgm_Ids_Stmt`(`_,__IMP-SYNTAX_Ids_Id_Ids`(X,Xs),_Gen0))),`<state>`(`_Map_`(Rho,`.Map`(.KList)))),_DotVar0)=>`<generatedTop>`(`<T>`(`<k>`(inj{Pgm,KItem}(`int_;__IMP-SYNTAX_Pgm_Ids_Stmt`(Xs,_Gen0))),`<state>`(`_Map_`(Rho,`_|->_`(inj{Id,KItem}(X),inj{Int,KItem}(#token("0","Int")))))),_DotVar0) requires `notBool_`(`Set:in`(inj{Id,KItem}(X),`keys(_)_MAP_Set_Map`(Rho))) ensures #token("true","Bool") [UNIQUE_ID(8a8d39fed34974de05d217d0c7014950a846aae159a11794bd36c81db4b3ede1), org.kframework.attributes.Location(Location(206,8,207,38)), org.kframework.attributes.Source(Source(/home/jost/work/RV/code/playground/imp/imp.k)), org.kframework.definition.Production(syntax #RuleContent ::= #RuleBody "requires" Bool [klabel(#ruleRequires), symbol])] | ||
| alias rule66LHS{}(SortMap{},SortId{},SortIds{},SortGeneratedCounterCell{},SortStmt{}) : SortGeneratedTopCell{} | ||
| where rule66LHS{}(VarRho:SortMap{},VarX:SortId{},VarXs:SortIds{},Var'Unds'DotVar0:SortGeneratedCounterCell{},Var'Unds'Gen0:SortStmt{}) := | ||
| \and{SortGeneratedTopCell{}} ( | ||
| \equals{SortBool{},SortGeneratedTopCell{}}( | ||
| LblnotBool'Unds'{}(LblSet'Coln'in{}(inj{SortId{}, SortKItem{}}(VarX:SortId{}),Lblkeys'LParUndsRParUnds'MAP'Unds'Set'Unds'Map{}(VarRho:SortMap{}))), | ||
| \dv{SortBool{}}("true")), Lbl'-LT-'generatedTop'-GT-'{}(Lbl'-LT-'T'-GT-'{}(Lbl'-LT-'k'-GT-'{}(kseq{}(inj{SortPgm{}, SortKItem{}}(Lblint'UndsSClnUndsUnds'IMP-SYNTAX'Unds'Pgm'Unds'Ids'Unds'Stmt{}(Lbl'UndsCommUndsUnds'IMP-SYNTAX'Unds'Ids'Unds'Id'Unds'Ids{}(VarX:SortId{},VarXs:SortIds{}),Var'Unds'Gen0:SortStmt{})),dotk{}())),Lbl'-LT-'state'-GT-'{}(Lbl'Unds'Map'Unds'{}(VarRho:SortMap{},Lbl'Stop'Map{}()))),Var'Unds'DotVar0:SortGeneratedCounterCell{})) [] |
There was a problem hiding this comment.
(Example of a rule-LHS alias with a predicate)
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.
Fixes #4028