extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 13:26:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix panic on double def; Tests; Double def error

Browse Source 
* Fixes a panic with defining two commands with the same name caused by
  declaration not found after predeclaration.
* Adds a new error if a custom command is defined more than once in one
  block.
* Add some tests
This commit is contained in:
Jakub Žádník
2021-10-01 23:16:27 +03:00
parent 2af8116f50
commit 25b05dec9e
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/nu-protocol/src/engine/engine_state.rs
View File

@ -311,17 +311,13 @@ impl<'a> StateWorkingSet<'a> {
decl_id
}
pub fn add_predecl(&mut self, decl: Box<dyn Command>) {
pub fn add_predecl(&mut self, decl: Box<dyn Command>) -> Option<DeclId> {
let name = decl.name().as_bytes().to_vec();
self.delta.decls.push(decl);
let decl_id = self.num_decls() - 1;
self.delta.predecls.insert(name, decl_id);
}
pub fn find_predecl(&mut self, name: &[u8]) -> Option<DeclId> {
self.delta.predecls.get(name).copied()
self.delta.predecls.insert(name, decl_id)
}
pub fn merge_predecl(&mut self, name: &[u8]) -> Option<DeclId> {