From 0d2ac550c25550f9588ec0a1b5885169260f67d6 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 11 Jan 2025 11:44:45 +0000 Subject: Support local project dependencies --- .../java/org/shedlang/compiler/ShedCompiler.java | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'src/main/java/org/shedlang/compiler/ShedCompiler.java') diff --git a/src/main/java/org/shedlang/compiler/ShedCompiler.java b/src/main/java/org/shedlang/compiler/ShedCompiler.java index a57a3386..af47ff5c 100644 --- a/src/main/java/org/shedlang/compiler/ShedCompiler.java +++ b/src/main/java/org/shedlang/compiler/ShedCompiler.java @@ -36,11 +36,24 @@ public class ShedCompiler { ) throws IOException, InterruptedException { var config = ProjectConfig.read(projectRoot); - var sourceRoot = projectRoot.resolve("src"); - - var sourceFilePaths = collectSourceFilePaths(sourceRoot); + // TODO: recursive dependencies + var projectRoots = new ArrayList(); + projectRoots.add(projectRoot); + for (var dependency : config.dependencies()) { + projectRoots.add(dependency.path()); + } - var untypedNamespaceNodes = parseSource(sourceRoot, sourceFilePaths); + var untypedNamespaceNodes = projectRoots.stream() + .flatMap(root -> { + var sourceRoot = root.resolve("src"); + try { + var sourceFilePaths = collectSourceFilePaths(sourceRoot); + return parseSource(sourceRoot, sourceFilePaths).stream(); + } catch (IOException exception) { + throw new RuntimeException(exception); + } + }) + .toList(); var namespaces = new ArrayList(); -- cgit v1.2.3