Support both IO and clean version of Generate monad.

[hs-java.git] / JVM / Common.hs

diff --git a/JVM/Common.hs b/JVM/Common.hs
index 65a6c6fcf8425eb1f75e70ed2991c998e495e322..301c40c433ea52b7a6e964aec521c088d0eb5589 100644 (file)
--- a/JVM/Common.hs
+++ b/JVM/Common.hs
@@ -8,26 +8,26 @@ module JVM.Common
   byteString
   ) where
 
-import Codec.Binary.UTF8.String hiding (encode, decode)
+import Codec.Binary.UTF8.String (encodeString, decodeString)
 import Data.Binary
 import Data.Binary.Put
 import qualified Data.ByteString.Lazy as B
-import Data.Char
-import Data.String
 import qualified Data.Map as M
 import Data.Default
+import Data.Char
+import Data.String
 
 import JVM.ClassFile
 
+instance IsString B.ByteString where
+  fromString s = B.pack $ map (fromIntegral . ord) $ encodeString s
+
 instance Default B.ByteString where
   def = B.empty
 
 instance Default Word16 where
   def = 0
 
-instance IsString B.ByteString where
-  fromString s = B.pack $ map (fromIntegral . ord) $ encodeString s
-
 toCharList :: B.ByteString -> [Int]
 toCharList bstr = map fromIntegral $ B.unpack bstr