Revamped the Semantifyr language and implementation

.gitattributes

@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: 2023-2025 The Semantifyr Authors
+#
+# SPDX-License-Identifier: EPL-2.0
+
+*               text
+
+./gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+
+# Binary files should be left untouched
+*.jar           binary

.gitignore

@@ -6,3 +6,4 @@
 .gradle/
 /**/build/
 .kotlin/
+*.lsp.log

CONTRIBUTORS.md

@@ -8,15 +8,9 @@
 
 ### Semantifyr Authors
 
-**Project leader** Vince, Molnar <[email protected]>
+**Project leader** Vince, Molnár <[email protected]>
 
 Contributors (in alphabetical order):
 
- - Armin, Zavada <[email protected]>
-
-### Support
-
-Semantifyr was also supported by
-
- - [Budapest University of Technology and Economics (BME)](https://www.bme.hu/?language=en), [Department of Measurement and Information Systems (MIT)](https://mit.bme.hu/eng/), [Critical Systems Research Group (FTSRG)](https://ftsrg.mit.bme.hu/en/)
- - [New National Excellence Program 2023](https://www.unkp.gov.hu)
+ - Ármin, Zavada <[email protected]>
+ - Marussy, Kristóf <[email protected]>

README.md

@@ -1,5 +1,5 @@
 <!--
-  SPDX-FileCopyrightText: 2023-2024 The Semantifyr Authors
+  SPDX-FileCopyrightText: 2023-2025 The Semantifyr Authors
 
   SPDX-License-Identifier: EPL-2.0
 -->
@@ -26,8 +26,17 @@ Please, follow the instructions in [CONTRIBUTING.md](CONTRIBUTING.md)
 
 ## License
 
-Copyright (c) 2024 [Semantifyr Authors](CONTRIBUTORS.md)
+Copyright (c) 2023-2025 [Semantifyr Authors](CONTRIBUTORS.md)
 
 Semantifyr is available under the [Eclipse Public License - v 2.0](https://www.eclipse.org/legal/epl-2.0/).
 
 Semantifyr complies with the [REUSE Specification – Version 3.0](https://reuse.software/) to provide copyright and licensing information to each file, including files available under other licenses. For more information, see the comments headers in each file and the license texts in the [LICENSES](LICENSES) directory.
+
+## Support
+
+The research and development of Semantifyr was also supported by (in no particular order):
+
+- [Budapest University of Technology and Economics (BME)](https://www.bme.hu/?language=en), [Department of Measurement and Information Systems (MIT)](https://mit.bme.hu/eng/), [Critical Systems Research Group (FTSRG)](https://ftsrg.mit.bme.hu/en/)
+- [New National Excellence Program 2023](https://www.unkp.gov.hu)
+- [IncQuery Labs cPlc.](https://incquery.io/)
+- Ministry of Culture and Innovation of Hungary, National Research, Development and Innovation Fund, financed under the EKÖP_KDP-24-1-BME-21 funding scheme (2024-2028)

buildSrc/src/main/kotlin/hu/bme/mit/semantifyr/gradle/conventions/jvm.gradle.kts

@@ -8,6 +8,7 @@ package hu.bme.mit.semantifyr.gradle.conventions
 
 import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.kotlin.dsl.registering
 
 plugins {
     `java-library`
@@ -24,15 +25,17 @@ val libs = the<LibrariesForLibs>()
 
 dependencies {
     testFixturesApi(libs.junit.api)
+    testFixturesApi(libs.assertj.core)
     testFixturesApi(libs.junit.params)
     testFixturesApi(libs.mockito.core)
     testFixturesApi(libs.mockito.junit)
 
     testRuntimeOnly(libs.junit.engine)
+    testRuntimeOnly(libs.junit.platform.launcher)
 }
 
 java.toolchain {
-    languageVersion.set(JavaLanguageVersion.of(21))
+    languageVersion = JavaLanguageVersion.of(21)
 }
 
 tasks {
@@ -49,7 +52,7 @@ tasks {
         finalizedBy(tasks.jacocoTestReport)
     }
 
-    val allTests by tasks.creating(Test::class) {
+    val allTests by tasks.registering(Test::class) {
         useJUnitPlatform()
 
         minHeapSize = "512m"

gradle/libs.versions.toml

@@ -3,16 +3,18 @@
 # SPDX-License-Identifier: EPL-2.0
 
 [versions]
-ecore = "2.37.0"
-junit = "5.11.0"
-mockito = "5.14.0"
-mwe2 = "2.19.0"
-slf4j = "2.0.16"
-log4j = "2.24.1"
-xtext = "2.36.0"
-kotlin = "2.1.0"
-kotlinxCoroutines = "1.9.0"
-cliKt = "5.0.1"
+ecore = "2.40.0"
+junit = "5.12.2"
+assertj = "3.27.6"
+junitplatform = "1.13.4"
+mockito = "5.19.0"
+mwe2 = "2.23.0"
+slf4j = "2.0.17"
+log4j = "2.25.1"
+xtext = "2.40.0"
+kotlin = "2.2.20"
+kotlinxCoroutines = "1.10.2"
+cliKt = "5.0.3"
 viatra = "2.9.1"
 dockerJava = "3.4.0"
 guice = "7.0.0"
@@ -21,9 +23,11 @@ node = "7.1.0"
 [libraries]
 ecore = { group = "org.eclipse.emf", name = "org.eclipse.emf.ecore", version.ref = "ecore" }
 ecore-codegen = { group = "org.eclipse.emf", name = "org.eclipse.emf.codegen.ecore", version.ref = "ecore" }
+junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform-launcher", version.ref = "junitplatform" }
 junit-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit" }
 junit-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit" }
 junit-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junit" }
+assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertj" }
 mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
 mockito-junit = { group = "org.mockito", name = "mockito-junit-jupiter", version.ref = "mockito" }
 mwe-utils = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe.utils", version = "1.9.0" }
@@ -44,6 +48,7 @@ viatra-query-language = { group = "org.eclipse.viatra", name = "viatra-query-lan
 viatra-query-runtime = { group = "org.eclipse.viatra", name = "viatra-query-runtime", version.ref = "viatra" }
 viatra-transformation-runtime = { group = "org.eclipse.viatra", name = "viatra-transformation-runtime", version.ref = "viatra" }
 guice = { group = "com.google.inject", name = "guice", version.ref = "guice" }
+guice-extensions-assistedinject = { group = "com.google.inject.extensions", name = "guice-assistedinject", version.ref = "guice" }
 docker-java-core = { group = "com.github.docker-java" , name = "docker-java-core", version.ref = "dockerJava" }
 docker-java-transport = { group = "com.github.docker-java" , name = "docker-java-transport-httpclient5", version.ref = "dockerJava" }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +85,9 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,15 +148,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +205,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \