Skip to content

NormalizedAc.concreteElements, InternalMap, InternalSet: use HashMap and HashSet #2543

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.

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
merged 27 commits into from
Apr 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9105998
NormalizedAc.concreteElements: use HashMap
ana-pantilie Apr 12, 2021
9044873
Format with fourmolu
invalid-email-address Apr 12, 2021
af7af24
Fix unit tests: term reorderings
ana-pantilie Apr 14, 2021
00cf1fd
Format with fourmolu
invalid-email-address Apr 14, 2021
a5b1f06
Builtin maps and sets: evaluate/test with HashMap and HashSet
ana-pantilie Apr 19, 2021
468f8a7
Format with fourmolu
invalid-email-address Apr 19, 2021
4003e61
Fix bug in implementation, clean-up
ana-pantilie Apr 20, 2021
ce21c92
WIP: fix unit tests
ana-pantilie Apr 20, 2021
484884a
Format with fourmolu
invalid-email-address Apr 20, 2021
166372b
Merge remote-tracking branch 'origin/master' into normalizedac-hashmap
ana-pantilie Apr 20, 2021
d92c12a
Format with fourmolu
invalid-email-address Apr 20, 2021
958d51d
Map reorderings: regenerate output for integration tests
ana-pantilie Apr 21, 2021
2b7fb2f
WIP unit tests: uncomment failing tests
ana-pantilie Apr 21, 2021
5a747b1
Merge branch 'normalizedac-hashmap' of github.com:kframework/kore int…
ana-pantilie Apr 21, 2021
6d5b074
Format with fourmolu
invalid-email-address Apr 21, 2021
d86886f
Fix Set.test_toList
ana-pantilie Apr 22, 2021
cb396c2
Fix all failing unit tests
ana-pantilie Apr 22, 2021
cb3fced
Merge branch 'master' into normalizedac-hashmap
ana-pantilie Apr 22, 2021
611bb2c
Format with fourmolu
invalid-email-address Apr 22, 2021
a812656
Remove commented import
ana-pantilie Apr 22, 2021
24e92d2
Update test name
ana-pantilie Apr 22, 2021
bb1b227
Make couple of unit tests independent of order
ana-pantilie Apr 23, 2021
a9faf40
Format with fourmolu
invalid-email-address Apr 23, 2021
fe937c1
Matcher tests: add matchMulti
ana-pantilie Apr 26, 2021
8bf8aa4
Merge branch 'normalizedac-hashmap' of github.com:kframework/kore int…
ana-pantilie Apr 26, 2021
3d325fd
Merge branch 'master' into normalizedac-hashmap
ana-pantilie Apr 26, 2021
56b5960
Merge branch 'master' into normalizedac-hashmap
rv-jenkins Apr 27, 2021
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
7 changes: 5 additions & 2 deletions kore/src/Kore/Builtin/AssocComm/CeilSimplifier.hs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import Control.Monad.Reader (
)
import qualified Control.Monad.Reader as Reader
import qualified Data.Bifunctor as Bifunctor
import qualified Data.HashMap.Strict as HashMap
import qualified Data.HashSet as HashSet
import qualified Data.Map.Strict as Map
import Kore.Attribute.Pattern.FreeVariables (
FreeVariables,
)
Expand Down Expand Up @@ -329,7 +329,10 @@ fromElement ::
NormalizedAc normalized Key (TermLike RewritingVariableName)
fromElement element
| Just concreteKey <- retractKey symbolicKey =
emptyNormalizedAc{concreteElements = Map.singleton concreteKey value}
emptyNormalizedAc
{ concreteElements =
HashMap.singleton concreteKey value
}
| otherwise =
emptyNormalizedAc{elementsWithVariables = [element]}
where
Expand Down
Loading