Skip to content

Commit

Permalink
Solve error on parenthesized variables (try to solve issue #21)
Browse files Browse the repository at this point in the history
  • Loading branch information
serras committed Feb 4, 2012
1 parent 6801ade commit 896a188
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
15 changes: 6 additions & 9 deletions src/Main.hs
@@ -1,4 +1,4 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE OverloadedStrings, TemplateHaskell #-}

module Main where

Expand All @@ -21,14 +21,11 @@ import Scion.PersistentBrowser.Util (logToStdout)
import GHC.IO.Handle (hDuplicate,hDuplicateTo)

main :: IO ()
main = do
args<-getArgs
case args of
("--version":_)->do
putStrLn ("scion-browser executable, version "++ (showVersion version))
_-> do
runStateT (runInputT defaultSettings loop) initialState
return ()
main = do args <- getArgs
case args of
("--version":_) -> putStrLn ("scion-browser executable, version " ++ (showVersion version))
_ -> do runStateT (runInputT defaultSettings loop) initialState
return ()

loop :: InputT BrowserM ()
loop = do maybeLine <- getInputLine ""
Expand Down
5 changes: 3 additions & 2 deletions src/Scion/PersistentBrowser/Parser/Internal.hs
Expand Up @@ -539,6 +539,7 @@ toKindedVars :: [Type Doc] -> [TyVarBind Doc]
toKindedVars [] = []
toKindedVars ((TyVar d (Ident _ n1)):( (TyList _ (TyVar _ (Ident _ n2))): xs )) =
(UnkindedVar d (Ident NoDoc $ n1 ++ "[" ++ n2 ++ "]")) : toKindedVars xs
toKindedVars ((TyVar d n):xs) = (UnkindedVar d n) : toKindedVars xs
toKindedVars (x:_) = error $ show x
toKindedVars ((TyVar d n):xs) = (UnkindedVar d n) : toKindedVars xs
toKindedVars ((TyParen _ inner):xs) = toKindedVars (inner:xs)
toKindedVars (x:_) = error $ show x

2 changes: 1 addition & 1 deletion src/Scion/PersistentBrowser/ToDb.hs
Expand Up @@ -60,7 +60,7 @@ saveDeclToDb moduleId (InstDecl doc ctx hd _) =
-- Signatures
saveDeclToDb moduleId (TypeSig doc names ty) =
do mapM_ saveSignatureToDb names
where saveSignatureToDb name =
where saveSignatureToDb name = do
insert $ DbDecl DbSignature (getNameString name) (docToString doc)
Nothing (Just (singleLinePrettyPrint ty)) Nothing moduleId
-- Types
Expand Down

0 comments on commit 896a188

Please sign in to comment.