Various minor performance optimizations.

Bindings.hs

@@ -45,10 +45,9 @@ newBindingHash [] hash = hash
 newBindingHash (h:t) hash = addBinding (h) (newBindingHash t hash)
 -- adds a Binding to a VarDict, removing bindings that are now irrelevant
 addBinding :: Binding -> VarDict -> VarDict
-addBinding binding vars = [if n == hash
-                           then binding : (removeBindingFrom binding (vars !! n))
-                           else vars !! n
-                           | n <- [0 .. (hashSize - 1)]]
+addBinding binding vars = [vars !! n | n <- [0 .. (hash - 1)]]
+                          ++ [binding : (removeBindingFrom binding (vars !! hash))] ++
+                          [vars !! n | n <- [(hash + 1) .. (hashSize - 1)]]
                           where hash = varHash (fst binding)
 
 samePattern [] [] = True

Eval.hs

@@ -219,7 +219,7 @@ iolist (h:t) = do item <- h
 ieval :: Expr -> VarDict -> IO Expr
 ieval expr vars =
   do subbed <- subfile expr vars
-     result <- subfile (eval subbed vars) vars
+     let result = eval subbed vars
      case result of
        Val v -> return result
        Exception e -> return result

ReadFile.hs

@@ -69,8 +69,7 @@ wexecute verbose (h:t) bindings =
                              wexecute verbose t bindings
        otherwise -> do new <- newBindings
                        wexecute verbose t (addBindings new bindings)
-     where -- scope is determined by amount of leading whitespace
-           name = case position of
+     where name = case position of
                     Just p -> sourceName p
                     Nothing -> ""
            line = case position of
@@ -79,7 +78,6 @@ wexecute verbose (h:t) bindings =
            column = case position of
                      Just p -> sourceColumn p
                      Nothing -> 1
-           -- parse the code
            showPosition = name ++ ": Line " ++ show line ++ ", column " ++ show column
            position = fst h
 
@@ -126,7 +124,7 @@ importFile verbose s =
                                                                then ([], Val (HFunc (Name (qualifier ++ n))))
                                                                else snd binding
                                  otherwise -> otherwise) | binding <- val],
-                               --(length (name newbinding) > 0 && (name newbinding) !! 0 /= '_') &&
+                               (name newbinding) !! 0 /= '_' &&
                                (s == ["std", "lib"] ||
                                 not (isInfixOf "std.lib." (name newbinding)))]
                            where qualifier = (foldl (++) [] [i ++ "." | i <- s, i /= "main" ])

build_deb.sh

@@ -9,7 +9,7 @@ mkdir usr
 cd usr
 mkdir bin
 cd ../..
-ghc --make scotch
+ghc --make scotch -O2
 cp scotch deb/usr/bin
 cp scotch.lib deb/usr/bin -r
 rm deb/usr/bin/scotch.lib/.svn -rf

scotch.hs

@@ -89,13 +89,13 @@ loop verbose bindings state =
                                      otherwise -> do return (Exception "Parse error - multiple expressions entered in interpreter")
                          imp' <- case parsed of
                                    Import s -> importFile verbose s
-                                   otherwise -> do return (False, [[],[]])
+                                   otherwise -> do return (False, [])
                          imp <- case imp' of
-                                  (False, []) -> do -- the imported module failed to open
+                                  (False, []) -> do -- there was no attempted import
+                                                   return emptyHash
+                                  (False, f) -> do -- the imported module failed to open
                                                     putStrLn ("Failed to open " ++ show (parsed))
                                                     return emptyHash
-                                  (False, f) -> do -- there was no attempted import
-                                                   return emptyHash
                                   (True, b) -> do -- successful module import
                                                   return b
                          -- evaluate parsed input