ProvableHQ/leo
1
1
Fork 0
mirror of https://github.com/ProvableHQ/leo.git synced 2024-12-25 11:12:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix package names

Browse Source
This commit is contained in:
Protryon 2021-03-05 09:15:37 -08:00
parent ed41a55c47
commit e492950106
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
parser/src/parser/file.rs
View File

@ -162,18 +162,35 @@ impl ParserContext {
pub fn parse_package_name(&mut self) -> SyntaxResult<Identifier> {
// Build the package name, starting with valid characters up to a dash `-` (Token::Minus).
let mut base = self.expect_loose_identifier()?;
let mut base = self.expect_loose_ident()?;
// Build the rest of the package name including dashes.
while let Some(token) = self.eat(Token::Minus) {
if token.span.line_start == base.span.line_stop && token.span.col_start == base.span.col_stop {
base.name += "-";
base.span = base.span + token.span;
let next = self.expect_loose_identifier()?;
base.name += &next.name;
base.span = base.span + next.span;
} else {
break;
loop {
match &self.peek()?.token {
Token::Minus => {
let span = self.expect(Token::Minus)?;
base.name += "-";
base.span = base.span + span;
let next = self.expect_loose_ident()?;
base.name += &next.name;
base.span = base.span + next.span;
},
Token::Int(_) => {
let (num, span) = self.eat_int().unwrap();
base.name += &num.value;
base.span = base.span + span;
},
Token::Ident(_) => {
let next = self.expect_ident()?;
base.name += &next.name;
base.span = base.span + next.span;
},
x if KEYWORD_TOKENS.contains(&x) => {
let next = self.expect_loose_ident()?;
base.name += &next.name;
base.span = base.span + next.span;
},
_ => break,
}
}