Support relative paths in %include_hex()

etk-asm/src/ingest.rs

@@ -219,6 +219,19 @@
     fn pop_path(&mut self) {
         self.sources.pop();
     }
+
+    /// Expands the path relative to last pushed path without pushing new path
+    fn resolve_path(&self, path: &PathBuf) -> Result<PathBuf, Error> {
+        let last = self.sources.last().unwrap();
+        let dir = match last.parent() {
+            Some(s) => s,
+            None => Path::new("./"),
+        };
+        let resolved = dir.join(path.to_owned());
+        self.root.as_ref().unwrap().check(&resolved)?;
+
+        Ok(resolved)
+    }
 }
 
 /// A high-level interface for assembling files into EVM bytecode.
@@ -321,7 +334,8 @@
                     raws.push(RawOp::Scope(inc_raws));
                 }
                 Node::IncludeHex(hex_path) => {
-                    let file = std::fs::read_to_string(&hex_path).with_context(|_| error::Io {
+                    let source = program.resolve_path(&hex_path)?;
+                    let file = std::fs::read_to_string(&source).with_context(|_| error::Io {
                         message: "reading hex include",
                         path: hex_path.to_owned(),
                     })?;

etk-asm/tests/asm.rs

@@ -329,3 +329,14 @@ fn test_variable_sized_push2() -> Result<(), Error> {
 
     Ok(())
 }
+
+#[test]
+fn test_include_hex() -> Result<(), Error> {
+    let mut output = Vec::new();
+    let mut ingester = Ingest::new(&mut output);
+    ingester.ingest_file(source(&["include-hex", "main.etk"]))?;
+
+    assert_eq!(output, hex!("6002600c5f3960025ff300 cafeb0ba cafebabe"));
+
+    Ok(())
+}

etk-asm/tests/asm/include-hex/hex1.etk

@@ -0,0 +1 @@
+cafeb0ba

etk-asm/tests/asm/include-hex/main.etk

@@ -0,0 +1,11 @@
+push1 2
+push1 12
+push0
+codecopy
+push1 2
+push0
+return
+stop
+
+%include_hex("hex1.etk")
+%include_hex("subdirectory/hex2.etk")

etk-asm/tests/asm/include-hex/subdirectory/hex2.etk

@@ -0,0 +1 @@
+cafebabe