Fix loading of overlapping sources in a manifest.

Author: jemc

spec/integration/run-overlapping-manifest-sources/manifest.savi

@@ -0,0 +1,3 @@
+:manifest "example"
+  :sources "src/Main*.savi"    // matches both Main.savi            and Main.Example.savi
+  :sources "src/*Example.savi" // matches both Message.Example.savi and Main.Example.savi

spec/integration/run-overlapping-manifest-sources/savi.run.output.txt

@@ -0,0 +1 @@
+Example output

spec/integration/run-overlapping-manifest-sources/savi.run.test.sh

@@ -0,0 +1,2 @@
+$SAVI
+bin/example

spec/integration/run-overlapping-manifest-sources/src/Main.Example.savi

@@ -0,0 +1,3 @@
+:actor Main.Example
+  :new (env Env)
+    env.out.print(Message.Example.string)

spec/integration/run-overlapping-manifest-sources/src/Main.savi

@@ -0,0 +1,3 @@
+:actor Main
+  :new (env)
+    Main.Example.new(env)

spec/integration/run-overlapping-manifest-sources/src/Message.Example.savi

@@ -0,0 +1,2 @@
+:module Message.Example
+  :const string: "Example output"

src/savi/compiler/source_service.cr

@@ -297,25 +297,36 @@ class Savi::Compiler::SourceService
   def get_sources_for_manifest(ctx, manifest : Packaging::Manifest)
     package = Source::Package.for_manifest(manifest)
 
-    manifest.sources_paths.flat_map { |sources_path, exclusions|
-      sources = [] of Source
+    sources = [] of Source
+
+    manifest.sources_paths.each { |sources_path, exclusions|
+      glob_sources = [] of Source
       absolute_glob = File.join(package.path, sources_path.value)
       exclusion_paths = exclusions.map { |e| File.join(package.path, e.value) }
 
       prior_source_size = sources.size
+      found_at_least_one = false
       each_savi_file_in_glob(absolute_glob) { |name, content|
         # Skip this source file if it is excluded.
         next if exclusion_paths.any? { |e| File.match?(e, name) }
 
-        # Otherwise add it to the list.
+        # Note that we found at least one source file in this glob.
+        found_at_least_one = true
+
+        # Split the file path into its two parts.
         dirname = File.dirname(name)
-        basename = File.basename(name)
-        sources << Source.new(dirname, basename, content, package)
+        filename = File.basename(name)
+
+        # Skip this source file if it already is included.
+        next if sources.any? { |s| s.filename == filename && s.dirname == dirname }
+
+        # Otherwise add it to the list.
+        glob_sources << Source.new(dirname, filename, content, package)
       }
 
       ctx.error_at sources_path,
-        "No '.savi' source files found in #{absolute_glob.inspect}" \
-          if sources.empty?
+        "No new '.savi' source files found in #{absolute_glob.inspect}" \
+          unless found_at_least_one
 
       # Sort the sources by case-insensitive name, so that they always get loaded
       # in a repeatable order regardless of platform implementation details, or
@@ -324,10 +335,14 @@ class Savi::Compiler::SourceService
       # Note that we sort each group (from each glob) separately,
       # and concatenate them in order of the globs declaration order, so that
       # the declaration order can be meaningful if desired.
-      sources.sort_by!(&.filename.downcase)
+      glob_sources.sort_by!(&.filename.downcase)
 
-      sources
+      # Finally, add the glob sources to the total sources list.
+      sources.concat(glob_sources)
     }
+
+
+    sources
   end
 
   # Given a directory name, load source objects for all the source files in