resolve to relative path in include! by default

sailfish-compiler/src/compiler.rs

@@ -38,14 +38,16 @@ impl Compiler {
     pub fn compile_file(&self, template_dir: &Path, input: &Path, output: &Path) -> Result<(), Error> {
         // TODO: introduce cache system
 
-        let input = if input.is_absolute() {
-            input.to_owned()
-        } else {
-            template_dir.join(input)
-        };
-        
+        let input = input.canonicalize()?;
+
         let include_handler = Arc::new(|arg: &str| -> Result<_, Error> {
-            let input_file = template_dir.join(arg);
+            let input_file = if arg.starts_with("/") {
+                // absolute imclude
+                template_dir.join(arg)
+            } else {
+                // relative include
+                input.parent().unwrap().join(arg)
+            };
             Ok(self.translate_file_contents(&*input_file)?.ast)
         });
 

sailfish-compiler/src/resolver.rs

@@ -60,13 +60,6 @@ impl<'h> VisitMut for ResolverImpl<'h> {
             }
         };
 
-        // TODO: support relative path
-        if arg.starts_with("./") || arg.starts_with("../") {
-            self.error = Some(make_error!(ErrorKind::Unimplemented(
-                "include! with relative path is not supported yet.".to_owned()
-            )))
-        }
-
         // parse and translate the child template
         let mut blk = match (*self.include_handler)(&arg) {
             Ok(blk) => blk,