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

Make export_prefix use fn name not export name

Browse Source
This commit is contained in:
J Henry Waugh 2020-09-02 20:10:52 -05:00
parent ce00ce77f0
commit 5585405bdc
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codegen/src/function.rs
View File

@ -228,7 +228,7 @@ impl ExportedFn {
let keep = match (self.params.skip, parent_scope) { let keep = match (self.params.skip, parent_scope) {
(true, _) => false, (true, _) => false,
(_, ExportScope::PubOnly) => self.is_public, (_, ExportScope::PubOnly) => self.is_public,
(_, ExportScope::Prefix(s)) => self.exported_name().as_ref().starts_with(s), (_, ExportScope::Prefix(s)) => self.name().to_string().starts_with(s),
(_, ExportScope::All) => true, (_, ExportScope::All) => true,
}; };
self.params.skip = !keep; self.params.skip = !keep;

24
codegen/tests/test_modules.rs
View File

@ -229,16 +229,16 @@ mod export_by_prefix {
use rhai::{FLOAT, INT}; use rhai::{FLOAT, INT};
#[rhai_fn(name = "foo_add_f")] #[rhai_fn(name = "foo_add_f")]
pub fn add_float(f1: FLOAT, f2: FLOAT) -> FLOAT { pub fn foo_add1(f1: FLOAT, f2: FLOAT) -> FLOAT {
f1 + f2 f1 + f2
} }
#[rhai_fn(name = "foo_add_i")] #[rhai_fn(name = "bar_add_i")]
fn add_int(i1: INT, i2: INT) -> INT { fn foo_add_int(i1: INT, i2: INT) -> INT {
i1 + i2 i1 + i2
} }
#[rhai_fn(name = "bar_add")] #[rhai_fn(name = "foo_add_float2")]
pub fn add_float2(f1: FLOAT, f2: FLOAT) -> FLOAT { pub fn add_float2(f1: FLOAT, f2: FLOAT) -> FLOAT {
f1 + f2 f1 + f2
} }
@ -271,7 +271,7 @@ fn export_by_prefix_test() -> Result<(), Box<EvalAltResult>> {
let fx = math::foo_add_f(ex, 1.0); let fx = math::foo_add_f(ex, 1.0);
let gx = math::foo_m(41.0, 1.0); let gx = math::foo_m(41.0, 1.0);
let ei = 41; let ei = 41;
let fi = math::foo_add_i(ei, 1); let fi = math::bar_add_i(ei, 1);
let gi = math::foo_n(41, 1); let gi = math::foo_n(41, 1);
[fx, gx, fi, gi] [fx, gx, fi, gi]
"#, "#,
@ -284,21 +284,11 @@ fn export_by_prefix_test() -> Result<(), Box<EvalAltResult>> {
assert!(matches!(*engine.eval::<FLOAT>( assert!(matches!(*engine.eval::<FLOAT>(
r#"import "Math::Advanced" as math; r#"import "Math::Advanced" as math;
let ex = 41.0; let ex = 41.0;
let fx = math::bar_add(ex, 1.0); let fx = math::foo_add_float2(ex, 1.0);
fx fx
"#).unwrap_err(), "#).unwrap_err(),
EvalAltResult::ErrorFunctionNotFound(s, p) EvalAltResult::ErrorFunctionNotFound(s, p)
if s == "math::bar_add (f64, f64)" if s == "math::foo_add_float2 (f64, f64)"
&& p == rhai::Position::new(3, 23)));
assert!(matches!(*engine.eval::<FLOAT>(
r#"import "Math::Advanced" as math;
let ex = 41.0;
let fx = math::add_float2(ex, 1.0);
fx
"#).unwrap_err(),
EvalAltResult::ErrorFunctionNotFound(s, p)
if s == "math::add_float2 (f64, f64)"
&& p == rhai::Position::new(3, 23))); && p == rhai::Position::new(3, 23)));
assert!(matches!(*engine.eval::<FLOAT>( assert!(matches!(*engine.eval::<FLOAT>(