From b5021411a84822cb3f1e3aeffad9550dd15bdeb6 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 16 Sep 2018 12:54:24 +0300 Subject: rename all things --- crates/libanalysis/src/db/imp.rs | 152 --------------------------------------- crates/libanalysis/src/db/mod.rs | 85 ---------------------- 2 files changed, 237 deletions(-) delete mode 100644 crates/libanalysis/src/db/imp.rs delete mode 100644 crates/libanalysis/src/db/mod.rs (limited to 'crates/libanalysis/src/db') diff --git a/crates/libanalysis/src/db/imp.rs b/crates/libanalysis/src/db/imp.rs deleted file mode 100644 index f26be1046..000000000 --- a/crates/libanalysis/src/db/imp.rs +++ /dev/null @@ -1,152 +0,0 @@ -use std::{ - sync::Arc, - any::Any, - hash::{Hash, Hasher}, - collections::hash_map::{DefaultHasher, HashMap}, - iter, -}; -use salsa; -use {FileId, imp::FileResolverImp}; -use super::{State, Query, QueryCtx}; - -pub(super) type Data = Arc; - -#[derive(Debug)] -pub(super) struct Db { - names: Arc>, - pub(super) imp: salsa::Db, -} - -impl Db { - pub(super) fn new(mut reg: QueryRegistry) -> Db { - let config = reg.config.take().unwrap(); - Db { - names: Arc::new(reg.names), - imp: salsa::Db::new(config, State::default()) - } - } - pub(crate) fn with_changes(&self, new_state: State, changed_files: &[FileId], resolver_changed: bool) -> Db { - let names = self.names.clone(); - let mut invalidations = salsa::Invalidations::new(); - invalidations.invalidate(FILE_TEXT, changed_files.iter().map(hash).map(salsa::InputFingerprint)); - if resolver_changed { - invalidations.invalidate(FILE_SET, iter::once(salsa::InputFingerprint(hash(&())))); - } else { - invalidations.invalidate(FILE_SET, iter::empty()); - } - let imp = self.imp.with_ground_data( - new_state, - invalidations, - ); - Db { names, imp } - } - pub(super) fn extract_trace(&self, ctx: &salsa::QueryCtx) -> Vec<&'static str> { - ctx.trace().into_iter().map(|it| self.names[&it]).collect() - } -} - -pub(crate) trait EvalQuery { - type Params; - type Output; - fn query_type(&self) -> salsa::QueryTypeId; - fn f(&self) -> salsa::QueryFn; - fn get(&self, &QueryCtx, Self::Params) -> Arc; -} - -impl EvalQuery for Query -where - T: Hash + Send + Sync + 'static, - R: Hash + Send + Sync + 'static, -{ - type Params = T; - type Output = R; - fn query_type(&self) -> salsa::QueryTypeId { - salsa::QueryTypeId(self.0) - } - fn f(&self) -> salsa::QueryFn { - let f = self.1; - Box::new(move |ctx, data| { - let ctx = QueryCtx { imp: ctx }; - let data: &T = data.downcast_ref().unwrap(); - let res = f(ctx, data); - let h = hash(&res); - (Arc::new(res), salsa::OutputFingerprint(h)) - }) - } - fn get(&self, ctx: &QueryCtx, params: Self::Params) -> Arc { - let query_id = salsa::QueryId( - self.query_type(), - salsa::InputFingerprint(hash(¶ms)), - ); - let res = ctx.imp.get(query_id, Arc::new(params)); - res.downcast().unwrap() - } -} - -pub(super) struct QueryRegistry { - config: Option>, - names: HashMap, -} - -impl QueryRegistry { - pub(super) fn new() -> QueryRegistry { - let mut config = salsa::QueryConfig::::new(); - config = config.with_ground_query( - FILE_TEXT, Box::new(|state, params| { - let file_id: &FileId = params.downcast_ref().unwrap(); - let res = state.file_map[file_id].clone(); - let fingerprint = salsa::OutputFingerprint(hash(&res)); - (res, fingerprint) - }) - ); - config = config.with_ground_query( - FILE_SET, Box::new(|state, _params| { - let file_ids: Vec = state.file_map.keys().cloned().collect(); - let hash = hash(&file_ids); - let file_resolver = state.file_resolver.clone(); - let res = (file_ids, file_resolver); - let fingerprint = salsa::OutputFingerprint(hash); - (Arc::new(res), fingerprint) - }) - ); - let mut names = HashMap::new(); - names.insert(FILE_TEXT, "FILE_TEXT"); - names.insert(FILE_SET, "FILE_SET"); - QueryRegistry { config: Some(config), names } - } - pub(super) fn add(&mut self, q: Q, name: &'static str) { - let id = q.query_type(); - let prev = self.names.insert(id, name); - assert!(prev.is_none(), "duplicate query: {:?}", id); - let config = self.config.take().unwrap(); - let config = config.with_query(id, q.f()); - self.config= Some(config); - } -} - -fn hash(x: &T) -> u64 { - let mut hasher = DefaultHasher::new(); - x.hash(&mut hasher); - hasher.finish() -} - -const FILE_TEXT: salsa::QueryTypeId = salsa::QueryTypeId(0); -pub(super) fn file_text(ctx: QueryCtx, file_id: FileId) -> Arc { - let query_id = salsa::QueryId( - FILE_TEXT, - salsa::InputFingerprint(hash(&file_id)), - ); - let res = ctx.imp.get(query_id, Arc::new(file_id)); - res.downcast().unwrap() -} - -const FILE_SET: salsa::QueryTypeId = salsa::QueryTypeId(1); -pub(super) fn file_set(ctx: QueryCtx) -> Arc<(Vec, FileResolverImp)> { - let query_id = salsa::QueryId( - FILE_SET, - salsa::InputFingerprint(hash(&())), - ); - let res = ctx.imp.get(query_id, Arc::new(())); - res.downcast().unwrap() -} - diff --git a/crates/libanalysis/src/db/mod.rs b/crates/libanalysis/src/db/mod.rs deleted file mode 100644 index 22769d112..000000000 --- a/crates/libanalysis/src/db/mod.rs +++ /dev/null @@ -1,85 +0,0 @@ -mod imp; - -use std::{ - sync::Arc, -}; -use im; -use salsa; -use {FileId, imp::FileResolverImp}; - -#[derive(Debug, Default, Clone)] -pub(crate) struct State { - pub(crate) file_map: im::HashMap>, - pub(crate) file_resolver: FileResolverImp -} - -#[derive(Debug)] -pub(crate) struct Db { - imp: imp::Db, -} - -#[derive(Clone, Copy)] -pub(crate) struct QueryCtx<'a> { - imp: &'a salsa::QueryCtx, -} - -pub(crate) struct Query(pub(crate) u16, pub(crate) fn(QueryCtx, &T) -> R); - -pub(crate) struct QueryRegistry { - imp: imp::QueryRegistry, -} - -impl Default for Db { - fn default() -> Db { - Db::new() - } -} - -impl Db { - pub(crate) fn new() -> Db { - let reg = QueryRegistry::new(); - Db { imp: imp::Db::new(reg.imp) } - } - pub(crate) fn state(&self) -> &State { - self.imp.imp.ground_data() - } - pub(crate) fn with_changes(&self, new_state: State, changed_files: &[FileId], resolver_changed: bool) -> Db { - Db { imp: self.imp.with_changes(new_state, changed_files, resolver_changed) } - } - pub(crate) fn make_query R, R>(&self, f: F) -> R { - let ctx = QueryCtx { imp: &self.imp.imp.query_ctx() }; - f(ctx) - } - #[allow(unused)] - pub(crate) fn trace_query R, R>(&self, f: F) -> (R, Vec<&'static str>) { - let ctx = QueryCtx { imp: &self.imp.imp.query_ctx() }; - let res = f(ctx); - let trace = self.imp.extract_trace(ctx.imp); - (res, trace) - } -} - -impl<'a> QueryCtx<'a> { - pub(crate) fn get(&self, q: Q, params: Q::Params) -> Arc { - q.get(self, params) - } -} - -pub(crate) fn file_text(ctx: QueryCtx, file_id: FileId) -> Arc { - imp::file_text(ctx, file_id) -} - -pub(crate) fn file_set(ctx: QueryCtx) -> Arc<(Vec, FileResolverImp)> { - imp::file_set(ctx) -} -impl QueryRegistry { - fn new() -> QueryRegistry { - let mut reg = QueryRegistry { imp: imp::QueryRegistry::new() }; - ::queries::register_queries(&mut reg); - ::module_map::register_queries(&mut reg); - reg - } - pub(crate) fn add(&mut self, q: Q, name: &'static str) { - self.imp.add(q, name) - } -} -- cgit v1.2.3