husk-scheme icon indicating copy to clipboard operation
husk-scheme copied to clipboard

9.6.1

Open rd-- opened this issue 3 years ago • 1 comments

Hello, Changes below let things compile with ghc-9.6.1. Best, R

husk-9.6.1.txt

rd-- avatar Mar 15 '23 02:03 rd--

hmm, inline incase

diff --git a/hs-src/Compiler/huskc.hs b/hs-src/Compiler/huskc.hs
index 89811926..dc69510e 100644
--- a/hs-src/Compiler/huskc.hs
+++ b/hs-src/Compiler/huskc.hs
@@ -16,7 +16,9 @@ import Language.Scheme.Compiler.Types
 import qualified Language.Scheme.Core
 import Language.Scheme.Types     -- Scheme data types
 import Language.Scheme.Variables -- Scheme variable operations
+import Control.Monad
 import Control.Monad.Except
+import Control.Monad.IO.Class
 import Data.Maybe (fromMaybe)
 import System.Console.GetOpt
 import System.FilePath (dropExtension)
diff --git a/hs-src/Interpreter/shell.hs b/hs-src/Interpreter/shell.hs
index 00defed5..1f71b3f2 100644
--- a/hs-src/Interpreter/shell.hs
+++ b/hs-src/Interpreter/shell.hs
@@ -16,7 +16,9 @@ import qualified Language.Scheme.Core as LSC -- Scheme Interpreter
 import Language.Scheme.Types                 -- Scheme data types
 import qualified Language.Scheme.Util as LSU (countAllLetters, countLetters, strip)
 import qualified Language.Scheme.Variables as LSV -- Scheme variable operations
+import Control.Monad
 import Control.Monad.Except
+import Control.Monad.IO.Class
 import qualified Data.Char as DC
 import qualified Data.List as DL
 import Data.Maybe (fromMaybe)
diff --git a/hs-src/Language/Scheme/Compiler.hs b/hs-src/Language/Scheme/Compiler.hs
index fb994cb9..ebd1df3a 100644
--- a/hs-src/Language/Scheme/Compiler.hs
+++ b/hs-src/Language/Scheme/Compiler.hs
@@ -59,6 +59,7 @@ import Language.Scheme.Primitives
 import Language.Scheme.Types
 import Language.Scheme.Variables
 import Control.Monad.Except
+import Control.Monad.IO.Class
 import qualified Data.List
 import Data.Maybe (fromMaybe)
 
diff --git a/hs-src/Language/Scheme/Compiler/Libraries.hs b/hs-src/Language/Scheme/Compiler/Libraries.hs
index e88b58fc..17c478e1 100644
--- a/hs-src/Language/Scheme/Compiler/Libraries.hs
+++ b/hs-src/Language/Scheme/Compiler/Libraries.hs
@@ -16,6 +16,7 @@ module Language.Scheme.Compiler.Libraries
       importAll
     )
 where 
+import Control.Monad.IO.Class
 import Language.Scheme.Compiler.Types
 import qualified Language.Scheme.Core as LSC 
     (evalLisp, findFileOrLib, meval, nullEnvWithImport)
diff --git a/hs-src/Language/Scheme/Core.hs b/hs-src/Language/Scheme/Core.hs
index 78596125..a391b1a7 100644
--- a/hs-src/Language/Scheme/Core.hs
+++ b/hs-src/Language/Scheme/Core.hs
@@ -62,7 +62,9 @@ import Language.Scheme.Primitives
 import Language.Scheme.Types
 import Language.Scheme.Util
 import Language.Scheme.Variables
+import Control.Monad
 import Control.Monad.Except
+import Control.Monad.IO.Class
 import Data.Array
 import qualified Data.ByteString as BS
 import qualified Data.Map
diff --git a/hs-src/Language/Scheme/Environments.hs b/hs-src/Language/Scheme/Environments.hs
index 3dbdec6c..761d0263 100644
--- a/hs-src/Language/Scheme/Environments.hs
+++ b/hs-src/Language/Scheme/Environments.hs
@@ -21,6 +21,7 @@ import Language.Scheme.Primitives
 import Language.Scheme.Types
 import Language.Scheme.Variables
 import Control.Monad.Except
+import Control.Monad.IO.Class
 import qualified Data.Char
 import System.IO
 
