version bump to 2.3.0; fix warnings

cryptol.cabal

@@ -1,5 +1,5 @@
 Name:                cryptol
-Version:             2.2.3
+Version:             2.3.0
 Synopsis:            Cryptol: The Language of Cryptography
 Description: Cryptol is a domain-specific language for specifying cryptographic algorithms. A Cryptol implementation of an algorithm resembles its mathematical specification more closely than an implementation in a general purpose language. For more, see <http://www.cryptol.net/>.
 License:             BSD3
@@ -23,7 +23,7 @@ source-repository head
 source-repository this
   type:     git
   location: https://github.com/GaloisInc/cryptol.git
-  tag:      v2.2.3
+  tag:      v2.3.0
 
 flag static
   default: False

src/Cryptol/Prims/Eval.hs

@@ -483,8 +483,8 @@ splitAtV front back a val =
 
     -- remember that words are big-endian in cryptol, so the masked portion
     -- needs to be first, assuming that we're on a little-endian machine.
-    Nat rightWidth | aBit, VWord (BV w a) <- val ->
-      let i          = mask w a
+    Nat rightWidth | aBit, VWord (BV w v) <- val ->
+      let i          = mask w v
        in VTuple [ word leftWidth (i `shiftR` fromInteger rightWidth)
                  , word rightWidth i ]
 

src/Cryptol/TypeCheck/Solver/Numeric/NonLin.hs

@@ -30,9 +30,16 @@ import qualified Data.Map as Map
 
 type Trie   = Map
 
+trie_empty :: Map k a
 trie_empty  = Map.empty
+
+trie_insert :: Expr -> a -> Map Expr a -> Map Expr a
 trie_insert = Map.insert
+
+trie_delete :: Expr -> Map Expr a -> Map Expr a
 trie_delete = Map.delete
+
+trie_lookup :: Expr -> Map Expr a -> Maybe a
 trie_lookup = Map.lookup
 
 

src/Cryptol/TypeCheck/Solver/Numeric/Simplify1.hs

@@ -80,6 +80,7 @@ apSubstAtom su atom =
                     return (pGt x y)
 
 
+{- TODO: Unused
 -- | The various way in which the given proposition may be true.
 -- The Boolean indicates if the atom is +ve:
 -- 'True' for positive, 'False' for -ve.
@@ -91,7 +92,7 @@ truePaths prop =
     Return True   -> [ [] ]
     If a t e      -> map ((True,a):)  (truePaths t) ++
                      map ((False,a):) (truePaths e)
-
+-}
 
 
 --------------------------------------------------------------------------------
@@ -331,11 +332,11 @@ balanceEq x y = (x,y)
 
 
 
-
+{- TODO: unused
 balanceGt (K (Nat a) :+ e1) (K (Nat b) :+ e2)
   | a >= b    = balanceGt (K (Nat (a - b)) :+ e1) e2
   | otherwise = balanceGt e1                      (K (Nat (b - a)) :+ e2)
-
+-}