From 7eb78c802879646ca0351dc8a47c0e392c6b3292 Mon Sep 17 00:00:00 2001 From: Calvin Rose Date: Wed, 19 Jun 2019 20:18:44 -0400 Subject: [PATCH] Load jimage files before janet source files. This should allow precompiled files to be placed right next to the source files in the file system with the expected behavior. --- src/boot/boot.janet | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/boot/boot.janet b/src/boot/boot.janet index 7673fd91..0645c1f0 100644 --- a/src/boot/boot.janet +++ b/src/boot/boot.janet @@ -1592,21 +1592,21 @@ path. The filter can be a string or a predicate function, and is often a file extension, including the period." @[# Relative to (dyn :current-file "./."). Path must start with . + [":cur:/:all:.jimage" :image check-.] [":cur:/:all:.janet" :source check-.] [":cur:/:all:/init.janet" :source check-.] - [":cur:/:all:.jimage" :image check-.] [(string ":cur:/:all:" nati) :native check-.] # As a path from (os/cwd) + [":all:.jimage" :image not-check-.] [":all:.janet" :source not-check-.] [":all:/init.janet" :source not-check-.] - [":all:.jimage" :image not-check-.] [(string ":all:" nati) :native not-check-.] # System paths + [":sys:/:all:.jimage" :image not-check-.] [":sys:/:all:.janet" :source not-check-.] [":sys:/:all:/init.janet" :source not-check-.] - [":sys:/:all:.jimage" :image not-check-.] [(string ":sys:/:all:" nati) :native not-check-.]]) (setdyn :syspath (process/opts "JANET_PATH"))