From 17a115d4f9805f40b7484133ab7f4eb97fda553e Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Tue, 19 Jun 2018 10:32:07 +0200
Subject: [PATCH] Fix model parsing.
---
jastadd-mquat-base/src/main/jastadd/Eval.jrag | 1 -
jastadd-mquat-base/src/main/jastadd/Printing.jrag | 2 +-
jastadd-mquat-base/src/main/jastadd/mquat.flex | 2 +-
jastadd-mquat-base/src/main/jastadd/mquat.parser | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/jastadd-mquat-base/src/main/jastadd/Eval.jrag b/jastadd-mquat-base/src/main/jastadd/Eval.jrag
index 6f0e30b..4f5b7f0 100644
--- a/jastadd-mquat-base/src/main/jastadd/Eval.jrag
+++ b/jastadd-mquat-base/src/main/jastadd/Eval.jrag
@@ -103,7 +103,6 @@ aspect eval {
rewrite QualifiedNameDesignator {
to Designator {
- MquatWriteSettings settings = new MquatWriteSettings(" ");
return containingClause().resolveQualifiedName(this.getQualifiedName());
}
}
diff --git a/jastadd-mquat-base/src/main/jastadd/Printing.jrag b/jastadd-mquat-base/src/main/jastadd/Printing.jrag
index ff4a028..33fc106 100644
--- a/jastadd-mquat-base/src/main/jastadd/Printing.jrag
+++ b/jastadd-mquat-base/src/main/jastadd/Printing.jrag
@@ -61,7 +61,7 @@ aspect Printing {
} else {
result.append(".");
}
- result.append(name.print(settings, indentationLevel)).append(".");
+ result.append(name.print(settings, indentationLevel));
}
return result;
}
diff --git a/jastadd-mquat-base/src/main/jastadd/mquat.flex b/jastadd-mquat-base/src/main/jastadd/mquat.flex
index 52881bc..dfc4dce 100644
--- a/jastadd-mquat-base/src/main/jastadd/mquat.flex
+++ b/jastadd-mquat-base/src/main/jastadd/mquat.flex
@@ -49,7 +49,7 @@ Comment = "//" [^\n\r]+
"resources" { return sym(Terminals.RESOURCE); }
"resource" { return sym(Terminals.RESOURCE); }
"request" { return sym(Terminals.REQUEST); }
-"request" { return sym(Terminals.REQUEST); }
+"for" { return sym(Terminals.FOR); }
// TODO there should be a maximize too
"minimize" { return sym(Terminals.MINIMIZE); }
"container" { return sym(Terminals.CONTAINER); }
diff --git a/jastadd-mquat-base/src/main/jastadd/mquat.parser b/jastadd-mquat-base/src/main/jastadd/mquat.parser
index e9c1856..37243db 100644
--- a/jastadd-mquat-base/src/main/jastadd/mquat.parser
+++ b/jastadd-mquat-base/src/main/jastadd/mquat.parser
@@ -37,7 +37,7 @@ import java.util.HashMap;
%goal solution;
Request request =
- REQUEST component_ref.c LB_CURLY request_body.b RB_CURLY {: b.setTarget(c); return b; :}
+ REQUEST NAME FOR component_ref.c LB_CURLY request_body.b RB_CURLY {: b.setTarget(c); return b; :}
;
Request request_body =
--
GitLab