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

Fix feature builds.

Browse Source
This commit is contained in:
Stephen Chung 2022-01-25 23:59:35 +08:00
parent 3c2ac7f0c5
commit c8357de1c8
4 changed files with 100 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/bin/rhai-dbg.rs
View File

@ -1,7 +1,7 @@
use rhai::{Dynamic, Engine, EvalAltResult, Position, Scope}; use rhai::{Dynamic, Engine, EvalAltResult, Position, Scope};
#[cfg(feature = "debugging")] #[cfg(feature = "debugging")]
use rhai::debugger::{BreakPoint, DebuggerCommand}; use rhai::debugger::DebuggerCommand;
use std::{ use std::{
env, env,
@ -83,8 +83,11 @@ fn print_debug_help() {
println!("disable <bp#> => disable a break-point"); println!("disable <bp#> => disable a break-point");
println!("delete <bp#> => delete a break-point"); println!("delete <bp#> => delete a break-point");
println!("clear => delete all break-points"); println!("clear => delete all break-points");
#[cfg(not(feature = "no_position"))]
println!("break => set a new break-point at the current position"); println!("break => set a new break-point at the current position");
#[cfg(not(feature = "no_position"))]
println!("break <line#> => set a new break-point at a line number"); println!("break <line#> => set a new break-point at a line number");
#[cfg(not(feature = "no_object"))]
println!("break .<prop> => set a new break-point for a property access"); println!("break .<prop> => set a new break-point for a property access");
println!("break <func> => set a new break-point for a function call"); println!("break <func> => set a new break-point for a function call");
println!( println!(
@ -261,7 +264,8 @@ fn main() {
.iter() .iter()
.enumerate() .enumerate()
.for_each(|(i, bp)| match bp { .for_each(|(i, bp)| match bp {
BreakPoint::AtPosition { pos, .. } => { #[cfg(not(feature = "no_position"))]
rhai::debugger::BreakPoint::AtPosition { pos, .. } => {
let line_num = format!("[{}] line ", i + 1); let line_num = format!("[{}] line ", i + 1);
print!("{}", line_num); print!("{}", line_num);
print_source(&lines, *pos, line_num.len()); print_source(&lines, *pos, line_num.len());
@ -352,9 +356,9 @@ fn main() {
eprintln!("Invalid number of arguments: '{}'", args); eprintln!("Invalid number of arguments: '{}'", args);
} }
} }
["break", param] => {
if param.starts_with('.') && param.len() > 1 {
// Property name // Property name
#[cfg(not(feature = "no_object"))]
["break", param] if param.starts_with('.') && param.len() > 1 => {
let bp = rhai::debugger::BreakPoint::AtProperty { let bp = rhai::debugger::BreakPoint::AtProperty {
name: param[1..].into(), name: param[1..].into(),
enabled: true, enabled: true,
@ -365,10 +369,13 @@ fn main() {
.debugger .debugger
.break_points_mut() .break_points_mut()
.push(bp); .push(bp);
} else if let Ok(n) = param.parse::<usize>() { }
// Numeric parameter // Numeric parameter
let range = 1..=lines.len(); #[cfg(not(feature = "no_position"))]
if range.contains(&n) { ["break", param] if param.parse::<usize>().is_ok() => {
let n = param.parse::<usize>().unwrap();
if (1..=lines.len()).contains(&n) {
let bp = rhai::debugger::BreakPoint::AtPosition { let bp = rhai::debugger::BreakPoint::AtPosition {
source: source.unwrap_or("").into(), source: source.unwrap_or("").into(),
pos: Position::new(n as u16, 0), pos: Position::new(n as u16, 0),
@ -383,8 +390,9 @@ fn main() {
} else { } else {
eprintln!("Invalid line number: {}", n); eprintln!("Invalid line number: {}", n);
} }
} else { }
// Function name parameter // Function name parameter
["break", param] => {
let bp = rhai::debugger::BreakPoint::AtFunctionName { let bp = rhai::debugger::BreakPoint::AtFunctionName {
name: param.trim().into(), name: param.trim().into(),
enabled: true, enabled: true,
@ -396,7 +404,7 @@ fn main() {
.break_points_mut() .break_points_mut()
.push(bp); .push(bp);
} }
} #[cfg(not(feature = "no_position"))]
["break", ..] => { ["break", ..] => {
let bp = rhai::debugger::BreakPoint::AtPosition { let bp = rhai::debugger::BreakPoint::AtPosition {
source: source.unwrap_or("").into(), source: source.unwrap_or("").into(),

42
src/eval/debugger.rs
View File

@ -40,6 +40,7 @@ pub enum DebuggerCommand {
#[derive(Debug, Clone, Eq, PartialEq, Hash)] #[derive(Debug, Clone, Eq, PartialEq, Hash)]
pub enum BreakPoint { pub enum BreakPoint {
/// Break at a particular position under a particular source. /// Break at a particular position under a particular source.
///
/// Not available under `no_position`. /// Not available under `no_position`.
/// ///
/// Source is empty if not available. /// Source is empty if not available.
@ -58,12 +59,16 @@ pub enum BreakPoint {
enabled: bool, enabled: bool,
}, },
/// Break at a particular property . /// Break at a particular property .
///
/// Not available under `no_object`.
#[cfg(not(feature = "no_object"))]
AtProperty { name: Identifier, enabled: bool }, AtProperty { name: Identifier, enabled: bool },
} }
impl fmt::Display for BreakPoint { impl fmt::Display for BreakPoint {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self { match self {
#[cfg(not(feature = "no_position"))]
Self::AtPosition { Self::AtPosition {
source, source,
pos, pos,
@ -108,6 +113,7 @@ impl fmt::Display for BreakPoint {
} }
Ok(()) Ok(())
} }
#[cfg(not(feature = "no_object"))]
Self::AtProperty { Self::AtProperty {
name: prop, name: prop,
enabled, enabled,
@ -129,9 +135,9 @@ impl BreakPoint {
match self { match self {
#[cfg(not(feature = "no_position"))] #[cfg(not(feature = "no_position"))]
Self::AtPosition { enabled, .. } => *enabled, Self::AtPosition { enabled, .. } => *enabled,
Self::AtFunctionName { enabled, .. } Self::AtFunctionName { enabled, .. } | Self::AtFunctionCall { enabled, .. } => *enabled,
| Self::AtFunctionCall { enabled, .. } #[cfg(not(feature = "no_object"))]
| Self::AtProperty { enabled, .. } => *enabled, Self::AtProperty { enabled, .. } => *enabled,
} }
} }
/// Enable/disable this [`BreakPoint`]. /// Enable/disable this [`BreakPoint`].
@ -140,9 +146,11 @@ impl BreakPoint {
match self { match self {
#[cfg(not(feature = "no_position"))] #[cfg(not(feature = "no_position"))]
Self::AtPosition { enabled, .. } => *enabled = value, Self::AtPosition { enabled, .. } => *enabled = value,
Self::AtFunctionName { enabled, .. } Self::AtFunctionName { enabled, .. } | Self::AtFunctionCall { enabled, .. } => {
| Self::AtFunctionCall { enabled, .. } *enabled = value
| Self::AtProperty { enabled, .. } => *enabled = value, }
#[cfg(not(feature = "no_object"))]
Self::AtProperty { enabled, .. } => *enabled = value,
} }
} }
} }
@ -151,9 +159,13 @@ impl BreakPoint {
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
#[derive(Debug, Clone, Hash)] #[derive(Debug, Clone, Hash)]
pub struct CallStackFrame { pub struct CallStackFrame {
/// Function name.
pub fn_name: Identifier, pub fn_name: Identifier,
/// Copies of function call arguments, if any.
pub args: crate::StaticVec<Dynamic>, pub args: crate::StaticVec<Dynamic>,
/// Source of the function, empty if none.
pub source: Identifier, pub source: Identifier,
/// [Position][`Position`] of the function call.
pub pos: Position, pub pos: Position,
} }
@ -183,8 +195,11 @@ impl fmt::Display for CallStackFrame {
/// A type providing debugging facilities. /// A type providing debugging facilities.
#[derive(Debug, Clone, Hash)] #[derive(Debug, Clone, Hash)]
pub struct Debugger { pub struct Debugger {
/// The current status command.
status: DebuggerCommand, status: DebuggerCommand,
/// The current set of break-points.
break_points: Vec<BreakPoint>, break_points: Vec<BreakPoint>,
/// The current function call stack.
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
call_stack: Vec<CallStackFrame>, call_stack: Vec<CallStackFrame>,
} }
@ -200,24 +215,32 @@ impl Debugger {
} }
} }
/// Get the function call stack depth. /// Get the function call stack depth.
///
/// Not available under `no_function`.
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
#[inline(always)] #[inline(always)]
pub fn call_stack_len(&self) -> usize { pub fn call_stack_len(&self) -> usize {
self.call_stack.len() self.call_stack.len()
} }
/// Get the current call stack. /// Get the current call stack.
///
/// Not available under `no_function`.
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
#[inline(always)] #[inline(always)]
pub fn call_stack(&self) -> &[CallStackFrame] { pub fn call_stack(&self) -> &[CallStackFrame] {
&self.call_stack &self.call_stack
} }
/// Rewind the function call stack to a particular depth. /// Rewind the function call stack to a particular depth.
///
/// Not available under `no_function`.
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
#[inline(always)] #[inline(always)]
pub(crate) fn rewind_call_stack(&mut self, len: usize) { pub(crate) fn rewind_call_stack(&mut self, len: usize) {
self.call_stack.truncate(len); self.call_stack.truncate(len);
} }
/// Add a new frame to the function call stack. /// Add a new frame to the function call stack.
///
/// Not available under `no_function`.
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
#[inline(always)] #[inline(always)]
pub(crate) fn push_call_stack_frame( pub(crate) fn push_call_stack_frame(
@ -264,6 +287,8 @@ impl Debugger {
} }
/// Does a particular [`AST` Node][ASTNode] trigger a break-point? /// Does a particular [`AST` Node][ASTNode] trigger a break-point?
pub fn is_break_point(&self, src: &str, node: ASTNode) -> bool { pub fn is_break_point(&self, src: &str, node: ASTNode) -> bool {
let _src = src;
self.break_points() self.break_points()
.iter() .iter()
.filter(|&bp| bp.is_enabled()) .filter(|&bp| bp.is_enabled())
@ -272,11 +297,11 @@ impl Debugger {
BreakPoint::AtPosition { pos, .. } if pos.is_none() => false, BreakPoint::AtPosition { pos, .. } if pos.is_none() => false,
#[cfg(not(feature = "no_position"))] #[cfg(not(feature = "no_position"))]
BreakPoint::AtPosition { source, pos, .. } if pos.is_beginning_of_line() => { BreakPoint::AtPosition { source, pos, .. } if pos.is_beginning_of_line() => {
node.position().line().unwrap_or(0) == pos.line().unwrap() && src == source node.position().line().unwrap_or(0) == pos.line().unwrap() && _src == source
} }
#[cfg(not(feature = "no_position"))] #[cfg(not(feature = "no_position"))]
BreakPoint::AtPosition { source, pos, .. } => { BreakPoint::AtPosition { source, pos, .. } => {
node.position() == *pos && src == source node.position() == *pos && _src == source
} }
BreakPoint::AtFunctionName { name, .. } => match node { BreakPoint::AtFunctionName { name, .. } => match node {
ASTNode::Expr(Expr::FnCall(x, _)) | ASTNode::Stmt(Stmt::FnCall(x, _)) => { ASTNode::Expr(Expr::FnCall(x, _)) | ASTNode::Stmt(Stmt::FnCall(x, _)) => {
@ -290,6 +315,7 @@ impl Debugger {
} }
_ => false, _ => false,
}, },
#[cfg(not(feature = "no_object"))]
BreakPoint::AtProperty { name, .. } => match node { BreakPoint::AtProperty { name, .. } => match node {
ASTNode::Expr(Expr::Property(x)) => (x.2).0 == *name, ASTNode::Expr(Expr::Property(x)) => (x.2).0 == *name,
_ => false, _ => false,

5
src/lib.rs
View File

@ -123,6 +123,7 @@ type UNSIGNED_INT = u64;
type UNSIGNED_INT = u32; type UNSIGNED_INT = u32;
/// The system floating-point type. It is defined as [`f64`]. /// The system floating-point type. It is defined as [`f64`].
///
/// Not available under `no_float`. /// Not available under `no_float`.
/// ///
/// If the `f32_float` feature is enabled, this will be [`f32`] instead. /// If the `f32_float` feature is enabled, this will be [`f32`] instead.
@ -132,6 +133,7 @@ pub type FLOAT = f64;
/// The system floating-point type. /// The system floating-point type.
/// It is defined as [`f32`] since the `f32_float` feature is used. /// It is defined as [`f32`] since the `f32_float` feature is used.
///
/// Not available under `no_float`. /// Not available under `no_float`.
/// ///
/// If the `f32_float` feature is not used, this will be `f64` instead. /// If the `f32_float` feature is not used, this will be `f64` instead.
@ -197,16 +199,19 @@ pub use func::Func;
pub use ast::ScriptFnMetadata; pub use ast::ScriptFnMetadata;
/// Variable-sized array of [`Dynamic`] values. /// Variable-sized array of [`Dynamic`] values.
///
/// Not available under `no_index`. /// Not available under `no_index`.
#[cfg(not(feature = "no_index"))] #[cfg(not(feature = "no_index"))]
pub type Array = Vec<Dynamic>; pub type Array = Vec<Dynamic>;
/// Variable-sized array of [`u8`] values (byte array). /// Variable-sized array of [`u8`] values (byte array).
///
/// Not available under `no_index`. /// Not available under `no_index`.
#[cfg(not(feature = "no_index"))] #[cfg(not(feature = "no_index"))]
pub type Blob = Vec<u8>; pub type Blob = Vec<u8>;
/// A dictionary of [`Dynamic`] values with string keys. /// A dictionary of [`Dynamic`] values with string keys.
///
/// Not available under `no_object`. /// Not available under `no_object`.
/// ///
/// [`SmartString`](https://crates.io/crates/smartstring) is used as the key type because most /// [`SmartString`](https://crates.io/crates/smartstring) is used as the key type because most

29
src/packages/debugging.rs
View File

@ -6,7 +6,7 @@ use crate::plugin::*;
use std::prelude::v1::*; use std::prelude::v1::*;
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
use crate::{Dynamic, NativeCallContext, INT}; use crate::{Dynamic, NativeCallContext};
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
#[cfg(not(feature = "no_index"))] #[cfg(not(feature = "no_index"))]
@ -38,10 +38,10 @@ mod debugging_functions {
.rev() .rev()
.map( .map(
|frame @ crate::debugger::CallStackFrame { |frame @ crate::debugger::CallStackFrame {
fn_name, fn_name: _fn_name,
args, args: _args,
source, source: _source,
pos, pos: _pos,
}| { }| {
let call = frame.to_string(); let call = frame.to_string();
@ -49,21 +49,24 @@ mod debugging_functions {
{ {
let mut map = Map::new(); let mut map = Map::new();
map.insert("call".into(), call.into()); map.insert("call".into(), call.into());
map.insert("fn_name".into(), fn_name.into()); map.insert("fn_name".into(), _fn_name.into());
if !args.is_empty() { if !_args.is_empty() {
map.insert( map.insert(
"args".into(), "args".into(),
Dynamic::from_array(args.clone().to_vec()), Dynamic::from_array(_args.clone().to_vec()),
); );
} }
if !source.is_empty() { if !_source.is_empty() {
map.insert("source".into(), source.into()); map.insert("source".into(), _source.into());
} }
if !pos.is_none() { if !_pos.is_none() {
map.insert("line".into(), (pos.line().unwrap() as INT).into()); map.insert(
"line".into(),
(_pos.line().unwrap() as crate::INT).into(),
);
map.insert( map.insert(
"position".into(), "position".into(),
(pos.position().unwrap_or(0) as INT).into(), (_pos.position().unwrap_or(0) as crate::INT).into(),
); );
} }
Dynamic::from_map(map) Dynamic::from_map(map)