From 7776f592884e36d00ebd9285768df020c4a2fe8b Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Sat, 26 Dec 2020 22:23:49 +0100
Subject: [PATCH] slight simplification of syntax tree

---
 src/main/grammar/RelAstGrammar.bnf | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/grammar/RelAstGrammar.bnf b/src/main/grammar/RelAstGrammar.bnf
index fa241e1..c0a5b23 100644
--- a/src/main/grammar/RelAstGrammar.bnf
+++ b/src/main/grammar/RelAstGrammar.bnf
@@ -11,6 +11,8 @@
   elementTypeHolderClass="org.jastadd.tooling.parser.RelAstGrammarTypes"
   elementTypeClass="org.jastadd.tooling.parser.RelAstGrammarElementType"
   tokenTypeClass="org.jastadd.tooling.parser.RelAstGrammarTokenType"
+
+  psiImplUtilClass="org.jastadd.tooling.psi.impl.RelAstGrammarPsiImplUtil"
 }
 
 relAstGrammarFile ::= comment* declaration*
@@ -19,11 +21,11 @@ declaration ::= (type_decl | relation) comment*
 
 comment ::= (WHITESPACE | MULTILINECOMMENT | DOCCOMMENT | SINGLELINECOMMENT)
 
-type_decl ::= ABSTRACT? ID (COL ID)? (ASSIGN component*)? SCOL
+type_decl ::= ABSTRACT? ID (COL ID)? (ASSIGN (component | nta_component)*)? SCOL
 
-component ::= (SLASH actual_component SLASH) | actual_component
+nta_component ::= SLASH component SLASH
 
-actual_component ::= (ID (COL ID)? STAR?) | (LBRACKET ID (COL ID)? RBRACKET) | (LT ID (COL (java_type_use))? GT)
+component ::= (ID (COL ID)? STAR?) | (LBRACKET ID (COL ID)? RBRACKET) | (LT ID (COL (java_type_use))? GT)
 
 java_type_use ::=  parameterized_java_type_use | simple_java_type_use
 
-- 
GitLab