Support GLJ classpath load paths

Author: ingydotnet

pkg/gljmain/gljmain.go

@@ -8,6 +8,7 @@ import (
 	"net"
 	"os"
 	"os/signal"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"syscall"
@@ -54,7 +55,11 @@ For more information, visit: https://github.com/glojurelang/glojure
 }
 
 func Main(args []string) {
-	runtime.AddLoadPath(os.DirFS("."))
+	for _, path := range filepath.SplitList(os.Getenv("GLJ_CLASSPATH")) {
+		if path != "" {
+			runtime.AddLoadPath(os.DirFS(path))
+		}
+	}
 
 	if len(args) == 0 {
 		// Check if stdin is a terminal

pkg/runtime/envinit.go

@@ -189,6 +189,16 @@ func NewEnvironment(opts ...EvalOption) lang.Environment {
 		return nil
 	}), true)
 
+	lang.InternVar(core, lang.NewSymbol("load"), lang.FnFunc(func(paths ...any) any {
+		if len(paths) == 0 {
+			panic("Wrong number of args passed to: clojure.core/load")
+		}
+		for _, path := range paths {
+			RT.Load(path.(string))
+		}
+		return nil
+	}), true)
+
 	lang.InternVar(core, lang.NewSymbol("load-file"), lang.FnFunc1(func(filename any) any {
 		fname := filename.(string)
 		buf, err := os.ReadFile(fname)

pkg/runtime/rtcompat.go

@@ -188,9 +188,11 @@ func (rt *RTMethods) Load(scriptBase string) {
 	PushThreadBindings(NewMap(kvs...))
 	defer PopThreadBindings()
 
+	resourceBase := strings.ReplaceAll(strings.TrimPrefix(scriptBase, "/"), ".", "/")
+
 	if useAot {
 		// check nsloaders
-		if loader := GetNSLoader(strings.TrimPrefix(scriptBase, "/")); loader != nil {
+		if loader := GetNSLoader(resourceBase); loader != nil {
 			loader()
 			return
 		}
@@ -205,10 +207,9 @@ func (rt *RTMethods) Load(scriptBase string) {
 	loadPathLock.Unlock()
 	for _, fs := range lp {
 		for _, testFilename := range []string{
-			scriptBase,
-			scriptBase + ".glj",
-			scriptBase + ".clj",
-			scriptBase + ".cljc",
+			resourceBase + ".glj",
+			resourceBase + ".clj",
+			resourceBase + ".cljc",
 		} {
 			b, err := readFile(fs, testFilename)
 			if err == nil {