From d780cc968f8482e6e78da71574d80b34d5a9a173 Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Sat, 6 Sep 2014 07:42:39 -0700 Subject: [PATCH] change project-require to directory-require (pt 2) --- project.rkt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/project.rkt b/project.rkt index 5e9412c..da85d17 100644 --- a/project.rkt +++ b/project.rkt @@ -2,20 +2,20 @@ (require "world.rkt" sugar/define sugar/coerce) -(define/contract+provide (get-project-require-files source-path) ; keep contract local to ensure coercion +(define/contract+provide (get-directory-require-files source-path) ; keep contract local to ensure coercion (coerce/path? . -> . (or/c #f (listof path?))) - (define possible-requires (list (simplify-path (build-path source-path 'up world:project-require)))) + (define possible-requires (list (simplify-path (build-path source-path 'up world:directory-require)))) (and (andmap file-exists? possible-requires) possible-requires)) -(define+provide/contract (require+provide-project-require-files here-path #:provide [provide #t]) +(define+provide/contract (require+provide-directory-require-files here-path #:provide [provide #t]) (coerce/path? . -> . (or/c list? void?)) (define (put-file-in-require-form file) `(file ,(path->string file))) - (define project-require-files (get-project-require-files here-path)) + (define directory-require-files (get-directory-require-files here-path)) - (if project-require-files - (let ([files-in-require-form (map put-file-in-require-form project-require-files)]) + (if directory-require-files + (let ([files-in-require-form (map put-file-in-require-form directory-require-files)]) `(begin (require ,@files-in-require-form) ,@(if provide @@ -24,5 +24,5 @@ '(begin))) -(define+provide (require-project-require-files here-path) - (require+provide-project-require-files here-path #:provide #f)) \ No newline at end of file +(define+provide (require-directory-require-files here-path) + (require+provide-directory-require-files here-path #:provide #f)) \ No newline at end of file