Use relative path in include statement for resources

Author: aNNiMON

ownlang-core/src/main/java/com/annimon/ownlang/util/input/InputSourceDetector.java

@@ -11,21 +11,30 @@ public InputSourceDetector() {
     }
 
     public boolean isReadable(String programPath) {
-        if (programPath.startsWith(RESOURCE_PREFIX)) {
-            String path = programPath.substring(RESOURCE_PREFIX.length());
-            return getClass().getResource(basePath + path) != null;
+        if (basePath.startsWith(RESOURCE_PREFIX) || programPath.startsWith(RESOURCE_PREFIX)) {
+            String base = removePrefixIfExists(basePath);
+            String path = removePrefixIfExists(programPath);
+            return getClass().getResource(base + path) != null;
         } else {
             Path path = Path.of(basePath, programPath);
             return Files.isReadable(path) && Files.isRegularFile(path);
         }
     }
 
     public InputSource toInputSource(String programPath) {
-        if (programPath.startsWith(RESOURCE_PREFIX)) {
-            String path = programPath.substring(RESOURCE_PREFIX.length());
-            return new InputSourceResource(basePath + path);
+        if (basePath.startsWith(RESOURCE_PREFIX) || programPath.startsWith(RESOURCE_PREFIX)) {
+            String base = removePrefixIfExists(basePath);
+            String path = removePrefixIfExists(programPath);
+            return new InputSourceResource(base + path);
         } else {
             return new InputSourceFile(basePath + programPath);
         }
     }
+
+    private String removePrefixIfExists(String path) {
+        if (path.startsWith(RESOURCE_PREFIX)) {
+            return path.substring(RESOURCE_PREFIX.length());
+        }
+        return path;
+    }
 }

ownlang-core/src/main/java/com/annimon/ownlang/util/input/InputSourceResource.java

@@ -20,6 +20,11 @@ public String load() throws IOException {
         throw new IOException(path + " not found");
     }
 
+    @Override
+    public String getBasePath() {
+        return "resource:" + InputSource.super.getBasePath();
+    }
+
     @Override
     public String toString() {
         return "Resource " + path;