Move optimization_level into Options.
This commit is contained in:
@@ -201,7 +201,11 @@ impl Engine {
|
||||
scope: &Scope,
|
||||
scripts: impl AsRef<[S]>,
|
||||
) -> ParseResult<AST> {
|
||||
self.compile_with_scope_and_optimization_level(scope, scripts, self.optimization_level)
|
||||
self.compile_with_scope_and_optimization_level(
|
||||
scope,
|
||||
scripts,
|
||||
self.options.optimization_level,
|
||||
)
|
||||
}
|
||||
/// Join a list of strings and compile into an [`AST`] using own scope at a specific optimization level.
|
||||
///
|
||||
@@ -297,7 +301,12 @@ impl Engine {
|
||||
|
||||
let mut peekable = stream.peekable();
|
||||
let mut state = ParseState::new(self, tokenizer_control);
|
||||
self.parse_global_expr(&mut peekable, &mut state, scope, self.optimization_level)
|
||||
self.parse_global_expr(
|
||||
&mut peekable,
|
||||
&mut state,
|
||||
scope,
|
||||
self.options.optimization_level,
|
||||
)
|
||||
}
|
||||
/// Parse a JSON string into an [object map][crate::Map].
|
||||
/// This is a light-weight alternative to using, say,
|
||||
|
@@ -67,7 +67,7 @@ impl Engine {
|
||||
let ast = self.compile_with_scope_and_optimization_level(
|
||||
scope,
|
||||
&[script],
|
||||
self.optimization_level,
|
||||
self.options.optimization_level,
|
||||
)?;
|
||||
self.eval_ast_with_scope(scope, &ast)
|
||||
}
|
||||
|
@@ -9,7 +9,7 @@ impl Engine {
|
||||
/// Not available under `no_optimize`.
|
||||
#[inline(always)]
|
||||
pub fn set_optimization_level(&mut self, optimization_level: OptimizationLevel) -> &mut Self {
|
||||
self.optimization_level = optimization_level;
|
||||
self.options.optimization_level = optimization_level;
|
||||
self
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ impl Engine {
|
||||
#[inline(always)]
|
||||
#[must_use]
|
||||
pub const fn optimization_level(&self) -> OptimizationLevel {
|
||||
self.optimization_level
|
||||
self.options.optimization_level
|
||||
}
|
||||
|
||||
/// Optimize the [`AST`] with constants defined in an external Scope.
|
||||
|
@@ -1,12 +1,14 @@
|
||||
//! Settings for [`Engine`]'s language options.
|
||||
|
||||
use crate::Engine;
|
||||
use crate::{Engine, OptimizationLevel};
|
||||
#[cfg(feature = "no_std")]
|
||||
use std::prelude::v1::*;
|
||||
|
||||
/// A type containing all language options for the [`Engine`].
|
||||
#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
|
||||
pub struct LanguageOptions {
|
||||
/// Script optimization level.
|
||||
pub optimization_level: OptimizationLevel,
|
||||
/// Is `if`-expression allowed?
|
||||
pub allow_if_expr: bool,
|
||||
/// Is `switch` expression allowed?
|
||||
@@ -33,6 +35,11 @@ impl LanguageOptions {
|
||||
#[inline(always)]
|
||||
pub const fn new() -> Self {
|
||||
Self {
|
||||
#[cfg(not(feature = "no_optimize"))]
|
||||
optimization_level: OptimizationLevel::Simple,
|
||||
#[cfg(feature = "no_optimize")]
|
||||
optimization_level: (),
|
||||
|
||||
allow_if_expr: true,
|
||||
allow_switch_expr: true,
|
||||
allow_stmt_expr: true,
|
||||
|
@@ -30,7 +30,7 @@ impl Engine {
|
||||
&mut stream.peekable(),
|
||||
&mut state,
|
||||
scope,
|
||||
self.optimization_level,
|
||||
self.options.optimization_level,
|
||||
)?;
|
||||
|
||||
self.run_ast_with_scope(scope, &ast)
|
||||
|
Reference in New Issue
Block a user