kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Remove ASTFlags::EMPTY.

Browse Source
This commit is contained in:
Stephen Chung 2023-03-22 10:19:30 +08:00
parent 7caf80e27c
commit 3d4a278f2e
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ast/expr.rs
View File

@ -620,7 +620,7 @@ impl Expr {
Self::Index(_, options, _) | Self::Dot(_, options, _) => *options, Self::Index(_, options, _) | Self::Dot(_, options, _) => *options,
#[cfg(not(feature = "no_float"))] #[cfg(not(feature = "no_float"))]
Self::FloatConstant(..) => ASTFlags::NONE, Self::FloatConstant(..) => ASTFlags::empty(),
Self::DynamicConstant(..) Self::DynamicConstant(..)
| Self::BoolConstant(..) | Self::BoolConstant(..)
@ -638,10 +638,10 @@ impl Expr {
| Self::MethodCall(..) | Self::MethodCall(..)
| Self::InterpolatedString(..) | Self::InterpolatedString(..)
| Self::Property(..) | Self::Property(..)
| Self::Stmt(..) => ASTFlags::NONE, | Self::Stmt(..) => ASTFlags::empty(),
#[cfg(not(feature = "no_custom_syntax"))] #[cfg(not(feature = "no_custom_syntax"))]
Self::Custom(..) => ASTFlags::NONE, Self::Custom(..) => ASTFlags::empty(),
} }
} }
/// Get the [position][Position] of the expression. /// Get the [position][Position] of the expression.

2
src/ast/flags.rs
View File

@ -41,8 +41,6 @@ bitflags! {
/// _(internals)_ Bit-flags containing [`AST`][crate::AST] node configuration options. /// _(internals)_ Bit-flags containing [`AST`][crate::AST] node configuration options.
/// Exported under the `internals` feature only. /// Exported under the `internals` feature only.
pub struct ASTFlags: u8 { pub struct ASTFlags: u8 {
/// No options for the [`AST`][crate::AST] node.
const NONE = 0b_0000_0000;
/// The [`AST`][crate::AST] node is read-only. /// The [`AST`][crate::AST] node is read-only.
const CONSTANT = 0b_0000_0001; const CONSTANT = 0b_0000_0001;
/// The [`AST`][crate::AST] node is exposed to the outside (i.e. public). /// The [`AST`][crate::AST] node is exposed to the outside (i.e. public).

6
src/ast/stmt.rs
View File

@ -779,13 +779,13 @@ impl Stmt {
| Self::While(..) | Self::While(..)
| Self::For(..) | Self::For(..)
| Self::TryCatch(..) | Self::TryCatch(..)
| Self::Assignment(..) => ASTFlags::NONE, | Self::Assignment(..) => ASTFlags::empty(),
#[cfg(not(feature = "no_module"))] #[cfg(not(feature = "no_module"))]
Self::Import(..) | Self::Export(..) => ASTFlags::NONE, Self::Import(..) | Self::Export(..) => ASTFlags::empty(),
#[cfg(not(feature = "no_closure"))] #[cfg(not(feature = "no_closure"))]
Self::Share(..) => ASTFlags::NONE, Self::Share(..) => ASTFlags::empty(),
} }
} }
/// Get the [position][Position] of this statement. /// Get the [position][Position] of this statement.

18
src/parser.rs
View File

