git.iko.soy/Idris-dev
on master help sign in
Merge pull request #2815 from Heather/idris_stdfgn
ed5ecbcNiklas Larsson
rts/Makefile+4−3
compare with master
unifiedsplit
@@ -1,7 +1,8 @@
1include ../config.mk
1include ../config.mk
2
2
3OBJS = idris_rts.o idris_heap.o idris_gc.o idris_gmp.o idris_bitstring.o \
3OBJS = idris_rts.o idris_heap.o idris_gc.o idris_gmp.o idris_bitstring.o \
4− idris_opts.o idris_stats.o idris_utf8.o mini-gmp.o getline.o
4+ idris_opts.o idris_stats.o idris_utf8.o idris_stdfgn.o mini-gmp.o \
5+ getline.o
5HDRS = idris_rts.h idris_heap.h idris_gc.h idris_gmp.h idris_bitstring.h \
6HDRS = idris_rts.h idris_heap.h idris_gc.h idris_gmp.h idris_bitstring.h \
6 idris_opts.h idris_stats.h mini-gmp.h idris_stdfgn.h idris_net.h \
7 idris_opts.h idris_stats.h mini-gmp.h idris_stdfgn.h idris_net.h \
7 idris_utf8.h getline.h
8 idris_utf8.h getline.h
@@ -19,10 +20,10 @@ endif
19endif
20endif
20
21
21ifeq ($(OS), windows)
22ifeq ($(OS), windows)
22− OBJS += windows/idris_stdfgn.o windows/idris_net.o windows/win_utils.o
23+ OBJS += windows/idris_net.o windows/win_utils.o
23else
24else
24 CFLAGS += -fPIC
25 CFLAGS += -fPIC
25− OBJS += idris_stdfgn.o idris_net.o
26+ OBJS += idris_net.o
26endif
27endif
27
28
28LIBTARGET = libidris_rts.a
29LIBTARGET = libidris_rts.a
rts/idris_stdfgn.c+11−1
@@ -2,12 +2,18 @@
2#include "idris_rts.h"
2#include "idris_rts.h"
3#include "idris_gmp.h"
3#include "idris_gmp.h"
4#include "idris_gc.h"
4#include "idris_gc.h"
5−#include <sys/select.h>
5+
6#include <fcntl.h>
6#include <fcntl.h>
7#include <errno.h>
7#include <errno.h>
8#include <stdio.h>
8#include <stdio.h>
9#include <time.h>
9#include <time.h>
10
10
11+#if defined(WIN32) || defined(__WIN32) || defined(__WIN32__)
12+int win_fpoll(void* h);
13+#else
14+#include <sys/select.h>
15+#endif
16+
11extern char** environ;
17extern char** environ;
12
18
13void putStr(char* str) {
19void putStr(char* str) {
@@ -45,6 +51,9 @@ int idris_writeStr(void* h, char* str) {
45
51
46int fpoll(void* h)
52int fpoll(void* h)
47{
53{
54+#if defined(WIN32) || defined(__WIN32) || defined(__WIN32__)
55+ return win_fpoll(h);
56+#else
48 FILE* f = (FILE*)h;
57 FILE* f = (FILE*)h;
49 fd_set x;
58 fd_set x;
50 struct timeval timeout;
59 struct timeval timeout;
@@ -57,6 +66,7 @@ int fpoll(void* h)
57
66
58 int r = select(fd+1, &x, 0, 0, &timeout);
67 int r = select(fd+1, &x, 0, 0, &timeout);
59 return r;
68 return r;
69+#endif
60}
70}
61
71
62void* do_popen(const char* cmd, const char* mode) {
72void* do_popen(const char* cmd, const char* mode) {
rts/windows/idris_stdfgn.cdeleted−101
@@ -1,101 +0,0 @@
1−#include "../idris_stdfgn.h"
2−#include "../idris_rts.h"
3−#include "../idris_gc.h"
4−
5−#include <fcntl.h>
6−#include <stdio.h>
7−#include <time.h>
8−#include <io.h>
9−
10−extern char** environ;
11−
12−int win_fpoll(void* h);
13−
14−void putStr(char* str) {
15− printf("%s", str);
16−}
17−
18−void* fileOpen(char* name, char* mode) {
19− FILE* f = fopen(name, mode);
20− return (void*)f;
21−}
22−
23−void fileClose(void* h) {
24− FILE* f = (FILE*)h;
25− fclose(f);
26−}
27−
28−int fileEOF(void* h) {
29− FILE* f = (FILE*)h;
30− return feof(f);
31−}
32−
33−int fileError(void* h) {
34− FILE* f = (FILE*)h;
35− return ferror(f);
36−}
37−
38−int idris_writeStr(void* h, char* str) {
39− FILE* f = (FILE*)h;
40− if (fputs(str, f)) {
41− return 0;
42− } else {
43− return -1;
44− }
45−}
46−
47−int fpoll(void* h)
48−{
49− return win_fpoll(h);
50−}
51−
52−void* do_popen(const char* cmd, const char* mode) {
53− FILE* f = _popen(cmd, mode);
54−// int d = fileno(f);
55−// fcntl(d, F_SETFL, O_NONBLOCK);
56− return f;
57−}
58−
59−int isNull(void* ptr) {
60− return ptr==NULL;
61−}
62−
63−int idris_eqPtr(void* x, void* y) {
64− return x==y;
65−}
66−
67−void* idris_stdin() {
68− return (void*)stdin;
69−}
70−
71−char* getEnvPair(int i) {
72− return *(environ + i);
73−}
74−
75−VAL idris_time() {
76− time_t t = time(NULL);
77− return MKBIGI(t);
78−}
79−
80−VAL idris_mkFileError(VM* vm) {
81− VAL result;
82− switch(errno) {
83− // Make sure this corresponds to the FileError structure in
84− // Prelude.File
85− case ENOENT:
86− idris_constructor(result, vm, 2, 0, 0);
87− break;
88− case EACCES:
89− idris_constructor(result, vm, 3, 0, 0);
90− break;
91− default:
92− idris_constructor(result, vm, 4, 1, 0);
93− idris_setConArg(result, 0, MKINT((intptr_t)errno));
94− break;
95− }
96− return result;
97−}
98−
99−void idris_forceGC(void* vm) {
100− idris_gc((VM*)vm);
101−}