diff --git a/hs-src/Language/Scheme/Libraries.hs b/hs-src/Language/Scheme/Libraries.hs
index 83cccff5..f598be96 100644
--- a/hs-src/Language/Scheme/Libraries.hs
+++ b/hs-src/Language/Scheme/Libraries.hs
@@ -20,6 +20,7 @@ module Language.Scheme.Libraries
 import Language.Scheme.Types
 import Language.Scheme.Variables
 import Control.Monad.Except
+import Control.Monad.IO.Class
 
 -- |Get the full path to a module file
 findModuleFile 
diff --git a/hs-src/Language/Scheme/Macro.hs b/hs-src/Language/Scheme/Macro.hs
index 833fc0c7..2c6e48d9 100644
--- a/hs-src/Language/Scheme/Macro.hs
+++ b/hs-src/Language/Scheme/Macro.hs
@@ -53,6 +53,7 @@ import Language.Scheme.Macro.ExplicitRenaming
 import qualified Language.Scheme.Macro.Matches as Matches
 import Language.Scheme.Primitives (_gensym)
 import Control.Monad.Except
+import Control.Monad.IO.Class
 import Data.Array
 -- import Debug.Trace -- Only req'd to support trace, can be disabled at any time...
 
diff --git a/hs-src/Language/Scheme/Macro/ExplicitRenaming.hs b/hs-src/Language/Scheme/Macro/ExplicitRenaming.hs
index 64730123..d4dbf212 100644
--- a/hs-src/Language/Scheme/Macro/ExplicitRenaming.hs
+++ b/hs-src/Language/Scheme/Macro/ExplicitRenaming.hs
@@ -28,6 +28,7 @@ import Language.Scheme.Types
 import Language.Scheme.Variables
 import Language.Scheme.Primitives (_gensym)
 import Control.Monad.Except
+import Control.Monad.IO.Class
 -- import Debug.Trace
 
 -- |Handle an explicit renaming macro
diff --git a/hs-src/Language/Scheme/Parser.hs b/hs-src/Language/Scheme/Parser.hs
index fccaa24e..263ac921 100644
--- a/hs-src/Language/Scheme/Parser.hs
+++ b/hs-src/Language/Scheme/Parser.hs
@@ -46,7 +46,9 @@ module Language.Scheme.Parser
     , parseUnquoteSpliced 
     ) where
 import Language.Scheme.Types
+import Control.Monad
 import Control.Monad.Except
+import Control.Monad.IO.Class
 import Data.Array
 import qualified Data.ByteString as BS
 import qualified Data.Char as DC
diff --git a/hs-src/Language/Scheme/Plugins/CPUTime.hs b/hs-src/Language/Scheme/Plugins/CPUTime.hs
index 1d7d0b13..89ec1611 100644
--- a/hs-src/Language/Scheme/Plugins/CPUTime.hs
+++ b/hs-src/Language/Scheme/Plugins/CPUTime.hs
@@ -21,6 +21,7 @@ module Language.Scheme.Plugins.CPUTime (get, precision) where
 import Language.Scheme.Types
 import System.CPUTime
 import Control.Monad.Except
+import Control.Monad.IO.Class
 
 -- |Wrapper for CPUTime.getCPUTime
 get :: [LispVal] -> IOThrowsError LispVal
diff --git a/hs-src/Language/Scheme/Primitives.hs b/hs-src/Language/Scheme/Primitives.hs
index 609be669..977904fa 100644
--- a/hs-src/Language/Scheme/Primitives.hs
+++ b/hs-src/Language/Scheme/Primitives.hs
@@ -161,7 +161,9 @@ import Language.Scheme.Parser
 import Language.Scheme.Types
 import Language.Scheme.Variables
 --import qualified Control.Exception
+import Control.Monad
 import Control.Monad.Except
+import Control.Monad.IO.Class
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.UTF8 as BSU
 import Data.Char hiding (isSymbol)
diff --git a/hs-src/Language/Scheme/Variables.hs b/hs-src/Language/Scheme/Variables.hs
index ef460d4e..77136612 100644
--- a/hs-src/Language/Scheme/Variables.hs
+++ b/hs-src/Language/Scheme/Variables.hs
@@ -55,6 +55,7 @@ module Language.Scheme.Variables
     ) where
 import Language.Scheme.Types
 import Control.Monad.Except
+import Control.Monad.IO.Class
 import Data.Array
 import Data.IORef
 import qualified Data.Map

rd-- avatar Mar 15 '23 02:03 rd--