forked from extern/nushell
<!-- if this PR closes one or more issues, you can automatically link the PR with them by using one of the [*linking keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), e.g. - this PR should close #xxxx - fixes #xxxx you can also mention related issues, PRs or discussions! --> # Description <!-- Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes. Description of your pull request goes here. **Provide examples and/or screenshots** if your changes affect the user experience. --> Relative: #8248 After this pr, user can define const variable inside a module.  And user can export const variables, the following screenshot shows how it works (it follows https://github.com/nushell/nushell/issues/8248#issuecomment-1637442612):  ## About the change 1. To make module support const, we need to change `parse_module_block` to support `const` keyword. 2. To suport export `const`, we need to make module tracking variables, so we add `variables` attribute to `Module` 3. During eval, the const variable may not exists in `stack`, because we don't eval `const` when we define a module, so we need to find variables which are already registered in `engine_state` ## One more thing to note about the const value. Consider the following code ``` module foo { const b = 3; export def bar [] { $b } } use foo bar const b = 4; bar ``` The result will be 3 (which is defined in module) rather than 4. I think it's expected behavior. It's something like [dynamic binding](https://www.gnu.org/software/emacs/manual/html_node/elisp/Dynamic-Binding-Tips.html) vs [lexical binding](https://www.gnu.org/software/emacs/manual/html_node/elisp/Lexical-Binding.html) in lisp like language, and lexical binding should be right behavior which generates more predicable result, and it doesn't introduce really subtle bugs in nushell code. What if user want dynamic-binding?(For example: the example code returns `4`) There is no way to do this, user should consider passing the value as argument to custom command rather than const. ## TODO - [X] adding tests for the feature. - [X] support export const out of module to use. # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # Tests + Formatting <!-- Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect -A clippy::result_large_err` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass - `cargo run -- -c "use std testing; testing run-tests --path crates/nu-std"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
322 lines
10 KiB
Rust
322 lines
10 KiB
Rust
use crate::{
|
|
ast::ImportPatternMember, engine::StateWorkingSet, BlockId, DeclId, ModuleId, ParseError, Span,
|
|
VarId,
|
|
};
|
|
|
|
use indexmap::IndexMap;
|
|
|
|
pub struct ResolvedImportPattern {
|
|
pub decls: Vec<(Vec<u8>, DeclId)>,
|
|
pub modules: Vec<(Vec<u8>, ModuleId)>,
|
|
pub variables: Vec<(Vec<u8>, VarId)>,
|
|
}
|
|
|
|
impl ResolvedImportPattern {
|
|
pub fn new(
|
|
decls: Vec<(Vec<u8>, DeclId)>,
|
|
modules: Vec<(Vec<u8>, ModuleId)>,
|
|
variables: Vec<(Vec<u8>, VarId)>,
|
|
) -> Self {
|
|
ResolvedImportPattern {
|
|
decls,
|
|
modules,
|
|
variables,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Collection of definitions that can be exported from a module
|
|
#[derive(Debug, Clone)]
|
|
pub struct Module {
|
|
pub name: Vec<u8>,
|
|
pub decls: IndexMap<Vec<u8>, DeclId>,
|
|
pub submodules: IndexMap<Vec<u8>, ModuleId>,
|
|
pub variables: IndexMap<Vec<u8>, VarId>,
|
|
pub env_block: Option<BlockId>, // `export-env { ... }` block
|
|
pub main: Option<DeclId>, // `export def main`
|
|
pub span: Option<Span>,
|
|
}
|
|
|
|
impl Module {
|
|
pub fn new(name: Vec<u8>) -> Self {
|
|
Module {
|
|
name,
|
|
decls: IndexMap::new(),
|
|
submodules: IndexMap::new(),
|
|
variables: IndexMap::new(),
|
|
env_block: None,
|
|
main: None,
|
|
span: None,
|
|
}
|
|
}
|
|
|
|
pub fn from_span(name: Vec<u8>, span: Span) -> Self {
|
|
Module {
|
|
name,
|
|
decls: IndexMap::new(),
|
|
submodules: IndexMap::new(),
|
|
variables: IndexMap::new(),
|
|
env_block: None,
|
|
main: None,
|
|
span: Some(span),
|
|
}
|
|
}
|
|
|
|
pub fn name(&self) -> Vec<u8> {
|
|
self.name.clone()
|
|
}
|
|
|
|
pub fn add_decl(&mut self, name: Vec<u8>, decl_id: DeclId) -> Option<DeclId> {
|
|
self.decls.insert(name, decl_id)
|
|
}
|
|
|
|
pub fn add_submodule(&mut self, name: Vec<u8>, module_id: ModuleId) -> Option<ModuleId> {
|
|
self.submodules.insert(name, module_id)
|
|
}
|
|
|
|
pub fn add_variable(&mut self, name: Vec<u8>, var_id: VarId) -> Option<VarId> {
|
|
self.variables.insert(name, var_id)
|
|
}
|
|
|
|
pub fn add_env_block(&mut self, block_id: BlockId) {
|
|
self.env_block = Some(block_id);
|
|
}
|
|
|
|
pub fn has_decl(&self, name: &[u8]) -> bool {
|
|
if name == self.name && self.main.is_some() {
|
|
return true;
|
|
}
|
|
|
|
self.decls.contains_key(name)
|
|
}
|
|
|
|
pub fn resolve_import_pattern(
|
|
&self,
|
|
working_set: &StateWorkingSet,
|
|
self_id: ModuleId,
|
|
members: &[ImportPatternMember],
|
|
name_override: Option<&[u8]>, // name under the module was stored (doesn't have to be the
|
|
// same as self.name)
|
|
) -> (ResolvedImportPattern, Vec<ParseError>) {
|
|
let final_name = name_override.unwrap_or(&self.name).to_vec();
|
|
|
|
let (head, rest) = if let Some((head, rest)) = members.split_first() {
|
|
(head, rest)
|
|
} else {
|
|
// Import pattern was just name without any members
|
|
let mut decls = vec![];
|
|
let mut vars = vec![];
|
|
let mut errors = vec![];
|
|
|
|
for (_, id) in &self.submodules {
|
|
let submodule = working_set.get_module(*id);
|
|
let (sub_results, sub_errors) =
|
|
submodule.resolve_import_pattern(working_set, *id, &[], None);
|
|
errors.extend(sub_errors);
|
|
|
|
for (sub_name, sub_decl_id) in sub_results.decls {
|
|
let mut new_name = final_name.clone();
|
|
new_name.push(b' ');
|
|
new_name.extend(sub_name);
|
|
|
|
decls.push((new_name, sub_decl_id));
|
|
}
|
|
|
|
for (sub_name, sub_var_id) in sub_results.variables {
|
|
vars.push((sub_name, sub_var_id));
|
|
}
|
|
}
|
|
|
|
decls.extend(self.decls_with_head(&final_name));
|
|
vars.extend(self.vars());
|
|
|
|
return (
|
|
ResolvedImportPattern::new(decls, vec![(final_name, self_id)], vars),
|
|
errors,
|
|
);
|
|
};
|
|
|
|
match head {
|
|
ImportPatternMember::Name { name, span } => {
|
|
if name == b"main" {
|
|
if let Some(main_decl_id) = self.main {
|
|
(
|
|
ResolvedImportPattern::new(
|
|
vec![(final_name, main_decl_id)],
|
|
vec![],
|
|
vec![],
|
|
),
|
|
vec![],
|
|
)
|
|
} else {
|
|
(
|
|
ResolvedImportPattern::new(vec![], vec![], vec![]),
|
|
vec![ParseError::ExportNotFound(*span)],
|
|
)
|
|
}
|
|
} else if let Some(decl_id) = self.decls.get(name) {
|
|
(
|
|
ResolvedImportPattern::new(vec![(name.clone(), *decl_id)], vec![], vec![]),
|
|
vec![],
|
|
)
|
|
} else if let Some(var_id) = self.variables.get(name) {
|
|
(
|
|
ResolvedImportPattern::new(vec![], vec![], vec![(name.clone(), *var_id)]),
|
|
vec![],
|
|
)
|
|
} else if let Some(submodule_id) = self.submodules.get(name) {
|
|
let submodule = working_set.get_module(*submodule_id);
|
|
submodule.resolve_import_pattern(working_set, *submodule_id, rest, None)
|
|
} else {
|
|
(
|
|
ResolvedImportPattern::new(vec![], vec![], vec![]),
|
|
vec![ParseError::ExportNotFound(*span)],
|
|
)
|
|
}
|
|
}
|
|
ImportPatternMember::Glob { .. } => {
|
|
let mut decls = vec![];
|
|
let mut submodules = vec![];
|
|
let mut variables = vec![];
|
|
let mut errors = vec![];
|
|
|
|
for (_, id) in &self.submodules {
|
|
let submodule = working_set.get_module(*id);
|
|
let (sub_results, sub_errors) =
|
|
submodule.resolve_import_pattern(working_set, *id, &[], None);
|
|
decls.extend(sub_results.decls);
|
|
|
|
submodules.extend(sub_results.modules);
|
|
variables.extend(sub_results.variables);
|
|
errors.extend(sub_errors);
|
|
}
|
|
|
|
decls.extend(self.decls());
|
|
variables.extend(self.variables.clone());
|
|
submodules.extend(self.submodules());
|
|
|
|
(
|
|
ResolvedImportPattern::new(decls, submodules, variables),
|
|
errors,
|
|
)
|
|
}
|
|
ImportPatternMember::List { names } => {
|
|
let mut decls = vec![];
|
|
let mut submodules = vec![];
|
|
let mut variables = vec![];
|
|
let mut errors = vec![];
|
|
|
|
for (name, span) in names {
|
|
if name == b"main" {
|
|
if let Some(main_decl_id) = self.main {
|
|
decls.push((final_name.clone(), main_decl_id));
|
|
} else {
|
|
errors.push(ParseError::ExportNotFound(*span));
|
|
}
|
|
} else if let Some(decl_id) = self.decls.get(name) {
|
|
decls.push((name.clone(), *decl_id));
|
|
} else if let Some(var_id) = self.variables.get(name) {
|
|
variables.push((name.clone(), *var_id));
|
|
} else if let Some(submodule_id) = self.submodules.get(name) {
|
|
submodules.push((name.clone(), *submodule_id));
|
|
} else {
|
|
errors.push(ParseError::ExportNotFound(*span));
|
|
}
|
|
}
|
|
|
|
(
|
|
ResolvedImportPattern::new(decls, submodules, variables),
|
|
errors,
|
|
)
|
|
}
|
|
}
|
|
}
|
|
|
|
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();
|
|
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
|
|
.iter()
|
|
.map(|(name, id)| {
|
|
let mut new_name = head.to_vec();
|
|
new_name.push(b' ');
|
|
new_name.extend(name);
|
|
(new_name, *id)
|
|
})
|
|
.collect();
|
|
|
|
if let Some(decl_id) = self.main {
|
|
result.push((self.name.clone(), decl_id));
|
|
}
|
|
|
|
result
|
|
}
|
|
|
|
pub fn vars(&self) -> Vec<(Vec<u8>, VarId)> {
|
|
self.variables
|
|
.iter()
|
|
.map(|(name, id)| (name.to_vec(), *id))
|
|
.collect()
|
|
}
|
|
|
|
pub fn decl_names_with_head(&self, head: &[u8]) -> Vec<Vec<u8>> {
|
|
let mut result: Vec<Vec<u8>> = self
|
|
.decls
|
|
.keys()
|
|
.map(|name| {
|
|
let mut new_name = head.to_vec();
|
|
new_name.push(b' ');
|
|
new_name.extend(name);
|
|
new_name
|
|
})
|
|
.collect();
|
|
|
|
if self.main.is_some() {
|
|
result.push(self.name.clone());
|
|
}
|
|
|
|
result
|
|
}
|
|
|
|
pub fn decls(&self) -> Vec<(Vec<u8>, DeclId)> {
|
|
let mut result: Vec<(Vec<u8>, DeclId)> = self
|
|
.decls
|
|
.iter()
|
|
.map(|(name, id)| (name.clone(), *id))
|
|
.collect();
|
|
|
|
if let Some(decl_id) = self.main {
|
|
result.push((self.name.clone(), decl_id));
|
|
}
|
|
|
|
result
|
|
}
|
|
|
|
pub fn submodules(&self) -> Vec<(Vec<u8>, ModuleId)> {
|
|
self.submodules
|
|
.iter()
|
|
.map(|(name, id)| (name.clone(), *id))
|
|
.collect()
|
|
}
|
|
|
|
pub fn decl_names(&self) -> Vec<Vec<u8>> {
|
|
let mut result: Vec<Vec<u8>> = self.decls.keys().cloned().collect();
|
|
|
|
if self.main.is_some() {
|
|
result.push(self.name.clone());
|
|
}
|
|
|
|
result
|
|
}
|
|
}
|