Commit d3fc1772 authored by Evgeny Kusmenko's avatar Evgeny Kusmenko
Browse files

Merge branch 'develop' into 'master'

misc

See merge request !23
parents 681d5d74 1b3c0013
Pipeline #348623 passed with stage
in 3 minutes and 55 seconds
......@@ -29,7 +29,7 @@
<monticore.version>5.0.1</monticore.version>
<se-commons.version>1.7.8</se-commons.version>
<mc.grammars.assembly.version>0.0.6</mc.grammars.assembly.version>
<CNNArch.version>0.3.7-SNAPSHOT</CNNArch.version>
<CNNArch.version>0.4.0-SNAPSHOT</CNNArch.version>
<!-- .. Libraries .................................................. -->
<guava.version>25.1-jre</guava.version>
......
......@@ -12,7 +12,6 @@ import de.monticore.lang.tagging._symboltable.TagSymbol;
public class LayerPathParameterSymbol extends TagSymbol {
public static final LayerPathParameterKind KIND = LayerPathParameterKind.INSTANCE;
public LayerPathParameterSymbol() {
super(KIND, ".");
}
......
......@@ -59,7 +59,7 @@ public class LayerPathParameterSymbolCreator implements TagSymbolCreator {
protected void addTag(ASTTag tag, TaggingResolver tagging, String root, SymbolKind kind) {
tag.getTagElementList().stream()
.filter(tagElement -> tagElement.getName().equals("LayerPathParameter"))
.forEachOrdered(tagElement -> {
.forEachOrdered(tagElement -> {
Matcher matcher = matchRegexPattern(tagElement.getTagValue());
tag.getScopeList().stream()
.filter(scope -> scope.getScopeKind().equals("NameScope"))
......@@ -84,7 +84,7 @@ public class LayerPathParameterSymbolCreator implements TagSymbolCreator {
Log.error(
String.format(
"'%s' does not match the specified regex pattern '%s'",
regex, "{path = {LayerPathParameter}, name = {tagId}}"
regex, "{path = {LayerPathParameter}, id = {tagId}}"
)
);
return null;
......
......@@ -14,7 +14,6 @@ import de.monticore.lang.monticar.emadl.AbstractTaggingResolverTest;
import de.monticore.lang.tagging._symboltable.TagSymbol;
import de.monticore.lang.tagging._symboltable.TaggingResolver;
import de.monticore.lang.monticar.emadl.tagging.dltag.DataPathSymbol;
import de.monticore.lang.monticar.emadl.tagging.dltag.LayerPathParameterSymbol;
import org.junit.Test;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment