mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-01-15 09:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rewrite calc example to use a salsa::input

Browse source
This commit is contained in:
Niko Matsakis 2022-08-03 00:41:36 -04:00
parent 7e3e77d611
commit aefb85385e
3 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
calc-example/calc/src/ir.rs
View file

@ -1,6 +1,14 @@
use ordered_float::OrderedFloat;
use salsa::debug::DebugWithDb;
// ANCHOR: input
#[salsa::input]
pub struct SourceProgram {
#[return_ref]
text: String,
}
// ANCHOR_END: input
// ANCHOR: interned_ids
#[salsa::interned]
#[derive(Eq, PartialEq, Clone, Hash)]

2
calc-example/calc/src/main.rs
View file

@ -1,6 +1,7 @@
// ANCHOR: jar_struct
#[salsa::jar(db = Db)]
pub struct Jar(
crate::ir::SourceProgram,
crate::ir::VariableId,
crate::ir::FunctionId,
crate::ir::Expression,
@ -8,7 +9,6 @@ pub struct Jar(
crate::ir::Function,
crate::ir::Diagnostics,
crate::parser::parse_statements,
crate::parser::source_text,
);
// ANCHOR_END: jar_struct

23
calc-example/calc/src/parser.rs
View file

@ -1,22 +1,15 @@
use ordered_float::OrderedFloat;
use crate::ir::{
Diagnostic, Diagnostics, Expression, ExpressionData, Function, FunctionId, Op, Statement,
StatementData, VariableId,
Diagnostic, Diagnostics, Expression, ExpressionData, Function, FunctionId, Op, SourceProgram,
Statement, StatementData, VariableId,
};
// ANCHOR: source_text
#[salsa::memoized(return_ref)]
pub fn source_text(_db: &dyn crate::Db) -> String {
panic!("input")
}
// ANCHOR_END: source_text
// ANCHOR: parse_statements
#[salsa::memoized(return_ref)]
pub fn parse_statements(db: &dyn crate::Db) -> Vec<Statement> {
pub fn parse_statements(db: &dyn crate::Db, source: SourceProgram) -> Vec<Statement> {
// Get the source text from the database
let source_text = source_text(db);
let source_text = source.text(db);
// Create the parser
let mut parser = Parser {
@ -339,14 +332,14 @@ fn parse_string(source_text: &str) -> String {
// Create the database
let mut db = crate::db::Database::default();
// Set the source_text value
source_text::set(&mut db, source_text.to_string());
// Create the source program
let source_program = SourceProgram::new(&mut db, source_text.to_string());
// Invoke the parser
let statements = parse_statements(&db);
let statements = parse_statements(&db, source_program);
// Read out any diagnostics
let accumulated = parse_statements::accumulated::<Diagnostics>(&db);
let accumulated = parse_statements::accumulated::<Diagnostics>(&db, source_program);
// Format the result as a string and return it
format!("{:#?}", (statements, accumulated).debug(&db))