git.iko.soy/Idris-dev
on master help sign in
Merge remote-tracking branch 'upstream/master' into deprecated-parser-features
b7e2e18Jason Felice
idris.cabal+2−2
compare with master
unifiedsplit
@@ -270,7 +270,7 @@ Library
270 Build-depends: base >=4 && <5
270 Build-depends: base >=4 && <5
271 , aeson >= 0.6 && < 1.3
271 , aeson >= 0.6 && < 1.3
272 , annotated-wl-pprint >= 0.7 && < 0.8
272 , annotated-wl-pprint >= 0.7 && < 0.8
273− , ansi-terminal < 0.7
273+ , ansi-terminal < 0.8
274 , ansi-wl-pprint < 0.7
274 , ansi-wl-pprint < 0.7
275 , array >= 0.4.0.1 && < 0.6
275 , array >= 0.4.0.1 && < 0.6
276 , base64-bytestring < 1.1
276 , base64-bytestring < 1.1
@@ -287,7 +287,7 @@ Library
287 , fingertree >= 0.1 && < 0.2
287 , fingertree >= 0.1 && < 0.2
288 , haskeline >= 0.7 && < 0.8
288 , haskeline >= 0.7 && < 0.8
289 , ieee754 >= 0.7 && < 0.9
289 , ieee754 >= 0.7 && < 0.9
290− , megaparsec >= 6.2 && <6.3
290+ , megaparsec >= 6.2
291 , mtl >= 2.1 && < 2.3
291 , mtl >= 2.1 && < 2.3
292 , network < 2.7
292 , network < 2.7
293 , optparse-applicative >= 0.13 && < 0.15
293 , optparse-applicative >= 0.13 && < 0.15
src/IRTS/JavaScript/Codegen.hs+1−4
@@ -112,15 +112,12 @@ makeExportDecls defs (Export _ _ e) =
112 ]
112 ]
113 uncurryF name argTy Nothing = name
113 uncurryF name argTy Nothing = name
114
114
115− addApplyForIO (FIO _) f = T.concat ["function(){ return (",f, ").apply(this,arguments)()}"]
116− addApplyForIO _ f = f
117−
118 makeExport (ExportData _) =
115 makeExport (ExportData _) =
119 []
116 []
120 makeExport (ExportFun name (FStr exportname) retTy argTy) =
117 makeExport (ExportFun name (FStr exportname) retTy argTy) =
121 [T.concat [ T.pack $ exportname
118 [T.concat [ T.pack $ exportname
122 , ": "
119 , ": "
123− , addApplyForIO retTy $ uncurryF (jsName name) argTy (getArgList' name defs)
120+ , uncurryF (jsName name) argTy (getArgList' name defs)
124 ]
121 ]
125 ]
122 ]
126
123
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 @@
1#recheck extra-deps next on resolver or cabal file change
1#recheck extra-deps next on resolver or cabal file change
2−resolver: lts-9.17
2+resolver: lts-10.0
3
3
4packages:
4packages:
5 - location: .
5 - location: .
6
6
7−extra-deps:
7+extra-deps: []
8− - binary-0.8.5.1
9− - cheapskate-0.1.1
10− - megaparsec-6.2.0
11
8
12flags:
9flags:
13 idris:
10 idris: