language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-02 00:01:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'trunk' of github.com:rtfeldman/roc into wasm-pre-linking

Browse source
This commit is contained in:
Brian Carroll 2022-01-14 18:20:24 +00:00
commit 7f5b8c7296
74 changed files with 759 additions and 679 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/build/src/program.rs
View file

@ -31,7 +31,6 @@ const LLVM_VERSION: &str = "12";
pub fn report_problems_monomorphized(loaded: &mut MonomorphizedModule) -> usize {
report_problems_help(
loaded.total_problems(),
&loaded.header_sources,
&loaded.sources,
&loaded.interns,
&mut loaded.can_problems,
@ -43,7 +42,6 @@ pub fn report_problems_monomorphized(loaded: &mut MonomorphizedModule) -> usize
pub fn report_problems_typechecked(loaded: &mut LoadedModule) -> usize {
report_problems_help(
loaded.total_problems(),
&loaded.header_sources,
&loaded.sources,
&loaded.interns,
&mut loaded.can_problems,
@ -54,7 +52,6 @@ pub fn report_problems_typechecked(loaded: &mut LoadedModule) -> usize {
fn report_problems_help(
total_problems: usize,
header_sources: &MutMap<ModuleId, (PathBuf, Box<str>)>,
sources: &MutMap<ModuleId, (PathBuf, Box<str>)>,
interns: &Interns,
can_problems: &mut MutMap<ModuleId, Vec<roc_problem::can::Problem>>,
@ -75,14 +72,9 @@ fn report_problems_help(
for (home, (module_path, src)) in sources.iter() {
let mut src_lines: Vec<&str> = Vec::new();
if let Some((_, header_src)) = header_sources.get(home) {
src_lines.extend(header_src.split('\n'));
src_lines.extend(src.split('\n').skip(1));
} else {
src_lines.extend(src.split('\n'));
}
src_lines.extend(src.split('\n'));
let lines = LineInfo::new(src);
let lines = LineInfo::new(&src_lines.join("\n"));
// Report parsing and canonicalization problems
let alloc = RocDocAllocator::new(&src_lines, *home, interns);