Merge pull request #298 from epage/interp

Move to stabilize interpreter

liquid-compiler/src/lib.rs

@@ -11,6 +11,7 @@ mod include;
 mod options;
 mod parser;
 mod tag;
+mod text;
 
 pub mod error {
     pub use liquid_error::*;
@@ -25,3 +26,5 @@ pub use include::*;
 pub use options::*;
 pub use parser::*;
 pub use tag::*;
+
+use text::Text;

liquid-compiler/src/parser.rs

@@ -7,7 +7,6 @@ use std;
 
 use liquid_interpreter::Expression;
 use liquid_interpreter::Renderable;
-use liquid_interpreter::Text;
 use liquid_interpreter::Variable;
 use liquid_interpreter::{FilterCall, FilterChain};
 use liquid_value::Scalar;
@@ -17,6 +16,7 @@ use super::error::{Error, Result};
 use super::LiquidOptions;
 use super::ParseBlock;
 use super::ParseTag;
+use super::Text;
 
 use pest::Parser;
 

liquid-interpreter/src/text.rs → liquid-compiler/src/text.rs

@@ -1,18 +1,18 @@
 use std::io::Write;
 
-use super::Context;
-use super::Renderable;
 use error::{Result, ResultLiquidChainExt};
+use liquid_interpreter::Context;
+use liquid_interpreter::Renderable;
 
 /// A raw template expression.
 #[derive(Clone, Debug, Eq, PartialEq)]
-pub struct Text {
+pub(crate) struct Text {
     text: String,
 }
 
 impl Text {
     /// Create a raw template expression.
-    pub fn new<S: Into<String>>(text: S) -> Text {
+    pub(crate) fn new<S: Into<String>>(text: S) -> Text {
         Text { text: text.into() }
     }
 }

liquid-interpreter/Cargo.toml

@@ -16,6 +16,7 @@ appveyor  = { repository = "johannhof/liquid-rust" }
 
 [dependencies]
 itertools = "0.7.0"
+anymap = "0.12"
 # Exposed in API
 liquid-error = { version = "0.16", path = "../liquid-error" }
 liquid-value = { version = "0.17", path = "../liquid-value" }