created new NativeFunctionDefinition

src/compiler/native_fn/implementation/eval.rs

@@ -0,0 +1,28 @@
+use crate::compiler::compiler_source::LiteralCompilerSource;
+use crate::compiler::native_fn::{
+    get_argument_at, Error, NativeFunction, NativeFunctionDefinition, NativeFunctionSignature,
+};
+use crate::util::byte_buffer::ByteBuffer;
+
+#[derive(Default)]
+pub(crate) struct EvalNativeFunctionDef {}
+
+impl NativeFunctionDefinition for EvalNativeFunctionDef {
+    fn create(&self) -> NativeFunction {
+        NativeFunction::new(
+            NativeFunctionSignature::new_unsafe("eval"),
+            |arguments, compiler| {
+                let buffer = get_argument_at(arguments, 0, "eval")?.clone();
+                let source = LiteralCompilerSource::anonymous(
+                    buffer
+                        .to_string()
+                        .map_err(|e| Error::Unknown(e.to_string()))?,
+                );
+                let result = compiler
+                    .compile(&source)
+                    .map_err(|e| Error::Unknown(e.to_string()))?;
+                Ok(ByteBuffer::from(result.content))
+            },
+        )
+    }
+}

src/compiler/native_fn/implementation/mod.rs

@@ -0,0 +1,2 @@
+mod eval;
+pub(crate) use eval::EvalNativeFunctionDef;

src/compiler/native_fn/implementations.rs

@@ -114,23 +114,7 @@ pub(crate) fn create_pad_native_function() -> NativeFunction {
     )
 }
 
-pub(crate) fn create_eval_native_function() -> NativeFunction {
-    NativeFunction::new(
-        NativeFunctionSignature::new_unsafe("eval"),
-        |arguments, compiler| {
-            let buffer = get_argument_at(arguments, 0, "eval")?.clone();
-            let source = LiteralCompilerSource::anonymous(
-                buffer.to_string()
-                    .map_err(|e| Error::Unknown(e.to_string()))?,
-            );
-            let result = compiler.compile(&source)
-                .map_err(|e| Error::Unknown(e.to_string()))?;
-            Ok(ByteBuffer::from(result.content))
-        },
-    )
-}
-
-fn get_argument_at<'a>(
+pub(crate) fn get_argument_at<'a>(
     arguments: &'a HashMap<String, ByteBuffer>,
     pos: usize,
     fn_name: &str,
@@ -144,7 +128,7 @@ fn get_argument_at<'a>(
         })
 }
 
-fn get_named_argument<'a>(
+pub(crate) fn get_named_argument<'a>(
     arguments: &'a HashMap<String, ByteBuffer>,
     name: &str,
 ) -> Option<&'a ByteBuffer> {

src/compiler/native_fn/index.rs

@@ -1,6 +1,6 @@
 use crate::compiler::native_fn::signature::NativeFunction;
-use crate::compiler::native_fn::{create_cmd_native_function, create_eval_native_function, create_len_native_function, create_pad_left_native_function, create_pad_native_function, create_pad_right_native_function, create_read_file_native_function};
-
+use crate::compiler::native_fn::{create_cmd_native_function, create_len_native_function, create_pad_left_native_function, create_pad_native_function, create_pad_right_native_function, create_read_file_native_function, NativeFunctionDefinition};
+use crate::compiler::native_fn::implementation::EvalNativeFunctionDef;
 #[derive(Clone, Debug)]
 pub(crate) struct NativeFunctionIndex {
     functions: Vec<NativeFunction>,
@@ -19,14 +19,26 @@ impl NativeFunctionIndex {
     }
 
     fn create_native_functions() -> Vec<NativeFunction> {
-        vec![
+        let definitions = Self::create_native_function_definitions();
+
+        let mut direct_fn = vec![
             create_len_native_function(),
             create_pad_left_native_function(),
             create_pad_right_native_function(),
             create_cmd_native_function(),
             create_read_file_native_function(),
             create_pad_native_function(),
-            create_eval_native_function()
+        ];
+        direct_fn.append(
+            &mut definitions.iter().map(|d| d.create()).collect()
+        );
+
+        direct_fn
+    }
+
+    fn create_native_function_definitions() -> Vec<Box<dyn NativeFunctionDefinition>> {
+        return vec![
+            Box::new(EvalNativeFunctionDef::default()),
         ]
     }
 }

src/compiler/native_fn/mod.rs

@@ -2,6 +2,7 @@ mod error;
 mod implementations;
 mod index;
 mod signature;
+pub(crate) mod implementation;
 
 pub(crate) use error::Error;
 pub(crate) use implementations::*;

src/compiler/native_fn/signature.rs

@@ -56,4 +56,8 @@ impl NativeFunction {
     pub(crate) fn executor(&self) -> NativeFunctionExecutor {
         self.executor
     }
-}
+}
+
+pub(crate) trait NativeFunctionDefinition {
+    fn create(&self) -> NativeFunction;
+}