vala: Add CodeContext.get_source_file() and perform some sanity checks

diff --git a/vala/valacodecontext.vala b/vala/valacodecontext.vala
index 8b1a78be4cb5fb73698fb968b76d4796463a35a7..42e6dabb2ca1e4cc3a1c40a08b3e88bf9c3af685 100644 (file)
--- a/vala/valacodecontext.vala
+++ b/vala/valacodecontext.vala
@@ -203,6 +203,7 @@ public class Vala.CodeContext {
        public string[] gresources_directories { get; set; default = {}; }
 
        private List<SourceFile> source_files = new ArrayList<SourceFile> ();
+       private Map<string,unowned SourceFile> source_files_map = new HashMap<string,unowned SourceFile> (str_hash, str_equal);
        private List<string> c_source_files = new ArrayList<string> ();
        private Namespace _root = new Namespace (null);
 
@@ -302,7 +303,23 @@ public class Vala.CodeContext {
         * @param file a source file
         */
        public void add_source_file (SourceFile file) {
+               if (source_files_map.contains (file.filename)) {
+                       Report.warning (null, "Ignoring source file `%s', which was already added to this context".printf (file.filename));
+                       return;
+               }
+
                source_files.add (file);
+               source_files_map.set (file.filename, file);
+       }
+
+       /**
+        * Returns the source file for a given path.
+        *
+        * @param filename a path to a source file
+        * @return the source file if found
+        */
+       public unowned Vala.SourceFile? get_source_file (string filename) {
+               return source_files_map.get (filename);
        }
 
        /**
@@ -445,11 +462,17 @@ public class Vala.CodeContext {
                        }
 
                        add_source_file (source_file);
+                       if (rpath != filename) {
+                               source_files_map.set (filename, source_file);
+                       }
                } else if (filename.has_suffix (".vapi") || filename.has_suffix (".gir")) {
                        var source_file = new SourceFile (this, SourceFileType.PACKAGE, rpath, null, cmdline);
                        source_file.relative_filename = filename;
 
                        add_source_file (source_file);
+                       if (rpath != filename) {
+                               source_files_map.set (filename, source_file);
+                       }
                } else if (filename.has_suffix (".c")) {
                        add_c_source_file (rpath);
                } else if (filename.has_suffix (".h")) {

diff --git a/vala/valasourcefile.vala b/vala/valasourcefile.vala
index 35eaf5f266d977c4042c27dffd0e5e3cc85a5208..4dca01224b472c76db6806f6529a6d4e0334c53a 100644 (file)
--- a/vala/valasourcefile.vala
+++ b/vala/valasourcefile.vala
@@ -29,7 +29,7 @@ public class Vala.SourceFile {
        /**
         * The name of this source file.
         */
-       public string filename { get; set; }
+       public string filename { get; private set; }
 
        public string? relative_filename {
                set {

diff --git a/vapigen/valavapigen.vala b/vapigen/valavapigen.vala
index 63205499dcfc1803cf12b078925580360ae41058..ef0b372006f6772be916b77728e88f4f40aeb48a 100644 (file)
--- a/vapigen/valavapigen.vala
+++ b/vapigen/valavapigen.vala
@@ -184,10 +184,9 @@ class Vala.VAPIGen {
                                        // mark relative metadata as source
                                        string? metadata_filename = context.get_metadata_path (file.filename);
                                        if (metadata_filename != null) {
-                                               foreach (SourceFile metadata_file in context.get_source_files ()) {
-                                                       if (metadata_file.filename == metadata_filename) {
-                                                               metadata_file.file_type = SourceFileType.SOURCE;
-                                                       }
+                                               unowned SourceFile? metadata_file = context.get_source_file (metadata_filename);
+                                               if (metadata_file != null) {
+                                                       metadata_file.file_type = SourceFileType.SOURCE;
                                                }
                                        }
                                        if (file.from_commandline && file.package_name != null) {