Move output to core out of interpreter (#90)

Author: ferranbt

Cargo.lock

@@ -1,7 +1,7 @@
 mod test_data;
 
 use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
-use pine_lang::interpreter::DefaultPineOutput;
+use pine_lang::core::DefaultPineOutput;
 use pine_lang::{execute, ScriptBuilder};
 use test_data::generate_bars;
 

benches/src/interpreter.rs

@@ -73,12 +73,12 @@ pub fn builtin_function_derive(input: TokenStream) -> TokenStream {
         // `#[builtin(output = LabelOutput)]` adds the capability the builtin needs
         // from the output type; without it `PineOutput` alone is enough.
         let capability = output_bound
-            .map(|bound| quote! { + ::pine_interpreter::#bound })
+            .map(|bound| quote! { + ::pine_core::#bound })
             .unwrap_or_default();
         (
             quote! {},
             quote! {},
-            quote! { <O: ::pine_interpreter::PineOutput #capability> },
+            quote! { <O: ::pine_core::PineOutput #capability> },
         )
     } else {
         (
@@ -131,7 +131,7 @@ pub fn builtin_function_derive(input: TokenStream) -> TokenStream {
             /// the state twice.
             #[derive(Default)]
             #[doc(hidden)]
-            pub struct #slot_name<O: ::pine_interpreter::PineOutput> {
+            pub struct #slot_name<O: ::pine_core::PineOutput> {
                 #(#state_decls,)*
                 bar_seq: u64,
                 memo: Option<::pine_interpreter::Value<O>>,

crates/pine-builtin-macro/src/lib.rs

@@ -5,9 +5,8 @@
 //! declaration (title + message) is simply recorded via [`AlertConditionOutput`].
 
 use pine_builtin_macro::BuiltinFunction;
-use pine_interpreter::{
-    AlertCondition, AlertConditionOutput, Interpreter, PineOutput, RuntimeError, Value,
-};
+use pine_core::{AlertCondition, AlertConditionOutput, PineOutput};
+use pine_interpreter::{Interpreter, RuntimeError, Value};
 
 /// alertcondition(condition, title, message)
 #[derive(BuiltinFunction)]

crates/pine-builtins/src/alertcondition/mod.rs

@@ -1,5 +1,6 @@
 use pine_builtin_macro::BuiltinFunction;
-use pine_interpreter::{Interpreter, PineOutput, RuntimeError, Value};
+use pine_core::PineOutput;
+use pine_interpreter::{Interpreter, RuntimeError, Value};
 use std::cell::RefCell;
 use std::rc::Rc;
 

crates/pine-builtins/src/array/mod.rs

@@ -3,8 +3,8 @@
 //! Unlike the compile-time namespaces, these change every bar, so they are built
 //! per bar from the [`Bar`]'s flags (see `register_per_bar` in the crate root).
 
-use pine_core::Bar;
-use pine_interpreter::{PineOutput, Value};
+use pine_core::{Bar, PineOutput};
+use pine_interpreter::Value;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::rc::Rc;

crates/pine-builtins/src/barstate/mod.rs

@@ -1,5 +1,6 @@
 use pine_builtin_macro::BuiltinFunction;
-use pine_interpreter::{BoxOutput, Color, Interpreter, PineBox, PineOutput, RuntimeError, Value};
+use pine_core::{BoxOutput, Color, PineBox, PineOutput};
+use pine_interpreter::{Interpreter, RuntimeError, Value};
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::rc::Rc;

crates/pine-builtins/src/box/mod.rs

@@ -1,5 +1,6 @@
 use pine_builtin_macro::BuiltinFunction;
-use pine_interpreter::{Interpreter, PineOutput, RuntimeError, Value};
+use pine_core::PineOutput;
+use pine_interpreter::{Interpreter, RuntimeError, Value};
 
 /// color.new(color, transp) - Applies transparency to a color
 #[derive(BuiltinFunction)]
@@ -34,7 +35,7 @@ impl ColorRgb {
         let g = self.green.clamp(0.0, 255.0) as u8;
         let b = self.blue.clamp(0.0, 255.0) as u8;
         let t = self.transp.clamp(0.0, 100.0) as u8;
-        Ok(Value::Color(pine_interpreter::Color::new(r, g, b, t)))
+        Ok(Value::Color(pine_core::Color::new(r, g, b, t)))
     }
 }
 
@@ -125,7 +126,7 @@ impl<O: PineOutput> ColorFromGradient<O> {
         let b = (c1.b as f64 + (c2.b as f64 - c1.b as f64) * ratio) as u8;
         let t = (c1.t as f64 + (c2.t as f64 - c1.t as f64) * ratio) as u8;
 
-        Ok(Value::Color(pine_interpreter::Color::new(r, g, b, t)))
+        Ok(Value::Color(pine_core::Color::new(r, g, b, t)))
     }
 }
 

crates/pine-builtins/src/color/mod.rs

@@ -1,4 +1,5 @@
-use pine_interpreter::{PineOutput, Value};
+use pine_core::PineOutput;
+use pine_interpreter::Value;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::rc::Rc;

crates/pine-builtins/src/constants/barmerge.rs

@@ -1,4 +1,5 @@
-use pine_interpreter::{PineOutput, Value};
+use pine_core::PineOutput;
+use pine_interpreter::Value;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::rc::Rc;