Relative imports!

This is a breaking change because existing imports in user Wren code
that assume the path is relative to the entrypoint file will now likely
fail.

Also, stack trace output and host API calls that take a module string
now need the resolved module string, not the short name that appears in
the import.

test/api/call.c

@@ -6,7 +6,7 @@
 void callRunTests(WrenVM* vm)
 {
   wrenEnsureSlots(vm, 1);
-  wrenGetVariable(vm, "main", "Call", 0);
+  wrenGetVariable(vm, "test/api/call", "Call", 0);
   WrenHandle* callClass = wrenGetSlotHandle(vm, 0);
   
   WrenHandle* noParams = wrenMakeCallHandle(vm, "noParams");

test/api/get_variable.c

@@ -4,23 +4,23 @@
 
 static void beforeDefined(WrenVM* vm)
 {
-  wrenGetVariable(vm, "main", "A", 0);
+  wrenGetVariable(vm, "test/api/get_variable", "A", 0);
 }
 
 static void afterDefined(WrenVM* vm)
 {
-  wrenGetVariable(vm, "main", "A", 0);
+  wrenGetVariable(vm, "test/api/get_variable", "A", 0);
 }
 
 static void afterAssigned(WrenVM* vm)
 {
-  wrenGetVariable(vm, "main", "A", 0);
+  wrenGetVariable(vm, "test/api/get_variable", "A", 0);
 }
 
 static void otherSlot(WrenVM* vm)
 {
   wrenEnsureSlots(vm, 3);
-  wrenGetVariable(vm, "main", "B", 2);
+  wrenGetVariable(vm, "test/api/get_variable", "B", 2);
   
   // Move it into return position.
   const char* string = wrenGetSlotString(vm, 2);
@@ -29,7 +29,7 @@ static void otherSlot(WrenVM* vm)
 
 static void otherModule(WrenVM* vm)
 {
-  wrenGetVariable(vm, "get_variable_module", "Variable", 0);
+  wrenGetVariable(vm, "test/api/get_variable_module", "Variable", 0);
 }
 
 WrenForeignMethodFn getVariableBindMethod(const char* signature)

test/api/get_variable.wren

@@ -1,4 +1,4 @@
-import "get_variable_module"
+import "./get_variable_module"
 
 class GetVariable {
   foreign static beforeDefined()

test/api/main.c

@@ -24,8 +24,8 @@ const char* testName;
 static WrenForeignMethodFn bindForeignMethod(
     WrenVM* vm, const char* module, const char* className,
     bool isStatic, const char* signature)
-{  
-  if (strcmp(module, "main") != 0) return NULL;
+{
+  if (strncmp(module, "test/", 5) != 0) return NULL;
 
   // For convenience, concatenate all of the method qualifiers into a single
   // signature string.
@@ -78,7 +78,7 @@ static WrenForeignClassMethods bindForeignClass(
     WrenVM* vm, const char* module, const char* className)
 {
   WrenForeignClassMethods methods = { NULL, NULL };
-  if (strcmp(module, "main") != 0) return methods;
+  if (strncmp(module, "test/", 5) != 0) return methods;
 
   foreignClassBindClass(className, &methods);
   if (methods.allocate != NULL) return methods;

test/api/reset_stack_after_call_abort.c

@@ -6,7 +6,7 @@
 void resetStackAfterCallAbortRunTests(WrenVM* vm)
 {
   wrenEnsureSlots(vm, 1);
-  wrenGetVariable(vm, "main", "Test", 0);
+  wrenGetVariable(vm, "test/api/reset_stack_after_call_abort", "Test", 0);
   WrenHandle* testClass = wrenGetSlotHandle(vm, 0);
   
   WrenHandle* abortFiber = wrenMakeCallHandle(vm, "abortFiber()");
@@ -25,4 +25,4 @@ void resetStackAfterCallAbortRunTests(WrenVM* vm)
   wrenReleaseHandle(vm, testClass);
   wrenReleaseHandle(vm, abortFiber);
   wrenReleaseHandle(vm, afterConstruct);
-}
+}

test/api/reset_stack_after_foreign_construct.c

@@ -22,7 +22,7 @@ void resetStackAfterForeignConstructBindClass(
 void resetStackAfterForeignConstructRunTests(WrenVM* vm)
 {
   wrenEnsureSlots(vm, 1);
-  wrenGetVariable(vm, "main", "Test", 0);
+  wrenGetVariable(vm, "test/api/reset_stack_after_foreign_construct", "Test", 0);
   WrenHandle* testClass = wrenGetSlotHandle(vm, 0);
   
   WrenHandle* callConstruct = wrenMakeCallHandle(vm, "callConstruct()");
@@ -41,4 +41,4 @@ void resetStackAfterForeignConstructRunTests(WrenVM* vm)
   wrenReleaseHandle(vm, testClass);
   wrenReleaseHandle(vm, callConstruct);
   wrenReleaseHandle(vm, afterConstruct);
-}
+}

test/core/fiber/yield_from_import.wren

@@ -1,7 +1,7 @@
 var fiber = Fiber.new {
   System.print("fiber 1")
 
-  import "yield_from_import_module"
+  import "./yield_from_import_module"
 
   System.print("fiber 2")
 }

test/language/foreign/unknown_method.wren

@@ -1,3 +1,3 @@
 class Foo {
-  foreign someUnknownMethod // expect runtime error: Could not find foreign method 'someUnknownMethod' for class Foo in module 'main'.
+  foreign someUnknownMethod // expect runtime error: Could not find foreign method 'someUnknownMethod' for class Foo in module 'test/language/foreign/unknown_method'.
 }

test/language/module/change_imported_value/change_imported_value.wren

@@ -1,4 +1,4 @@
-import "module" for Module, Other
+import "./module" for Module, Other
 
 System.print(Module) // expect: before
 

test/language/module/compile_error/compile_error.wren

@@ -1,2 +1,2 @@
 System.print("before") // expect: before
-import "module" for Module // expect runtime error: Could not compile module 'module'.
+import "./module" for Module // expect runtime error: Could not compile module 'test/language/module/compile_error/module'.

test/language/module/cyclic_import/a.wren

@@ -3,7 +3,7 @@ System.print("start a")
 
 var A = "a value"
 System.print("a defined %(A)")
-import "b" for B
+import "./b" for B
 System.print("a imported %(B)")
 
 System.print("end a")

test/language/module/cyclic_import/b.wren

@@ -3,7 +3,7 @@ System.print("start b")
 
 var B = "b value"
 System.print("b defined %(B)")
-import "a" for A
+import "./a" for A
 System.print("b imported %(A)")
 
 System.print("end b")

test/language/module/cyclic_import/cyclic_import.wren

@@ -1,4 +1,4 @@
-import "a"
+import "./a"
 
 // Shared module should only run once:
 // expect: start a

test/language/module/implicitly_imports_core/implicitly_imports_core.wren

@@ -1,4 +1,4 @@
-import "module"
+import "./module"
 // expect: Bool
 // expect: Class
 // expect: Fiber

test/language/module/inside_block/inside_block.wren

@@ -1,7 +1,7 @@
 var Module = "outer"
 
 if (true) {
-  import "module" for Module
+  import "./module" for Module
   // expect: ran module
 
   System.print(Module) // expect: from module

test/language/module/missing_for.wren

@@ -1 +1 @@
-import "module" NoString // expect error
+import "./module" NoString // expect error

test/language/module/module_dir/module_dir.wren

@@ -1,3 +1,3 @@
-import "something" for Index
+import "./something/module" for Index
 
 System.print(Index) // expect: index

test/language/module/multiple_variables/multiple_variables.wren

@@ -1,4 +1,4 @@
-import "module" for Module1, Module2, Module3, Module4, Module5
+import "./module" for Module1, Module2, Module3, Module4, Module5
 
 // Only execute module body once:
 // expect: ran module

test/language/module/name_collision.wren

@@ -1,2 +1,2 @@
 var Collides
-import "module" for Collides // expect error
+import "./module" for Collides // expect error

test/language/module/newlines/newlines.wren

@@ -1,9 +1,9 @@
 import
 
 
-"module"
+"./module"
 
-import "module" for
+import "./module" for
 
 A,
 

test/language/module/no_variable/no_variable.wren

@@ -1,2 +1,2 @@
-import "module"
+import "./module"
 // expect: ran module

test/language/module/relative_import/module_3.wren

@@ -0,0 +1,2 @@
+// nontest
+System.print("module_3")

test/language/module/relative_import/relative_import.wren

@@ -0,0 +1,8 @@
+import "./sub/module"
+import "./sub/././///dir/module"
+// expect: sub/module
+// expect: sub/module_2
+// expect: sub/dir/module
+// expect: sub/dir/module_2
+// expect: sub/module_3
+// expect: module_3

test/language/module/relative_import/sub/dir/module.wren

@@ -0,0 +1,3 @@
+// nontest
+System.print("sub/dir/module")
+import "./module_2"

test/language/module/relative_import/sub/dir/module_2.wren

@@ -0,0 +1,4 @@
+// nontest
+System.print("sub/dir/module_2")
+import "../module_3"
+import "../../module_3"

test/language/module/relative_import/sub/module.wren

@@ -0,0 +1,3 @@
+// nontest
+System.print("sub/module")
+import "./module_2"

test/language/module/relative_import/sub/module_2.wren

@@ -0,0 +1,2 @@
+// nontest
+System.print("sub/module_2")

test/language/module/relative_import/sub/module_3.wren

@@ -0,0 +1,2 @@
+// nontest
+System.print("sub/module_3")

test/language/module/shared_import/a.wren

@@ -1,5 +1,5 @@
 // nontest
 System.print("a")
-import "shared" for Shared
+import "./shared" for Shared
 var A = "a %(Shared)"
 System.print("a done")

test/language/module/shared_import/b.wren

@@ -1,5 +1,5 @@
 // nontest
 System.print("b")
-import "shared" for Shared
+import "./shared" for Shared
 var B = "b %(Shared)"
 System.print("b done")

test/language/module/shared_import/shared_import.wren

@@ -1,5 +1,5 @@
-import "a" for A
-import "b" for B
+import "./a" for A
+import "./b" for B
 
 // Shared module should only run once:
 // expect: a

test/language/module/simple_import/simple_import.wren

@@ -1,4 +1,4 @@
-import "module" for Module
+import "./module" for Module
 // expect: ran module
 
 System.print(Module) // expect: from module

test/language/module/unknown_module.wren

@@ -1 +1 @@
-import "does_not_exist" for DoesNotExist // expect runtime error: Could not load module 'does_not_exist'.
+import "./does_not_exist" for DoesNotExist // expect runtime error: Could not load module 'test/language/module/does_not_exist'.

test/language/module/unknown_variable/unknown_variable.wren

@@ -1,3 +1,3 @@
 // Should execute the module:
 // expect: ran module
-import "module" for DoesNotExist // expect runtime error: Could not find a variable named 'DoesNotExist' in module 'module'.
+import "./module" for DoesNotExist // expect runtime error: Could not find a variable named 'DoesNotExist' in module 'test/language/module/unknown_variable/module'.

test/meta/get_module_variables.wren

@@ -1,6 +1,6 @@
 import "meta" for Meta
 
-var variables = Meta.getModuleVariables("main")
+var variables = Meta.getModuleVariables("test/meta/get_module_variables")
 
 // Includes implicitly imported core stuff.
 System.print(variables.contains("Object")) // expect: true