X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=JVM%2FCommon.hs;h=301c40c433ea52b7a6e964aec521c088d0eb5589;hb=4174461dc7cd2b14183917db3cd11219a37e804c;hp=65a6c6fcf8425eb1f75e70ed2991c998e495e322;hpb=c2fa4732b54ceb6d0329bb49ed110477acd735b6;p=hs-java.git

diff --git a/JVM/Common.hs b/JVM/Common.hs
index 65a6c6f..301c40c 100644
--- 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