fix parsing of token without explicit type

src/main/jastadd/RelAst.relast

@@ -20,7 +20,7 @@ NormalComponent : TypeComponent;
 ListComponent : TypeComponent;
 OptComponent : TypeComponent;
 
-TokenComponent : Component ::= JavaTypeUse;
+TokenComponent : Component ::= [JavaTypeUse];
 
 abstract JavaTypeUse ::= <Name>;
 SimpleJavaTypeUse : JavaTypeUse;

src/main/jastadd/backend/AbstractGrammar.jadd

@@ -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("/");

src/main/jastadd/parser/RelAst.parser

@@ -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;
     :}
 ;