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

get_constant_value for FnPointer.

Browse Source
This commit is contained in:
Stephen Chung 2020-08-03 23:12:42 +08:00
parent 3b6d35368f
commit 2aa08c0dd9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/parser.rs
View File

@ -6,7 +6,7 @@ use crate::engine::{
Engine, KEYWORD_FN_PTR_CURRY, KEYWORD_THIS, MARKER_BLOCK, MARKER_EXPR, MARKER_IDENT, Engine, KEYWORD_FN_PTR_CURRY, KEYWORD_THIS, MARKER_BLOCK, MARKER_EXPR, MARKER_IDENT,
}; };
use crate::error::{LexError, ParseError, ParseErrorType}; use crate::error::{LexError, ParseError, ParseErrorType};
use crate::fn_native::Shared; use crate::fn_native::{FnPtr, Shared};
use crate::module::{Module, ModuleRef}; use crate::module::{Module, ModuleRef};
use crate::optimize::{optimize_into_ast, OptimizationLevel}; use crate::optimize::{optimize_into_ast, OptimizationLevel};
use crate::scope::{EntryType as ScopeEntryType, Scope}; use crate::scope::{EntryType as ScopeEntryType, Scope};
@ -835,6 +835,10 @@ impl Expr {
Self::FloatConstant(x) => x.0.into(), Self::FloatConstant(x) => x.0.into(),
Self::CharConstant(x) => x.0.into(), Self::CharConstant(x) => x.0.into(),
Self::StringConstant(x) => x.0.clone().into(), Self::StringConstant(x) => x.0.clone().into(),
Self::FnPointer(x) => Dynamic(Union::FnPtr(Box::new(FnPtr::new_unchecked(
x.0.clone(),
Default::default(),
)))),
Self::True(_) => true.into(), Self::True(_) => true.into(),
Self::False(_) => false.into(), Self::False(_) => false.into(),
Self::Unit(_) => ().into(), Self::Unit(_) => ().into(),
@ -3292,7 +3296,7 @@ fn parse_anon_fn(
let hash = s.finish(); let hash = s.finish();
// Create unique function name // Create unique function name
let fn_name: ImmutableString = format!("{}{:16x}", FN_ANONYMOUS, hash).into(); let fn_name: ImmutableString = format!("{}{:016x}", FN_ANONYMOUS, hash).into();
// Define the function // Define the function
let script = ScriptFnDef { let script = ScriptFnDef {