@ -864,7 +864,7 @@ impl Engine {
let settings = settings.level_up()?; let settings = settings.level_up()?;
// Recursively parse the indexing chain, right-binding each // Recursively parse the indexing chain, right-binding each
let options = match token { let options = match token {
Token::LeftBracket => ASTFlags::NONE, Token::LeftBracket => ASTFlags::empty(),
Token::QuestionBracket => ASTFlags::NEGATED, Token::QuestionBracket => ASTFlags::NEGATED,
_ => unreachable!("`[` or `?[`"), _ => unreachable!("`[` or `?[`"),
}; };
@ -1810,7 +1810,7 @@ impl Engine {
#[cfg(not(feature = "no_index"))] #[cfg(not(feature = "no_index"))]
(expr, token @ (Token::LeftBracket | Token::QuestionBracket)) => { (expr, token @ (Token::LeftBracket | Token::QuestionBracket)) => {
let opt = match token { let opt = match token {
Token::LeftBracket => ASTFlags::NONE, Token::LeftBracket => ASTFlags::empty(),
Token::QuestionBracket => ASTFlags::NEGATED, Token::QuestionBracket => ASTFlags::NEGATED,
_ => unreachable!("`[` or `?[`"), _ => unreachable!("`[` or `?[`"),
}; };
@ -1834,7 +1834,7 @@ impl Engine {
} }
let op_flags = match op { let op_flags = match op {
Token::Period => ASTFlags::NONE, Token::Period => ASTFlags::empty(),
Token::Elvis => ASTFlags::NEGATED, Token::Elvis => ASTFlags::NEGATED,
_ => unreachable!("`.` or `?.`"), _ => unreachable!("`.` or `?.`"),
}; };
@ -1842,7 +1842,7 @@ impl Engine {
let rhs = let rhs =
self.parse_primary(input, state, lib, settings.level_up()?, options)?; self.parse_primary(input, state, lib, settings.level_up()?, options)?;
Self::make_dot_expr(state, expr, rhs, ASTFlags::NONE, op_flags, tail_pos)? Self::make_dot_expr(state, expr, rhs, ASTFlags::empty(), op_flags, tail_pos)?
} }
// Unknown postfix operator // Unknown postfix operator
(expr, token) => { (expr, token) => {
@ -2141,7 +2141,7 @@ impl Engine {
{ {
let options = options | parent_options; let options = options | parent_options;
x.rhs = Self::make_dot_expr(state, x.rhs, rhs, options, op_flags, op_pos)?; x.rhs = Self::make_dot_expr(state, x.rhs, rhs, options, op_flags, op_pos)?;
Ok(Expr::Index(x, ASTFlags::NONE, pos)) Ok(Expr::Index(x, ASTFlags::empty(), pos))
} }
// lhs.module::id - syntax error // lhs.module::id - syntax error
#[cfg(not(feature = "no_module"))] #[cfg(not(feature = "no_module"))]
@ -2770,7 +2770,7 @@ impl Engine {
let body = self.parse_block(input, state, lib, settings)?.into(); let body = self.parse_block(input, state, lib, settings)?.into();
let negated = match input.next().expect(NEVER_ENDS) { let negated = match input.next().expect(NEVER_ENDS) {
(Token::While, ..) => ASTFlags::NONE, (Token::While, ..) => ASTFlags::empty(),
(Token::Until, ..) => ASTFlags::NEGATED, (Token::Until, ..) => ASTFlags::NEGATED,
(.., pos) => { (.., pos) => {
return Err( return Err(
@ -2966,7 +2966,7 @@ impl Engine {
let export = if is_export { let export = if is_export {
ASTFlags::EXPORTED ASTFlags::EXPORTED
} else { } else {
ASTFlags::NONE ASTFlags::empty()
}; };
let (existing, hit_barrier) = state.find_var(&name); let (existing, hit_barrier) = state.find_var(&name);
@ -3433,7 +3433,7 @@ impl Engine {
if self.allow_looping() && settings.has_flag(ParseSettingFlags::BREAKABLE) => if self.allow_looping() && settings.has_flag(ParseSettingFlags::BREAKABLE) =>
{ {
let pos = eat_token(input, Token::Continue); let pos = eat_token(input, Token::Continue);
Ok(Stmt::BreakLoop(None, ASTFlags::NONE, pos)) Ok(Stmt::BreakLoop(None, ASTFlags::empty(), pos))
} }
Token::Break Token::Break
if self.allow_looping() && settings.has_flag(ParseSettingFlags::BREAKABLE) => if self.allow_looping() && settings.has_flag(ParseSettingFlags::BREAKABLE) =>
@ -3465,7 +3465,7 @@ impl Engine {
.next() .next()
.map(|(token, pos)| { .map(|(token, pos)| {
let flags = match token { let flags = match token {
Token::Return => ASTFlags::NONE, Token::Return => ASTFlags::empty(),
Token::Throw => ASTFlags::BREAK, Token::Throw => ASTFlags::BREAK,
token => unreachable!( token => unreachable!(
"Token::Return or Token::Throw expected but gets {:?}", "Token::Return or Token::Throw expected but gets {:?}",