Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
stgroup
ttc18
Commits
17a115d4
Commit
17a115d4
authored
Jun 19, 2018
by
René Schöne
Browse files
Fix model parsing.
parent
8eec1cf4
Changes
4
Hide whitespace changes
Inline
Side-by-side
jastadd-mquat-base/src/main/jastadd/Eval.jrag
View file @
17a115d4
...
...
@@ -103,7 +103,6 @@ aspect eval {
rewrite QualifiedNameDesignator {
to Designator {
MquatWriteSettings settings = new MquatWriteSettings(" ");
return containingClause().resolveQualifiedName(this.getQualifiedName());
}
}
...
...
jastadd-mquat-base/src/main/jastadd/Printing.jrag
View file @
17a115d4
...
...
@@ -61,7 +61,7 @@ aspect Printing {
} else {
result.append(".");
}
result.append(name.print(settings, indentationLevel))
.append(".")
;
result.append(name.print(settings, indentationLevel));
}
return result;
}
...
...
jastadd-mquat-base/src/main/jastadd/mquat.flex
View file @
17a115d4
...
...
@@ -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
);
}
...
...
jastadd-mquat-base/src/main/jastadd/mquat.parser
View file @
17a115d4
...
...
@@ -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
=
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment