Skip to content
Snippets Groups Projects
Commit 9dfc2fdb authored by Johannes Mey's avatar Johannes Mey
Browse files

fix parsing of token without explicit type

parent e0e975cc
Branches
Tags
No related merge requests found
......@@ -20,7 +20,7 @@ NormalComponent : TypeComponent;
ListComponent : TypeComponent;
OptComponent : TypeComponent;
TokenComponent : Component ::= JavaTypeUse;
TokenComponent : Component ::= [JavaTypeUse];
abstract JavaTypeUse ::= <Name>;
SimpleJavaTypeUse : JavaTypeUse;
......
......@@ -101,9 +101,14 @@ aspect BackendAbstractGrammar {
}
b.append("<");
if (!getName().equals("")) {
b.append(getName()).append(":");
b.append(getName());
if (hasJavaTypeUse()) {
b.append(":");
}
}
if (hasJavaTypeUse()) {
getJavaTypeUse().generateAbstractGrammar(b);
}
b.append(">");
if (getNTA()) {
b.append("/");
......
......@@ -118,11 +118,10 @@ Component actual_component
result.setJavaTypeUse(type);
return result;
:}
| LT ID.type GT
| LT ID.name GT
{:
TokenComponent result = new TokenComponent();
result.setName(type);
result.setJavaTypeUse(new SimpleJavaTypeUse(type));
result.setName(name);
return result;
:}
;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment