From 9f3b590206e3dfe33b7129b1c8ff010f60318cf2 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Sun, 27 Aug 2017 22:10:42 +0200
Subject: Move most of the code into new askama_shared crate

This makes it possible to share code between askama and askama_derive.
---
 askama_derive/src/lib.rs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'askama_derive/src/lib.rs')

diff --git a/askama_derive/src/lib.rs b/askama_derive/src/lib.rs
index 0564ccc..0333c06 100644
--- a/askama_derive/src/lib.rs
+++ b/askama_derive/src/lib.rs
@@ -1,7 +1,5 @@
-#[macro_use]
-extern crate nom;
+extern crate askama_shared as shared;
 extern crate proc_macro;
-extern crate quote;
 extern crate syn;
 
 use proc_macro::TokenStream;
@@ -9,10 +7,6 @@ use proc_macro::TokenStream;
 use std::borrow::Cow;
 use std::path::PathBuf;
 
-mod generator;
-mod parser;
-mod path;
-
 #[proc_macro_derive(Template, attributes(template))]
 pub fn derive_template(input: TokenStream) -> TokenStream {
     let ast = syn::parse_derive_input(&input.to_string()).unwrap();
@@ -35,16 +29,16 @@ fn build_template(ast: &syn::DeriveInput) -> String {
     let (path, src) = match meta.source {
         Source::Source(s) => (PathBuf::new(), Cow::Borrowed(s)),
         Source::Path(s) => {
-            let path = path::find_template_from_path(&s, None);
-            let src = path::get_template_source(&path);
+            let path = shared::path::find_template_from_path(&s, None);
+            let src = shared::path::get_template_source(&path);
             (path, Cow::Owned(src))
         },
     };
-    let nodes = parser::parse(src.as_ref());
+    let nodes = shared::parse(src.as_ref());
     if meta.print == Print::Ast || meta.print == Print::All {
         println!("{:?}", nodes);
     }
-    let code = generator::generate(ast, &path, nodes);
+    let code = shared::generate(ast, &path, nodes);
     if meta.print == Print::Code || meta.print == Print::All {
         println!("{}", code);
     }
-- 
cgit