stackify

Author: jsarracino

Language/Boogie/ErrorAccum.hs

@@ -3,12 +3,13 @@
 module Language.Boogie.ErrorAccum where
 
 import Control.Monad
+import Control.Applicative
 import Control.Monad.Trans
 import Control.Monad.Trans.Error
 
--- | Error accumulator: 
--- used in combination with ErrorT to store intermediate computation results, 
--- when errors should be accumulated rather than reported immediately  
+-- | Error accumulator:
+-- used in combination with ErrorT to store intermediate computation results,
+-- when errors should be accumulated rather than reported immediately
 newtype ErrorAccumT e m a = ErrorAccumT { runErrorAccumT :: m ([e], a) }
 
 instance (ErrorList e, Monad m) => Functor (ErrorAccumT e m) where
@@ -29,48 +30,48 @@ instance (ErrorList e, Monad m) => Monad (ErrorAccumT e m) where
     (errs', res') <- runErrorAccumT $ k res
     return (errs ++ errs', res')
 
-    
+
 instance ErrorList e => MonadTrans (ErrorAccumT e) where
   lift m = ErrorAccumT $ do
     a <- m
-    return ([], a)  
-    
+    return ([], a)
+
 -- | Transform an error computation and default value into an error accumlator
 accum :: (ErrorList e, Monad m) => ErrorT [e] m a -> a -> ErrorAccumT e m a
 accum c def = ErrorAccumT (errToAccum def `liftM` runErrorT c)
   where
     errToAccum def (Left errs)  = (errs, def)
     errToAccum def (Right x)    = ([], x)
-        
--- | Transform an error accumlator back into a regular error computation  
+
+-- | Transform an error accumlator back into a regular error computation
 report :: (ErrorList e, Monad m) => ErrorAccumT e m a -> ErrorT [e] m a
 report accum = ErrorT (accumToErr `liftM` runErrorAccumT accum)
   where
     accumToErr ([], x) = Right x
-    accumToErr (es, _) = Left es  
+    accumToErr (es, _) = Left es
 
 -- | 'mapAccum' @f def xs@ :
 -- Apply @f@ to all @xs@, accumulating errors and reporting them at the end
 mapAccum :: (ErrorList e, Monad m) => (a -> ErrorT [e] m b) -> b -> [a] -> ErrorT [e] m [b]
-mapAccum f def xs = report $ mapM (acc f) xs  
+mapAccum f def xs = report $ mapM (acc f) xs
   where
     acc f x  = accum (f x) def
-   
+
 -- | 'mapAccumA_' @f xs@ :
 -- Apply @f@ to all @xs@ throwing away the result, accumulating errors
 mapAccumA_ :: (ErrorList e, Monad m) => (a -> ErrorT [e] m ()) -> [a] -> ErrorAccumT e m ()
-mapAccumA_ f xs = mapM_ (acc f) xs  
+mapAccumA_ f xs = mapM_ (acc f) xs
   where
     acc f x  = accum (f x) ()
-    
+
 -- | Same as 'mapAccumA_', but reporting errors at the end
 mapAccum_ :: (ErrorList e, Monad m) => (a -> ErrorT [e] m ()) -> [a] -> ErrorT [e] m ()
-mapAccum_ f xs = report $ mapAccumA_ f xs  
+mapAccum_ f xs = report $ mapAccumA_ f xs
 
 -- | 'zipWithAccum_' @f xs ys@ :
 -- Apply type checking @f@ to all @xs@ and @ys@ throwing away the result,
 -- accumulating errors and reporting them at the end
 zipWithAccum_ :: (ErrorList e, Monad m) => (a -> b -> ErrorT [e] m ()) -> [a] -> [b] -> ErrorT [e] m ()
-zipWithAccum_ f xs ys = report $ zipWithM_ (acc f) xs ys  
+zipWithAccum_ f xs ys = report $ zipWithM_ (acc f) xs ys
   where
     acc f x y  = accum (f x y) ()

language-boogie.cabal

@@ -9,7 +9,7 @@ license-file:        LICENSE
 author:              Nadia Polikarpova
 maintainer:          nadia.polikarpova@gmail.com
 category:            Language
-tested-with:         GHC==7.4.1, GHC==7.6.2
+tested-with:         GHC==7.4.1, GHC==7.6.2, GHC==7.8.4
 build-type:          Simple
 cabal-version:       >=1.8
 
@@ -19,7 +19,7 @@ source-repository head
 
 flag boogaloo
   Description: Build the boogaloo executable
-  Default:     True
+  Default:     False
 
 flag tests
   Description: Build boogaloo-tests executable
@@ -63,8 +63,8 @@ library
       lens >=4.13,
       logict,
       z3 >=0.3
-      
-    
+
+
 executable boogaloo
   main-is:             Boogaloo.hs
   ghc-options: -threaded
@@ -88,8 +88,34 @@ executable boogaloo
       time ==1.4.*,
       ansi-terminal >=0.5
   If !flag(boogaloo)
-    buildable: False  
-  
+    buildable: False
+
+test-suite boogaloo-test
+  type:                exitcode-stdio-1.0
+  hs-source-dirs:      .
+  main-is:             Tests.hs
+  build-depends:
+      base ==4.*,
+      random ==1.0.*,
+      containers >=0.4 && <0.6,
+      mtl ==2.1.*,
+      ansi-wl-pprint >=0.6,
+      html ==1.*,
+      parsec ==3.1.*,
+      transformers ==0.3.*,
+      stream-monad ==0.4.*,
+      random ==1.0.*,
+      syb >=0.1,
+      lens >=4.13,
+      z3 >=0.3,
+      language-boogie ==0.2.*,
+      filepath ==1.3.*,
+      html ==1.*,
+      HUnit ==1.2.*,
+      logict
+  If !flag(tests)
+    buildable: False
+
 executable boogaloo-tests
   main-is:             Tests.hs
   build-depends:
@@ -109,7 +135,7 @@ executable boogaloo-tests
       language-boogie ==0.2.*,
       filepath ==1.3.*,
       html ==1.*,
-      HUnit ==1.2.*
+      HUnit ==1.2.*,
+      logict
   If !flag(tests)
-    buildable: False  
-  
+    buildable: False

stack.yaml

@@ -0,0 +1,35 @@
+
+flags:
+  generic-deriving:
+    base-4-9: false
+  language-boogie:
+    boogaloo: true
+    tests: true
+extra-package-dbs: []
+packages:
+- .
+extra-deps:
+- lens-4.13
+- z3-4.2.0
+- random-1.0.0.0
+- mtl-2.1.2
+- ansi-wl-pprint-0.6.4
+- html-1.0
+- parsec-3.1.0
+- ansi-terminal-0.5.0
+- stream-monad-0.4.0.2
+- base-orphans-0.4.0
+- tagged-0.7.3
+- adjunctions-4.2.1
+- free-4.12
+- bifunctors-5
+- profunctors-5
+- semigroupoids-5
+- comonad-4.2.7.1
+- kan-extensions-4.2.2
+- reflection-2.1
+- nats-0.1
+- logict-0.5.0.2
+- text-0.11.3.1
+
+resolver: lts-2.0