Enable OverloadedStrings as default extension

7 files changed, 2 insertions, 11 deletions

diff --git a/erebos-tester.cabal b/erebos-tester.cabal
index 55866fc..2766ee2 100644
--- a/erebos-tester.cabal
+++ b/erebos-tester.cabal
@@ -45,7 +45,6 @@ executable erebos-tester-core
                        Test
                        Util
   other-extensions:    TemplateHaskell
-                       OverloadedStrings
   default-extensions:  ExistentialQuantification
                        FlexibleContexts
                        FlexibleInstances
@@ -54,6 +53,7 @@ executable erebos-tester-core
                        ImportQualifiedPost
                        LambdaCase
                        MultiParamTypeClasses
+                       OverloadedStrings
                        RankNTypes
                        ScopedTypeVariables
                        TupleSections
diff --git a/src/Config.hs b/src/Config.hs
index 2079092..7f5895c 100644
--- a/src/Config.hs
+++ b/src/Config.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedStrings #-}
-
 module Config (
     Config(..),
     findConfig,
diff --git a/src/GDB.hs b/src/GDB.hs
index ad8ff84..8c23bb9 100644
--- a/src/GDB.hs
+++ b/src/GDB.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedStrings #-}
-
 module GDB (
     GDB, gdbProcess,
     gdbStart,
diff --git a/src/Main.hs b/src/Main.hs
index e9e3c4c..81fb04f 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedStrings #-}
-
 module Main (main) where
 
 import Control.Applicative
diff --git a/src/Output.hs b/src/Output.hs
index 8c913b2..7f9341b 100644
--- a/src/Output.hs
+++ b/src/Output.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedStrings #-}
-
 module Output (
     Output, OutputType(..),
     MonadOutput(..),
diff --git a/src/Parser.hs b/src/Parser.hs
index f8c5b0e..b67ce55 100644
--- a/src/Parser.hs
+++ b/src/Parser.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 {-# OPTIONS_GHC -Wno-orphans #-}
diff --git a/src/Test.hs b/src/Test.hs
index 11cbca8..b2644b6 100644
--- a/src/Test.hs
+++ b/src/Test.hs
@@ -161,5 +161,5 @@ regexSource (RegexPart src) = src
 regexSource (RegexString str) = T.concatMap escapeChar str
   where
     escapeChar c | isAlphaNum c = T.singleton c
-                 | c `elem` "`'<>" = T.singleton c
+                 | c `elem` ['`', '\'', '<', '>'] = T.singleton c
                  | otherwise = T.pack ['\\', c]