Merge Cryptol/Extras.cry with Cryptol.cry

Closes #427.
GaloisInc · May 23, 2018 · 99f3fdb · 99f3fdb
1 parent ddfe615
commit 99f3fdb
Show file tree

Hide file tree

Showing 13 changed files with 137 additions and 736 deletions.
diff --git a/bench/Main.hs b/bench/Main.hs
@@ -48,7 +48,6 @@ main = do
   defaultMain [
     bgroup "parser" [
         parser "Prelude" "lib/Cryptol.cry"
-      , parser "Extras"  "lib/Cryptol/Extras.cry"
       , parser "PreludeWithExtras" "bench/data/PreludeWithExtras.cry"
       , parser "BigSequence" "bench/data/BigSequence.cry"
       , parser "BigSequenceHex" "bench/data/BigSequenceHex.cry"
@@ -57,7 +56,6 @@ main = do
       ]
    , bgroup "typechecker" [
         tc cd "Prelude" "lib/Cryptol.cry"
-      , tc cd "Extras"  "lib/Cryptol/Extras.cry"
       , tc cd "PreludeWithExtras" "bench/data/PreludeWithExtras.cry"
       , tc cd "BigSequence" "bench/data/BigSequence.cry"
       , tc cd "BigSequenceHex" "bench/data/BigSequenceHex.cry"

diff --git a/cryptol-server/Cryptol/Aeson.hs b/cryptol-server/Cryptol/Aeson.hs