diff --git a/Makefile b/Makefile index 156922b6..f07069c5 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ TESTSCM = unit-tests TESTFILES = $(addprefix tests/, $(addsuffix .scm, $(TESTSCM))) -all: cyclone scheme/base.o scheme/read.o scheme/write.o scheme/char.o scheme/eval.o icyc +all: cyclone scheme/base.o scheme/read.o scheme/write.o scheme/char.o scheme/eval.o scheme/file.o icyc scheme/base.o: cyclone scheme/base.sld ./cyclone scheme/base.sld @@ -12,6 +12,9 @@ scheme/char.o: cyclone scheme/char.sld scheme/eval.o: cyclone scheme/eval.sld ./cyclone scheme/eval.sld +scheme/file.o: cyclone scheme/file.sld + ./cyclone scheme/file.sld + scheme/read.o: cyclone scheme/read.sld ./cyclone scheme/read.sld diff --git a/scheme/base.sld b/scheme/base.sld index b7f6ca83..404ceea9 100644 --- a/scheme/base.sld +++ b/scheme/base.sld @@ -56,8 +56,6 @@ current-input-port current-error-port call-with-port - call-with-input-file - call-with-output-file error raise raise-continuable @@ -91,10 +89,6 @@ (let ((result (proc port))) (close-port port) result)) - (define (call-with-input-file string proc) - (call-with-port (open-input-file string) proc)) - (define (call-with-output-file string proc) - (call-with-port (open-output-file string) proc)) (define (Cyc-bin-op cmp x lst) (cond ((null? lst) #t) diff --git a/scheme/eval.sld b/scheme/eval.sld index a2a1e13a..460f94af 100644 --- a/scheme/eval.sld +++ b/scheme/eval.sld @@ -1,6 +1,7 @@ (define-library (scheme eval) (import (scheme base) + (scheme file) (scheme write) (scheme read)) (export