Removed unnecessary import statements, migrated 2 more eval functions into Core.

Author: justinethier

core.hs

@@ -34,10 +34,17 @@ import List
 import IO hiding (try)
 import Numeric
 import Ratio
-import System.Environment
 
+-- Evaluate a string containing Scheme code
+evalString :: Env -> String -> IO String
+evalString env expr = runIOThrows $ liftM show $ (liftThrows $ readExpr expr) >>= macroEval env >>= eval env
 
--- Eval section
+-- Evaluate a string and print results to console
+evalAndPrint :: Env -> String -> IO ()
+evalAndPrint env expr = evalString env expr >>= putStrLn
+
+-- Core eval section
+-- Note: do not call directly if you want Macro support; instead, call macroEval first.
 eval :: Env -> LispVal -> IOThrowsError LispVal
 eval env val@(Nil _) = return val
 eval env val@(String _) = return val

shell.hs

@@ -11,24 +11,11 @@
  - -}
 
 module Main where
-import Scheme.Core
-import Scheme.Macro
-import Scheme.Numerical
-import Scheme.Parser
-import Scheme.Types
-import Scheme.Variables
-import Complex
-import Control.Monad
+import Scheme.Core      -- Scheme Interpreter
+import Scheme.Types     -- Scheme data types
+import Scheme.Variables -- Scheme variable operations
 import Control.Monad.Error
-import Char
-import Data.Array
-import Data.IORef
-import qualified Data.Map
-import Maybe
-import List
 import IO hiding (try)
-import Numeric
-import Ratio
 import System.Environment
 import System.Console.Haskeline
 
@@ -42,12 +29,6 @@ main = do args <- getArgs
 flushStr :: String -> IO ()
 flushStr str = putStr str >> hFlush stdout
 
-evalString :: Env -> String -> IO String
-evalString env expr = runIOThrows $ liftM show $ (liftThrows $ readExpr expr) >>= macroEval env >>= eval env
-
-evalAndPrint :: Env -> String -> IO ()
-evalAndPrint env expr = evalString env expr >>= putStrLn
-
 runOne :: [String] -> IO ()
 runOne args = do
   env <-primitiveBindings >>= flip bindVars [((varNamespace, "args"), List $ map String $ drop 1 args)]