Merge branch 'remove-no-token-mode-in-component-grammar-coco' into 'dev'

Remove NoTokenModeInComponentGrammar CoCo to allow component grammars with token modes See merge request monticore/monticore!878
MontiCore · Sep 21, 2023 · 6a5393c · 6a5393c
2 parents fe63b8d + 020836c
commit 6a5393c
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 68 deletions.
diff --git a/monticore-generator/src/main/java/de/monticore/grammar/GrammarCoCosFix.java b/monticore-generator/src/main/java/de/monticore/grammar/GrammarCoCosFix.java
@@ -51,7 +51,6 @@
 import de.monticore.grammar.cocos.NoNestedGenericsInAdditionalAttributes;
 import de.monticore.grammar.cocos.NoOverridingNTHasAnnotation;
 import de.monticore.grammar.cocos.NoTokenDefined;
-import de.monticore.grammar.cocos.NoTokenModeInComponentGrammar;
 import de.monticore.grammar.cocos.OverridingAbstractNTs;
 import de.monticore.grammar.cocos.OverridingAbstractNTsHaveNoSuperRules;
 import de.monticore.grammar.cocos.OverridingAdditionalAttributes;
@@ -163,7 +162,6 @@ public Grammar_WithConceptsCoCoChecker getCoCoChecker() {
     checker.addCoCo(new NoExtensionOfSymbolThatOnlySpansScope());
     // checker.addCoCo(new NoNTInheritanceCycle());
     checker.addCoCo(new LexProdModeNameUpperCase());
-    checker.addCoCo(new NoTokenModeInComponentGrammar());
     checker.addCoCo(new InheritedModiOverwrite());
     checker.addCoCo(new NoForbiddenGrammarName());
     checker.addCoCo(new NoForbiddenProdName());

diff --git a/monticore-grammar/src/main/java/de/monticore/grammar/cocos/GrammarCoCos.java b/monticore-grammar/src/main/java/de/monticore/grammar/cocos/GrammarCoCos.java
@@ -80,7 +80,6 @@ public Grammar_WithConceptsCoCoChecker getCoCoChecker() {
     checker.addCoCo(new NoExtensionOfSymbolThatOnlySpansScope());
     // checker.addCoCo(new NoNTInheritanceCycle());
     checker.addCoCo(new LexProdModeNameUpperCase());
-    checker.addCoCo(new NoTokenModeInComponentGrammar());
     checker.addCoCo(new InheritedModiOverwrite());
     checker.addCoCo(new NoForbiddenGrammarName());
     checker.addCoCo(new NoForbiddenProdName());

diff --git a/...icore-grammar/src/main/java/de/monticore/grammar/cocos/NoTokenModeInComponentGrammar.java b/...icore-grammar/src/main/java/de/monticore/grammar/cocos/NoTokenModeInComponentGrammar.java
diff --git a/...e-grammar/src/test/java/de/monticore/grammar/cocos/NoTokenModeInComponentGrammarTest.java b/...e-grammar/src/test/java/de/monticore/grammar/cocos/NoTokenModeInComponentGrammarTest.java
diff --git a/monticore-grammar/src/test/resources/de/monticore/grammar/cocos/invalid/A4068/A4068.mc4 b/monticore-grammar/src/test/resources/de/monticore/grammar/cocos/invalid/A4068/A4068.mc4