split macro parser into its own crate and improve error handling / reporting

1 files changed, 27 insertions, 9 deletions

diff --git a/macros/src/lib.rs b/macros/src/lib.rs
index 10839eeb..467cbb93 100644
--- a/macros/src/lib.rs
+++ b/macros/src/lib.rs
@@ -1,26 +1,44 @@
-#![deny(warnings)]
 #![feature(proc_macro)]
 #![recursion_limit = "128"]
 
+#[macro_use]
+extern crate error_chain;
 extern crate proc_macro;
 #[macro_use]
 extern crate quote;
+extern crate rtfm_syntax;
 extern crate syn;
 
+use proc_macro::TokenStream;
+use rtfm_syntax::App;
+
+use error::*;
+
+mod analyze;
 mod check;
-mod syntax;
+mod error;
 mod trans;
-mod util;
-
-use proc_macro::TokenStream;
 
 #[proc_macro]
 pub fn rtfm(ts: TokenStream) -> TokenStream {
+    match run(ts) {
+        Err(e) => panic!("{}", error_chain::ChainedError::display(&e)),
+        Ok(ts) => ts,
+    }
+}
+
+fn run(ts: TokenStream) -> Result<TokenStream> {
     let input = format!("{}", ts);
 
-    let app = syntax::parse::app(&input);
-    let ceilings = util::compute_ceilings(&app);
-    check::resources(&app.resources, &ceilings);
+    let app = check::app(App::parse(&input)
+        .chain_err(|| "parsing the `rtfm!` macro")?).chain_err(
+        || "checking the application specification",
+    )?;
+
+    let ownerships = analyze::app(&app);
+    let tokens = trans::app(&app, &ownerships);
 
-    format!("{}", trans::app(&app, &ceilings)).parse().unwrap()
+    Ok(format!("{}", tokens)
+        .parse()
+        .map_err(|_| "BUG: error parsing the generated code")?)
 }