diff --git a/jastadd-mquat-base/src/main/jastadd/Eval.jrag b/jastadd-mquat-base/src/main/jastadd/Eval.jrag index 6f0e30ba20a9fdb6eed5eb694b6f807a83db2661..4f5b7f0ac6781876cb0b057d81b24dd1fff5e55a 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 ff4a0280fd7387c61081a6c7519579ecdf8a6b38..33fc1064b9d58e6f08f3b969ca07aac6a40040ee 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 52881bc84f94b2c923df00533c59d4caba4e293f..dfc4dcea396fe1348145671e3f01cd8d3f0bac45 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 e9c1856b59380eaf477d368584c159d0edd5ba90..37243db6d937080d99c3e2ae8f160302cbfd682c 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 =