Change import pattern delimiter to ::

This commit is contained in:
Jakub Žádník
2021-10-19 22:56:01 +03:00
parent e66fd91045
commit cbda1b1650
3 changed files with 23 additions and 19 deletions

View File

@ -513,7 +513,8 @@ pub fn parse_use(
.into_iter()
.map(|(name, id)| {
let mut new_name = import_pattern.head.to_vec();
new_name.push(b'.');
new_name.push(b':');
new_name.push(b':');
new_name.extend(&name);
(new_name, id)
})
@ -628,7 +629,8 @@ pub fn parse_hide(
.into_iter()
.map(|name| {
let mut new_name = import_pattern.head.to_vec();
new_name.push(b'.');
new_name.push(b':');
new_name.push(b':');
new_name.extend(&name);
new_name
})
@ -639,7 +641,8 @@ pub fn parse_hide(
.filter(|n| n == name)
.map(|n| {
let mut new_name = import_pattern.head.to_vec();
new_name.push(b'.');
new_name.push(b':');
new_name.push(b':');
new_name.extend(&n);
new_name
})
@ -660,7 +663,8 @@ pub fn parse_hide(
.filter_map(|n| if n == name { Some(n.clone()) } else { None })
.map(|n| {
let mut new_name = import_pattern.head.to_vec();
new_name.push(b'.');
new_name.push(b':');
new_name.push(b':');
new_name.extend(n);
new_name
})

View File

@ -1698,7 +1698,7 @@ pub fn parse_import_pattern(
let source = working_set.get_span_contents(span);
let mut error = None;
let (tokens, err) = lex(source, span.start, &[], &[b'.']);
let (tokens, err) = lex(source, span.start, &[], &[b':']);
error = error.or(err);
if tokens.is_empty() {
@ -1713,7 +1713,7 @@ pub fn parse_import_pattern(
let head = working_set.get_span_contents(tokens[0].span).to_vec();
if let Some(tail) = tokens.get(2) {
if let Some(tail) = tokens.get(3) {
// FIXME: expand this to handle deeper imports once we support module imports
let tail_span = tail.span;
let tail = working_set.get_span_contents(tail.span);