holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove old alias implementation (#8797)

Browse Source
This commit is contained in:
Jakub Žádník
2023-04-07 21:09:38 +03:00
committed by GitHub
parent d881481758
commit 1b677f167e
39 changed files with 387 additions and 1818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
crates/nu-protocol/src/module.rs
View File

@ -1,4 +1,4 @@
use crate::{AliasId, BlockId, DeclId, Span};
use crate::{BlockId, DeclId, Span};
use indexmap::IndexMap;
@ -7,7 +7,6 @@ use indexmap::IndexMap;
pub struct Module {
pub name: Vec<u8>,
pub decls: IndexMap<Vec<u8>, DeclId>,
pub aliases: IndexMap<Vec<u8>, AliasId>,
pub env_block: Option<BlockId>, // `export-env { ... }` block
pub main: Option<DeclId>, // `export def main`
pub span: Option<Span>,
@ -18,7 +17,6 @@ impl Module {
Module {
name,
decls: IndexMap::new(),
aliases: IndexMap::new(),
env_block: None,
main: None,
span: None,
@ -29,7 +27,6 @@ impl Module {
Module {
name,
decls: IndexMap::new(),
aliases: IndexMap::new(),
env_block: None,
main: None,
span: Some(span),
@ -40,31 +37,22 @@ impl Module {
self.decls.insert(name, decl_id)
}
pub fn add_alias(&mut self, name: Vec<u8>, alias_id: AliasId) -> Option<AliasId> {
self.aliases.insert(name, alias_id)
}
pub fn add_env_block(&mut self, block_id: BlockId) {
self.env_block = Some(block_id);
}
pub fn extend(&mut self, other: &Module) {
self.decls.extend(other.decls.clone());
self.aliases.extend(other.aliases.clone());
}
pub fn is_empty(&self) -> bool {
self.decls.is_empty() && self.aliases.is_empty()
self.decls.is_empty()
}
pub fn get_decl_id(&self, name: &[u8]) -> Option<DeclId> {
self.decls.get(name).copied()
}
pub fn get_alias_id(&self, name: &[u8]) -> Option<AliasId> {
self.aliases.get(name).copied()
}
pub fn has_decl(&self, name: &[u8]) -> bool {
if name == self.name && self.main.is_some() {
return true;
@ -73,10 +61,6 @@ impl Module {
self.decls.contains_key(name)
}
pub fn has_alias(&self, name: &[u8]) -> bool {
self.aliases.contains_key(name)
}
pub fn decl_name_with_head(&self, name: &[u8], head: &[u8]) -> Option<Vec<u8>> {
if self.has_decl(name) {
let mut new_name = head.to_vec();
@ -88,17 +72,6 @@ impl Module {
}
}
pub fn alias_name_with_head(&self, name: &[u8], head: &[u8]) -> Option<Vec<u8>> {
if self.has_alias(name) {
let mut new_name = head.to_vec();
new_name.push(b' ');
new_name.extend(name);
Some(new_name)
} else {
None
}
}
pub fn decls_with_head(&self, head: &[u8]) -> Vec<(Vec<u8>, DeclId)> {
let mut result: Vec<(Vec<u8>, DeclId)> = self
.decls
@ -137,30 +110,6 @@ impl Module {
result
}
pub fn aliases_with_head(&self, head: &[u8]) -> Vec<(Vec<u8>, AliasId)> {
self.aliases
.iter()
.map(|(name, id)| {
let mut new_name = head.to_vec();
new_name.push(b' ');
new_name.extend(name);
(new_name, *id)
})
.collect()
}
pub fn alias_names_with_head(&self, head: &[u8]) -> Vec<Vec<u8>> {
self.aliases
.keys()
.map(|name| {
let mut new_name = head.to_vec();
new_name.push(b' ');
new_name.extend(name);
new_name
})
.collect()
}
pub fn decls(&self) -> Vec<(Vec<u8>, DeclId)> {
let mut result: Vec<(Vec<u8>, DeclId)> = self
.decls
@ -184,15 +133,4 @@ impl Module {
result
}
pub fn alias_names(&self) -> Vec<Vec<u8>> {
self.aliases.keys().cloned().collect()
}
pub fn aliases(&self) -> Vec<(Vec<u8>, AliasId)> {
self.aliases
.iter()
.map(|(name, id)| (name.clone(), *id))
.collect()
}
}