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

make some changes to semantics of function names

Browse Source
This commit is contained in:
gluax 2022-01-31 14:13:15 -08:00
parent e8ffe7ff9d
commit 437e06d0d3
3 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
parser/src/parser/context.rs
View File

@ -67,7 +67,7 @@ impl<'a> ParserContext<'a> {
}
/// Returns the current token if there is one.
pub fn curr(&self) -> Option<&SpannedToken> {
pub fn peek_option(&self) -> Option<&SpannedToken> {
self.tokens.last()
}
@ -84,25 +84,24 @@ impl<'a> ParserContext<'a> {
}
///
/// Returns a reference to the next next token or error if it does not exist.
/// Returns a reference to the next SpannedToken or error if it does not exist.
///
pub fn peek_next(&self) -> Result<&SpannedToken> {
self.tokens.get(self.tokens.len() - 2).ok_or_else(|| self.eof())
}
///
/// Returns a reference to the next SpannedToken or error if it does not exist.
/// Returns a reference to the current SpannedToken or error if it does not exist.
///
pub fn peek(&self) -> Result<&SpannedToken> {
self.curr().ok_or_else(|| self.eof())
self.tokens.last().ok_or_else(|| self.eof())
}
///
/// Returns a reference to the next Token.
///
pub fn peek_token(&self) -> Cow<'_, Token> {
self.tokens
.last()
self.peek_option()
.map(|x| &x.token)
.map(Cow::Borrowed)
.unwrap_or_else(|| Cow::Owned(Token::Eof))
@ -125,7 +124,7 @@ impl<'a> ParserContext<'a> {
/// the next token does not exist.
///
pub fn eat(&mut self, token: Token) -> Option<SpannedToken> {
if let Some(SpannedToken { token: inner, .. }) = self.curr() {
if let Some(SpannedToken { token: inner, .. }) = self.peek_option() {
if &token == inner {
return self.bump();
}
@ -147,7 +146,7 @@ impl<'a> ParserContext<'a> {
pub fn eat_identifier(&mut self) -> Option<Identifier> {
if let Some(SpannedToken {
token: Token::Ident(_), ..
}) = self.curr()
}) = self.peek_option()
{
if let SpannedToken {
token: Token::Ident(name),
@ -156,7 +155,7 @@ impl<'a> ParserContext<'a> {
{
return Some(Identifier { name, span });
} else {
unreachable!("Impossible to reach area, unless a change broke the parser.")
unreachable!("eat_identifier_ shouldn't produce this")
}
}
None
@ -285,7 +284,7 @@ impl<'a> ParserContext<'a> {
pub fn eat_int(&mut self) -> Option<(PositiveNumber, Span)> {
if let Some(SpannedToken {
token: Token::Int(_), ..
}) = self.curr()
}) = self.peek_option()
{
if let SpannedToken {
token: Token::Int(value),
@ -294,7 +293,7 @@ impl<'a> ParserContext<'a> {
{
return Some((PositiveNumber { value }, span));
} else {
unreachable!("Impossible to reach area, unless a change broke the parser.")
unreachable!("eat_int_ shouldn't produce this")
}
}
None
@ -305,7 +304,7 @@ impl<'a> ParserContext<'a> {
/// the next token does not exist.
///
pub fn eat_any(&mut self, token: &[Token]) -> Option<SpannedToken> {
if let Some(SpannedToken { token: inner, .. }) = self.curr() {
if let Some(SpannedToken { token: inner, .. }) = self.peek_option() {
if token.iter().any(|x| x == inner) {
return self.bump();
}
@ -317,7 +316,7 @@ impl<'a> ParserContext<'a> {
/// Returns the span of the next token if it is equal to the given [`Token`], or error.
///
pub fn expect(&mut self, token: Token) -> Result<Span> {
if let Some(SpannedToken { token: inner, span }) = self.curr() {
if let Some(SpannedToken { token: inner, span }) = self.peek_option() {
if &token == inner {
Ok(self.bump().unwrap().span)
} else {
@ -332,7 +331,7 @@ impl<'a> ParserContext<'a> {
/// Returns the span of the next token if it is equal to one of the given [`Token`]s, or error.
///
pub fn expect_oneof(&mut self, token: &[Token]) -> Result<SpannedToken> {
if let Some(SpannedToken { token: inner, span }) = self.curr() {
if let Some(SpannedToken { token: inner, span }) = self.peek_option() {
if token.iter().any(|x| x == inner) {
Ok(self.bump().unwrap())
} else {
@ -368,7 +367,7 @@ impl<'a> ParserContext<'a> {
/// Returns the [`Identifier`] of the next token if it is an [`Identifier`], or error.
pub fn expect_ident(&mut self) -> Result<Identifier> {
if let Some(SpannedToken { token: inner, span }) = self.curr() {
if let Some(SpannedToken { token: inner, span }) = self.peek_option() {
if let Token::Ident(_) = inner {
if let SpannedToken {
token: Token::Ident(name),
@ -377,7 +376,7 @@ impl<'a> ParserContext<'a> {
{
Ok(Identifier { name, span })
} else {
unreachable!("Impossible to reach area, unless a change broke the parser.")
unreachable!("expect_ident_ shouldn't produce this")
}
} else {
Err(ParserError::unexpected_str(inner, "ident", span).into())
@ -444,6 +443,6 @@ impl<'a> ParserContext<'a> {
/// Returns true if the current token is `(`.
pub(super) fn peek_is_left_par(&self) -> bool {
matches!(self.curr().map(|t| &t.token), Some(Token::LeftParen))
matches!(self.peek_option().map(|t| &t.token), Some(Token::LeftParen))
}
}

12
parser/src/parser/expression.rs
View File

@ -134,7 +134,7 @@ impl ParserContext<'_> {
let op = match op {
Token::Eq => BinaryOperation::Eq,
Token::NotEq => BinaryOperation::Ne,
_ => unreachable!("Impossible to reach area, unless a change broke the parser."),
_ => unreachable!("parse_equality_expression_ shouldn't produce this"),
};
expr = Self::bin_expr(expr, right, op);
}
@ -155,7 +155,7 @@ impl ParserContext<'_> {
Token::LtEq => BinaryOperation::Le,
Token::Gt => BinaryOperation::Gt,
Token::GtEq => BinaryOperation::Ge,
_ => unreachable!("Impossible to reach area, unless a change broke the parser."),
_ => unreachable!("parse_ordering_expression_ shouldn't produce this"),
};
expr = Self::bin_expr(expr, right, op);
}
@ -173,7 +173,7 @@ impl ParserContext<'_> {
let op = match op {
Token::Add => BinaryOperation::Add,
Token::Minus => BinaryOperation::Sub,
_ => unreachable!("Impossible to reach area, unless a change broke the parser."),
_ => unreachable!("parse_additive_expression_ shouldn't produce this"),
};
expr = Self::bin_expr(expr, right, op);
}
@ -191,7 +191,7 @@ impl ParserContext<'_> {
let op = match op {
Token::Mul => BinaryOperation::Mul,
Token::Div => BinaryOperation::Div,
_ => unreachable!("Impossible to reach area, unless a change broke the parser."),
_ => unreachable!("parse_multiplicative_expression_ shouldn't produce this"),
};
expr = Self::bin_expr(expr, right, op);
}
@ -248,7 +248,7 @@ impl ParserContext<'_> {
let operation = match op.token {
Token::Not => UnaryOperation::Not,
Token::Minus => UnaryOperation::Negate,
_ => unreachable!("Impossible to reach area, unless a change broke the parser."),
_ => unreachable!("parse_unary_expression_ shouldn't produce this"),
};
// hack for const signed integer overflow issues
if matches!(operation, UnaryOperation::Negate) {
@ -379,7 +379,7 @@ impl ParserContext<'_> {
name: ident,
}));
}
_ => unreachable!("Impossible to reach area, unless a change broke the parser."),
_ => unreachable!("parse_postfix_expression_ shouldn't produce this"),
}
}
Ok(expr)

4
parser/src/parser/statement.rs
View File

@ -115,7 +115,7 @@ impl ParserContext<'_> {
Token::MulEq => AssignOperation::Mul,
Token::DivEq => AssignOperation::Div,
Token::ExpEq => AssignOperation::Pow,
_ => unreachable!("Impossible to reach area, unless a change broke the parser."),
_ => unreachable!("parse_assign_statement_ shouldn't produce this"),
},
value,
})))
@ -317,7 +317,7 @@ impl ParserContext<'_> {
declaration_type: match declare.token {
Token::Let => Declare::Let,
Token::Const => Declare::Const,
_ => unreachable!("Impossible to reach area, unless a change broke the parser."),
_ => unreachable!("parse_definition_statement_ shouldn't produce this"),
},
variable_names,
type_,