Merge branch 'tokenizer'

src/lib.rs

@@ -131,15 +131,11 @@ pub use optimize::OptimizationLevel;
 
 #[cfg(feature = "internals")]
 #[deprecated(note = "this type is volatile and may change")]
-pub use token::Token;
+pub use token::{get_next_token, parse_string_literal, InputStream, Token, TokenizeState};
 
 #[cfg(feature = "internals")]
 #[deprecated(note = "this type is volatile and may change")]
-pub use parser::Expr;
+pub use parser::{Expr, FnAccess, ReturnType, ScriptFnDef, Stmt};
-
-#[cfg(feature = "internals")]
-#[deprecated(note = "this type is volatile and may change")]
-pub use parser::Stmt;
 
 #[cfg(feature = "internals")]
 #[deprecated(note = "this type is volatile and may change")]
@@ -148,7 +144,3 @@ pub use module::ModuleRef;
 #[cfg(feature = "internals")]
 #[deprecated(note = "this type is volatile and may change")]
 pub use utils::StaticVec;
-
-#[cfg(feature = "internals")]
-#[deprecated(note = "this type is volatile and may change")]
-pub use parser::ReturnType;

src/module.rs

@@ -3,7 +3,7 @@
 use crate::any::{Dynamic, Variant};
 use crate::calc_fn_hash;
 use crate::engine::{make_getter, make_setter, Engine, Imports, FN_IDX_GET, FN_IDX_SET};
-use crate::fn_native::{CallableFunction, FnCallArgs, IteratorFn, SendSync};
+use crate::fn_native::{CallableFunction, FnCallArgs, IteratorFn, SendSync, Shared};
 use crate::parser::{
     FnAccess,
     FnAccess::{Private, Public},
@@ -19,7 +19,7 @@ use crate::stdlib::{
     boxed::Box,
     cell::RefCell,
     collections::HashMap,
-    fmt,
+    fmt, format,
     iter::empty,
     mem,
     num::NonZeroUsize,
@@ -892,6 +892,15 @@ impl Module {
         self.functions.values()
     }
 
+    /// Get an iterator over all script-defined functions in the module.
+    pub fn iter_script_fn<'a>(&'a self) -> impl Iterator<Item = Shared<ScriptFnDef>> + 'a {
+        self.functions
+            .values()
+            .map(|(_, _, _, f)| f)
+            .filter(|f| f.is_script())
+            .map(|f| f.get_shared_fn_def())
+    }
+
     /// Create a new `Module` by evaluating an `AST`.
     ///
     /// # Examples