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

Make every file evaluation use PathBuf instead of str

Browse Source
This commit is contained in:
Jarkko Kuukkanen 2020-03-13 10:17:55 +02:00
parent faf78ccdd3
commit 8c1c37666d
No known key found for this signature in database
GPG Key ID: 7F6664266DAD7878
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/api.rs
View File

@ -12,6 +12,7 @@ use std::{
any::{type_name, TypeId},
fs::File,
io::prelude::*,
path::PathBuf,
sync::Arc,
};
@ -105,26 +106,26 @@ impl<'e> Engine<'e> {
}
/// Compile a file into an AST.
pub fn compile_file(&self, filename: &str) -> Result<AST, EvalAltResult> {
let mut f = File::open(filename)
.map_err(|err| EvalAltResult::ErrorReadingScriptFile(filename.into(), err))?;
pub fn compile_file(&self, filename: PathBuf) -> Result<AST, EvalAltResult> {
let mut f = File::open(filename.clone())
.map_err(|err| EvalAltResult::ErrorReadingScriptFile(filename.clone(), err))?;
let mut contents = String::new();
f.read_to_string(&mut contents)
.map_err(|err| EvalAltResult::ErrorReadingScriptFile(filename.into(), err))
.map_err(|err| EvalAltResult::ErrorReadingScriptFile(filename.clone(), err))
.and_then(|_| self.compile(&contents).map_err(EvalAltResult::ErrorParsing))
}
/// Evaluate a file.
pub fn eval_file<T: Any + Clone>(&mut self, filename: &str) -> Result<T, EvalAltResult> {
let mut f = File::open(filename)
.map_err(|err| EvalAltResult::ErrorReadingScriptFile(filename.into(), err))?;
pub fn eval_file<T: Any + Clone>(&mut self, filename: PathBuf) -> Result<T, EvalAltResult> {
let mut f = File::open(filename.clone())
.map_err(|err| EvalAltResult::ErrorReadingScriptFile(filename.clone(), err))?;
let mut contents = String::new();
f.read_to_string(&mut contents)
.map_err(|err| EvalAltResult::ErrorReadingScriptFile(filename.into(), err))
.map_err(|err| EvalAltResult::ErrorReadingScriptFile(filename.clone(), err))
.and_then(|_| self.eval::<T>(&contents))
}
@ -205,14 +206,14 @@ impl<'e> Engine<'e> {
/// Evaluate a file, but throw away the result and only return error (if any).
/// Useful for when you don't need the result, but still need to keep track of possible errors.
pub fn consume_file(&mut self, filename: &str) -> Result<(), EvalAltResult> {
let mut f = File::open(filename)
.map_err(|err| EvalAltResult::ErrorReadingScriptFile(filename.into(), err))?;
pub fn consume_file(&mut self, filename: PathBuf) -> Result<(), EvalAltResult> {
let mut f = File::open(filename.clone())
.map_err(|err| EvalAltResult::ErrorReadingScriptFile(filename.clone(), err))?;
let mut contents = String::new();
f.read_to_string(&mut contents)
.map_err(|err| EvalAltResult::ErrorReadingScriptFile(filename.into(), err))
.map_err(|err| EvalAltResult::ErrorReadingScriptFile(filename.clone(), err))
.and_then(|_| self.consume(&contents))
}

2
src/lib.rs
View File

@ -29,7 +29,7 @@
//!
//! engine.register_fn("compute_something", compute_something);
//!
//! assert_eq!(engine.eval_file::<bool>("my_script.rhai")?, true);
//! assert_eq!(engine.eval_file::<bool>("my_script.rhai".into())?, true);
//!
//! Ok(())
//! }

6
src/result.rs
View File

@ -3,7 +3,7 @@
use crate::any::Dynamic;
use crate::error::ParseError;
use crate::parser::Position;
use std::{error::Error, fmt};
use std::{error::Error, fmt, path::PathBuf};
/// Evaluation result.
///
@ -44,7 +44,7 @@ pub enum EvalAltResult {
/// Wrapped value is the type of the actual result.
ErrorMismatchOutputType(String, Position),
/// Error reading from a script file. Wrapped value is the path of the script file.
ErrorReadingScriptFile(String, std::io::Error),
ErrorReadingScriptFile(PathBuf, std::io::Error),
/// Inappropriate member access.
ErrorDotExpr(String, Position),
/// Arithmetic error encountered. Wrapped value is the error message.
@ -125,7 +125,7 @@ impl fmt::Display for EvalAltResult {
Self::LoopBreak => write!(f, "{}", desc),
Self::Return(_, pos) => write!(f, "{} ({})", desc, pos),
Self::ErrorReadingScriptFile(filename, err) => {
write!(f, "{} '{}': {}", desc, filename, err)
write!(f, "{} '{}': {}", desc, filename.display(), err)
}
Self::ErrorParsing(p) => write!(f, "Syntax error: {}", p),
Self::ErrorFunctionArgsMismatch(fun, need, n, pos) => write!(