Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build breaks in Paka, HamletAst and SockeyeInstantiator #9

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix build breaks in Paka, HamletAst and SockeyeInstantiator #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tools/fof/IL/Paka/Compile.lhs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

> module IL.Paka.Compile where

> import Prelude hiding ((<>))

> import Text.PrettyPrint.HughesPJ as Pprinter
> import qualified Data.Map as Map
> import Data.List
Expand Down
1 change: 1 addition & 0 deletions tools/fof/IL/Paka/Paka.lhs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
> module IL.Paka.Paka where

> import Debug.Trace
> import Prelude hiding ((<>))

> import Text.PrettyPrint.HughesPJ as Pprinter

Expand Down
1 change: 1 addition & 0 deletions tools/hamlet/HamletAst.lhs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
> module HamletAst where

> import Debug.Trace
> import Prelude hiding ((<>))
> import Text.PrettyPrint.HughesPJ as Pprinter
> import Data.List

Expand Down
6 changes: 3 additions & 3 deletions tools/sockeye/SockeyeInstantiator.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ instance Instantiatable CheckAST.SockeyeSpec InstAST.SockeyeSpec where
mods = CheckAST.modules ast
specContext = context
{ modules = mods }
[instRoot] <- instantiate specContext root
instRoots <- instantiate specContext root
modules <- get
return InstAST.SockeyeSpec
{ InstAST.root = instRoot
{ InstAST.root = head instRoots -- There should only be one.
, InstAST.modules = modules
}

Expand Down Expand Up @@ -353,7 +353,7 @@ instance Instantiatable a b => Instantiatable (CheckAST.For a) [b] where
let body = CheckAST.body ast
varRanges = CheckAST.varRanges ast
concreteRanges <- instantiate context varRanges
let valueList = Map.foldWithKey iterations [] concreteRanges
let valueList = Map.foldrWithKey iterations [] concreteRanges
iterContexts = map iterationContext valueList
mapM (\c -> instantiate c body) iterContexts
where
Expand Down