std lib v2

crates/common2/Cargo.toml

@@ -16,3 +16,6 @@ smol_str = "0.1.24"
 salsa = { git = "https://github.com/salsa-rs/salsa", rev = "a1bf3a6" }
 indexmap = "2.2"
 parser = { path = "../parser2", package = "fe-parser2" }
+toml = "0.8.13"
+serde = { version = "1", features = ["derive"] }
+git2 = "0.18.3"

crates/common2/src/config.rs

@@ -0,0 +1,37 @@
+// use camino::Utf8PathBuf;
+// use indexmap::IndexSet;
+// use serde::{Deserialize, Serialize};
+// use toml::Table;
+
+// use crate::resolver::ingot::IngotDesc;
+
+// #[derive(Deserialize, Serialize)]
+// pub struct Config {
+//     pub modes: Table,
+//     pub base_registry: Table,
+// }
+
+// impl Config {
+//     pub fn new() -> Self {
+//         Self {
+//             base_registry: Table::new(),
+//         }
+//     }
+
+//     pub fn base_registry(&self) -> IndexSet<IngotDesc> {
+//         self.base_registry
+//             .iter()
+//             .map(|(name, value)| IngotDesc::from(name, value))
+//             .collect()
+//     }
+// }
+
+// pub fn load_config(path: Utf8PathBuf) -> Config {
+//     let text = std::fs::read_to_string(path).unwrap();
+//     toml::from_str(&text).unwrap()
+// }
+
+// pub fn write_config(path: Utf8PathBuf, config: Config) {
+//     let text = toml::to_string(&config).unwrap();
+//     std::fs::write(path, text).unwrap();
+// }

crates/common2/src/input.rs

@@ -8,7 +8,7 @@ use crate::{indexmap::IndexSet, InputDb};
 #[salsa::input(constructor = __new_impl)]
 pub struct InputIngot {
     /// An absolute path to the ingot root directory.
-    /// The all files in the ingot should be located under this directory.
+    /// All files in the ingot should be located under this directory.
     #[return_ref]
     pub path: Utf8PathBuf,
 
@@ -60,7 +60,7 @@ impl InputIngot {
     }
 
     /// Set the list of files which the ingot contains.
-    /// All files must bee set before the ingot is used.
+    /// All files must be set before the ingot is used.
     pub fn set_files(self, db: &mut dyn InputDb, files: IndexSet<InputFile>) {
         self.__set_files_impl(db).to(files);
     }

crates/common2/src/lib.rs

@@ -1,6 +1,8 @@
+pub mod config;
 pub mod diagnostics;
 pub mod indexmap;
 pub mod input;
+pub mod resolver;
 
 pub use input::{InputFile, InputIngot};
 

crates/driver2/Cargo.toml

@@ -18,3 +18,7 @@ common = { path = "../common2", package = "fe-common2" }
 hir-analysis = { path = "../hir-analysis", package = "fe-hir-analysis" }
 camino = "1.1.4"
 clap = { version = "4.3", features = ["derive"] }
+semver = "1.0.23"
+walkdir = "2"
+include_dir = "0.7"
+dirs = "5.0.1"

crates/driver2/src/check.rs

@@ -0,0 +1,108 @@
+use crate::{load_ingot, CheckArgs};
+use common::indexmap::IndexSet;
+use common::input::IngotDependency;
+use common::{input::IngotKind, InputIngot};
+use fe_driver2::DriverDataBase;
+use include_dir::{include_dir, Dir};
+use semver::Version;
+use std::fs;
+use std::{collections::BTreeSet, path::Path};
+
+pub fn check_standalone(
+    path: &Path,
+    source: String,
+    std_ingot: InputIngot,
+    db: &mut DriverDataBase,
+    dump_scope_graph: bool,
+) {
+    let mut dependencies = IndexSet::default();
+    dependencies.insert(IngotDependency::new("std", std_ingot));
+    let ingot = InputIngot::new(
+        db,
+        path.parent().unwrap().to_str().unwrap(),
+        IngotKind::StandAlone,
+        Version::new(0, 1, 0),
+        dependencies.clone(),
+    );
+
+    // let input_file = InputFile::new(
+    //     db,
+    //     ingot.clone(),
+    //     path.file_name().unwrap().to_str().unwrap().into(),
+    //     source,
+    // );
+    // ingot.set_files(db, BTreeSet::from([input_file.clone()]));
+    // ingot.set_root_file(db, input_file);
+
+    let top_mod = db.standalone(path, &source);
+    // db.run_on_top_mod(top_mod);
+    // db.emit_diags();
+
+    // if dump_scope_graph {
+    //     println!("{}", dump_scope_graph(db, top_mod));
+    // }
+}
+
+pub fn check_ingot(
+    path: &Path,
+    std_ingot: InputIngot,
+    db: &mut DriverDataBase,
+    dump_scope_graph: bool,
+) {
+    // let mut dependencies = BTreeSet::from([IngotDependency::new("std", std_ingot)]);
+    let mut dependencies = IndexSet::default();
+    let mut main_ingot = load_ingot(path, db, IngotKind::Local, &mut dependencies);
+
+    // main_ingot.set_external_ingots(db, dependencies);
+
+    let diags = db.run_on_ingot(std_ingot);
+
+    // let diags = db.format_diags();
+    // if !diags.is_empty() {
+    //     panic!("{diags}")
+    // }
+
+    // db.run_on_ingot(main_ingot);
+
+    // let diags = db.format_diags();
+    // if !diags.is_empty() {
+    // panic!("{:?}", diags)
+    // }
+
+    // if dump_scope_graph {
+    //     println!("{}", dump_scope_graph(db, top_mod));
+    // }
+}
+
+use include_dir::{include_dir, Dir};
+use std::path::PathBuf;
+use std::{collections::BTreeSet, path::Path};
+
+fn check_std_lib_exists(std_lib_files: &Dir, std_lib_path: &Path) -> bool {
+    true
+}
+
+fn write_std_lib(std_lib_files: &Dir, std_lib_path: &Path) {
+    write_files_recursive(std_lib_files, std_lib_path);
+}
+
+fn default_std_lib_path() -> PathBuf {
+    let home_dir = dirs::home_dir().expect("Failed to get user home directory");
+    home_dir.join(".fe/std")
+}
+
+fn write_files_recursive(dir: &Dir<'_>, base_path: &Path) {
+    for file in dir.files() {
+        let file_path = base_path.join(file.path());
+        if let Some(parent_dir) = file_path.parent() {
+            std::fs::create_dir_all(parent_dir).unwrap();
+        }
+        std::fs::write(file_path, file.contents()).unwrap();
+    }
+
+    for subdir in dir.dirs() {
+        let subdir_path = base_path.join(subdir.path());
+        std::fs::create_dir_all(&subdir_path).unwrap();
+        write_files_recursive(subdir, &base_path);
+    }
+}

crates/driver2/src/lib.rs

@@ -13,8 +13,11 @@ use common::{
     InputDb, InputFile, InputIngot,
 };
 use hir::{
-    analysis_pass::AnalysisPassManager, diagnostics::DiagnosticVoucher, hir_def::TopLevelMod,
-    lower::map_file_to_mod, HirDb, LowerHirDb, ParsingPass, SpannedHirDb,
+    analysis_pass::AnalysisPassManager,
+    diagnostics::DiagnosticVoucher,
+    hir_def::TopLevelMod,
+    lower::{map_file_to_mod, module_tree},
+    HirDb, LowerHirDb, ParsingPass, SpannedHirDb,
 };
 use hir_analysis::{
     name_resolution::{DefConflictAnalysisPass, ImportAnalysisPass, PathAnalysisPass},
@@ -71,6 +74,23 @@ impl DriverDataBase {
         DiagnosticsCollection(pass_manager.run_on_module(top_mod))
     }
 
+    pub fn run_on_ingot<'db>(&'db mut self, ingot: InputIngot) -> DiagnosticsCollection<'db> {
+        self.run_on_ingot_with_pass_manager(ingot, initialize_analysis_pass)
+    }
+
+    pub fn run_on_ingot_with_pass_manager<'db, F>(
+        &'db mut self,
+        ingot: InputIngot,
+        pm_builder: F,
+    ) -> DiagnosticsCollection<'db>
+    where
+        F: FnOnce(&'db DriverDataBase) -> AnalysisPassManager<'db>,
+    {
+        let tree = module_tree(self, ingot);
+        let mut pass_manager = pm_builder(self);
+        DiagnosticsCollection(pass_manager.run_on_module_tree(tree))
+    }
+
     pub fn standalone(&mut self, file_path: &path::Path, source: &str) -> InputFile {
         let kind = IngotKind::StandAlone;