git.iko.soy/Idris-dev
on master help sign in
Merge branch 'master' of github.com:idris-lang/Idris-dev into liftDecls_js_backend
b5715bfRui Barreiro
rts/idris_stdfgn.c+1−1
compare with master
unifiedsplit
@@ -61,7 +61,7 @@ int fileSize(void* h) {
61
61
62int idris_writeStr(void* h, char* str) {
62int idris_writeStr(void* h, char* str) {
63 FILE* f = (FILE*)h;
63 FILE* f = (FILE*)h;
64− if (fputs(str, f)) {
64+ if (fputs(str, f) >= 0) {
65 return 0;
65 return 0;
66 } else {
66 } else {
67 return -1;
67 return -1;
src/IRTS/Portable.hs+3−4
@@ -144,6 +144,8 @@ instance ToJSON PrimFn where
144 toJSON (LTimes aty) = object ["LTimes" .= aty]
144 toJSON (LTimes aty) = object ["LTimes" .= aty]
145 toJSON (LUDiv aty) = object ["LUDiv" .= aty]
145 toJSON (LUDiv aty) = object ["LUDiv" .= aty]
146 toJSON (LSDiv aty) = object ["LSDiv" .= aty]
146 toJSON (LSDiv aty) = object ["LSDiv" .= aty]
147+ toJSON (LURem ity) = object ["LURem" .= ity]
148+ toJSON (LSRem aty) = object ["LSRem" .= aty]
147 toJSON (LAnd ity) = object ["LAnd" .= ity]
149 toJSON (LAnd ity) = object ["LAnd" .= ity]
148 toJSON (LOr ity) = object ["LOr" .= ity]
150 toJSON (LOr ity) = object ["LOr" .= ity]
149 toJSON (LXOr ity) = object ["LXOr" .= ity]
151 toJSON (LXOr ity) = object ["LXOr" .= ity]
@@ -200,12 +202,9 @@ instance ToJSON PrimFn where
200 toJSON LFork = object ["LFork" .= Null]
202 toJSON LFork = object ["LFork" .= Null]
201 toJSON LPar = object ["LPar" .= Null]
203 toJSON LPar = object ["LPar" .= Null]
202 toJSON (LExternal name) = object ["LExternal" .= name]
204 toJSON (LExternal name) = object ["LExternal" .= name]
205+ toJSON LCrash = object ["LCrash" .= Null]
203 toJSON LNoOp = object ["LNoOp" .= Null]
206 toJSON LNoOp = object ["LNoOp" .= Null]
204
207
205−
206−
207−
208−
209instance ToJSON DDecl where
208instance ToJSON DDecl where
210 toJSON (DFun name args exp) = object ["DFun" .= (name, args, exp)]
209 toJSON (DFun name args exp) = object ["DFun" .= (name, args, exp)]
211 toJSON (DConstructor name tag arity) = object ["DConstructor" .= (name, tag, arity)]
210 toJSON (DConstructor name tag arity) = object ["DConstructor" .= (name, tag, arity)]