Commit a91866f0 authored by Malte Heithoff's avatar Malte Heithoff

Removed double license

parent fb804bea
Pipeline #392206 passed with stage
in 58 seconds
......@@ -21,13 +21,7 @@ import de.monticore.ast.ASTNode;
import de.monticore.lang.tagging._ast.*;
import de.monticore.lang.tagging._parser.TaggingParser;
import de.monticore.lang.tagging.helper.RangeFixer;
import de.monticore.symboltable.CommonScope;
import de.monticore.symboltable.MutableScope;
import de.monticore.symboltable.Scope;
import de.monticore.symboltable.ScopeSpanningSymbol;
import de.monticore.symboltable.Symbol;
import de.monticore.symboltable.SymbolKind;
import de.monticore.symboltable.SymbolPredicate;
import de.monticore.symboltable.*;
import de.monticore.symboltable.modifiers.AccessModifier;
import de.monticore.symboltable.resolving.ResolvingFilter;
import de.se_rwth.commons.logging.Log;
......@@ -277,4 +271,20 @@ public class TaggingResolver implements Scope {
public MutableScope getAsMutableScope() {
return globalScope.getAsMutableScope();
}
public void addSubScope(MutableScope subScope) {
if (!(globalScope instanceof GlobalScope)) return;
if (!globalScope.getSubScopes().contains(subScope)) {
((GlobalScope) this.globalScope).addSubScope(subScope);
subScope.setEnclosingScope((GlobalScope) this.globalScope);
}
}
public void removeSubScope(MutableScope subScope) {
if (!(globalScope instanceof GlobalScope)) return;
if (globalScope.getSubScopes().contains(subScope)) {
((GlobalScope) this.globalScope).removeSubScope(subScope);
subScope.setEnclosingScope(null);
}
}
}
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.SimpleTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.SimpleTagTypeCreator*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.TagSchema*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.SimpleTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.SimpleTagTypeCreator*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.TagSchema*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagTypeCreator*/
......@@ -56,7 +55,7 @@ public class CompPowerInstSymbolCreator implements TagSymbolCreator {
for (ASTTag element : unit.getTagBody().getTagList()) {
element.getTagElementList().stream()
.filter(t -> t.getName().equals("CompPowerInst"))
.filter(t -> !t.getTagValueOpt().isPresent())
.filter(t -> t.isPresentTagValue())
.map(t -> checkContent(t.getTagValueOpt().get()))
.filter(r -> r != null)
.filter(this::checkUnit)
......@@ -100,7 +99,7 @@ public class CompPowerInstSymbolCreator implements TagSymbolCreator {
Log.enableFailQuick(false);
long errorCount = Log.getErrorCount();
ast = parser.parseUnitTagValue(s);
ast = parser.parse_StringUnitTagValue(s);
Log.enableFailQuick(enableFailQuick);
if (Log.getErrorCount() > errorCount) {
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagTypeCreator*/
......@@ -56,7 +55,7 @@ public class CompPowerSymbolCreator implements TagSymbolCreator {
for (ASTTag element : unit.getTagBody().getTagList()) {
element.getTagElementList().stream()
.filter(t -> t.getName().equals("CompPower"))
.filter(t -> !t.getTagValueOpt().isPresent())
.filter(t -> t.isPresentTagValue())
.map(t -> checkContent(t.getTagValueOpt().get()))
.filter(r -> r != null)
.filter(this::checkUnit)
......@@ -100,7 +99,7 @@ public class CompPowerSymbolCreator implements TagSymbolCreator {
Log.enableFailQuick(false);
long errorCount = Log.getErrorCount();
ast = parser.parseUnitTagValue(s);
ast = parser.parse_StringUnitTagValue(s);
Log.enableFailQuick(enableFailQuick);
if (Log.getErrorCount() > errorCount) {
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagTypeCreator*/
......@@ -56,7 +55,7 @@ public class LatencyCmpInstSymbolCreator implements TagSymbolCreator {
for (ASTTag element : unit.getTagBody().getTagList()) {
element.getTagElementList().stream()
.filter(t -> t.getName().equals("LatencyCmpInst"))
.filter(t -> !t.getTagValueOpt().isPresent())
.filter(t -> t.isPresentTagValue())
.map(t -> checkContent(t.getTagValueOpt().get()))
.filter(r -> r != null)
.filter(this::checkUnit)
......@@ -100,7 +99,7 @@ public class LatencyCmpInstSymbolCreator implements TagSymbolCreator {
Log.enableFailQuick(false);
long errorCount = Log.getErrorCount();
ast = parser.parseUnitTagValue(s);
ast = parser.parse_StringUnitTagValue(s);
Log.enableFailQuick(enableFailQuick);
if (Log.getErrorCount() > errorCount) {
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagTypeCreator*/
......@@ -56,7 +55,7 @@ public class LatencyCmpSymbolCreator implements TagSymbolCreator {
for (ASTTag element : unit.getTagBody().getTagList()) {
element.getTagElementList().stream()
.filter(t -> t.getName().equals("LatencyCmp"))
.filter(t -> !t.getTagValueOpt().isPresent())
.filter(t -> t.isPresentTagValue())
.map(t -> checkContent(t.getTagValueOpt().get()))
.filter(r -> r != null)
.filter(this::checkUnit)
......@@ -100,7 +99,7 @@ public class LatencyCmpSymbolCreator implements TagSymbolCreator {
Log.enableFailQuick(false);
long errorCount = Log.getErrorCount();
ast = parser.parseUnitTagValue(s);
ast = parser.parse_StringUnitTagValue(s);
Log.enableFailQuick(enableFailQuick);
if (Log.getErrorCount() > errorCount) {
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagTypeCreator*/
......@@ -56,7 +55,7 @@ public class LatencyConnSymbolCreator implements TagSymbolCreator {
for (ASTTag element : unit.getTagBody().getTagList()) {
element.getTagElementList().stream()
.filter(t -> t.getName().equals("LatencyConn"))
.filter(t -> !t.getTagValueOpt().isPresent())
.filter(t -> t.isPresentTagValue())
.map(t -> checkContent(t.getTagValueOpt().get()))
.filter(r -> r != null)
.filter(this::checkUnit)
......@@ -100,7 +99,7 @@ public class LatencyConnSymbolCreator implements TagSymbolCreator {
Log.enableFailQuick(false);
long errorCount = Log.getErrorCount();
ast = parser.parseUnitTagValue(s);
ast = parser.parse_StringUnitTagValue(s);
Log.enableFailQuick(enableFailQuick);
if (Log.getErrorCount() > errorCount) {
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagTypeCreator*/
......@@ -56,7 +55,7 @@ public class LatencyPortSymbolCreator implements TagSymbolCreator {
for (ASTTag element : unit.getTagBody().getTagList()) {
element.getTagElementList().stream()
.filter(t -> t.getName().equals("LatencyPort"))
.filter(t -> !t.getTagValueOpt().isPresent())
.filter(t -> t.isPresentTagValue())
.map(t -> checkContent(t.getTagValueOpt().get()))
.filter(r -> r != null)
.filter(this::checkUnit)
......@@ -100,7 +99,7 @@ public class LatencyPortSymbolCreator implements TagSymbolCreator {
Log.enableFailQuick(false);
long errorCount = Log.getErrorCount();
ast = parser.parseUnitTagValue(s);
ast = parser.parse_StringUnitTagValue(s);
Log.enableFailQuick(enableFailQuick);
if (Log.getErrorCount() > errorCount) {
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.TagSchema*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.TagSchema*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagTypeCreator*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.SimpleTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.SimpleTagTypeCreator*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.TagSchema*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ComplexTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ComplexTagTypeCreator*/
......@@ -63,7 +62,7 @@ public class SizeSymbolCreator implements TagSymbolCreator {
for (ASTTag element : unit.getTagBody().getTagList()) {
element.getTagElementList().stream()
.filter(t -> t.getName().equals("Size"))
.filter(t -> !t.getTagValueOpt().isPresent())
.filter(t -> t.isPresentTagValue())
.map(t -> matchRegexPattern(t.getTagValueOpt().get()))
.filter(r -> r != null)
.forEachOrdered(m ->
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagTypeCreator*/
......@@ -58,7 +57,7 @@ public class WeightSymbolCreator implements TagSymbolCreator {
for (ASTTag element : unit.getTagBody().getTagList()) {
element.getTagElementList().stream()
.filter(t -> t.getName().equals("Weight"))
.filter(t -> !t.getTagValueOpt().isPresent())
.filter(t -> t.isPresentTagValue())
.map(t -> checkContent(t.getTagValueOpt().get()))
.filter(r -> r != null)
.filter(this::checkUnit)
......@@ -102,7 +101,7 @@ public class WeightSymbolCreator implements TagSymbolCreator {
Log.enableFailQuick(false);
long errorCount = Log.getErrorCount();
ast = parser.parseUnitTagValue(s);
ast = parser.parse_StringUnitTagValue(s);
Log.enableFailQuick(enableFailQuick);
if (Log.getErrorCount() > errorCount) {
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagTypeCreator*/
......@@ -53,7 +52,7 @@ public class PowerBooleanSymbolCreator implements TagSymbolCreator {
for (ASTTag element : unit.getTagBody().getTagList()) {
element.getTagElementList().stream()
.filter(t -> t.getName().equals("PowerBoolean"))
.filter(t -> !t.getTagValueOpt().isPresent())
.filter(t -> t.isPresentTagValue())
.map(t -> checkContent(t.getTagValueOpt().get()))
.filter(r -> r != null)
.forEachOrdered(v ->
......@@ -76,7 +75,7 @@ public class PowerBooleanSymbolCreator implements TagSymbolCreator {
Log.enableFailQuick(false);
long errorCount = Log.getErrorCount();
ast = parser.parseBooleanTagValue(s);
ast = parser.parse_StringBooleanTagValue(s);
Log.enableFailQuick(enableFailQuick);
if (Log.getErrorCount() > errorCount) {
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagTypeCreator*/
......@@ -56,7 +55,7 @@ public class PowerConsumptionSymbolCreator implements TagSymbolCreator {
for (ASTTag element : unit.getTagBody().getTagList()) {
element.getTagElementList().stream()
.filter(t -> t.getName().equals("PowerConsumption"))
.filter(t -> !t.getTagValueOpt().isPresent())
.filter(t -> t.isPresentTagValue())
.map(t -> checkContent(t.getTagValueOpt().get()))
.filter(r -> r != null)
.filter(this::checkUnit)
......@@ -100,7 +99,7 @@ public class PowerConsumptionSymbolCreator implements TagSymbolCreator {
Log.enableFailQuick(false);
long errorCount = Log.getErrorCount();
ast = parser.parseUnitTagValue(s);
ast = parser.parse_StringUnitTagValue(s);
Log.enableFailQuick(enableFailQuick);
if (Log.getErrorCount() > errorCount) {
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.TagSchema*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagTypeCreator*/
......@@ -54,7 +53,7 @@ public class PowerIdSymbolCreator implements TagSymbolCreator {
for (ASTTag element : unit.getTagBody().getTagList()) {
element.getTagElementList().stream()
.filter(t -> t.getName().equals("PowerId"))
.filter(t -> !t.getTagValueOpt().isPresent())
.filter(t -> t.isPresentTagValue())
.map(t -> checkContent(t.getTagValueOpt().get()))
.filter(r -> r != null)
.forEachOrdered(v ->
......@@ -77,7 +76,7 @@ public class PowerIdSymbolCreator implements TagSymbolCreator {
Log.enableFailQuick(false);
long errorCount = Log.getErrorCount();
ast = parser.parseNumericTagValue(s);
ast = parser.parse_StringNumericTagValue(s);
Log.enableFailQuick(enableFailQuick);
if (Log.getErrorCount() > errorCount) {
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagTypeCreator*/
......@@ -53,7 +52,7 @@ public class PowerTesterSymbolCreator implements TagSymbolCreator {
for (ASTTag element : unit.getTagBody().getTagList()) {
element.getTagElementList().stream()
.filter(t -> t.getName().equals("PowerTester"))
.filter(t -> !t.getTagValueOpt().isPresent())
.filter(t -> t.isPresentTagValue())
.map(t -> checkContent(t.getTagValueOpt().get()))
.filter(r -> r != null)
.forEachOrdered(v ->
......@@ -76,7 +75,7 @@ public class PowerTesterSymbolCreator implements TagSymbolCreator {
Log.enableFailQuick(false);
long errorCount = Log.getErrorCount();
ast = parser.parseStringTagValue(s);
ast = parser.parse_StringStringTagValue(s);
Log.enableFailQuick(enableFailQuick);
if (Log.getErrorCount() > errorCount) {
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagTypeCreator*/
......@@ -56,7 +55,7 @@ public class TransCostCmpInstSymbolCreator implements TagSymbolCreator {
for (ASTTag element : unit.getTagBody().getTagList()) {
element.getTagElementList().stream()
.filter(t -> t.getName().equals("TransCostCmpInst"))
.filter(t -> !t.getTagValueOpt().isPresent())
.filter(t -> t.isPresentTagValue())
.map(t -> checkContent(t.getTagValueOpt().get()))
.filter(r -> r != null)
.filter(this::checkUnit)
......@@ -100,7 +99,7 @@ public class TransCostCmpInstSymbolCreator implements TagSymbolCreator {
Log.enableFailQuick(false);
long errorCount = Log.getErrorCount();
ast = parser.parseUnitTagValue(s);
ast = parser.parse_StringUnitTagValue(s);
Log.enableFailQuick(enableFailQuick);
if (Log.getErrorCount() > errorCount) {
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagTypeCreator*/
......@@ -56,7 +55,7 @@ public class TransCostCmpSymbolCreator implements TagSymbolCreator {
for (ASTTag element : unit.getTagBody().getTagList()) {
element.getTagElementList().stream()
.filter(t -> t.getName().equals("TransCostCmp"))
.filter(t -> !t.getTagValueOpt().isPresent())
.filter(t -> t.isPresentTagValue())
.map(t -> checkContent(t.getTagValueOpt().get()))
.filter(r -> r != null)
.filter(this::checkUnit)
......@@ -100,7 +99,7 @@ public class TransCostCmpSymbolCreator implements TagSymbolCreator {
Log.enableFailQuick(false);
long errorCount = Log.getErrorCount();
ast = parser.parseUnitTagValue(s);
ast = parser.parse_StringUnitTagValue(s);
Log.enableFailQuick(enableFailQuick);
if (Log.getErrorCount() > errorCount) {
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagTypeCreator*/
......@@ -56,7 +55,7 @@ public class TransCostConnSymbolCreator implements TagSymbolCreator {
for (ASTTag element : unit.getTagBody().getTagList()) {
element.getTagElementList().stream()
.filter(t -> t.getName().equals("TransCostConn"))
.filter(t -> !t.getTagValueOpt().isPresent())
.filter(t -> t.isPresentTagValue())
.map(t -> checkContent(t.getTagValueOpt().get()))
.filter(r -> r != null)
.filter(this::checkUnit)
......@@ -100,7 +99,7 @@ public class TransCostConnSymbolCreator implements TagSymbolCreator {
Log.enableFailQuick(false);
long errorCount = Log.getErrorCount();
ast = parser.parseUnitTagValue(s);
ast = parser.parse_StringUnitTagValue(s);
Log.enableFailQuick(enableFailQuick);
if (Log.getErrorCount() > errorCount) {
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagType*/
......
/* (c) https://github.com/MontiCore/monticore */
/* generated by template templates.de.monticore.lang.tagschema.ValuedTagTypeCreator*/
......@@ -56,7 +55,7 @@ public class TransCostPortSymbolCreator implements TagSymbolCreator {
for (ASTTag element : unit.getTagBody().getTagList()) {
element.getTagElementList().stream()
.filter(t -> t.getName().equals("TransCostPort"))
.filter(t -> !t.getTagValueOpt().isPresent())
.filter(t -> t.isPresentTagValue())
.map(t -> checkContent(