Update .cabal file and LANGUAGE pragmas
authorHerbert Valerio Riedel <hvr@gnu.org>
Sat, 27 Dec 2014 22:22:17 +0000 (23:22 +0100)
committerHerbert Valerio Riedel <hvr@gnu.org>
Sat, 27 Dec 2014 22:23:41 +0000 (23:23 +0100)
C.hs
Common.hs
Main.hs
UtilsCodegen.hs
hsc2hs.cabal

diff --git a/C.hs b/C.hs
index c6a7e5e..dd02f43 100644 (file)
--- a/C.hs
+++ b/C.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 module C where
 
 {-
index ae11241..fefc40c 100644 (file)
--- a/Common.hs
+++ b/Common.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 module Common where
 
 import Control.Exception        ( bracket_ )
diff --git a/Main.hs b/Main.hs
index 30b3a2d..afa192e 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -1,5 +1,4 @@
-{-# OPTIONS -cpp #-}
-{-# LANGUAGE CPP, ForeignFunctionInterface #-}
+{-# LANGUAGE CPP #-}
 
 ------------------------------------------------------------------------
 -- Program for converting .hsc files to .hs files, by converting the
index 8844052..19befd2 100644 (file)
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 module UtilsCodegen where
 
 {-
index 2eee52a..6dfa7c4 100644 (file)
@@ -1,7 +1,6 @@
 Name: hsc2hs
 Version: 0.67
 Copyright: 2000, Marcin Kowalczyk
-Build-Depends: base, directory, process
 License: BSD3
 License-File: LICENSE
 Author: Marcin Kowalczyk <qrczak@knm.org.pl>
@@ -21,20 +20,21 @@ Description:
 Category: Development
 Data-Files: template-hsc.h
 build-type: Simple
-cabal-version: >=1.2
+cabal-version: >=1.10
 
 Executable hsc2hs
+    Default-Language: Haskell2010
     Main-Is: Main.hs
-    Other-Modules: HSCParser,
-                   DirectCodegen,
-                   CrossCodegen,
-                   UtilsCodegen,
-                   Common,
-                   C,
-                   Flags
-    -- needed for ReadP (used by Data.Version)
-    Hugs-Options: -98
-    Extensions: CPP, ForeignFunctionInterface
+    Other-Modules:
+        C
+        Common
+        CrossCodegen
+        DirectCodegen
+        Flags
+        HSCParser
+        UtilsCodegen
+
+    Other-Extensions: CPP, NoMonomorphismRestriction
 
     Build-Depends: base       >= 4   && < 5,
                    containers >= 0.2 && < 0.6,