Merge branch 'bug-terminal-ntas' into extendj

src/main/jastadd/Analysis.jrag

@@ -105,6 +105,11 @@ aspect ComponentAnalysis {
   //--- isEqual ---
   syn boolean Component.isEqual(Component c) = this.getClass() == c.getClass() && getTypeUse().isEqual(c.getTypeUse());
 
+  /**
+   * TokenComponents may be specialized by NTATokenComponents and vice versa
+   */
+  eq TokenComponent.isEqual(Component c) = (c instanceof TokenComponent) && getTypeUse().isEqual(c.getTypeUse());
+
   syn boolean TypeUse.isEqual(TypeUse u);
   eq SimpleTypeUse.isEqual(TypeUse u) = u instanceof SimpleTypeUse && getID().equals(u.getID());
   eq ParameterizedTypeUse.isEqual(TypeUse u) {

src/main/jastadd/Backend.jadd

@@ -111,6 +111,9 @@ aspect BackendAbstractGrammar {
   public String TokenComponent.generateAbstractGrammar() {
     return "<" + getID() + ":" + getTypeUse() + ">";
   }
+  public String NTATokenComponent.generateAbstractGrammar() {
+    return "/<" + getID() + ":" + getTypeUse() + ">/";
+  }
 
   public String RelationComponent.generateAbstractGrammar() {
     return "<" + getImplAttributeName() + ":" + ofTypeDecl() + ">";

src/main/jastadd/RelAst.ast

@@ -11,6 +11,7 @@ NTAComponent : SimpleTypeComponent;
 NTAOptComponent : SimpleTypeComponent;
 NTAListComponent : SimpleTypeComponent;
 TokenComponent : Component ::= TypeUse;
+NTATokenComponent : TokenComponent ::= TypeUse;
 
 abstract TypeUse ::= <ID>;
 SimpleTypeUse : TypeUse;

src/main/jastadd/RelAst.parser

@@ -75,8 +75,8 @@ Component component =
   | SLASH ID COL s_type_use.u SLASH           {: return new NTAComponent(ID, u); :}
   | SLASH s_type_use.u SLASH                  {: return new NTAComponent(u.getID(), u); :}
   // NTA Token (same as NTA)
-  | SLASH LT ID COL s_type_use.u GT SLASH     {: return new NTAComponent(ID, u); :}
-  | SLASH LT s_type_use.u GT SLASH            {: return new NTAComponent(u.getID(), u); :}
+  | SLASH LT ID COL s_type_use.u GT SLASH     {: return new NTATokenComponent(ID, u); :}
+  | SLASH LT s_type_use.u GT SLASH            {: return new NTATokenComponent(u.getID(), u); :}
   // Token
   | LT ID COL type_use.u GT                   {: return new TokenComponent(ID, u); :}
   | LT ID GT                                  {: return new TokenComponent(ID, new SimpleTypeUse("String")); :}