From 583416471485a963a404b54d47f24793bb17ea1a Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Mon, 6 Aug 2018 17:21:32 +0200
Subject: [PATCH] make assignments part of model
---
jastadd-mquat-base/src/main/jastadd/Mquat.ast | 2 +-
jastadd-mquat-base/src/main/jastadd/mquat.parser | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jastadd-mquat-base/src/main/jastadd/Mquat.ast b/jastadd-mquat-base/src/main/jastadd/Mquat.ast
index 6dbb4ba..7e51520 100644
--- a/jastadd-mquat-base/src/main/jastadd/Mquat.ast
+++ b/jastadd-mquat-base/src/main/jastadd/Mquat.ast
@@ -1,4 +1,4 @@
-Root ::= HardwareModel SoftwareModel Request* Objective /ILP/ ;
+Root ::= HardwareModel SoftwareModel Request* Objective /ILP/ Solution:Solution* ;
// =====================================================================================================================
// Low-Level Grammar Rules
diff --git a/jastadd-mquat-base/src/main/jastadd/mquat.parser b/jastadd-mquat-base/src/main/jastadd/mquat.parser
index ba0955b..15b4cf1 100644
--- a/jastadd-mquat-base/src/main/jastadd/mquat.parser
+++ b/jastadd-mquat-base/src/main/jastadd/mquat.parser
@@ -84,7 +84,7 @@ Objective objective =
;
Root goal =
- hardware_model.h software_model.s request.r* objective.o {: return new Root(h,s,r,o); :}
+ hardware_model.h software_model.s request.r* objective.o {: return new Root(h,s,r,o, new List<>()); :}
;
MetaParameter meta_parameter =
--
GitLab