From 05fe76f49a21a18de8eb5d6c7cfa4a9db725811c Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 25 Apr 2019 17:19:47 -0600 Subject: [PATCH] repair module name resolver Revert an accidental change in 2d3ee903ec. --- racket/src/expander/boot/handler.rkt | 2 -- racket/src/racket/src/startup.inc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/racket/src/expander/boot/handler.rkt b/racket/src/expander/boot/handler.rkt index d43135e018..a7ceba57ab 100644 --- a/racket/src/expander/boot/handler.rkt +++ b/racket/src/expander/boot/handler.rkt @@ -536,8 +536,6 @@ [(symbol? s-parsed) ;; Return a genenerated symnol (make-resolved-module-path - s-parsed - #; (cons s-parsed subm-path))] [(not (or (path? s-parsed) (vector? s-parsed))) diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc index 92b04b2a87..bd1807d731 100644 --- a/racket/src/racket/src/startup.inc +++ b/racket/src/racket/src/startup.inc @@ -65435,7 +65435,7 @@ static const char *startup_source = "(path->complete-path(expand-user-path(cadr s_1))(get-dir_0)))))" "(void))))))))" "(if(symbol? s-parsed_0)" -"(let-values()(1/make-resolved-module-path s-parsed_0))" +"(let-values()(1/make-resolved-module-path(cons s-parsed_0 subm-path_0)))" "(if(not" "(let-values(((or-part_0)(path? s-parsed_0)))" "(if or-part_0 or-part_0(vector? s-parsed_0))))"