From 0715cfe2aef2fee3188565cb2b84a3a799dc1c43 Mon Sep 17 00:00:00 2001 From: hallgren Date: Tue, 24 Jun 2014 13:59:09 +0000 Subject: minibar: include the grammar's last modification in the grammar info shown by the "i" button Also bumped version number in gf.cabal to 3.6-darcs. Also removed some unecessary use of CPP. --- src/compiler/GF/Text/Coding.hs | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/compiler/GF/Text/Coding.hs') diff --git a/src/compiler/GF/Text/Coding.hs b/src/compiler/GF/Text/Coding.hs index 3669733d0..bac7938c0 100644 --- a/src/compiler/GF/Text/Coding.hs +++ b/src/compiler/GF/Text/Coding.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE CPP #-} - module GF.Text.Coding where import qualified Data.ByteString as BS @@ -25,11 +23,7 @@ encodeUnicode enc s = where translate cod cbuf | i < w = do bbuf <- newByteBuffer 128 WriteBuffer -#if __GLASGOW_HASKELL__ >= 702 (_,cbuf,bbuf) <- cod cbuf bbuf -#else - (cbuf,bbuf) <- cod cbuf bbuf -#endif if isEmptyBuffer bbuf then ioe_invalidCharacter1 else do let bs = PS (bufRaw bbuf) (bufL bbuf) (bufR bbuf-bufL bbuf) @@ -54,11 +48,7 @@ decodeUnicodeIO enc (PS fptr l len) = do where translate cod bbuf cbuf | i < w = do -#if __GLASGOW_HASKELL__ >= 702 (_,bbuf,cbuf) <- cod bbuf cbuf -#else - (bbuf,cbuf) <- cod bbuf cbuf -#endif if isEmptyBuffer cbuf then ioe_invalidCharacter2 else unpack cod bbuf cbuf -- cgit v1.2.3