From 1083aa131792b9df9fc5d670e5459e882253ed58 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 5 Dec 2019 05:50:07 -0700 Subject: [PATCH] cs: improve function and module name The former "path.rkt" module handles more than just paths. --- racket/src/cs/linklet.sls | 2 +- racket/src/cs/schemify.sls | 2 +- racket/src/schemify/main.rkt | 4 ++-- .../schemify/{path.rkt => path-and-fasl.rkt} | 23 ++++++++++--------- 4 files changed, 16 insertions(+), 15 deletions(-) rename racket/src/schemify/{path.rkt => path-and-fasl.rkt} (86%) diff --git a/racket/src/cs/linklet.sls b/racket/src/cs/linklet.sls index 82f0cd1961..12e2e2007b 100644 --- a/racket/src/cs/linklet.sls +++ b/racket/src/cs/linklet.sls @@ -595,7 +595,7 @@ code))))])))])) (define-values (paths impl-lam/paths) (if serializable? - (extract-paths-from-schemified-linklet impl-lam/jitified (not jitify-mode?)) + (extract-paths-and-fasls-from-schemified-linklet impl-lam/jitified (not jitify-mode?)) (values '() impl-lam/jitified))) (define impl-lam/interpable (let ([impl-lam (case (and jitify-mode? diff --git a/racket/src/cs/schemify.sls b/racket/src/cs/schemify.sls index 5528bd798c..6534ba35a8 100644 --- a/racket/src/cs/schemify.sls +++ b/racket/src/cs/schemify.sls @@ -3,7 +3,7 @@ lift-in-schemified-linklet jitify-schemified-linklet xify - extract-paths-from-schemified-linklet + extract-paths-and-fasls-from-schemified-linklet interpretable-jitified-linklet interpret-linklet linklet-bigger-than? diff --git a/racket/src/schemify/main.rkt b/racket/src/schemify/main.rkt index f113f69084..03497d0e89 100644 --- a/racket/src/schemify/main.rkt +++ b/racket/src/schemify/main.rkt @@ -4,7 +4,7 @@ "lift.rkt" "jitify.rkt" "xify.rkt" - "path.rkt" + "path-and-fasl.rkt" "interpret.rkt" "size.rkt" "fasl.rkt") @@ -21,7 +21,7 @@ xify - extract-paths-from-schemified-linklet + extract-paths-and-fasls-from-schemified-linklet make-path->compiled-path compiled-path->path diff --git a/racket/src/schemify/path.rkt b/racket/src/schemify/path-and-fasl.rkt similarity index 86% rename from racket/src/schemify/path.rkt rename to racket/src/schemify/path-and-fasl.rkt index 98f29a55df..d61b25af5f 100644 --- a/racket/src/schemify/path.rkt +++ b/racket/src/schemify/path-and-fasl.rkt @@ -6,23 +6,24 @@ "path-for-srcloc.rkt" "to-fasl.rkt") -(provide extract-paths-from-schemified-linklet +(provide extract-paths-and-fasls-from-schemified-linklet make-path->compiled-path compiled-path->path force-unfasl) -;; Recognize lifted paths in a schemified linklet, and -;; return the list of path values. If `convert?`, then -;; change the schemified linklet to expect the paths -;; as arguments. +;; Recognize lifted paths and `to-fasl`s in a schemified linklet, and +;; return the list of path and `to-fasl` values. If `convert?`, then +;; change the schemified linklet to expect the paths as arguments. ;; -;; In addition to paths, this extraction deals with values -;; that have been packages as `to-fasl`, either because they -;; are large values that are best handled in fasl form or -;; because they are not serializable (and we want to delay -;; complaining in case no serialization is needed). +;; In addition to paths, this extraction deals with values that have +;; been packages as `to-fasl`, either because they are large values +;; that are best handled in fasl form, because they are not +;; serializable (and we want to delay complaining in case no +;; serialization is needed), or because they are uninterned symbols +;; that need to be exposed to the Scheme-level `fasl` for a full +;; linklet. -(define (extract-paths-from-schemified-linklet linklet-e convert?) +(define (extract-paths-and-fasls-from-schemified-linklet linklet-e convert?) (match linklet-e [`(lambda . ,_) ;; No constants, so no paths: