Merge branch 'master' into renovate/org.cyclonedx.bom-2.x

Author: Alexander Pann

.github/workflows/vulnerability-scanning.yml

@@ -13,7 +13,7 @@ jobs:
           distribution: temurin
           java-version: 17
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4
+        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4
       - name: Call setup
         run: ./gradlew dependencies
       - name: Dependency Check

.gitignore

@@ -51,6 +51,7 @@ code/languages/*/build.properties
 code/languages/*/TEST*.xml
 code/languages/org.iets3.core/build/tmp
 .mps-caches
+*.iml
 
 # -----------------------------------------------------------
 # GRADLE

CHANGELOG.md

@@ -5,13 +5,38 @@ All notable changes to this project are documented in this file.
 Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
 
+## April 2025
+
+### Fixed
+
+- Number literals in scientific format e.g. 1e10 now require a number before "e". Numbers like "e-5" are not valid anymore because it caused exceptions in other parts of the code base.
+
+## March 2025
+
+### Fixed
+
+- An issue with conflicting rules for overloaded operation types with rational types was fixed.
+- The interpreter of the lookup tables was fixed.
+- The syntax of optional names in assert statements was improved.
+- A stack overflow related to success types was fixed.
+- Invalid value and constrained failed test items now show why tests fail.
+- An exception related to generator vs interpreter selection for tests was fixed.
+
+### Removed
+
+- The demo language `org.iets3.core.expr.typetags.lib` was removed.
+- The unused field `ReferenceableFlag#idMember` was removed.
+
 ## Feburary 2025
 
 ### Added
 
+- Move languages org.iets3.protocol.transport, org.iets3.components.functional, org.iets3.components.hardware, org.iets3.components.toplevel.adapter, org.iets3.core.mapping, and org.iets3.safety.attributes from iets3.core to iets3.os
+
 - a new approach to run interpreter test case from command line (and inside MPS) directly without invoking JUnit code generation
 - Added EmptyType to Pluggable Type Facade (PTF). If your language has some kind of _NixType_, you should override `PrimitiveTypeMapper.isEmptyType()` to recognize your _NixType_.
 
+
 ### Fixed
 
 - Strings are not comparable with strings with constraints.

build.gradle

@@ -1,22 +1,17 @@
 import de.itemis.mps.gradle.*
+import de.itemis.mps.gradle.tasks.MpsMigrate
+import de.itemis.mps.gradle.tasks.Remigrate
+import de.itemis.mps.gradle.downloadJBR.DownloadJbrForPlatform
 import groovy.xml.XmlSlurper
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
 
-//will pull the groovy classes/types from nexus to the classpath
-buildscript {
-    repositories {
-        maven { url 'https://artifacts.itemis.cloud/repository/maven-mps/' }
-    }
-    dependencies {
-        classpath 'de.itemis.mps:mps-gradle-plugin:1.29.1.1.d7f2744'
-    }
-}
-
 plugins {
     id 'base'
     id 'maven-publish'
+    id 'de.itemis.mps.gradle.common' version '1.29.+'
+    id 'de.itemis.mps.gradle.launcher' version '2.5.2.+'
     id "com.github.breadmoirai.github-release" version "2.4.1"
     id "org.cyclonedx.bom" version "2.2.0"
 }
@@ -25,6 +20,7 @@ repositories {
     maven {
         url 'https://artifacts.itemis.cloud/repository/maven-mps/'
     }
+
     mavenCentral()
 }
 
@@ -51,7 +47,7 @@ def minor = "1"
 // Dependency versions
 
 ext.mpsVersion = '2024.1.2'
-ext.mpsQAVersion = "2024.1.952.3aa34aa"
+ext.mpsQAVersion = "2024.1.1022.300f07a"
 
 // if building a against a special branch from mbeddr is required add the name here
 // the name is enough no trailing "." is required, also the plain name from git can
@@ -63,7 +59,7 @@ if (!project.hasProperty('mbeddrVersion')) {
     if (mbeddrBranch != null && !mbeddrBranch.trim().isEmpty()) {
         ext.mbeddrVersion = "${mbeddrBranch.replace("/", "-")}.${major}.${minor}.+"
     } else {
-        ext.mbeddrVersion = "2024.1.25253.ccb451a"
+        ext.mbeddrVersion = "2024.1.25305.dff1a9a"
     }
 }
 
@@ -105,6 +101,7 @@ ext.artifactsDir = new File(buildDir, 'artifacts')
 
 configurations {
     mps
+    rerunMigrationsBackend
     languageLibs
     junitAnt
     pcollections // Synced to org.iets3.core.expr.base.collections.stubs/lib
@@ -113,10 +110,11 @@ configurations {
 
 dependencies {
     mps "com.jetbrains:mps:$mpsVersion"
+    rerunMigrationsBackend("de.itemis.mps.build-backends:remigrate:0.2.0.+")
     languageLibs "org.mpsqa:all-in-one:$mpsQAVersion"
     languageLibs "com.mbeddr:platform:$mbeddrVersion"
-    junitAnt 'org.apache.ant:ant-junit:1.10.6'
-    pcollections 'org.pcollections:pcollections:4.0.1'
+    junitAnt 'org.apache.ant:ant-junit:1.10.15'
+    pcollections 'org.pcollections:pcollections:4.0.2'
     bigMath 'ch.obermuhlner:big-math:2.3.2'
 }
 
@@ -172,6 +170,8 @@ task resolveBigMath(type: Sync) {
 
 task resolveDependencies(dependsOn: ['downloadJbr', resolveMps, resolveLanguageLibs, resolvePcollections, resolveBigMath])
 
+ext.mpsHomeDir = resolveMps.destinationDir
+
 // Default arguments for ant scripts
 def defaultScriptArgs = [
         'mps.home'                          : resolveMps.destinationDir,
@@ -255,14 +255,47 @@ task failOnTestError() {
 buildAndRunTests.configure { finalizedBy failOnTestError }
 check.dependsOn buildAndRunTests
 
+tasks.register('migrate', MpsMigrate) {
+    dependsOn(resolveMps, 'resolveMpsForModelcheck', 'downloadJbr', 'buildLanguages', 'buildAndRunTests')
+    javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }
+
+    haltOnPrecheckFailure = false
+    haltOnDependencyError = true
+
+    mpsHome = mpsHomeDir
+
+    projectDirectories.from('code/languages/org.iets3.opensource')
+    folderMacros['iets3.github.opensource.home'] = rootProject.layout.projectDirectory
+
+    pluginRoots.from(new File(mpsHomeDir, 'plugins'))
+
+    maxHeapSize = '4G'
+}
+
+tasks.register('remigrate', Remigrate) {
+    mustRunAfter('migrate')
+    mustRunAfter('buildLanguages', 'buildAndRunTests')
+
+    dependsOn(resolveMps, 'resolveMpsForModelcheck','downloadJbr')
+
+    javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }
+
+    mpsHome = mpsHomeDir
+    projectDirectories.from('code/languages/org.iets3.opensource')
+    folderMacros['iets3.github.opensource.home'] = rootProject.layout.projectDirectory
+
+    pluginRoots.from(new File(mpsHomeDir, 'plugins'))
+    maxHeapSize = '4G'
+}
+
 apply plugin: 'modelcheck'
 
 File modelcheckresult = new File("$buildDir/TEST-checkProject.xml")
 
 def pluginsList = []
 
 modelcheck {
-    projectLocation =  new File("$projectDir/code")
+    projectLocation = new File("$projectDir/code/languages/org.iets3.opensource")
     mpsLocation = new File("$buildDir/mps")
     plugins = pluginsList
     mpsConfig = configurations.mps
@@ -283,6 +316,7 @@ afterEvaluate {  project ->
     */
 }
 
+
 checkmodels {
     dependsOn(resolveMps)
 }

build/scripts/build-allScripts.xml

@@ -63,6 +63,7 @@
         <uses>
           <language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
           <language id="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" />
+          <language id="l:427a473d-5177-432c-9905-bcbceb71b996:jetbrains.mps.build.mps.runner" />
           <language id="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" />
           <language id="l:9d000fbd-bdca-4a46-b39b-c5ba9e79b38c:org.iets3.opensource.build.gentests" />
         </uses>

code/languages/org.iets3.opensource/.mps/modules.xml

@@ -4,6 +4,9 @@
     <projectModules>
       <modulePath path="$PROJECT_DIR$/_spreferences/CodeReviewPreferences/module.msd" folder="_spreferences" />
       <modulePath path="$PROJECT_DIR$/_spreferences/TestExecutionPreferences/module.msd" folder="_spreferences" />
+      <modulePath path="$PROJECT_DIR$/devkits/org.iets3.components.devkit/org.iets3.components.devkit.devkit" folder="comp" />
+      <modulePath path="$PROJECT_DIR$/devkits/org.iets3.components.functional.devkit/org.iets3.components.functional.devkit.devkit" folder="comp" />
+      <modulePath path="$PROJECT_DIR$/devkits/org.iets3.components.hardware.devkit/org.iets3.components.hardware.devkit.devkit" folder="comp" />
       <modulePath path="$PROJECT_DIR$/devkits/org.iets3.core.expr.advanced.devkit/org.iets3.core.expr.advanced.devkit.devkit" folder="expr.lang-advanced" />
       <modulePath path="$PROJECT_DIR$/devkits/org.iets3.core.expr.base.devkit/org.iets3.core.expr.base.devkit.devkit" folder="expr.lang-core" />
       <modulePath path="$PROJECT_DIR$/devkits/org.iets3.core.expr.core.devkit/org.iets3.core.expr.core.devkit.devkit" folder="expr.lang-core" />
@@ -18,8 +21,11 @@
       <modulePath path="$PROJECT_DIR$/devkits/org.iets3.req/org.iets3.req.devkit" folder="req" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.analysis.base/org.iets3.analysis.base.mpl" folder="analysis" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.components.core/org.iets3.components.core.mpl" folder="comp" />
+      <modulePath path="$PROJECT_DIR$/languages/org.iets3.components.functional/org.iets3.components.functional.mpl" folder="comp" />
+      <modulePath path="$PROJECT_DIR$/languages/org.iets3.components.hardware/org.iets3.components.hardware.mpl" folder="comp" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.components.plugin/org.iets3.components.plugin.msd" folder="comp" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.components.req/org.iets3.components.req.mpl" folder="comp" />
+      <modulePath path="$PROJECT_DIR$/languages/org.iets3.components.toplevel.adapter/org.iets3.components.toplevel.adapter.mpl" folder="comp" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.core.assessment/org.iets3.core.assessment.mpl" folder="assessmt" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.core.attributes/org.iets3.core.attributes.mpl" folder="core" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.core.base/org.iets3.core.base.mpl" folder="core" />
@@ -65,23 +71,25 @@
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl" folder="expr.lang-core" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.tracing/org.iets3.core.expr.tracing.mpl" folder="expr.tracing" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.bindingtime/org.iets3.core.expr.typetags.bindingtime.mpl" folder="expr.lang-advanced" />
-      <modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.lib/org.iets3.core.expr.typetags.lib.mpl" folder="expr.lang-advanced" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.physunits/org.iets3.core.expr.typetags.physunits.mpl" folder="expr.lang-advanced" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.units.quantity/org.iets3.core.expr.typetags.units.quantity.mpl" folder="expr.lang-advanced" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.units/org.iets3.core.expr.typetags.units.mpl" folder="expr.lang-advanced" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags/org.iets3.core.expr.typetags.mpl" folder="expr.lang-advanced" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.util/org.iets3.core.expr.util.mpl" folder="expr.lang-advanced" />
+      <modulePath path="$PROJECT_DIR$/languages/org.iets3.core.mapping/org.iets3.core.mapping.mpl" folder="comp.mapping" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.core.plugin/org.iets3.core.plugin.msd" folder="core" />
-      <modulePath path="$PROJECT_DIR$/languages/org.iets3.core.trace.sandbox/org.iets3.core.trace.test.mpl" folder="trace" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.core.trace/org.iets3.core.trace.mpl" folder="trace" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.core.users/org.iets3.core.users.mpl" folder="core" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.glossary/org.iets3.glossary.mpl" folder="req" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.opensource.build.gentests/org.iets3.opensource.build.gentests.mpl" folder="_build" />
+      <modulePath path="$PROJECT_DIR$/languages/org.iets3.protocol.transport/org.iets3.protocol.transport.mpl" folder="comp.protocols" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.req.core/org.iets3.req.core.mpl" folder="req" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.req.plugin/org.iets3.req.plugin.msd" folder="req" />
+      <modulePath path="$PROJECT_DIR$/languages/org.iets3.safety.attributes/org.iets3.safety.attributes.mpl" folder="safety" />
       <modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.artifacts.base/org.iets3.variability.artifacts.base.mpl" folder="variability" />
       <modulePath path="$PROJECT_DIR$/languages/test.iest3.component.attribute/test.iest3.component.attribute.mpl" folder="comp" />
-      <modulePath path="$PROJECT_DIR$/languages/test.org.iets3.analysis.base.solvable/test.org.iets3.analysis.base.solvable.mpl" folder="analysis.test" />
+      <modulePath path="$PROJECT_DIR$/languages/test.org.iets3.analysis.base.solvable/test.org.iets3.analysis.base.solvable.mpl" folder="analysis.tests" />
+      <modulePath path="$PROJECT_DIR$/languages/test.org.iets3.core.trace/test.org.iets3.core.trace.mpl" folder="trace" />
       <modulePath path="$PROJECT_DIR$/languages/test.ts.expr.os.nix/test.ts.expr.os.nix.mpl" folder="expr.tests" />
       <modulePath path="$PROJECT_DIR$/languages/test.ts.expr.os.validNameConcept/test.ts.expr.os.validNameConcept.mpl" folder="expr.tests" />
       <modulePath path="$PROJECT_DIR$/solutions/InterpreterTestExecutor/InterpreterTestExecutor.msd" folder="_build" />
@@ -133,7 +141,6 @@
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.tests.rt/org.iets3.core.expr.tests.rt.msd" folder="expr" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.toplevel.interpreter/org.iets3.core.expr.toplevel.interpreter.msd" folder="expr.lang-core" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.tracing.plugin/org.iets3.core.expr.tracing.plugin.msd" folder="expr.tracing" />
-      <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.typetags.lib.interpreter/org.iets3.core.expr.typetags.lib.interpreter.msd" folder="expr.lang-advanced" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.typetags.physunits.documentation/org.iets3.core.expr.typetags.physunits.documentation.msd" folder="expr.lang-advanced" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.typetags.phyunits.si/org.iets3.core.expr.typetags.phyunits.si.msd" folder="expr.lang-advanced" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.typetags.units.interpreter/org.iets3.core.expr.typetags.units.interpreter.msd" folder="expr.lang-advanced" />
@@ -146,13 +153,19 @@
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.interpreterExecutor/org.iets3.opensource.interpreterExecutor.msd" folder="_build" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.linters/org.iets3.opensource.linters.msd" folder="linters" />
       <modulePath path="$PROJECT_DIR$/solutions/playground/playground.msd" folder="expr.tests" />
-      <modulePath path="$PROJECT_DIR$/solutions/test.ex.core.expr.genjava/test.ex.core.expr.genjava.msd" folder="expr.genjava" />
-      <modulePath path="$PROJECT_DIR$/solutions/test.iets3.core.assessment/test.iets3.core.tracequery.msd" folder="trace" />
-      <modulePath path="$PROJECT_DIR$/solutions/test.org.iets3.analysis.base/test.org.iets3.analysis.base.msd" folder="analysis.test" />
-      <modulePath path="$PROJECT_DIR$/solutions/test.org.iets3.core.comments/test.org.iets3.core.comments.msd" folder="core" />
-      <modulePath path="$PROJECT_DIR$/solutions/test.ts.components.core/test.ts.components.core.msd" folder="comp" />
+      <modulePath path="$PROJECT_DIR$/tests/test.components.functional/test.components.functional.msd" folder="comp.tests" />
+      <modulePath path="$PROJECT_DIR$/tests/test.ex.core.expr.genjava/test.ex.core.expr.genjava.msd" folder="expr.tests" />
+      <modulePath path="$PROJECT_DIR$/tests/test.iets3.components.toplevel.adapter/test.iets3.components.toplevel.adapter.msd" folder="comp.tests" />
+      <modulePath path="$PROJECT_DIR$/tests/test.iets3.core.mapping/test.iets3.core.mapping.msd" folder="comp.mapping" />
+      <modulePath path="$PROJECT_DIR$/tests/test.iets3.core.tracequery/test.iets3.core.tracequery.msd" folder="trace" />
+      <modulePath path="$PROJECT_DIR$/tests/test.iets3.safety.attributes/test.iets3.safety.attributes.msd" folder="safety" />
       <modulePath path="$PROJECT_DIR$/tests/test.in.expr.os/test.in.expr.os.msd" folder="expr.tests" />
       <modulePath path="$PROJECT_DIR$/tests/test.node.expr.os/test.node.expr.os.msd" folder="expr.tests" />
+      <modulePath path="$PROJECT_DIR$/tests/test.org.iets3.analysis.base/test.org.iets3.analysis.base.msd" folder="analysis.tests" />
+      <modulePath path="$PROJECT_DIR$/tests/test.org.iets3.core.comments/test.org.iets3.core.comments.msd" folder="core" />
+      <modulePath path="$PROJECT_DIR$/tests/test.org.iets3.protocol.transport/test.org.iets3.protocol.transport.msd" folder="comp.protocols" />
+      <modulePath path="$PROJECT_DIR$/tests/test.ts.components.core/test.ts.components.core.msd" folder="comp.tests" />
+      <modulePath path="$PROJECT_DIR$/tests/test.ts.components.hardware/test.ts.components.hardware.msd" folder="comp.tests" />
       <modulePath path="$PROJECT_DIR$/tests/test.ts.expr.os.comma/test.ts.expr.os.comma.msd" folder="expr.tests" />
       <modulePath path="$PROJECT_DIR$/tests/test.ts.expr.os/test.ts.expr.os.msd" folder="expr.tests" />
     </projectModules>

code/languages/org.iets3.opensource/devkits/org.iets3.components.devkit/org.iets3.components.devkit.devkit

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dev-kit name="org.iets3.components.devkit" uuid="903db50e-99bf-4552-9b9f-0c8c5d7a9d09">
+  <exported-language name="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" />
+  <exported-language name="f0fd486f-8577-43e9-b671-3d118449c6e7(org.iets3.components.core)" />
+  <exported-language name="1eafb1ad-d782-45f3-97a2-dcc9e9e9e152(org.iets3.components.toplevel.adapter)" />
+  <exported-language name="7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)" />
+  <exported-language name="cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)" />
+  <exported-language name="8bb1251e-eae5-47ab-9843-33adfae8edaa(org.iets3.core.expr.util)" />
+</dev-kit>
+

code/languages/org.iets3.opensource/devkits/org.iets3.components.functional.devkit/org.iets3.components.functional.devkit.devkit

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dev-kit name="org.iets3.components.functional.devkit" uuid="14b54709-6e21-4520-8f63-0e7cc8084a7d">
+  <exported-language name="25797606-3fb6-47b8-bc3c-b4384df7da44(org.iets3.components.functional)" />
+  <exported-language name="6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)" />
+  <extendedDevKits>
+    <extendedDevKit>903db50e-99bf-4552-9b9f-0c8c5d7a9d09(org.iets3.components.devkit)</extendedDevKit>
+  </extendedDevKits>
+</dev-kit>
+

code/languages/org.iets3.opensource/devkits/org.iets3.components.hardware.devkit/org.iets3.components.hardware.devkit.devkit

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dev-kit name="org.iets3.components.hardware.devkit" uuid="81923f47-8fdd-4466-bb24-6346a8ef0a42">
+  <exported-language name="c35abfa8-0db0-4d42-bb3f-f46112aeb888(org.iets3.components.hardware)" />
+  <extendedDevKits>
+    <extendedDevKit>903db50e-99bf-4552-9b9f-0c8c5d7a9d09(org.iets3.components.devkit)</extendedDevKit>
+  </extendedDevKits>
+</dev-kit>
+