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

Updates for 0.11 #2

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

Updates for 0.11 #2

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
33 changes: 4 additions & 29 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,37 +16,12 @@
"output"
],
"dependencies": {
"purescript-jquery": "^1.0.0",
"purescript-ace": "^3.0.0",
"purescript-globals": "^2.0.0",
"purescript-jquery": "^4.0.0",
"purescript-ace": "^4.0.0",
"purescript-globals": "^3.0.0",
"purescript-lambdacube-webgl": "git://github.com/lambdacube3d/purescript-lambdacube-webgl.git#master"
},
"resolutions": {
"purescript-eff": "^2.0.0",
"purescript-dom": "^3.1.0",
"purescript-foreign": "^3.0.0",
"purescript-prelude": "^2.1.0",
"purescript-exceptions": "~2.0.0",
"purescript-js-date": "^3.0.0",
"purescript-foldable-traversable": "^2.0.0",
"purescript-enums": "^2.0.0",
"purescript-datetime": "^2.0.0",
"purescript-media-types": "^2.0.0",
"purescript-unsafe-coerce": "^2.0.0",
"purescript-nullable": "^2.0.0",
"purescript-arrays": "^3.0.0",
"purescript-integers": "^2.0.0",
"purescript-strings": "^2.0.0",
"purescript-functions": "^2.0.0",
"purescript-either": "^2.0.0",
"purescript-generics": "^3.0.0",
"purescript-unfoldable": "^2.0.0",
"purescript-maybe": "^2.0.0",
"purescript-invariant": "^2.0.0",
"purescript-monoid": "^2.0.0",
"purescript-control": "^2.0.0",
"purescript-st": "^2.0.0",
"purescript-tuples": "^3.0.0",
"purescript-bifunctors": "^2.0.0"
"purescript-arraybuffer-types": "^2.0.0"
}
}
2 changes: 1 addition & 1 deletion compiler-service/compiler-service.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ executable compiler-service
text >=1.2 && <1.3,
aeson >=0.9 && <0.12,
lambdacube-ir,
lambdacube-compiler,
lambdacube-compiler >=0.6.0.1,
pretty-show == 1.6.*,
containers,
vector >= 0.11 && <0.12,
Expand Down
8 changes: 4 additions & 4 deletions compiler-service/server.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import qualified Snap.Http.Server as Snap
import qualified Snap.Snaplet.Config as Snap

import LambdaCube.Compiler.Pretty as C
import LambdaCube.Compiler as C
import LambdaCube.Compiler as C hiding(catchErr)

import TypeInfo as T
import Cache
Expand Down Expand Up @@ -87,15 +87,15 @@ app compiler ch = Snap.route
json <- case r of
Left json -> return json
Right add -> do
json <- catchErr er $ encodePretty . ff <$> compiler bs
json <- Main.catchErr er $ encodePretty . ff <$> compiler bs
add json
return json
WS.sendTextData c json
putStrLn "compileApp ended"
where
cvtRange (C.Range _ (SPos r c) (SPos r' c')) = T.Range r c r' c'
cvtRange (C.Range _ (C.SPos r c) (C.SPos r' c')) = T.Range r c r' c'

ff (Left err, (infos, _)) = CompileError (plainShow err) (convertInfos infos) (convertWarnings infos) (convertErrors infos)
ff (Left err, (infos, _)) = CompileError (C.plainShow err) (convertInfos infos) (convertWarnings infos) (convertErrors infos)
ff (Right ppl, (infos, dsg)) = Compiled dsg (prettyShowUnlines ppl) ppl (convertInfos infos) (convertWarnings infos)

er e = return $ encodePretty $ CompileError ("\n!FAIL\n" ++ e) mempty mempty mempty
Expand Down
Loading