Merge pull request #43 from SpontanCombust:dev

v0.3.1
SpontanCombust · Jun 15, 2024 · bedd333 · bedd333
2 parents 5ba3992 + 9803d73
commit bedd333
Show file tree

Hide file tree

Showing 89 changed files with 4,927 additions and 2,848 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/analysis/src/jobs/merge_symtabs.rs b/crates/analysis/src/jobs/merge_symtabs.rs
@@ -1,5 +1,5 @@
 use witcherscript_diagnostics::*;
-use crate::symbol_analysis::symbol_table::SymbolTable;
+use crate::symbol_analysis::{symbol_table::SymbolTable, symbols::SymbolType};
 
 
 pub fn merge_symbol_tables(
@@ -12,14 +12,50 @@ pub fn merge_symbol_tables(
         .merge(source_symtab)
         .into_iter()
         .map(|err| {
-            LocatedDiagnostic {
-                path: err.incoming_location.abs_source_path(),
-                diagnostic: Diagnostic { 
-                    range: err.incoming_location.label_range, 
-                    kind: DiagnosticKind::SymbolNameTaken { 
-                        name: err.occupied_path.components().last().unwrap().name.to_string(),
-                        precursor_range: err.occupied_location.as_ref().map(|loc| loc.label_range),
-                        precursor_file_path: err.occupied_location.as_ref().map(|loc| loc.abs_source_path())
+            let (occupied_file_path, occupied_range) = err.occupied_location
+                .map(|loc| (Some(loc.abs_source_path()), Some(loc.label_range)))
+                .unwrap_or((None, None));
+
+            match (err.occupied_typ, err.incoming_typ) {
+                (SymbolType::MemberFunction, SymbolType::MemberFunctionReplacer) |
+                (SymbolType::MemberFunction, SymbolType::MemberFunctionWrapper)  |
+                (SymbolType::GlobalFunction, SymbolType::GlobalFunctionReplacer) => {
+                    LocatedDiagnostic { 
+                        path: err.incoming_location.abs_source_path(), 
+                        diagnostic: Diagnostic { 
+                            range: err.incoming_location.label_range, 
+                            kind: DiagnosticKind::SameContentAnnotation { 
+                                original_file_path: occupied_file_path,
+                                original_range: occupied_range
+                            }
+                        }
+                    }
+                },
+                (SymbolType::MemberFunctionReplacer, SymbolType::MemberFunction) |
+                (SymbolType::MemberFunctionWrapper, SymbolType::MemberFunction)  |
+                (SymbolType::GlobalFunctionReplacer, SymbolType::GlobalFunction) => {
+                    LocatedDiagnostic {
+                        path: occupied_file_path.expect("Annotation symbol without location"), 
+                        diagnostic: Diagnostic { 
+                            range: occupied_range.unwrap_or_default(), 
+                            kind: DiagnosticKind::SameContentAnnotation { 
+                                original_file_path: Some(err.incoming_location.abs_source_path()),
+                                original_range: Some(err.incoming_location.range)
+                            }
+                        }
+                    }
+                },
+                _ => {
+                    LocatedDiagnostic {
+                        path: err.incoming_location.abs_source_path(),
+                        diagnostic: Diagnostic { 
+                            range: err.incoming_location.label_range, 
+                            kind: DiagnosticKind::SymbolNameTaken { 
+                                name: err.occupied_path.components().last().unwrap().name.to_string(),
+                                precursor_file_path: occupied_file_path,
+                                precursor_range: occupied_range
+                            }
+                        }
                     }
                 }
             }

diff --git a/crates/analysis/src/jobs/mod.rs b/crates/analysis/src/jobs/mod.rs
@@ -5,7 +5,7 @@ mod scan_symbols;
 pub use scan_symbols::scan_symbols;
 
 mod syntax_analysis;
-pub use syntax_analysis::syntax_analysis;
+pub use syntax_analysis::{syntax_analysis, contextual_syntax_analysis};
 
 mod merge_symtabs;
 pub use merge_symtabs::merge_symbol_tables;