GaloisInc/cryptol
1
1
Fork 0
mirror of https://github.com/GaloisInc/cryptol.git synced 2025-01-08 08:49:44 +03:00
Code Issues Projects Releases Wiki Activity

fix problems from merge

Browse Source
This commit is contained in:
Brian Huffman 2016-09-20 16:17:40 -07:00
parent 67e730a07c
commit 11f3752041
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Cryptol/Symbolic/Value.hs
View File

@ -141,7 +141,7 @@ mergeValue f c v1 v2 =
[ "mergeValue.mergeField: incompatible values" ]
mergeSeqMap :: Bool -> SBool -> SeqMap SBool SWord -> SeqMap SBool SWord -> SeqMap SBool SWord
mergeSeqMap :: Bool -> SBool -> SeqMap SBool SWord SInteger -> SeqMap SBool SWord SInteger -> SeqMap SBool SWord SInteger
mergeSeqMap f c x y =
IndexSeqMap $ \i -> mergeValue f c <$> lookupSeqMap x i <*> lookupSeqMap y i