summaryrefslogtreecommitdiff
path: root/src/codegen.rs
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers+gitlab@digital-scurf.org>2020-05-21 07:27:38 +0000
committerDaniel Silverstone <dsilvers+gitlab@digital-scurf.org>2020-05-21 07:27:38 +0000
commit576aa3bcbb6615f4fef73264029fc22af78fdfdc (patch)
treeec50e222e1c9b139d08a0eae6911cbe87e0fb485 /src/codegen.rs
parent6d77fdedd7fd0f832a543b7eb530ae15984aa377 (diff)
parent0a073fa0b2a7e456d3bff9c9bfe930e8b3ee7449 (diff)
downloadsubplot-576aa3bcbb6615f4fef73264029fc22af78fdfdc.tar.gz
Merge branch 'multi' into 'master'
Add support for multiple bindings and functions files See merge request larswirzenius/subplot!43
Diffstat (limited to 'src/codegen.rs')
-rw-r--r--src/codegen.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/codegen.rs b/src/codegen.rs
index 70d1966..db31765 100644
--- a/src/codegen.rs
+++ b/src/codegen.rs
@@ -41,12 +41,12 @@ fn context(doc: &mut Document) -> Result<Context> {
context.insert("scenarios", &doc.matched_scenarios()?);
context.insert("files", doc.files());
- let (funcs_filename, funcs) = match doc.meta().functions_filename() {
- Some(filename) => (filename, cat(filename)?),
- None => (Path::new(""), "".to_string()),
- };
+ let funcs_filenames = doc.meta().functions_filenames();
+ let mut funcs = String::new();
+ for filename in funcs_filenames {
+ funcs.push_str(&cat(filename)?);
+ }
context.insert("functions", &funcs);
- context.insert("functions_filename", funcs_filename);
Ok(context)
}