From 7a4de27a97dc1e3cc2e517d96683e3c4ba9f7508 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Wed, 5 Feb 2020 23:58:15 +0100
Subject: parse assemblages from json

---
 src/template.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/template.rs')

diff --git a/src/template.rs b/src/template.rs
index d6f5c81..5e52cc0 100644
--- a/src/template.rs
+++ b/src/template.rs
@@ -1,7 +1,7 @@
 
 use std::collections::HashMap;
-use serde_json::Value;
-use super::compwrapper::CompWrapper;
+use crate::parameter::Parameter;
+use crate::compwrapper::CompWrapper;
 
 pub struct Template {
 	pub arguments: Vec<String>,
@@ -9,10 +9,10 @@ pub struct Template {
 }
 
 impl Template {
-	pub fn instantiate(&self, args: Vec<Value>, kwargs: HashMap<String, Value>) -> Option<Vec<CompWrapper>>{
+	pub fn instantiate(&self, args: Vec<Parameter>, kwargs: HashMap<String, Parameter>) -> Option<Vec<CompWrapper>>{
 		let mut components: Vec<CompWrapper> = Vec::new();
 		for (compname, compparams) in &self.components {
-			let mut compargs: HashMap<&str, &Value> = HashMap::new();
+			let mut compargs: HashMap<&str, &Parameter> = HashMap::new();
 			for (name, param) in compparams {
 				match param {
 					CompParam::Constant(val) => {compargs.insert(name.as_str(), &val); Some(())},
@@ -43,6 +43,6 @@ impl Template {
 
 
 pub enum CompParam {
-	Constant(Value),
+	Constant(Parameter),
 	Argument(String)
 }
-- 
cgit