diff options
author | Kristóf Marussy <kristof@marussy.com> | 2021-10-05 00:36:47 +0200 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2021-10-05 00:36:47 +0200 |
commit | c3e27396c62f191b4343df151e5a86bfa63a32f3 (patch) | |
tree | 4f698c9ba0320a5c740c53877c3f75c00240dca4 /language | |
parent | fix(web): improve accessibility (diff) | |
download | refinery-c3e27396c62f191b4343df151e5a86bfa63a32f3.tar.gz refinery-c3e27396c62f191b4343df151e5a86bfa63a32f3.tar.zst refinery-c3e27396c62f191b4343df151e5a86bfa63a32f3.zip |
chore: change package name
Diffstat (limited to 'language')
-rw-r--r-- | language/build.gradle | 6 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/GenerateProblem.mwe2 (renamed from language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2) | 6 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/Problem.xtext (renamed from language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext) | 4 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/ProblemRuntimeModule.java (renamed from language/src/main/java/org/eclipse/viatra/solver/language/ProblemRuntimeModule.java) | 17 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/ProblemStandaloneSetup.java (renamed from language/src/main/java/org/eclipse/viatra/solver/language/ProblemStandaloneSetup.java) | 5 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/ProblemUtil.java (renamed from language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java) | 19 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/conversion/ProblemValueConverterService.java (renamed from language/src/main/java/org/eclipse/viatra/solver/language/conversion/ProblemValueConverterService.java) | 2 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/conversion/UpperBoundValueConverter.java (renamed from language/src/main/java/org/eclipse/viatra/solver/language/conversion/UpperBoundValueConverter.java) | 2 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/naming/NamingUtil.java (renamed from language/src/main/java/org/eclipse/viatra/solver/language/naming/NamingUtil.java) | 2 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/naming/ProblemQualifiedNameConverter.java (renamed from language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameConverter.java) | 2 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/resource/DerivedVariableComputer.java (renamed from language/src/main/java/org/eclipse/viatra/solver/language/resource/DerivedVariableComputer.java) | 33 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/resource/NodeNameCollector.java (renamed from language/src/main/java/org/eclipse/viatra/solver/language/resource/NodeNameCollector.java) | 19 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/resource/ProblemDerivedStateComputer.java (renamed from language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java) | 13 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/resource/ProblemLocationInFileProvider.java (renamed from language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java) | 9 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java (renamed from language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemResourceDescriptionStrategy.java) | 15 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/scoping/ProblemGlobalScopeProvider.java (renamed from language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemGlobalScopeProvider.java) | 2 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/scoping/ProblemLocalScopeProvider.java (renamed from language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemLocalScopeProvider.java) | 2 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java (renamed from language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java) | 21 | ||||
-rw-r--r-- | language/src/main/java/tools/refinery/language/validation/ProblemValidator.java (renamed from language/src/main/java/org/eclipse/viatra/solver/language/validation/ProblemValidator.java) | 2 | ||||
-rw-r--r-- | language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.xtend (renamed from language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemParsingTest.xtend) | 4 | ||||
-rw-r--r-- | language/src/test/java/tools/refinery/language/tests/ProblemTestUtil.xtend (renamed from language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemTestUtil.xtend) | 38 | ||||
-rw-r--r-- | language/src/test/java/tools/refinery/language/tests/scoping/NodeScopingTest.xtend (renamed from language/src/test/java/org/eclipse/viatra/solver/language/tests/scoping/NodeScopingTest.xtend) | 8 |
22 files changed, 120 insertions, 111 deletions
diff --git a/language/build.gradle b/language/build.gradle index 0b8492c3..85b0902f 100644 --- a/language/build.gradle +++ b/language/build.gradle | |||
@@ -34,14 +34,14 @@ tasks.named('jar') { | |||
34 | def generateXtextLanguage = tasks.register('generateXtextLanguage', JavaExec) { | 34 | def generateXtextLanguage = tasks.register('generateXtextLanguage', JavaExec) { |
35 | mainClass = 'org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher' | 35 | mainClass = 'org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher' |
36 | classpath = configurations.mwe2 | 36 | classpath = configurations.mwe2 |
37 | inputs.file 'src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2' | 37 | inputs.file 'src/main/java/tools/refinery/language/GenerateProblem.mwe2' |
38 | inputs.file 'src/main/java/org/eclipse/viatra/solver/language/Problem.xtext' | 38 | inputs.file 'src/main/java/tools/refinery/language/Problem.xtext' |
39 | outputs.dir 'src/main/xtext-gen' | 39 | outputs.dir 'src/main/xtext-gen' |
40 | outputs.dir 'src/testFixtures/xtext-gen' | 40 | outputs.dir 'src/testFixtures/xtext-gen' |
41 | outputs.dir '../language-ide/src/main/xtext-gen' | 41 | outputs.dir '../language-ide/src/main/xtext-gen' |
42 | outputs.dir '../language-web/src/main/xtext-gen' | 42 | outputs.dir '../language-web/src/main/xtext-gen' |
43 | outputs.dir '../language-web/build/generated/sources/xtext' | 43 | outputs.dir '../language-web/build/generated/sources/xtext' |
44 | args += 'src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2' | 44 | args += 'src/main/java/tools/refinery/language/GenerateProblem.mwe2' |
45 | args += '-p' | 45 | args += '-p' |
46 | args += "rootPath=/${projectDir}/.." | 46 | args += "rootPath=/${projectDir}/.." |
47 | } | 47 | } |
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2 b/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2 index 4dfbb242..1b177c94 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2 +++ b/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2 | |||
@@ -1,9 +1,9 @@ | |||
1 | module org.eclipse.viatra.solver.language.GenerateProblem | 1 | module tools.refinery.language.GenerateProblem |
2 | 2 | ||
3 | import org.eclipse.xtext.xtext.generator.* | 3 | import org.eclipse.xtext.xtext.generator.* |
4 | import org.eclipse.xtext.xtext.generator.model.project.* | 4 | import org.eclipse.xtext.xtext.generator.model.project.* |
5 | 5 | ||
6 | import org.eclipse.viatra.solver.language.mwe2.* | 6 | import tools.refinery.language.mwe2.* |
7 | 7 | ||
8 | var rootPath = ".." | 8 | var rootPath = ".." |
9 | 9 | ||
@@ -36,7 +36,7 @@ Workflow { | |||
36 | } | 36 | } |
37 | 37 | ||
38 | language = StandardLanguage { | 38 | language = StandardLanguage { |
39 | name = "org.eclipse.viatra.solver.language.Problem" | 39 | name = "tools.refinery.language.Problem" |
40 | fileExtensions = "problem" | 40 | fileExtensions = "problem" |
41 | referencedResource = "platform:/resource/refinery-language-model/model/problem.genmodel" | 41 | referencedResource = "platform:/resource/refinery-language-model/model/problem.genmodel" |
42 | serializer = { | 42 | serializer = { |
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext b/language/src/main/java/tools/refinery/language/Problem.xtext index d4fa6f35..6b46ee86 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext +++ b/language/src/main/java/tools/refinery/language/Problem.xtext | |||
@@ -1,7 +1,7 @@ | |||
1 | grammar org.eclipse.viatra.solver.language.Problem with org.eclipse.xtext.common.Terminals | 1 | grammar tools.refinery.language.Problem with org.eclipse.xtext.common.Terminals |
2 | 2 | ||
3 | import "http://www.eclipse.org/emf/2002/Ecore" as ecore | 3 | import "http://www.eclipse.org/emf/2002/Ecore" as ecore |
4 | import "http://www.eclipse.org/viatra/solver/language/model/Problem" | 4 | import "https://refinery.tools/emf/2021/Problem" |
5 | 5 | ||
6 | Problem: | 6 | Problem: |
7 | ("problem" name=Identifier ".")? | 7 | ("problem" name=Identifier ".")? |
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/ProblemRuntimeModule.java b/language/src/main/java/tools/refinery/language/ProblemRuntimeModule.java index 9fec7d75..dd7731b4 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/ProblemRuntimeModule.java +++ b/language/src/main/java/tools/refinery/language/ProblemRuntimeModule.java | |||
@@ -1,15 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.25.0 | 2 | * generated by Xtext 2.25.0 |
3 | */ | 3 | */ |
4 | package org.eclipse.viatra.solver.language; | 4 | package tools.refinery.language; |
5 | 5 | ||
6 | import org.eclipse.viatra.solver.language.conversion.ProblemValueConverterService; | ||
7 | import org.eclipse.viatra.solver.language.naming.ProblemQualifiedNameConverter; | ||
8 | import org.eclipse.viatra.solver.language.resource.ProblemDerivedStateComputer; | ||
9 | import org.eclipse.viatra.solver.language.resource.ProblemLocationInFileProvider; | ||
10 | import org.eclipse.viatra.solver.language.resource.ProblemResourceDescriptionStrategy; | ||
11 | import org.eclipse.viatra.solver.language.scoping.ProblemGlobalScopeProvider; | ||
12 | import org.eclipse.viatra.solver.language.scoping.ProblemLocalScopeProvider; | ||
13 | import org.eclipse.xtext.conversion.IValueConverterService; | 6 | import org.eclipse.xtext.conversion.IValueConverterService; |
14 | import org.eclipse.xtext.naming.IQualifiedNameConverter; | 7 | import org.eclipse.xtext.naming.IQualifiedNameConverter; |
15 | import org.eclipse.xtext.resource.DerivedStateAwareResource; | 8 | import org.eclipse.xtext.resource.DerivedStateAwareResource; |
@@ -28,6 +21,14 @@ import org.eclipse.xtext.xbase.annotations.validation.DerivedStateAwareResourceV | |||
28 | import com.google.inject.Binder; | 21 | import com.google.inject.Binder; |
29 | import com.google.inject.name.Names; | 22 | import com.google.inject.name.Names; |
30 | 23 | ||
24 | import tools.refinery.language.conversion.ProblemValueConverterService; | ||
25 | import tools.refinery.language.naming.ProblemQualifiedNameConverter; | ||
26 | import tools.refinery.language.resource.ProblemDerivedStateComputer; | ||
27 | import tools.refinery.language.resource.ProblemLocationInFileProvider; | ||
28 | import tools.refinery.language.resource.ProblemResourceDescriptionStrategy; | ||
29 | import tools.refinery.language.scoping.ProblemGlobalScopeProvider; | ||
30 | import tools.refinery.language.scoping.ProblemLocalScopeProvider; | ||
31 | |||
31 | /** | 32 | /** |
32 | * Use this class to register components to be used at runtime / without the | 33 | * Use this class to register components to be used at runtime / without the |
33 | * Equinox extension registry. | 34 | * Equinox extension registry. |
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/ProblemStandaloneSetup.java b/language/src/main/java/tools/refinery/language/ProblemStandaloneSetup.java index 11e5ad8a..f49069a5 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/ProblemStandaloneSetup.java +++ b/language/src/main/java/tools/refinery/language/ProblemStandaloneSetup.java | |||
@@ -1,13 +1,14 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.25.0 | 2 | * generated by Xtext 2.25.0 |
3 | */ | 3 | */ |
4 | package org.eclipse.viatra.solver.language; | 4 | package tools.refinery.language; |
5 | 5 | ||
6 | import org.eclipse.emf.ecore.EPackage; | 6 | import org.eclipse.emf.ecore.EPackage; |
7 | import org.eclipse.viatra.solver.language.model.problem.ProblemPackage; | ||
8 | 7 | ||
9 | import com.google.inject.Injector; | 8 | import com.google.inject.Injector; |
10 | 9 | ||
10 | import tools.refinery.language.model.problem.ProblemPackage; | ||
11 | |||
11 | /** | 12 | /** |
12 | * Initialization support for running Xtext languages without Equinox extension | 13 | * Initialization support for running Xtext languages without Equinox extension |
13 | * registry. | 14 | * registry. |
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java b/language/src/main/java/tools/refinery/language/ProblemUtil.java index a2938274..ae2efc3d 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java +++ b/language/src/main/java/tools/refinery/language/ProblemUtil.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.language; | 1 | package tools.refinery.language; |
2 | 2 | ||
3 | import java.util.ArrayDeque; | 3 | import java.util.ArrayDeque; |
4 | import java.util.Collection; | 4 | import java.util.Collection; |
@@ -9,17 +9,18 @@ import java.util.Set; | |||
9 | 9 | ||
10 | import org.eclipse.emf.ecore.EObject; | 10 | import org.eclipse.emf.ecore.EObject; |
11 | import org.eclipse.emf.ecore.resource.Resource; | 11 | import org.eclipse.emf.ecore.resource.Resource; |
12 | import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration; | ||
13 | import org.eclipse.viatra.solver.language.model.problem.Node; | ||
14 | import org.eclipse.viatra.solver.language.model.problem.Problem; | ||
15 | import org.eclipse.viatra.solver.language.model.problem.ProblemPackage; | ||
16 | import org.eclipse.viatra.solver.language.model.problem.ReferenceDeclaration; | ||
17 | import org.eclipse.viatra.solver.language.model.problem.Relation; | ||
18 | import org.eclipse.viatra.solver.language.model.problem.Variable; | ||
19 | import org.eclipse.viatra.solver.language.scoping.ProblemGlobalScopeProvider; | ||
20 | 12 | ||
21 | import com.google.common.collect.ImmutableList; | 13 | import com.google.common.collect.ImmutableList; |
22 | 14 | ||
15 | import tools.refinery.language.model.problem.ClassDeclaration; | ||
16 | import tools.refinery.language.model.problem.Node; | ||
17 | import tools.refinery.language.model.problem.Problem; | ||
18 | import tools.refinery.language.model.problem.ProblemPackage; | ||
19 | import tools.refinery.language.model.problem.ReferenceDeclaration; | ||
20 | import tools.refinery.language.model.problem.Relation; | ||
21 | import tools.refinery.language.model.problem.Variable; | ||
22 | import tools.refinery.language.scoping.ProblemGlobalScopeProvider; | ||
23 | |||
23 | public final class ProblemUtil { | 24 | public final class ProblemUtil { |
24 | private ProblemUtil() { | 25 | private ProblemUtil() { |
25 | throw new IllegalStateException("This is a static utility class and should not be instantiated directly"); | 26 | throw new IllegalStateException("This is a static utility class and should not be instantiated directly"); |
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/conversion/ProblemValueConverterService.java b/language/src/main/java/tools/refinery/language/conversion/ProblemValueConverterService.java index 1c665e6f..508688ed 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/conversion/ProblemValueConverterService.java +++ b/language/src/main/java/tools/refinery/language/conversion/ProblemValueConverterService.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.language.conversion; | 1 | package tools.refinery.language.conversion; |
2 | 2 | ||
3 | import org.eclipse.xtext.common.services.DefaultTerminalConverters; | 3 | import org.eclipse.xtext.common.services.DefaultTerminalConverters; |
4 | import org.eclipse.xtext.conversion.IValueConverter; | 4 | import org.eclipse.xtext.conversion.IValueConverter; |
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/conversion/UpperBoundValueConverter.java b/language/src/main/java/tools/refinery/language/conversion/UpperBoundValueConverter.java index 3111b69b..be0d15ad 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/conversion/UpperBoundValueConverter.java +++ b/language/src/main/java/tools/refinery/language/conversion/UpperBoundValueConverter.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.language.conversion; | 1 | package tools.refinery.language.conversion; |
2 | 2 | ||
3 | import org.eclipse.xtext.conversion.ValueConverterException; | 3 | import org.eclipse.xtext.conversion.ValueConverterException; |
4 | import org.eclipse.xtext.conversion.impl.AbstractValueConverter; | 4 | import org.eclipse.xtext.conversion.impl.AbstractValueConverter; |
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/naming/NamingUtil.java b/language/src/main/java/tools/refinery/language/naming/NamingUtil.java index edd455bb..e959be74 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/naming/NamingUtil.java +++ b/language/src/main/java/tools/refinery/language/naming/NamingUtil.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.language.naming; | 1 | package tools.refinery.language.naming; |
2 | 2 | ||
3 | import java.util.regex.Pattern; | 3 | import java.util.regex.Pattern; |
4 | 4 | ||
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameConverter.java b/language/src/main/java/tools/refinery/language/naming/ProblemQualifiedNameConverter.java index e55e5dda..5453906f 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameConverter.java +++ b/language/src/main/java/tools/refinery/language/naming/ProblemQualifiedNameConverter.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.language.naming; | 1 | package tools.refinery.language.naming; |
2 | 2 | ||
3 | import org.eclipse.xtext.naming.IQualifiedNameConverter; | 3 | import org.eclipse.xtext.naming.IQualifiedNameConverter; |
4 | 4 | ||
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/resource/DerivedVariableComputer.java b/language/src/main/java/tools/refinery/language/resource/DerivedVariableComputer.java index 2789f590..2061c30e 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/resource/DerivedVariableComputer.java +++ b/language/src/main/java/tools/refinery/language/resource/DerivedVariableComputer.java | |||
@@ -1,24 +1,9 @@ | |||
1 | package org.eclipse.viatra.solver.language.resource; | 1 | package tools.refinery.language.resource; |
2 | 2 | ||
3 | import java.util.HashSet; | 3 | import java.util.HashSet; |
4 | import java.util.List; | 4 | import java.util.List; |
5 | import java.util.Set; | 5 | import java.util.Set; |
6 | 6 | ||
7 | import org.eclipse.viatra.solver.language.model.problem.Argument; | ||
8 | import org.eclipse.viatra.solver.language.model.problem.Atom; | ||
9 | import org.eclipse.viatra.solver.language.model.problem.Conjunction; | ||
10 | import org.eclipse.viatra.solver.language.model.problem.ExistentialQuantifier; | ||
11 | import org.eclipse.viatra.solver.language.model.problem.ImplicitVariable; | ||
12 | import org.eclipse.viatra.solver.language.model.problem.Literal; | ||
13 | import org.eclipse.viatra.solver.language.model.problem.NegativeLiteral; | ||
14 | import org.eclipse.viatra.solver.language.model.problem.Parameter; | ||
15 | import org.eclipse.viatra.solver.language.model.problem.PredicateDefinition; | ||
16 | import org.eclipse.viatra.solver.language.model.problem.Problem; | ||
17 | import org.eclipse.viatra.solver.language.model.problem.ProblemFactory; | ||
18 | import org.eclipse.viatra.solver.language.model.problem.ProblemPackage; | ||
19 | import org.eclipse.viatra.solver.language.model.problem.Statement; | ||
20 | import org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument; | ||
21 | import org.eclipse.viatra.solver.language.naming.NamingUtil; | ||
22 | import org.eclipse.xtext.linking.impl.LinkingHelper; | 7 | import org.eclipse.xtext.linking.impl.LinkingHelper; |
23 | import org.eclipse.xtext.naming.IQualifiedNameConverter; | 8 | import org.eclipse.xtext.naming.IQualifiedNameConverter; |
24 | import org.eclipse.xtext.nodemodel.INode; | 9 | import org.eclipse.xtext.nodemodel.INode; |
@@ -31,6 +16,22 @@ import com.google.inject.Inject; | |||
31 | import com.google.inject.Singleton; | 16 | import com.google.inject.Singleton; |
32 | import com.google.inject.name.Named; | 17 | import com.google.inject.name.Named; |
33 | 18 | ||
19 | import tools.refinery.language.model.problem.Argument; | ||
20 | import tools.refinery.language.model.problem.Atom; | ||
21 | import tools.refinery.language.model.problem.Conjunction; | ||
22 | import tools.refinery.language.model.problem.ExistentialQuantifier; | ||
23 | import tools.refinery.language.model.problem.ImplicitVariable; | ||
24 | import tools.refinery.language.model.problem.Literal; | ||
25 | import tools.refinery.language.model.problem.NegativeLiteral; | ||
26 | import tools.refinery.language.model.problem.Parameter; | ||
27 | import tools.refinery.language.model.problem.PredicateDefinition; | ||
28 | import tools.refinery.language.model.problem.Problem; | ||
29 | import tools.refinery.language.model.problem.ProblemFactory; | ||
30 | import tools.refinery.language.model.problem.ProblemPackage; | ||
31 | import tools.refinery.language.model.problem.Statement; | ||
32 | import tools.refinery.language.model.problem.VariableOrNodeArgument; | ||
33 | import tools.refinery.language.naming.NamingUtil; | ||
34 | |||
34 | @Singleton | 35 | @Singleton |
35 | public class DerivedVariableComputer { | 36 | public class DerivedVariableComputer { |
36 | @Inject | 37 | @Inject |
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/resource/NodeNameCollector.java b/language/src/main/java/tools/refinery/language/resource/NodeNameCollector.java index 415db9a9..99bf9b64 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/resource/NodeNameCollector.java +++ b/language/src/main/java/tools/refinery/language/resource/NodeNameCollector.java | |||
@@ -1,18 +1,10 @@ | |||
1 | package org.eclipse.viatra.solver.language.resource; | 1 | package tools.refinery.language.resource; |
2 | 2 | ||
3 | import java.util.List; | 3 | import java.util.List; |
4 | import java.util.Set; | 4 | import java.util.Set; |
5 | 5 | ||
6 | import org.eclipse.emf.ecore.EObject; | 6 | import org.eclipse.emf.ecore.EObject; |
7 | import org.eclipse.emf.ecore.EStructuralFeature; | 7 | import org.eclipse.emf.ecore.EStructuralFeature; |
8 | import org.eclipse.viatra.solver.language.model.problem.Assertion; | ||
9 | import org.eclipse.viatra.solver.language.model.problem.AssertionArgument; | ||
10 | import org.eclipse.viatra.solver.language.model.problem.NodeAssertionArgument; | ||
11 | import org.eclipse.viatra.solver.language.model.problem.NodeValueAssertion; | ||
12 | import org.eclipse.viatra.solver.language.model.problem.Problem; | ||
13 | import org.eclipse.viatra.solver.language.model.problem.ProblemPackage; | ||
14 | import org.eclipse.viatra.solver.language.model.problem.Statement; | ||
15 | import org.eclipse.viatra.solver.language.naming.NamingUtil; | ||
16 | import org.eclipse.xtext.linking.impl.LinkingHelper; | 8 | import org.eclipse.xtext.linking.impl.LinkingHelper; |
17 | import org.eclipse.xtext.naming.IQualifiedNameConverter; | 9 | import org.eclipse.xtext.naming.IQualifiedNameConverter; |
18 | import org.eclipse.xtext.nodemodel.INode; | 10 | import org.eclipse.xtext.nodemodel.INode; |
@@ -25,6 +17,15 @@ import com.google.common.collect.ImmutableSet; | |||
25 | import com.google.inject.Inject; | 17 | import com.google.inject.Inject; |
26 | import com.google.inject.name.Named; | 18 | import com.google.inject.name.Named; |
27 | 19 | ||
20 | import tools.refinery.language.model.problem.Assertion; | ||
21 | import tools.refinery.language.model.problem.AssertionArgument; | ||
22 | import tools.refinery.language.model.problem.NodeAssertionArgument; | ||
23 | import tools.refinery.language.model.problem.NodeValueAssertion; | ||
24 | import tools.refinery.language.model.problem.Problem; | ||
25 | import tools.refinery.language.model.problem.ProblemPackage; | ||
26 | import tools.refinery.language.model.problem.Statement; | ||
27 | import tools.refinery.language.naming.NamingUtil; | ||
28 | |||
28 | public class NodeNameCollector { | 29 | public class NodeNameCollector { |
29 | @Inject | 30 | @Inject |
30 | private LinkingHelper linkingHelper; | 31 | private LinkingHelper linkingHelper; |
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java b/language/src/main/java/tools/refinery/language/resource/ProblemDerivedStateComputer.java index 3c6c8273..275feca3 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java +++ b/language/src/main/java/tools/refinery/language/resource/ProblemDerivedStateComputer.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.language.resource; | 1 | package tools.refinery.language.resource; |
2 | 2 | ||
3 | import java.util.Collection; | 3 | import java.util.Collection; |
4 | import java.util.HashMap; | 4 | import java.util.HashMap; |
@@ -12,11 +12,6 @@ import org.eclipse.emf.common.notify.impl.AdapterImpl; | |||
12 | import org.eclipse.emf.ecore.EObject; | 12 | import org.eclipse.emf.ecore.EObject; |
13 | import org.eclipse.emf.ecore.resource.Resource; | 13 | import org.eclipse.emf.ecore.resource.Resource; |
14 | import org.eclipse.emf.ecore.util.EcoreUtil; | 14 | import org.eclipse.emf.ecore.util.EcoreUtil; |
15 | import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration; | ||
16 | import org.eclipse.viatra.solver.language.model.problem.Node; | ||
17 | import org.eclipse.viatra.solver.language.model.problem.Problem; | ||
18 | import org.eclipse.viatra.solver.language.model.problem.ProblemFactory; | ||
19 | import org.eclipse.viatra.solver.language.model.problem.Statement; | ||
20 | import org.eclipse.xtext.Constants; | 15 | import org.eclipse.xtext.Constants; |
21 | import org.eclipse.xtext.resource.DerivedStateAwareResource; | 16 | import org.eclipse.xtext.resource.DerivedStateAwareResource; |
22 | import org.eclipse.xtext.resource.IDerivedStateComputer; | 17 | import org.eclipse.xtext.resource.IDerivedStateComputer; |
@@ -29,6 +24,12 @@ import com.google.inject.Provider; | |||
29 | import com.google.inject.Singleton; | 24 | import com.google.inject.Singleton; |
30 | import com.google.inject.name.Named; | 25 | import com.google.inject.name.Named; |
31 | 26 | ||
27 | import tools.refinery.language.model.problem.ClassDeclaration; | ||
28 | import tools.refinery.language.model.problem.Node; | ||
29 | import tools.refinery.language.model.problem.Problem; | ||
30 | import tools.refinery.language.model.problem.ProblemFactory; | ||
31 | import tools.refinery.language.model.problem.Statement; | ||
32 | |||
32 | @Singleton | 33 | @Singleton |
33 | public class ProblemDerivedStateComputer implements IDerivedStateComputer { | 34 | public class ProblemDerivedStateComputer implements IDerivedStateComputer { |
34 | public static final String NEW_NODE = "new"; | 35 | public static final String NEW_NODE = "new"; |
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java b/language/src/main/java/tools/refinery/language/resource/ProblemLocationInFileProvider.java index bd05e8cf..f6a3ec75 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java +++ b/language/src/main/java/tools/refinery/language/resource/ProblemLocationInFileProvider.java | |||
@@ -1,12 +1,13 @@ | |||
1 | package org.eclipse.viatra.solver.language.resource; | 1 | package tools.refinery.language.resource; |
2 | 2 | ||
3 | import org.eclipse.emf.ecore.EObject; | 3 | import org.eclipse.emf.ecore.EObject; |
4 | import org.eclipse.viatra.solver.language.ProblemUtil; | ||
5 | import org.eclipse.viatra.solver.language.model.problem.ImplicitVariable; | ||
6 | import org.eclipse.viatra.solver.language.model.problem.Node; | ||
7 | import org.eclipse.xtext.resource.DefaultLocationInFileProvider; | 4 | import org.eclipse.xtext.resource.DefaultLocationInFileProvider; |
8 | import org.eclipse.xtext.util.ITextRegion; | 5 | import org.eclipse.xtext.util.ITextRegion; |
9 | 6 | ||
7 | import tools.refinery.language.ProblemUtil; | ||
8 | import tools.refinery.language.model.problem.ImplicitVariable; | ||
9 | import tools.refinery.language.model.problem.Node; | ||
10 | |||
10 | public class ProblemLocationInFileProvider extends DefaultLocationInFileProvider { | 11 | public class ProblemLocationInFileProvider extends DefaultLocationInFileProvider { |
11 | @Override | 12 | @Override |
12 | protected ITextRegion doGetTextRegion(EObject obj, RegionDescription query) { | 13 | protected ITextRegion doGetTextRegion(EObject obj, RegionDescription query) { |
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemResourceDescriptionStrategy.java b/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java index cd5020e7..c5dea671 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemResourceDescriptionStrategy.java +++ b/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java | |||
@@ -1,12 +1,6 @@ | |||
1 | package org.eclipse.viatra.solver.language.resource; | 1 | package tools.refinery.language.resource; |
2 | 2 | ||
3 | import org.eclipse.emf.ecore.EObject; | 3 | import org.eclipse.emf.ecore.EObject; |
4 | import org.eclipse.viatra.solver.language.ProblemUtil; | ||
5 | import org.eclipse.viatra.solver.language.model.problem.NamedElement; | ||
6 | import org.eclipse.viatra.solver.language.model.problem.Node; | ||
7 | import org.eclipse.viatra.solver.language.model.problem.Problem; | ||
8 | import org.eclipse.viatra.solver.language.model.problem.Variable; | ||
9 | import org.eclipse.viatra.solver.language.naming.NamingUtil; | ||
10 | import org.eclipse.xtext.EcoreUtil2; | 4 | import org.eclipse.xtext.EcoreUtil2; |
11 | import org.eclipse.xtext.naming.IQualifiedNameConverter; | 5 | import org.eclipse.xtext.naming.IQualifiedNameConverter; |
12 | import org.eclipse.xtext.naming.QualifiedName; | 6 | import org.eclipse.xtext.naming.QualifiedName; |
@@ -18,6 +12,13 @@ import org.eclipse.xtext.util.IAcceptor; | |||
18 | import com.google.inject.Inject; | 12 | import com.google.inject.Inject; |
19 | import com.google.inject.Singleton; | 13 | import com.google.inject.Singleton; |
20 | 14 | ||
15 | import tools.refinery.language.ProblemUtil; | ||
16 | import tools.refinery.language.model.problem.NamedElement; | ||
17 | import tools.refinery.language.model.problem.Node; | ||
18 | import tools.refinery.language.model.problem.Problem; | ||
19 | import tools.refinery.language.model.problem.Variable; | ||
20 | import tools.refinery.language.naming.NamingUtil; | ||
21 | |||
21 | @Singleton | 22 | @Singleton |
22 | public class ProblemResourceDescriptionStrategy extends DefaultResourceDescriptionStrategy { | 23 | public class ProblemResourceDescriptionStrategy extends DefaultResourceDescriptionStrategy { |
23 | @Inject | 24 | @Inject |
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemGlobalScopeProvider.java b/language/src/main/java/tools/refinery/language/scoping/ProblemGlobalScopeProvider.java index 05da277a..8f4c9374 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemGlobalScopeProvider.java +++ b/language/src/main/java/tools/refinery/language/scoping/ProblemGlobalScopeProvider.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.language.scoping; | 1 | package tools.refinery.language.scoping; |
2 | 2 | ||
3 | import java.util.LinkedHashSet; | 3 | import java.util.LinkedHashSet; |
4 | 4 | ||
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemLocalScopeProvider.java b/language/src/main/java/tools/refinery/language/scoping/ProblemLocalScopeProvider.java index e832bb09..05a3bcf9 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemLocalScopeProvider.java +++ b/language/src/main/java/tools/refinery/language/scoping/ProblemLocalScopeProvider.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package org.eclipse.viatra.solver.language.scoping; | 1 | package tools.refinery.language.scoping; |
2 | 2 | ||
3 | import java.util.List; | 3 | import java.util.List; |
4 | 4 | ||
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java b/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java index 56de6b1b..61a3c8f9 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java +++ b/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java | |||
@@ -1,26 +1,27 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.25.0 | 2 | * generated by Xtext 2.25.0 |
3 | */ | 3 | */ |
4 | package org.eclipse.viatra.solver.language.scoping; | 4 | package tools.refinery.language.scoping; |
5 | 5 | ||
6 | import java.util.ArrayList; | 6 | import java.util.ArrayList; |
7 | import java.util.List; | 7 | import java.util.List; |
8 | 8 | ||
9 | import org.eclipse.emf.ecore.EObject; | 9 | import org.eclipse.emf.ecore.EObject; |
10 | import org.eclipse.emf.ecore.EReference; | 10 | import org.eclipse.emf.ecore.EReference; |
11 | import org.eclipse.viatra.solver.language.ProblemUtil; | ||
12 | import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration; | ||
13 | import org.eclipse.viatra.solver.language.model.problem.ExistentialQuantifier; | ||
14 | import org.eclipse.viatra.solver.language.model.problem.PredicateDefinition; | ||
15 | import org.eclipse.viatra.solver.language.model.problem.Problem; | ||
16 | import org.eclipse.viatra.solver.language.model.problem.ProblemPackage; | ||
17 | import org.eclipse.viatra.solver.language.model.problem.ReferenceDeclaration; | ||
18 | import org.eclipse.viatra.solver.language.model.problem.Variable; | ||
19 | import org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument; | ||
20 | import org.eclipse.xtext.EcoreUtil2; | 11 | import org.eclipse.xtext.EcoreUtil2; |
21 | import org.eclipse.xtext.scoping.IScope; | 12 | import org.eclipse.xtext.scoping.IScope; |
22 | import org.eclipse.xtext.scoping.Scopes; | 13 | import org.eclipse.xtext.scoping.Scopes; |
23 | 14 | ||
15 | import tools.refinery.language.ProblemUtil; | ||
16 | import tools.refinery.language.model.problem.ClassDeclaration; | ||
17 | import tools.refinery.language.model.problem.ExistentialQuantifier; | ||
18 | import tools.refinery.language.model.problem.PredicateDefinition; | ||
19 | import tools.refinery.language.model.problem.Problem; | ||
20 | import tools.refinery.language.model.problem.ProblemPackage; | ||
21 | import tools.refinery.language.model.problem.ReferenceDeclaration; | ||
22 | import tools.refinery.language.model.problem.Variable; | ||
23 | import tools.refinery.language.model.problem.VariableOrNodeArgument; | ||
24 | |||
24 | /** | 25 | /** |
25 | * This class contains custom scoping description. | 26 | * This class contains custom scoping description. |
26 | * | 27 | * |
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/validation/ProblemValidator.java b/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java index 96b656a3..f2378df6 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/validation/ProblemValidator.java +++ b/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.25.0 | 2 | * generated by Xtext 2.25.0 |
3 | */ | 3 | */ |
4 | package org.eclipse.viatra.solver.language.validation; | 4 | package tools.refinery.language.validation; |
5 | 5 | ||
6 | /** | 6 | /** |
7 | * This class contains custom validation rules. | 7 | * This class contains custom validation rules. |
diff --git a/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemParsingTest.xtend b/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.xtend index 11bfc6d9..9bd728d6 100644 --- a/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemParsingTest.xtend +++ b/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.xtend | |||
@@ -1,15 +1,15 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.26.0.M1 | 2 | * generated by Xtext 2.26.0.M1 |
3 | */ | 3 | */ |
4 | package org.eclipse.viatra.solver.language.tests | 4 | package tools.refinery.language.tests |
5 | 5 | ||
6 | import com.google.inject.Inject | 6 | import com.google.inject.Inject |
7 | import org.eclipse.viatra.solver.language.model.problem.Problem | ||
8 | import org.eclipse.xtext.testing.InjectWith | 7 | import org.eclipse.xtext.testing.InjectWith |
9 | import org.eclipse.xtext.testing.extensions.InjectionExtension | 8 | import org.eclipse.xtext.testing.extensions.InjectionExtension |
10 | import org.eclipse.xtext.testing.util.ParseHelper | 9 | import org.eclipse.xtext.testing.util.ParseHelper |
11 | import org.junit.jupiter.api.Test | 10 | import org.junit.jupiter.api.Test |
12 | import org.junit.jupiter.api.^extension.ExtendWith | 11 | import org.junit.jupiter.api.^extension.ExtendWith |
12 | import tools.refinery.language.model.problem.Problem | ||
13 | 13 | ||
14 | import static org.hamcrest.MatcherAssert.assertThat | 14 | import static org.hamcrest.MatcherAssert.assertThat |
15 | import static org.hamcrest.Matchers.* | 15 | import static org.hamcrest.Matchers.* |
diff --git a/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemTestUtil.xtend b/language/src/test/java/tools/refinery/language/tests/ProblemTestUtil.xtend index b3175659..46418892 100644 --- a/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemTestUtil.xtend +++ b/language/src/test/java/tools/refinery/language/tests/ProblemTestUtil.xtend | |||
@@ -1,23 +1,23 @@ | |||
1 | package org.eclipse.viatra.solver.language.tests | 1 | package tools.refinery.language.tests |
2 | 2 | ||
3 | import org.eclipse.viatra.solver.language.ProblemUtil | 3 | import tools.refinery.language.ProblemUtil |
4 | import org.eclipse.viatra.solver.language.model.problem.Argument | 4 | import tools.refinery.language.model.problem.Argument |
5 | import org.eclipse.viatra.solver.language.model.problem.Assertion | 5 | import tools.refinery.language.model.problem.Assertion |
6 | import org.eclipse.viatra.solver.language.model.problem.AssertionArgument | 6 | import tools.refinery.language.model.problem.AssertionArgument |
7 | import org.eclipse.viatra.solver.language.model.problem.Atom | 7 | import tools.refinery.language.model.problem.Atom |
8 | import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration | 8 | import tools.refinery.language.model.problem.ClassDeclaration |
9 | import org.eclipse.viatra.solver.language.model.problem.Conjunction | 9 | import tools.refinery.language.model.problem.Conjunction |
10 | import org.eclipse.viatra.solver.language.model.problem.EnumDeclaration | 10 | import tools.refinery.language.model.problem.EnumDeclaration |
11 | import org.eclipse.viatra.solver.language.model.problem.Literal | 11 | import tools.refinery.language.model.problem.Literal |
12 | import org.eclipse.viatra.solver.language.model.problem.NegativeLiteral | 12 | import tools.refinery.language.model.problem.NegativeLiteral |
13 | import org.eclipse.viatra.solver.language.model.problem.Node | 13 | import tools.refinery.language.model.problem.Node |
14 | import org.eclipse.viatra.solver.language.model.problem.NodeAssertionArgument | 14 | import tools.refinery.language.model.problem.NodeAssertionArgument |
15 | import org.eclipse.viatra.solver.language.model.problem.NodeValueAssertion | 15 | import tools.refinery.language.model.problem.NodeValueAssertion |
16 | import org.eclipse.viatra.solver.language.model.problem.PredicateDefinition | 16 | import tools.refinery.language.model.problem.PredicateDefinition |
17 | import org.eclipse.viatra.solver.language.model.problem.Problem | 17 | import tools.refinery.language.model.problem.Problem |
18 | import org.eclipse.viatra.solver.language.model.problem.Variable | 18 | import tools.refinery.language.model.problem.UniqueDeclaration |
19 | import org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument | 19 | import tools.refinery.language.model.problem.Variable |
20 | import org.eclipse.viatra.solver.language.model.problem.UniqueDeclaration | 20 | import tools.refinery.language.model.problem.VariableOrNodeArgument |
21 | 21 | ||
22 | class ProblemTestUtil { | 22 | class ProblemTestUtil { |
23 | def builtin(Problem it) { | 23 | def builtin(Problem it) { |
diff --git a/language/src/test/java/org/eclipse/viatra/solver/language/tests/scoping/NodeScopingTest.xtend b/language/src/test/java/tools/refinery/language/tests/scoping/NodeScopingTest.xtend index db588e5d..ab3e325f 100644 --- a/language/src/test/java/org/eclipse/viatra/solver/language/tests/scoping/NodeScopingTest.xtend +++ b/language/src/test/java/tools/refinery/language/tests/scoping/NodeScopingTest.xtend | |||
@@ -1,10 +1,7 @@ | |||
1 | package org.eclipse.viatra.solver.language.tests.scoping | 1 | package tools.refinery.language.tests.scoping |
2 | 2 | ||
3 | import com.google.inject.Inject | 3 | import com.google.inject.Inject |
4 | import java.util.stream.Stream | 4 | import java.util.stream.Stream |
5 | import org.eclipse.viatra.solver.language.model.problem.Problem | ||
6 | import org.eclipse.viatra.solver.language.tests.ProblemInjectorProvider | ||
7 | import org.eclipse.viatra.solver.language.tests.ProblemTestUtil | ||
8 | import org.eclipse.xtext.testing.InjectWith | 5 | import org.eclipse.xtext.testing.InjectWith |
9 | import org.eclipse.xtext.testing.extensions.InjectionExtension | 6 | import org.eclipse.xtext.testing.extensions.InjectionExtension |
10 | import org.eclipse.xtext.testing.util.ParseHelper | 7 | import org.eclipse.xtext.testing.util.ParseHelper |
@@ -14,6 +11,9 @@ import org.junit.jupiter.params.ParameterizedTest | |||
14 | import org.junit.jupiter.params.provider.Arguments | 11 | import org.junit.jupiter.params.provider.Arguments |
15 | import org.junit.jupiter.params.provider.MethodSource | 12 | import org.junit.jupiter.params.provider.MethodSource |
16 | import org.junit.jupiter.params.provider.ValueSource | 13 | import org.junit.jupiter.params.provider.ValueSource |
14 | import tools.refinery.language.model.problem.Problem | ||
15 | import tools.refinery.language.tests.ProblemInjectorProvider | ||
16 | import tools.refinery.language.tests.ProblemTestUtil | ||
17 | 17 | ||
18 | import static org.hamcrest.MatcherAssert.assertThat | 18 | import static org.hamcrest.MatcherAssert.assertThat |
19 | import static org.hamcrest.Matchers.* | 19 | import static org.hamcrest.Matchers.* |