feat(hir): expose hir from parsing context

CONTRIBUTING.md

@@ -126,6 +126,7 @@ to ignore benchmarks and examples:
 ```
 cargo check --workspace
 cargo clippy --workspace
+cargo fmt --all --check
 cargo test --workspace
 ```
 

crates/sema/src/lib.rs

@@ -25,6 +25,7 @@ mod ast_lowering;
 mod ast_passes;
 
 mod parse;
+use crate::hir::{Arena, Hir};
 pub use parse::{ParsedSource, ParsedSources, ParsingContext};
 
 pub mod builtins;
@@ -100,6 +101,32 @@ pub fn parse_and_resolve(pcx: ParsingContext<'_>) -> Result<()> {
     Ok(())
 }
 
+/// Parses and lowers to HIR, recursing into imports.
+pub fn parse_and_lower_to_hir<'hir>(
+    pcx: ParsingContext<'_>,
+    hir_arena: &'hir Arena,
+) -> Result<Hir<'hir>> {
+    let sess = pcx.sess;
+
+    if pcx.sources.is_empty() {
+        let msg = "no files found";
+        let note = "if you wish to use the standard input, please specify `-` explicitly";
+        return Err(sess.dcx.err(msg).note(note).emit());
+    }
+
+    let ast_arenas = OnDrop::new(ThreadLocal::<ast::Arena>::new(), |mut arenas| {
+        debug!(asts_allocated = arenas.iter_mut().map(|a| a.allocated_bytes()).sum::<usize>());
+        debug_span!("dropping_ast_arenas").in_scope(|| drop(arenas));
+    });
+    let mut sources = pcx.parse(&ast_arenas);
+
+    sources.topo_sort();
+
+    let (hir, _) = lower(sess, &sources, hir_arena)?;
+
+    Ok(hir)
+}
+
 /// Lowers the parsed ASTs into the HIR.
 fn lower<'sess, 'hir>(
     sess: &'sess Session,

crates/sema/src/parse.rs

@@ -1,4 +1,4 @@
-use crate::hir::SourceId;
+use crate::hir::{Arena, Hir, SourceId};
 use rayon::prelude::*;
 use solar_ast as ast;
 use solar_data_structures::{
@@ -90,6 +90,10 @@ impl<'sess> ParsingContext<'sess> {
         crate::parse_and_resolve(self)
     }
 
+    pub fn parse_and_lower_to_hir(self, hir_arena: &Arena) -> Result<Hir<'_>> {
+        crate::parse_and_lower_to_hir(self, hir_arena)
+    }
+
     /// Parses all the loaded sources, recursing into imports.
     ///
     /// Sources are not guaranteed to be in any particular order, as they may be parsed in parallel.

examples/src/AnotherCounter.sol

@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.13;
+
+import "./Counter.sol";
+
+contract AnotherCounter {
+    Counter counter = new Counter();
+
+    constructor(Counter _counter) {
+        counter = _counter;
+    }
+
+    function setNumber(uint256 newNumber) public {
+        counter.setNumber(newNumber);
+    }
+
+    function increment() public {
+        counter.increment();
+    }
+}

examples/src/hir.rs

@@ -0,0 +1,36 @@
+use solar::{
+    interface::{diagnostics::EmittedDiagnostics, Session},
+    sema::{
+        hir::{Arena, ContractId},
+        ParsingContext,
+    },
+};
+use std::path::Path;
+
+#[test]
+fn main() -> Result<(), EmittedDiagnostics> {
+    let paths = vec![Path::new("src/AnotherCounter.sol")];
+
+    // Create a new session with a buffer emitter.
+    // This is required to capture the emitted diagnostics and to return them at the end.
+    let sess = Session::builder().with_buffer_emitter(solar::interface::ColorChoice::Auto).build();
+
+    // Enter the context and parse the file.
+    // Counter will be parsed, even if not explicitly provided, since it is a dependency.
+    let _ = sess.enter_parallel(|| -> solar::interface::Result<()> {
+        // Set up the parser.
+        let hir_arena = Arena::new();
+        let mut parsing_context = ParsingContext::new(&sess);
+        parsing_context.load_files(paths)?;
+        let hir = parsing_context.parse_and_lower_to_hir(&hir_arena)?;
+        let counter_contract = hir.contract(ContractId::new(0));
+        assert_eq!(counter_contract.name.to_string(), "Counter");
+        let another_counter_contract = hir.contract(ContractId::new(1));
+        assert_eq!(another_counter_contract.name.to_string(), "AnotherCounter");
+        Ok(())
+    });
+
+    // Return the emitted diagnostics as a `Result<(), _>`.
+    // If any errors were emitted, this returns `Err(_)`, otherwise `Ok(())`.
+    sess.emitted_errors().unwrap()
+}

examples/src/lib.rs

@@ -3,4 +3,5 @@
 #![allow(unreachable_pub)]
 #![cfg(test)]
 
+mod hir;
 mod parser;