diff options
| author | hallgren <hallgren@chalmers.se> | 2014-06-24 13:59:09 +0000 |
|---|---|---|
| committer | hallgren <hallgren@chalmers.se> | 2014-06-24 13:59:09 +0000 |
| commit | 0715cfe2aef2fee3188565cb2b84a3a799dc1c43 (patch) | |
| tree | f037f7fc779d259baeb0b84cfe0d8e4f1a189fba /src/compiler | |
| parent | 23ec403402f10a7fd9156844d4d16cd26f34a2cd (diff) | |
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.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/GF/Infra/Option.hs | 10 | ||||
| -rw-r--r-- | src/compiler/GF/Text/Coding.hs | 10 |
2 files changed, 1 insertions, 19 deletions
diff --git a/src/compiler/GF/Infra/Option.hs b/src/compiler/GF/Infra/Option.hs index 80606c0a9..88767c72e 100644 --- a/src/compiler/GF/Infra/Option.hs +++ b/src/compiler/GF/Infra/Option.hs @@ -1,4 +1,3 @@ --- LANGUAGE CPP module GF.Infra.Option ( -- * Option types @@ -285,14 +284,7 @@ defaultFlags = Flags { optTagsOnly = False, optHeuristicFactor = Nothing, optMetaProb = Nothing, - optMetaToknProb = Nothing{-, - optNewComp = -#ifdef NEW_COMP - True -#else - False -#endif --} + optMetaToknProb = Nothing } -- | Option descriptions 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 |