[teyjus] r1175 committed - readterm can now read from standard input

1 view
Skip to first unread message

tey...@googlecode.com

unread,
Jan 27, 2015, 10:28:06 AM1/27/15
to teyju...@googlegroups.com
Revision: 1175
Author: fafo...@gmail.com
Date: Tue Jan 27 15:27:47 2015 UTC
Log: readterm can now read from standard input

https://code.google.com/p/teyjus/source/detail?r=1175

Modified:
/branches/ocaml-builtins/source/simulator/builtins/io.c

=======================================
--- /branches/ocaml-builtins/source/simulator/builtins/io.c Sat Jan 10
18:55:30 2015 UTC
+++ /branches/ocaml-builtins/source/simulator/builtins/io.c Tue Jan 27
15:27:47 2015 UTC
@@ -580,10 +580,6 @@
HN_hnorm(tmPtr);
tmPtr = DF_termDeref(tmPtr);

- finfo = BIIO_getFinfoFromTerm(tmPtr);
- if (finfo != NULL) {
- fname = ((BIIO_finfo*)finfo)->name;
- }

typ = (DF_TypePtr)(AM_hreg);
RT_setTypeStart(AM_hreg);
@@ -593,10 +589,13 @@
RT_setTermStart(AM_hreg);
AM_hreg += DF_TM_ATOMIC_SIZE;

- if (finfo == NULL) {
+ finfo = BIIO_getFinfoFromTerm(tmPtr);
+
+ if (((BIIO_finfo*)finfo)->type == FINFO_STDIN) {
/* We read from the standard input */
FRONT_IO_readTermAndTypeStdin();
} else {
+ fname = ((BIIO_finfo*)finfo)->name;
if ((FRONT_IO_readTermAndTypeFileId(fname)) == -1) {
EM_THROW(EM_FAIL);
} else {
Reply all
Reply to author
Forward
0 new messages