diff --git a/.gitignore b/.gitignore index f22a2a08..ab45345d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.hi +.stack-work notebooks/Test.ipynb notebooks/Untitled.ipynb notebooks/Untitled0.ipynb diff --git a/ghc-parser/src-7.6/Language/Haskell/GHC/HappyParser.hs b/ghc-parser/src-7.6/Language/Haskell/GHC/HappyParser.hs index b452db26..d53a1ad6 100644 --- a/ghc-parser/src-7.6/Language/Haskell/GHC/HappyParser.hs +++ b/ghc-parser/src-7.6/Language/Haskell/GHC/HappyParser.hs @@ -63,8 +63,9 @@ import GHC.Exts import Data.Char import Control.Monad ( mplus ) import Control.Applicative(Applicative(..)) +import Control.Monad (ap) --- parser produced by Happy Version 1.19.4 +-- parser produced by Happy Version 1.19.5 data HappyAbsSyn = HappyTerminal ((Located Token)) @@ -26666,6 +26667,27 @@ hintMultiWayIf span = do {-# LINE 1 "templates/GenericTemplate.hs" #-} {-# LINE 1 "templates/GenericTemplate.hs" #-} {-# LINE 1 "" #-} +{-# LINE 16 "" #-} +{-# LINE 1 "/Users/silver/.stack/programs/x86_64-osx/ghc-7.10.2/lib/ghc-7.10.2/include/ghcversion.h" #-} + + + + + + + + + + + + + + + + + + +{-# LINE 17 "" #-} {-# LINE 1 "templates/GenericTemplate.hs" #-} -- Id: GenericTemplate.hs,v 1.26 2005/01/14 14:47:22 simonmar Exp diff --git a/ghc-parser/src-7.8.2/Language/Haskell/GHC/HappyParser.hs b/ghc-parser/src-7.8.2/Language/Haskell/GHC/HappyParser.hs index 763a9fd8..1d8ac0ad 100644 --- a/ghc-parser/src-7.8.2/Language/Haskell/GHC/HappyParser.hs +++ b/ghc-parser/src-7.8.2/Language/Haskell/GHC/HappyParser.hs @@ -55,8 +55,9 @@ import GHC.Exts import Data.Char import Control.Monad ( mplus ) import Control.Applicative(Applicative(..)) +import Control.Monad (ap) --- parser produced by Happy Version 1.19.4 +-- parser produced by Happy Version 1.19.5 data HappyAbsSyn = HappyTerminal ((Located Token)) @@ -29390,6 +29391,27 @@ hintExplicitForall span = do {-# LINE 1 "templates/GenericTemplate.hs" #-} {-# LINE 1 "templates/GenericTemplate.hs" #-} {-# LINE 1 "" #-} +{-# LINE 16 "" #-} +{-# LINE 1 "/Users/silver/.stack/programs/x86_64-osx/ghc-7.10.2/lib/ghc-7.10.2/include/ghcversion.h" #-} + + + + + + + + + + + + + + + + + + +{-# LINE 17 "" #-} {-# LINE 1 "templates/GenericTemplate.hs" #-} -- Id: GenericTemplate.hs,v 1.26 2005/01/14 14:47:22 simonmar Exp diff --git a/ghc-parser/src-7.8.3/Language/Haskell/GHC/HappyParser.hs b/ghc-parser/src-7.8.3/Language/Haskell/GHC/HappyParser.hs index edb05048..78a9fa0e 100644 --- a/ghc-parser/src-7.8.3/Language/Haskell/GHC/HappyParser.hs +++ b/ghc-parser/src-7.8.3/Language/Haskell/GHC/HappyParser.hs @@ -55,8 +55,9 @@ import GHC.Exts import Data.Char import Control.Monad ( mplus ) import Control.Applicative(Applicative(..)) +import Control.Monad (ap) --- parser produced by Happy Version 1.19.4 +-- parser produced by Happy Version 1.19.5 data HappyAbsSyn = HappyTerminal ((Located Token)) @@ -29390,6 +29391,27 @@ hintExplicitForall span = do {-# LINE 1 "templates/GenericTemplate.hs" #-} {-# LINE 1 "templates/GenericTemplate.hs" #-} {-# LINE 1 "" #-} +{-# LINE 16 "" #-} +{-# LINE 1 "/Users/silver/.stack/programs/x86_64-osx/ghc-7.10.2/lib/ghc-7.10.2/include/ghcversion.h" #-} + + + + + + + + + + + + + + + + + + +{-# LINE 17 "" #-} {-# LINE 1 "templates/GenericTemplate.hs" #-} -- Id: GenericTemplate.hs,v 1.26 2005/01/14 14:47:22 simonmar Exp