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

Use bitflag options for chains parsing.

Browse Source
This commit is contained in:
Stephen Chung 2023-01-30 12:31:33 +08:00
parent 9f966f6473
commit 6400b33b1b
2 changed files with 48 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/func/call.rs
View File

@ -11,7 +11,7 @@ use crate::eval::{Caches, FnResolutionCacheEntry, GlobalRuntimeState};
use crate::tokenizer::{is_valid_function_name, Token}; use crate::tokenizer::{is_valid_function_name, Token};
use crate::{ use crate::{
calc_fn_hash, calc_fn_hash_full, Dynamic, Engine, FnArgsVec, FnPtr, ImmutableString, calc_fn_hash, calc_fn_hash_full, Dynamic, Engine, FnArgsVec, FnPtr, ImmutableString,
OptimizationLevel, Position, RhaiError, RhaiResult, RhaiResultOf, Scope, Shared, ERR, OptimizationLevel, Position, RhaiResult, RhaiResultOf, Scope, Shared, ERR,
}; };
#[cfg(feature = "no_std")] #[cfg(feature = "no_std")]
use hashbrown::hash_map::Entry; use hashbrown::hash_map::Entry;
@ -1053,7 +1053,7 @@ impl Engine {
let mut arg_values = curry let mut arg_values = curry
.into_iter() .into_iter()
.map(Ok) .map(Ok)
.chain(a_expr.iter().map(|expr| -> Result<_, RhaiError> { .chain(a_expr.iter().map(|expr| -> Result<_, crate::RhaiError> {
let this_ptr = this_ptr.as_deref_mut(); let this_ptr = this_ptr.as_deref_mut();
self.get_arg_value(global, caches, scope, this_ptr, expr) self.get_arg_value(global, caches, scope, this_ptr, expr)
.map(|(v, ..)| v) .map(|(v, ..)| v)

101
src/parser.rs
View File

@ -67,13 +67,12 @@ pub struct ParseState<'e, 's> {
pub external_vars: Option<Box<crate::FnArgsVec<Ident>>>, pub external_vars: Option<Box<crate::FnArgsVec<Ident>>>,
/// An indicator that, when set to `false`, disables variable capturing into externals one /// An indicator that, when set to `false`, disables variable capturing into externals one
/// single time up until the nearest consumed Identifier token. /// single time up until the nearest consumed Identifier token.
/// If set to false the next call to [`access_var`][ParseState::access_var] will not capture the ///
/// variable. All consequent calls to [`access_var`][ParseState::access_var] will not be affected. /// If set to `false` the next call to [`access_var`][ParseState::access_var] will not capture
#[cfg(not(feature = "no_closure"))] /// the variable.
///
/// All consequent calls to [`access_var`][ParseState::access_var] will not be affected.
pub allow_capture: bool, pub allow_capture: bool,
/// If set to `false`, no namespace-qualified identifiers are parsed.
#[cfg(not(feature = "no_module"))]
pub allow_namespace: bool,
/// Encapsulates a local stack with imported [module][crate::Module] names. /// Encapsulates a local stack with imported [module][crate::Module] names.
#[cfg(not(feature = "no_module"))] #[cfg(not(feature = "no_module"))]
pub imports: Option<Box<StaticVec<ImmutableString>>>, pub imports: Option<Box<StaticVec<ImmutableString>>>,
@ -101,8 +100,7 @@ impl fmt::Debug for ParseState<'_, '_> {
#[cfg(not(feature = "no_module"))] #[cfg(not(feature = "no_module"))]
f.field("imports", &self.imports) f.field("imports", &self.imports)
.field("global_imports", &self.global_imports) .field("global_imports", &self.global_imports);
.field("allow_namespace", &self.allow_namespace);
f.finish() f.finish()
} }
@ -122,10 +120,7 @@ impl<'e, 's> ParseState<'e, 's> {
expr_filter: |_| true, expr_filter: |_| true,
#[cfg(not(feature = "no_closure"))] #[cfg(not(feature = "no_closure"))]
external_vars: None, external_vars: None,
#[cfg(not(feature = "no_closure"))]
allow_capture: true, allow_capture: true,
#[cfg(not(feature = "no_module"))]
allow_namespace: true,
interned_strings, interned_strings,
external_constants, external_constants,
global: None, global: None,
@ -302,11 +297,8 @@ bitflags! {
/// Is the construct being parsed located at global level? /// Is the construct being parsed located at global level?
const GLOBAL_LEVEL = 0b0000_0001; const GLOBAL_LEVEL = 0b0000_0001;
/// Is the construct being parsed located inside a function definition? /// Is the construct being parsed located inside a function definition?
#[cfg(not(feature = "no_function"))]
const FN_SCOPE = 0b0000_0010; const FN_SCOPE = 0b0000_0010;
/// Is the construct being parsed located inside a closure definition? /// Is the construct being parsed located inside a closure definition?
#[cfg(not(feature = "no_function"))]
#[cfg(not(feature = "no_closure"))]
const CLOSURE_SCOPE = 0b0000_0100; const CLOSURE_SCOPE = 0b0000_0100;
/// Is the construct being parsed located inside a breakable loop? /// Is the construct being parsed located inside a breakable loop?
const BREAKABLE = 0b0000_1000; const BREAKABLE = 0b0000_1000;
@ -318,6 +310,16 @@ bitflags! {
} }
} }
bitflags! {
/// Bit-flags containing all status for parsing property/indexing/namespace chains.
struct ChainingFlags: u8 {
/// Is the construct being parsed a property?
const PROPERTY = 0b0000_0001;
/// Disallow namespaces?
const DISALLOW_NAMESPACES = 0b0000_0010;
}
}
/// A type that encapsulates all the settings for a particular parsing function. /// A type that encapsulates all the settings for a particular parsing function.
#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)] #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
pub struct ParseSettings { pub struct ParseSettings {
@ -1314,7 +1316,7 @@ impl Engine {
state: &mut ParseState, state: &mut ParseState,
lib: &mut FnLib, lib: &mut FnLib,
settings: ParseSettings, settings: ParseSettings,
is_property: bool, options: ChainingFlags,
) -> ParseResult<Expr> { ) -> ParseResult<Expr> {
let (token, token_pos) = input.peek().expect(NEVER_ENDS); let (token, token_pos) = input.peek().expect(NEVER_ENDS);
@ -1450,15 +1452,13 @@ impl Engine {
#[cfg(feature = "no_closure")] #[cfg(feature = "no_closure")]
let options = self.options | (settings.options & LangOptions::STRICT_VAR); let options = self.options | (settings.options & LangOptions::STRICT_VAR);
// Brand new flags, turn on function scope // Brand new flags, turn on function scope and closure scope
let flags = ParseSettingFlags::FN_SCOPE let flags = ParseSettingFlags::FN_SCOPE
| ParseSettingFlags::CLOSURE_SCOPE
| (settings.flags | (settings.flags
& (ParseSettingFlags::DISALLOW_UNQUOTED_MAP_PROPERTIES & (ParseSettingFlags::DISALLOW_UNQUOTED_MAP_PROPERTIES
| ParseSettingFlags::DISALLOW_STATEMENTS_IN_BLOCKS)); | ParseSettingFlags::DISALLOW_STATEMENTS_IN_BLOCKS));
#[cfg(not(feature = "no_closure"))]
let flags = flags | ParseSettingFlags::CLOSURE_SCOPE; // turn on closure scope
let new_settings = ParseSettings { let new_settings = ParseSettings {
flags, flags,
options, options,
@ -1602,11 +1602,9 @@ impl Engine {
match input.peek().expect(NEVER_ENDS) { match input.peek().expect(NEVER_ENDS) {
// Function call // Function call
(Token::LeftParen | Token::Bang | Token::Unit, _) => { (Token::LeftParen | Token::Bang | Token::Unit, _) => {
#[cfg(not(feature = "no_closure"))] // Once the identifier consumed we must enable next variables capturing
{ state.allow_capture = true;
// Once the identifier consumed we must enable next variables capturing
state.allow_capture = true;
}
Expr::Variable( Expr::Variable(
(None, ns, 0, state.get_interned_string(*s)).into(), (None, ns, 0, state.get_interned_string(*s)).into(),
None, None,
@ -1616,7 +1614,7 @@ impl Engine {
// Namespace qualification // Namespace qualification
#[cfg(not(feature = "no_module"))] #[cfg(not(feature = "no_module"))]
(token @ Token::DoubleColon, pos) => { (token @ Token::DoubleColon, pos) => {
if !state.allow_namespace { if options.contains(ChainingFlags::DISALLOW_NAMESPACES) {
return Err(LexError::ImproperSymbol( return Err(LexError::ImproperSymbol(
token.literal_syntax().into(), token.literal_syntax().into(),
String::new(), String::new(),
@ -1624,11 +1622,9 @@ impl Engine {
.into_err(*pos)); .into_err(*pos));
} }
#[cfg(not(feature = "no_closure"))] // Once the identifier consumed we must enable next variables capturing
{ state.allow_capture = true;
// Once the identifier consumed we must enable next variables capturing
state.allow_capture = true;
}
let name = state.get_interned_string(*s); let name = state.get_interned_string(*s);
Expr::Variable((None, ns, 0, name).into(), None, settings.pos) Expr::Variable((None, ns, 0, name).into(), None, settings.pos)
} }
@ -1636,7 +1632,7 @@ impl Engine {
_ => { _ => {
let (index, is_func) = state.access_var(&s, lib, settings.pos); let (index, is_func) = state.access_var(&s, lib, settings.pos);
if !is_property if !options.contains(ChainingFlags::PROPERTY)
&& !is_func && !is_func
&& index.is_none() && index.is_none()
&& settings.has_option(LangOptions::STRICT_VAR) && settings.has_option(LangOptions::STRICT_VAR)
@ -1708,7 +1704,14 @@ impl Engine {
return Ok(root_expr); return Ok(root_expr);
} }
self.parse_postfix(input, state, lib, settings, root_expr) self.parse_postfix(
input,
state,
lib,
settings,
root_expr,
ChainingFlags::empty(),
)
} }
/// Tail processing of all possible postfix operators of a primary expression. /// Tail processing of all possible postfix operators of a primary expression.
@ -1719,6 +1722,7 @@ impl Engine {
lib: &mut FnLib, lib: &mut FnLib,
settings: ParseSettings, settings: ParseSettings,
mut lhs: Expr, mut lhs: Expr,
options: ChainingFlags,
) -> ParseResult<Expr> { ) -> ParseResult<Expr> {
let mut settings = settings; let mut settings = settings;
@ -1766,9 +1770,6 @@ impl Engine {
let (.., ns, _, name) = *x; let (.., ns, _, name) = *x;
settings.pos = pos; settings.pos = pos;
#[cfg(not(feature = "no_module"))]
auto_restore! { let orig_allow_namespace = state.allow_namespace; state.allow_namespace = true }
self.parse_fn_call(input, state, lib, settings, name, no_args, true, ns)? self.parse_fn_call(input, state, lib, settings, name, no_args, true, ns)?
} }
// Function call // Function call
@ -1777,14 +1778,13 @@ impl Engine {
let no_args = t == Token::Unit; let no_args = t == Token::Unit;
settings.pos = pos; settings.pos = pos;
#[cfg(not(feature = "no_module"))]
auto_restore! { let orig_allow_namespace = state.allow_namespace; state.allow_namespace = true }
self.parse_fn_call(input, state, lib, settings, name, no_args, false, ns)? self.parse_fn_call(input, state, lib, settings, name, no_args, false, ns)?
} }
// Disallowed module separator // Disallowed module separator
#[cfg(not(feature = "no_module"))] #[cfg(not(feature = "no_module"))]
(_, token @ Token::DoubleColon) if !state.allow_namespace => { (_, token @ Token::DoubleColon)
if options.contains(ChainingFlags::DISALLOW_NAMESPACES) =>
{
return Err(LexError::ImproperSymbol( return Err(LexError::ImproperSymbol(
token.literal_syntax().into(), token.literal_syntax().into(),
String::new(), String::new(),
@ -1807,9 +1807,6 @@ impl Engine {
// Indexing // Indexing
#[cfg(not(feature = "no_index"))] #[cfg(not(feature = "no_index"))]
(expr, token @ (Token::LeftBracket | Token::QuestionBracket)) => { (expr, token @ (Token::LeftBracket | Token::QuestionBracket)) => {
#[cfg(not(feature = "no_module"))]
auto_restore! { let orig_allow_namespace = state.allow_namespace; state.allow_namespace = true }
let opt = match token { let opt = match token {
Token::LeftBracket => ASTFlags::NONE, Token::LeftBracket => ASTFlags::NONE,
Token::QuestionBracket => ASTFlags::NEGATED, Token::QuestionBracket => ASTFlags::NEGATED,
@ -1824,11 +1821,8 @@ impl Engine {
// Expression after dot must start with an identifier // Expression after dot must start with an identifier
match input.peek().expect(NEVER_ENDS) { match input.peek().expect(NEVER_ENDS) {
(Token::Identifier(..), ..) => { (Token::Identifier(..), ..) => {
#[cfg(not(feature = "no_closure"))] // Prevents capturing of the object properties as vars: xxx.<var>
{ state.allow_capture = false;
// Prevents capturing of the object properties as vars: xxx.<var>
state.allow_capture = false;
}
} }
(Token::Reserved(s), ..) if is_keyword_function(s).1 => (), (Token::Reserved(s), ..) if is_keyword_function(s).1 => (),
(Token::Reserved(s), pos) => { (Token::Reserved(s), pos) => {
@ -1837,18 +1831,15 @@ impl Engine {
(.., pos) => return Err(PERR::PropertyExpected.into_err(*pos)), (.., pos) => return Err(PERR::PropertyExpected.into_err(*pos)),
} }
let rhs = {
#[cfg(not(feature = "no_module"))]
auto_restore! { let orig_allow_namespace = state.allow_namespace; state.allow_namespace = false }
self.parse_primary(input, state, lib, settings.level_up()?, true)?
};
let op_flags = match op { let op_flags = match op {
Token::Period => ASTFlags::NONE, Token::Period => ASTFlags::NONE,
Token::Elvis => ASTFlags::NEGATED, Token::Elvis => ASTFlags::NEGATED,
_ => unreachable!("`.` or `?.`"), _ => unreachable!("`.` or `?.`"),
}; };
let options = ChainingFlags::PROPERTY | ChainingFlags::DISALLOW_NAMESPACES;
let rhs =
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::NONE, op_flags, tail_pos)?
} }
// Unknown postfix operator // Unknown postfix operator
@ -2020,7 +2011,7 @@ impl Engine {
// <EOF> // <EOF>
Token::EOF => Err(PERR::UnexpectedEOF.into_err(settings.pos)), Token::EOF => Err(PERR::UnexpectedEOF.into_err(settings.pos)),
// All other tokens // All other tokens
_ => self.parse_primary(input, state, lib, settings, false), _ => self.parse_primary(input, state, lib, settings, ChainingFlags::empty()),
} }
} }