From 5585405bdc131c40e448a79dfd10eb67adccb0c9 Mon Sep 17 00:00:00 2001
From: J Henry Waugh <jhwgh1968@protonmail.com>
Date: Wed, 2 Sep 2020 20:10:52 -0500
Subject: [PATCH] Make export_prefix use fn name not export name

---
 codegen/src/function.rs       |  2 +-
 codegen/tests/test_modules.rs | 24 +++++++-----------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/codegen/src/function.rs b/codegen/src/function.rs
index f5bb6989..9c005554 100644
--- a/codegen/src/function.rs
+++ b/codegen/src/function.rs
@@ -228,7 +228,7 @@ impl ExportedFn {
         let keep = match (self.params.skip, parent_scope) {
             (true, _) => false,
             (_, 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,
         };
         self.params.skip = !keep;
diff --git a/codegen/tests/test_modules.rs b/codegen/tests/test_modules.rs
index 3ce1bf37..f873e42b 100644
--- a/codegen/tests/test_modules.rs
+++ b/codegen/tests/test_modules.rs
@@ -229,16 +229,16 @@ mod export_by_prefix {
         use rhai::{FLOAT, INT};
 
         #[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
         }
 
-        #[rhai_fn(name = "foo_add_i")]
-        fn add_int(i1: INT, i2: INT) -> INT {
+        #[rhai_fn(name = "bar_add_i")]
+        fn foo_add_int(i1: INT, i2: INT) -> INT {
             i1 + i2
         }
 
-        #[rhai_fn(name = "bar_add")]
+        #[rhai_fn(name = "foo_add_float2")]
         pub fn add_float2(f1: FLOAT, f2: FLOAT) -> FLOAT {
             f1 + f2
         }
@@ -271,7 +271,7 @@ fn export_by_prefix_test() -> Result<(), Box<EvalAltResult>> {
        let fx = math::foo_add_f(ex, 1.0);
        let gx = math::foo_m(41.0, 1.0);
        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);
        [fx, gx, fi, gi]
        "#,
@@ -284,21 +284,11 @@ fn export_by_prefix_test() -> Result<(), Box<EvalAltResult>> {
     assert!(matches!(*engine.eval::<FLOAT>(
         r#"import "Math::Advanced" as math;
        let ex = 41.0;
-       let fx = math::bar_add(ex, 1.0);
+       let fx = math::foo_add_float2(ex, 1.0);
        fx
        "#).unwrap_err(),
        EvalAltResult::ErrorFunctionNotFound(s, p)
-            if s == "math::bar_add (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)"
+            if s == "math::foo_add_float2 (f64, f64)"
             && p == rhai::Position::new(3, 23)));
 
     assert!(matches!(*engine.eval::<FLOAT>(