Adapt vAsFirstOrderType to saw-core tuple representation.

Since saw-core revision 5c0f54e0 (December 2018), tuple types are no longer nil-terminated.
GaloisInc · Dec 3, 2019 · 414d7b3 · 414d7b3
1 parent 8b185b3
commit 414d7b3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Verifier/SAW/Simulator/SBV.hs b/src/Verifier/SAW/Simulator/SBV.hs
@@ -611,7 +611,8 @@ vAsFirstOrderType v =
             t2 <- vAsFirstOrderType v2
             case t2 of
               FOTTuple ts -> return (FOTTuple (t1 : ts))
-              _ -> Nothing
+              _ -> return (FOTTuple [t1, t2])
+
     VRecordType tps
       -> (FOTRec <$> Map.fromList <$>
           mapM (\(f,tp) -> (f,) <$> vAsFirstOrderType tp) tps)