chore: testing stdlib-import-root

vknabel · Mar 6, 2022 · afd978e · afd978e
1 parent 5db80b2
commit afd978e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/resolution/module-resolver.go b/resolution/module-resolver.go
@@ -20,9 +20,9 @@ type ModuleResolver struct {
  lithiaSourceGlob string
 }
 
-func DefaultModuleResolver() ModuleResolver {
+func DefaultModuleResolver(importRoots ...string) ModuleResolver {
  return ModuleResolver{
- externalImportRoots: defaultImportRoots(),
+ externalImportRoots: defaultImportRoots(importRoots...),
  defaultPackageName: "root",
  manifestName: "Potfile",
  manifestSearchPaths: []string{".", "..", "../..", "../../..", "../../../.."},
@@ -52,8 +52,8 @@ type PackageManifest struct {
  Path string
 }
 
-func defaultImportRoots() []string {
- roots := []string{}
+func defaultImportRoots(importRoots ...string) []string {
+ roots := importRoots
  if path, ok := os.LookupEnv("LITHIA_LOCALS"); ok {
  roots = append(roots, path)
  }

diff --git a/runtime/interpreter.go b/runtime/interpreter.go
@@ -18,7 +18,7 @@ type Interpreter struct {
 
 func NewInterpreter(referenceFile string, importRoots ...string) *Interpreter {
  inter := &Interpreter{
- Resolver: resolution.DefaultModuleResolver(),
+ Resolver: resolution.DefaultModuleResolver(importRoots...),
  Parser: parser.NewParser(),
  Modules: make(map[ast.ModuleName]*RuntimeModule),
  ExternalDefinitions: make(map[ast.ModuleName]ExternalDefinition),

diff --git a/runtime/runtime-stdlib_test.go b/runtime/runtime-stdlib_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestStdlib(t *testing.T) {
  pathToStdlib := "../stdlib"
- inter := r.NewInterpreter(pathToStdlib)
+ inter := r.NewInterpreter(pathToStdlib, "../stdlib")
  mockOS := &mockExternalOS{
  calledExitCode: -1,
  env: map[string]string{"LITHIA_TESTS": "1"},