git.iko.soy/Idris-dev
on master help sign in
Merge remote-tracking branch 'upstream/master' into deprecated-parser-features
commitb7e2e18244cf3fe9f6b2cbc215200e56cb99076c authorJason Felice <jason.m.felice@gmail.com> dateWed 20 Dec 2017, 14:51 (9 years ago) parent12594b376e45a3
4 files changed+5−28
compare with master
unifiedsplit
idris.cabal+2−2 src/IRTS/JavaScript/Codegen.hs+1−4 stack-nightly.yaml−17 stack.yaml+2−5
idris.cabal+2−2
@@ -270,7 +270,7 @@ Library
270270 Build-depends: base >=4 && <5
271271 , aeson >= 0.6 && < 1.3
272272 , annotated-wl-pprint >= 0.7 && < 0.8
273− , ansi-terminal < 0.7
273+ , ansi-terminal < 0.8
274274 , ansi-wl-pprint < 0.7
275275 , array >= 0.4.0.1 && < 0.6
276276 , base64-bytestring < 1.1
@@ -287,7 +287,7 @@ Library
287287 , fingertree >= 0.1 && < 0.2
288288 , haskeline >= 0.7 && < 0.8
289289 , ieee754 >= 0.7 && < 0.9
290− , megaparsec >= 6.2 && <6.3
290+ , megaparsec >= 6.2
291291 , mtl >= 2.1 && < 2.3
292292 , network < 2.7
293293 , optparse-applicative >= 0.13 && < 0.15
src/IRTS/JavaScript/Codegen.hs+1−4
@@ -112,15 +112,12 @@ makeExportDecls defs (Export _ _ e) =
112112 ]
113113 uncurryF name argTy Nothing = name
114114
115− addApplyForIO (FIO _) f = T.concat ["function(){ return (",f, ").apply(this,arguments)()}"]
116− addApplyForIO _ f = f
117−
118115 makeExport (ExportData _) =
119116 []
120117 makeExport (ExportFun name (FStr exportname) retTy argTy) =
121118 [T.concat [ T.pack $ exportname
122119 , ": "
123− , addApplyForIO retTy $ uncurryF (jsName name) argTy (getArgList' name defs)
120+ , uncurryF (jsName name) argTy (getArgList' name defs)
124121 ]
125122 ]
126123
stack-nightly.yamldeleted−17
@@ -1,17 +0,0 @@
1−#recheck extra-deps next on resolver or cabal file change
2−resolver: nightly-2017-11-25
3−
4−packages:
5− - location: .
6−
7−flags:
8− idris:
9− FFI: true
10− GMP: true
11−
12−ghc-options:
13− idris: -fwarn-unused-imports -fwarn-unused-binds
14−
15−nix:
16− enable: false
17− shell-file: stack-shell.nix
stack.yaml+2−5
@@ -1,13 +1,10 @@
11#recheck extra-deps next on resolver or cabal file change
2−resolver: lts-9.17
2+resolver: lts-10.0
33
44packages:
55 - location: .
66
7−extra-deps:
8− - binary-0.8.5.1
9− - cheapskate-0.1.1
10− - megaparsec-6.2.0
7+extra-deps: []
118
129flags:
1310 idris: