diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c67770846..2e49c05f9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,9 +11,13 @@ on: publish: description: Whether to publish the build result to Maven repositories type: boolean - default: false + default: 'false' required: false - + publish_rcp: + description: Whether to publish the RCP to Github packages + type: boolean + default: 'false' + required: true jobs: build: runs-on: ubuntu-latest @@ -35,7 +39,7 @@ jobs: - name: Build run: | - xvfb-run ./gradlew package_fasten_safety_distribution_win build_all_languages check \ + xvfb-run ./gradlew build_all_languages check \ -Pgpr.user=${{github.actor}} -Pgpr.token=${{ secrets.GITHUB_TOKEN }} - name: Publish test report @@ -64,15 +68,15 @@ jobs: exit 1 fi - - name: Upload distribution - uses: actions/upload-artifact@v4 - with: - name: fasten-distribution-win-2024.1-${{ steps.time.outputs.time }} - path: build/distributions/fasten-2024.1-SNAPSHOT-Win-2024.1-SNAPSHOT.zip + #- name: Upload distribution + # uses: actions/upload-artifact@v4 + # with: + # name: fasten-distribution-win-2023.2-${{ steps.time.outputs.time }} + # path: build/distributions/fasten-2023.2-SNAPSHOT-Win-2023.2-SNAPSHOT.zip publish: # Only publish on push (to maintenance or master) or on dispatch if requested - if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && inputs.publish == 'true') + if: ${{ github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && inputs.publish == 'true') }} runs-on: ubuntu-latest steps: @@ -94,3 +98,33 @@ jobs: -Pgpr.token=${{ secrets.GITHUB_TOKEN }} \ -Partifacts.itemis.cloud.user=${{ secrets.ARTIFACTS_ITEMIS_CLOUD_USER }} \ -Partifacts.itemis.cloud.pw=${{ secrets.ARTIFACTS_ITEMIS_CLOUD_PW }} + + publish_rcps: + # Only publish on push (to maintenance or master) or on dispatch if requested + if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.publish_rcp == 'true' }} + + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 17 + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v3 + + - name: Publish FASTEN-Windows RCP to Github Packages + run: | + ./gradlew publishFASTEN_WIN_RCPPublicationToGitHubPackagesRepository \ + -Pgpr.user=${{ github.actor }} \ + -Pgpr.token=${{ secrets.GITHUB_TOKEN }} \ + + - name: Publish FASTEN-Linux RCPs to Github Packages + run: | + ./gradlew publishFASTEN_LINUX_RCPPublicationToGitHubPackagesRepository -x package_fasten_distribution_for_specific_platforms \ + -Pgpr.user=${{ github.actor }} \ + -Pgpr.token=${{ secrets.GITHUB_TOKEN }} \ + diff --git a/build.gradle.kts b/build.gradle.kts index 59a776a6f..20a2814a5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,7 +15,9 @@ plugins { id("de.itemis.mps.gradle.common") version mpsGradlePluginVersion } -val jbrVers = "17.0.11-b1207.30" +val jbrVers = "17.0.8.1-b1000.32" +val jbrWindowsVers = "jbr_jcef-17.0.8.1-windows-x64-b1000.32" +val jbrLinuxVers = "jbr_jcef-17.0.8.1-linux-x64-b1000.32" downloadJbr { jbrVersion = jbrVers @@ -98,11 +100,19 @@ configurations { dependencyLocking { lockAllConfigurations() } repositories { - val dependencyRepositories = listOf("https://artifacts.itemis.cloud/repository/maven-mps") + val dependencyRepositories = listOf("https://artifacts.itemis.cloud/repository/maven-mps", + "https://maven.pkg.github.com/mbeddr/*") for (repoUrl in dependencyRepositories) { maven { url = uri(repoUrl) + + if (repoUrl.startsWith("https://maven.pkg.github.com/")) { + credentials { + username = project.property("gpr.user") as String + password = project.property("gpr.token") as String + } + } } } mavenCentral() @@ -153,6 +163,16 @@ val defaultScriptArgs = mapOf( fun scriptFile(relativePath: String):File = File("$rootDir/build/scripts/patched/$relativePath") +fun unpackAndRenameJBR(archiveName : String, nameOfDirectoryInsideArchive : String, nameOfJbrDirectory : String) { + val jbrDownloadDir = jdkDir.toString() + "/../jbrDownload"; + //project.delete(files("${jbrDownloadDir}")); + copy { + from(tarTree(resources.gzip(jdkDir.toString() + "/${archiveName}"))) + into(jbrDownloadDir) + } + file(jbrDownloadDir + "/${nameOfDirectoryInsideArchive}").renameTo(file("${jbrDownloadDir}/${nameOfJbrDirectory}")) +} + tasks { val configureJava by registering { dependsOn(downloadJbr) @@ -346,34 +366,48 @@ tasks { val resolvedArtifact = configurations["jbrWin"].resolvedConfiguration.resolvedArtifacts.find { ra -> ra.file.name == filename }!! resolvedArtifact.name + "-" + resolvedArtifact.classifier + "." + resolvedArtifact.extension } + + doLast { + unpackAndRenameJBR("jbr_jcef-windows-x64.tgz", jbrWindowsVers, "jbr_windows"); + } } - val unpackDistribution by registering(Copy::class) { - from(zipTree("$artifactsDir/com.mbeddr.formal.safetyDistribution/fasten-${version}.zip")) - into("$artifactsDir/com.mbeddr.formal.safetyDistribution/tmp") + val resolveJBR_Linux by registering(Copy::class) { + from(configurations["jbrLinux"]) + into(jdkDir) + rename { filename -> + val resolvedArtifact = configurations["jbrLinux"].resolvedConfiguration.resolvedArtifacts.find { ra -> ra.file.name == filename }!! + resolvedArtifact.name + "-" + resolvedArtifact.classifier + "." + resolvedArtifact.extension + } + + doLast { + unpackAndRenameJBR("jbr_jcef-linux-x64.tgz", jbrLinuxVers, "jbr_linux"); + } } - val deleteJBR by registering(Delete::class) { - dependsOn(unpackDistribution) - delete("$artifactsDir/com.mbeddr.formal.safetyDistribution/tmp/fasten-${version}/jbr") + val package_fasten_distribution_for_specific_platforms by registering(BuildLanguages::class) { + dependsOn(resolveJBR_Win, resolveJBR_Linux, build_fasten_safety_distribution) + script = scriptFile("build-fasten-distribution-for-specific-platforms.xml") } - val removeJBR by registering(Zip::class) { - dependsOn(deleteJBR) - from("$artifactsDir/com.mbeddr.formal.safetyDistribution/tmp/fasten-${version}") - archiveFileName.set("fasten-${version}_with_removed_JBR.zip") - destinationDirectory.set(file("$artifactsDir/com.mbeddr.formal.safetyDistribution")) + val produce_fasten_distribution_win by registering(Zip::class) { + dependsOn(package_fasten_distribution_for_specific_platforms) + from(zipTree(artifactsDir.file("com.mbeddr.formal.safetyDistribution.platforms/fasten-${version}-Win.zip"))) + destinationDirectory = artifactsDir } - val package_fasten_safety_distribution_win by registering(Zip::class) { - dependsOn(resolveJBR_Win, build_fasten_safety_distribution, removeJBR) - archiveBaseName.set("fasten-${version}-Win") - from(zipTree("$artifactsDir/com.mbeddr.formal.safetyDistribution/fasten-${version}_with_removed_JBR.zip")) - from(tarTree("$jdkDir/jbr_jcef-windows-x64.tgz")) + val produce_fasten_distribution_linux by registering(Tar::class) { + dependsOn(package_fasten_distribution_for_specific_platforms) + compression = Compression.GZIP + from(tarTree(artifactsDir.file("com.mbeddr.formal.safetyDistribution.platforms/fasten-${version}-Linux.tar.gz"))) + destinationDirectory = artifactsDir + archiveFileName = "fasten-${version}-Linux.tar.gz" } val build_all_languages by registering { - dependsOn(build_assurance_languages, build_formal_languages) + // as of 01.2025, all languages built by 'build_assurance_languages' are also built by 'build_formal_languages' + // commented out to avoid multiple building of the same languages + dependsOn(/*build_assurance_languages,*/ build_formal_languages) } assemble { dependsOn(package_formal, package_assurance) } @@ -402,7 +436,7 @@ tasks { "com.mbeddr.formal.safety", ).map { layout.projectDirectory.dir("code/languages/$it") } - val pluginRootsForMigration = listOf(mpsHomeDir.resolve("plugins"), dependenciesDir.asFile) + val pluginRootsForMigration = mpsHomeDir.listFiles() val migrate by registering(MpsMigrate::class) { dependsOn(resolveMps, downloadJbr, build_all_languages) @@ -509,6 +543,16 @@ publishing { } } } + create("FASTEN_WIN_RCP") { + groupId = "fasten" + artifactId = "win.rcp" + artifact(tasks.named("produce_fasten_distribution_win")) + } + create("FASTEN_LINUX_RCP") { + groupId = "fasten" + artifactId = "linux.rcp" + artifact(tasks.named("produce_fasten_distribution_linux")) + } } } diff --git a/build/scripts/build_all_scripts.xml b/build/scripts/build_all_scripts.xml index 2bfacaadc..e274e3294 100644 --- a/build/scripts/build_all_scripts.xml +++ b/build/scripts/build_all_scripts.xml @@ -68,6 +68,7 @@ + diff --git a/code/languages/com.fasten.symo/.mps/libraries.xml b/code/languages/com.fasten.symo/.mps/libraries.xml new file mode 100644 index 000000000..6b84430d8 --- /dev/null +++ b/code/languages/com.fasten.symo/.mps/libraries.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/code/languages/com.fasten.symo/.mps/modules.xml b/code/languages/com.fasten.symo/.mps/modules.xml index 5faf165de..6c8a09d9e 100644 --- a/code/languages/com.fasten.symo/.mps/modules.xml +++ b/code/languages/com.fasten.symo/.mps/modules.xml @@ -2,9 +2,13 @@ + + + + diff --git a/code/languages/com.fasten.symo/devkits/fasten.symo.plantuml/fasten.symo.plantuml.devkit b/code/languages/com.fasten.symo/devkits/fasten.symo.plantuml/fasten.symo.plantuml.devkit new file mode 100644 index 000000000..82253edf3 --- /dev/null +++ b/code/languages/com.fasten.symo/devkits/fasten.symo.plantuml/fasten.symo.plantuml.devkit @@ -0,0 +1,8 @@ + + + + + 377bf088-4ffc-48ac-910f-fb1c66ffa60e(com.symo.plantuml.lib) + + + diff --git a/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl b/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl index 80724c18c..b7d607156 100644 --- a/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl +++ b/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl @@ -14,6 +14,7 @@ 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) 1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -60,6 +61,7 @@ + diff --git a/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/models/com.fasten.symo.hw.editor.mps b/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/models/com.fasten.symo.hw.editor.mps index b70e976a5..2f73d0ada 100644 --- a/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/models/com.fasten.symo.hw.editor.mps +++ b/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/models/com.fasten.symo.hw.editor.mps @@ -9,6 +9,7 @@ + @@ -210,7 +211,7 @@ - + diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/com.symo.plantuml.mpl b/code/languages/com.fasten.symo/languages/com.symo.plantuml/com.symo.plantuml.mpl new file mode 100644 index 000000000..34f0e9206 --- /dev/null +++ b/code/languages/com.fasten.symo/languages/com.symo.plantuml/com.symo.plantuml.mpl @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 377bf088-4ffc-48ac-910f-fb1c66ffa60e(com.symo.plantuml.lib) + 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) + 848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime) + 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) + c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text) + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/doc/PlantUML_Language_Reference_Guide_en.pdf b/code/languages/com.fasten.symo/languages/com.symo.plantuml/doc/PlantUML_Language_Reference_Guide_en.pdf new file mode 100644 index 000000000..85b5609dd Binary files /dev/null and b/code/languages/com.fasten.symo/languages/com.symo.plantuml/doc/PlantUML_Language_Reference_Guide_en.pdf differ diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/generator/templates/com.symo.plantuml.generator.templates@generator.mps b/code/languages/com.fasten.symo/languages/com.symo.plantuml/generator/templates/com.symo.plantuml.generator.templates@generator.mps new file mode 100644 index 000000000..309e9f3d7 --- /dev/null +++ b/code/languages/com.fasten.symo/languages/com.symo.plantuml/generator/templates/com.symo.plantuml.generator.templates@generator.mps @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.behavior.mps b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.behavior.mps new file mode 100644 index 000000000..d31349136 --- /dev/null +++ b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.behavior.mps @@ -0,0 +1,1506 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.constraints.mps b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.constraints.mps new file mode 100644 index 000000000..402b02b0c --- /dev/null +++ b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.constraints.mps @@ -0,0 +1,266 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.editor.mps b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.editor.mps new file mode 100644 index 000000000..eeeb156a1 --- /dev/null +++ b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.editor.mps @@ -0,0 +1,2039 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.structure.mps b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.structure.mps new file mode 100644 index 000000000..d73be2114 --- /dev/null +++ b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.structure.mps @@ -0,0 +1,732 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.typesystem.mps b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.typesystem.mps new file mode 100644 index 000000000..aab6b7f5e --- /dev/null +++ b/code/languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.typesystem.mps @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl index e9843393d..0b903918d 100644 --- a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl +++ b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl @@ -17,6 +17,7 @@ ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -68,6 +69,7 @@ + diff --git a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.editor.mps b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.editor.mps index 4deb48955..f46a87524 100644 --- a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.editor.mps +++ b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.editor.mps @@ -14,6 +14,7 @@ + @@ -365,7 +366,7 @@ - + @@ -552,7 +553,7 @@ - + diff --git a/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/com.symo.plantuml.lib.msd b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/com.symo.plantuml.lib.msd new file mode 100644 index 000000000..d07a0dbb9 --- /dev/null +++ b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/com.symo.plantuml.lib.msd @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + + + + + + + + + + + + + diff --git a/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/batik-all-1.18.jar b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/batik-all-1.18.jar new file mode 100644 index 000000000..71e0568cc Binary files /dev/null and b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/batik-all-1.18.jar differ diff --git a/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/plantuml-epl-1.2024.7.jar b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/plantuml-epl-1.2024.7.jar new file mode 100644 index 000000000..b1d6740cb Binary files /dev/null and b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/plantuml-epl-1.2024.7.jar differ diff --git a/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/xml-apis-ext.jar b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/xml-apis-ext.jar new file mode 100644 index 000000000..a7869d68a Binary files /dev/null and b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/xml-apis-ext.jar differ diff --git a/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/xmlgraphics-commons-2.2.jar b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/xmlgraphics-commons-2.2.jar new file mode 100644 index 000000000..d1813ff7f Binary files /dev/null and b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/xmlgraphics-commons-2.2.jar differ diff --git a/code/languages/com.fasten.symo/solutions/com.symo.plantuml.sandbox/com.symo.plantuml.sandbox.msd b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.sandbox/com.symo.plantuml.sandbox.msd new file mode 100644 index 000000000..362c1d5e9 --- /dev/null +++ b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.sandbox/com.symo.plantuml.sandbox.msd @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.fasten.symo/solutions/com.symo.plantuml.sandbox/models/com.symo.plantuml.sandbox._010_smoke.mps b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.sandbox/models/com.symo.plantuml.sandbox._010_smoke.mps new file mode 100644 index 000000000..f6b6f7052 --- /dev/null +++ b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.sandbox/models/com.symo.plantuml.sandbox._010_smoke.mps @@ -0,0 +1,407 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.nusmv/.mps/modules.xml b/code/languages/com.mbeddr.formal.nusmv/.mps/modules.xml index e48438d0b..1f9a11338 100644 --- a/code/languages/com.mbeddr.formal.nusmv/.mps/modules.xml +++ b/code/languages/com.mbeddr.formal.nusmv/.mps/modules.xml @@ -32,6 +32,7 @@ + @@ -43,6 +44,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/com.fasten.base.activity.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/com.fasten.base.activity.mpl index c89daa071..e341ca6c1 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/com.fasten.base.activity.mpl +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/com.fasten.base.activity.mpl @@ -83,6 +83,7 @@ fa13cc63-c476-4d46-9c96-d53670abe7bc(de.itemis.mps.editor.diagram) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -131,6 +132,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/models/com.fasten.base.activity.editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/models/com.fasten.base.activity.editor.mps index 75cee1ee0..68d271cd7 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/models/com.fasten.base.activity.editor.mps +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/models/com.fasten.base.activity.editor.mps @@ -13,6 +13,7 @@ + @@ -319,7 +320,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/com.fasten.base.msc.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/com.fasten.base.msc.mpl index 0163126d8..841f1215a 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/com.fasten.base.msc.mpl +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/com.fasten.base.msc.mpl @@ -61,6 +61,7 @@ b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions) 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -108,6 +109,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.editor.mps index 3d3fe7d6c..792bb5f92 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.editor.mps +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/models/com.fasten.base.msc.editor.mps @@ -19,6 +19,7 @@ + @@ -563,7 +564,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl index 896336350..a57c56760 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl @@ -19,6 +19,7 @@ 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -76,6 +77,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/editor.mps index e0b3c3630..72eb76514 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/editor.mps +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/editor.mps @@ -29,6 +29,7 @@ + @@ -579,7 +580,7 @@ - + @@ -597,7 +598,7 @@ - + @@ -626,7 +627,7 @@ - + @@ -1427,7 +1428,7 @@ - + @@ -1487,7 +1488,7 @@ - + @@ -1524,7 +1525,7 @@ - + @@ -1584,7 +1585,7 @@ - + @@ -1633,7 +1634,7 @@ - + @@ -1695,7 +1696,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/com.mbeddr.formal.base.expressions.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/com.mbeddr.formal.base.expressions.mpl index e3c96376b..c20bbf6cd 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/com.mbeddr.formal.base.expressions.mpl +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/com.mbeddr.formal.base.expressions.mpl @@ -19,6 +19,7 @@ 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) 7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -76,6 +77,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/editor.mps index 7cf7352eb..daaeab41a 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/editor.mps +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/editor.mps @@ -11,6 +11,7 @@ + @@ -264,7 +265,7 @@ - + @@ -328,7 +329,7 @@ - + @@ -369,7 +370,7 @@ - + @@ -450,7 +451,7 @@ - + @@ -524,7 +525,7 @@ - + @@ -547,14 +548,14 @@ - + - + @@ -613,7 +614,7 @@ - + @@ -669,7 +670,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/structure.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/structure.mps index 628a40ec8..fe1f5fef3 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/structure.mps +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/models/structure.mps @@ -313,6 +313,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl index 493e94f33..fe4b1e1f8 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl @@ -17,6 +17,7 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) 4bf9a860-39c9-4cb2-8004-157a961bf42c(com.mbeddr.formal.base.operatorspanel.rt) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -75,6 +76,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/editor.mps index 428d5b171..374cbdb0b 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/editor.mps +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/editor.mps @@ -31,6 +31,7 @@ + @@ -607,7 +608,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/com.mbeddr.formal.base.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/com.mbeddr.formal.base.mpl index 18f582eb5..8a9f15387 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/com.mbeddr.formal.base.mpl +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/com.mbeddr.formal.base.mpl @@ -28,6 +28,7 @@ 8da51702-0e05-44c8-96db-8f11d1457c0c(com.mpsbasics.snode.utils) 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) 1f4710e9-f074-4732-a0bd-6fa896d282b7(com.mpsbasics.project.utils) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -89,6 +90,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/editor.mps index 4ae3d5e1a..97a14852e 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/editor.mps +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/editor.mps @@ -44,6 +44,7 @@ + @@ -83,7 +84,6 @@ - @@ -143,9 +143,6 @@ - - - @@ -176,9 +173,6 @@ - - - @@ -262,9 +256,6 @@ - - - @@ -313,10 +304,7 @@ - - - - + @@ -402,7 +390,6 @@ - @@ -532,643 +519,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2016,13 +1366,13 @@ - - - + + + - - - + + + @@ -2044,13 +1394,13 @@ - - - + + + - - - + + + @@ -3321,81 +2671,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3535,208 +2810,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3746,7 +2819,7 @@ - + @@ -4288,7 +3361,7 @@ - + @@ -4466,13 +3539,13 @@ - - - + + + - - - + + + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl index d48ec580d..ae37b2928 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl @@ -83,6 +83,7 @@ 450c81f1-1811-41ac-a9c8-8fda59f778ca(com.mbeddr.formal.nusmv.tabular) 9d368018-badb-4569-9884-4b463e4f6696(de.slisson.mps.conditionalEditor.runtime) 8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -153,6 +154,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/editor.mps index 1c1105360..33e34baf7 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/editor.mps +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/editor.mps @@ -36,6 +36,7 @@ + @@ -3118,7 +3119,7 @@ - + @@ -3168,7 +3169,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/com.mbeddr.formal.nusmv.operatorspanel.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/com.mbeddr.formal.nusmv.operatorspanel.mpl index e069ea0d7..6fa4be206 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/com.mbeddr.formal.nusmv.operatorspanel.mpl +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/com.mbeddr.formal.nusmv.operatorspanel.mpl @@ -18,6 +18,7 @@ 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) 735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt) b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -84,6 +85,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/editor.mps index 601527ecc..c97ef7108 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/editor.mps +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/models/editor.mps @@ -7,6 +7,7 @@ + @@ -111,7 +112,7 @@ - + @@ -122,7 +123,7 @@ - + @@ -151,7 +152,7 @@ - + @@ -161,7 +162,7 @@ - + @@ -189,7 +190,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/com.mbeddr.formal.nusmv.source.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/com.mbeddr.formal.nusmv.source.mpl index 1a526f843..f81cc3065 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/com.mbeddr.formal.nusmv.source.mpl +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/com.mbeddr.formal.nusmv.source.mpl @@ -16,6 +16,7 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -72,6 +73,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/editor.mps index ce4314182..ae91728a4 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/editor.mps +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/models/editor.mps @@ -11,6 +11,7 @@ + @@ -98,7 +99,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/com.mbeddr.formal.nusmv.tests.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/com.mbeddr.formal.nusmv.tests.mpl index 387ce8e6f..cfc782262 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/com.mbeddr.formal.nusmv.tests.mpl +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/com.mbeddr.formal.nusmv.tests.mpl @@ -81,6 +81,7 @@ 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) 692c2a6d-09c5-40f7-98f0-1f4b59860c1b(com.mbeddr.formal.nusmv.pluginSolution) e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -147,6 +148,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/editor.mps index 01dc9ce69..9440d1bac 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/editor.mps +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/models/editor.mps @@ -13,6 +13,7 @@ + @@ -427,7 +428,7 @@ - + @@ -450,7 +451,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/com.mbeddr.formal.nusmv.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/com.mbeddr.formal.nusmv.mpl index 81b992afd..45261d2f7 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/com.mbeddr.formal.nusmv.mpl +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/com.mbeddr.formal.nusmv.mpl @@ -68,6 +68,7 @@ 692c2a6d-09c5-40f7-98f0-1f4b59860c1b(com.mbeddr.formal.nusmv.pluginSolution) e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling) 848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -130,6 +131,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/editor.mps index 56e9ae16a..16ac2d4af 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/editor.mps +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/models/editor.mps @@ -22,6 +22,7 @@ + @@ -254,7 +255,7 @@ - + @@ -1059,7 +1060,7 @@ - + @@ -1178,7 +1179,7 @@ - + @@ -1239,7 +1240,7 @@ - + @@ -1287,7 +1288,7 @@ - + @@ -1411,7 +1412,7 @@ - + @@ -1471,7 +1472,7 @@ - + @@ -1507,7 +1508,7 @@ - + @@ -1547,7 +1548,7 @@ - + @@ -1655,7 +1656,7 @@ - + @@ -1683,14 +1684,14 @@ - + - + @@ -1703,7 +1704,7 @@ - + @@ -1717,7 +1718,7 @@ - + @@ -1727,7 +1728,7 @@ - + @@ -1740,7 +1741,7 @@ - + @@ -1753,7 +1754,7 @@ - + @@ -2331,7 +2332,7 @@ - + @@ -2354,7 +2355,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/com.mbeddr.formal.ocra.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/com.mbeddr.formal.ocra.mpl index 3b9102d2d..8d8e677a9 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/com.mbeddr.formal.ocra.mpl +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/com.mbeddr.formal.ocra.mpl @@ -18,6 +18,7 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv) c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -69,6 +70,7 @@ + diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.editor.mps index e1f81b141..263dd826f 100644 --- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.editor.mps +++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/models/com.mbeddr.formal.ocra.editor.mps @@ -8,9 +8,10 @@ - + + @@ -223,7 +224,7 @@ - + @@ -1312,7 +1313,7 @@ - + @@ -1341,7 +1342,7 @@ - + @@ -1455,7 +1456,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.sat/com.fasten.base.sat.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.sat/com.fasten.base.sat.msd new file mode 100644 index 000000000..b5a0d9e51 --- /dev/null +++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.sat/com.fasten.base.sat.msd @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions) + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.sat/lib/org.sat4j.core-src.jar b/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.sat/lib/org.sat4j.core-src.jar new file mode 100644 index 000000000..fea2fd813 Binary files /dev/null and b/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.sat/lib/org.sat4j.core-src.jar differ diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.sat/lib/org.sat4j.core.jar b/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.sat/lib/org.sat4j.core.jar new file mode 100644 index 000000000..1f993070a Binary files /dev/null and b/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.sat/lib/org.sat4j.core.jar differ diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.sat/models/com.fasten.base.sat.util.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.sat/models/com.fasten.base.sat.util.mps new file mode 100644 index 000000000..d8790faa2 --- /dev/null +++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.sat/models/com.fasten.base.sat.util.mps @@ -0,0 +1,1092 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/models/plugin.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/models/plugin.mps index 0e86822d2..61fefc27d 100644 --- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/models/plugin.mps +++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/models/plugin.mps @@ -69,9 +69,6 @@ - - - @@ -101,9 +98,6 @@ - - - @@ -642,50 +636,27 @@ - - - - - - - + + + + + + - - + + - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - + + + + diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.com.fasten.base.sat/models/test.com.fasten.base.sat._010_expression_to_cnf_converter@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.com.fasten.base.sat/models/test.com.fasten.base.sat._010_expression_to_cnf_converter@tests.mps new file mode 100644 index 000000000..cab6c25db --- /dev/null +++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.com.fasten.base.sat/models/test.com.fasten.base.sat._010_expression_to_cnf_converter@tests.mps @@ -0,0 +1,997 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.com.fasten.base.sat/test.com.fasten.base.sat.msd b/code/languages/com.mbeddr.formal.nusmv/tests/test.com.fasten.base.sat/test.com.fasten.base.sat.msd new file mode 100644 index 000000000..df42c4f12 --- /dev/null +++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.com.fasten.base.sat/test.com.fasten.base.sat.msd @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + e9038998-a640-4eb0-b13b-4b4970869bbd(com.fasten.base.sat) + b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions) + 001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/com.mbeddr.formal.prism.mpl b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/com.mbeddr.formal.prism.mpl index 32466ebe0..2e61c6052 100644 --- a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/com.mbeddr.formal.prism.mpl +++ b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/com.mbeddr.formal.prism.mpl @@ -17,6 +17,7 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 3c34ac43-22de-4ba4-9539-377c90eb9be6(com.mbeddr.formal.prism) b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -66,6 +67,7 @@ + diff --git a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.editor.mps b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.editor.mps index 7ddceb593..4825bb597 100644 --- a/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.editor.mps +++ b/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/models/com.mbeddr.formal.prism.editor.mps @@ -8,6 +8,7 @@ + @@ -130,7 +131,7 @@ - + @@ -474,7 +475,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps index f80933191..0960cb680 100644 --- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps +++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps @@ -12,6 +12,11 @@ + + + + + @@ -23,12 +28,18 @@ - - - + + + + + + + + + @@ -48,7 +59,7 @@ - + @@ -60,6 +71,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps index 42c803ce9..3bf3b07a0 100644 --- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps +++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps @@ -12,6 +12,11 @@ + + + + + @@ -23,12 +28,12 @@ - - - + + + @@ -45,7 +50,7 @@ - + @@ -58,5 +63,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps index e547d9c73..2f4062b91 100644 --- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps +++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps @@ -23,9 +23,6 @@ - - - @@ -45,7 +42,6 @@ - @@ -58,5 +54,18 @@ + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps index 84b2e236b..600862dea 100644 --- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps +++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps @@ -23,12 +23,18 @@ - - - + + + + + + + + + @@ -45,7 +51,7 @@ - + @@ -57,6 +63,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps index e3ca40220..9ca54e6c6 100644 --- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps +++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps @@ -22,12 +22,18 @@ - - - + + + + + + + + + @@ -50,7 +56,7 @@ - + @@ -62,6 +68,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps index 42f8055f0..d52179ef9 100644 --- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps +++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps @@ -11,6 +11,14 @@ + + + + + + + + @@ -22,9 +30,6 @@ - - - @@ -68,12 +73,20 @@ + + + + + + + + - + @@ -85,6 +98,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.req/.mps/modules.xml b/code/languages/com.mbeddr.formal.req/.mps/modules.xml index bbc2ed6bc..4f9e7a799 100644 --- a/code/languages/com.mbeddr.formal.req/.mps/modules.xml +++ b/code/languages/com.mbeddr.formal.req/.mps/modules.xml @@ -20,6 +20,7 @@ + diff --git a/code/languages/com.mbeddr.formal.req/devkits/fasten.requirements/fasten.requirements.devkit b/code/languages/com.mbeddr.formal.req/devkits/fasten.requirements/fasten.requirements.devkit index c3035594c..494b3812c 100644 --- a/code/languages/com.mbeddr.formal.req/devkits/fasten.requirements/fasten.requirements.devkit +++ b/code/languages/com.mbeddr.formal.req/devkits/fasten.requirements/fasten.requirements.devkit @@ -5,5 +5,6 @@ + diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/com.fasten.req.odd.mpl b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/com.fasten.req.odd.mpl index 175567ae5..3f5cb8c3e 100644 --- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/com.fasten.req.odd.mpl +++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/com.fasten.req.odd.mpl @@ -16,6 +16,7 @@ 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions) 65ed2ac6-4499-4751-951e-3819684a4b8d(com.fasten.req.ontology) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -71,6 +72,7 @@ + diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.behavior.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.behavior.mps index 32311ee6c..ebffbf1b3 100644 --- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.behavior.mps +++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.behavior.mps @@ -425,11 +425,6 @@ - - - - - diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.constraints.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.constraints.mps index 6b6b49ce4..79f590037 100644 --- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.constraints.mps +++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.constraints.mps @@ -14,10 +14,14 @@ + + + + @@ -25,16 +29,38 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -48,6 +74,13 @@ + + + + + + + @@ -55,16 +88,36 @@ + + + + + + + + + + + + + + + + + + + + @@ -89,9 +142,10 @@ - + + @@ -100,5 +154,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.editor.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.editor.mps index 8c714e4c6..9d0fc6828 100644 --- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.editor.mps +++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.editor.mps @@ -10,9 +10,9 @@ - + - + @@ -25,18 +25,26 @@ + + - + + + + + + + @@ -55,14 +63,15 @@ - - + + + @@ -87,6 +96,14 @@ + + + + + + + + @@ -141,7 +158,10 @@ + + + @@ -151,6 +171,9 @@ + + + @@ -161,121 +184,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -333,7 +266,7 @@ - + @@ -424,76 +357,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -528,6 +391,12 @@ + + + + + + @@ -625,6 +494,12 @@ + + + + + + @@ -676,5 +551,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.structure.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.structure.mps index c5ddbd4e0..18712e985 100644 --- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.structure.mps +++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.structure.mps @@ -123,92 +123,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -305,49 +219,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -361,7 +232,7 @@ - + @@ -397,9 +268,6 @@ - - - @@ -498,21 +366,16 @@ - - - - - - - - + + + + + + + + - - - - - - + diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.typesystem.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.typesystem.mps index 9a7eb59e1..4a3b2b2cc 100644 --- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.typesystem.mps +++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.typesystem.mps @@ -9,6 +9,108 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/com.fasten.req.ontology.mpl b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/com.fasten.req.ontology.mpl index 1d19d81de..6f2a2d367 100644 --- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/com.fasten.req.ontology.mpl +++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/com.fasten.req.ontology.mpl @@ -20,6 +20,7 @@ 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -74,6 +75,7 @@ + diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.behavior.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.behavior.mps index 5181baeb6..fd3447654 100644 --- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.behavior.mps +++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.behavior.mps @@ -91,9 +91,16 @@ + + + + + + + @@ -104,9 +111,13 @@ + + + + @@ -202,6 +213,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.editor.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.editor.mps index 29eb8a2a1..ef6e3c148 100644 --- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.editor.mps +++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.editor.mps @@ -26,6 +26,7 @@ + @@ -437,7 +438,7 @@ - + @@ -477,7 +478,7 @@ - + @@ -732,7 +733,7 @@ - + @@ -996,7 +997,7 @@ - + @@ -1879,7 +1880,7 @@ - + @@ -2344,7 +2345,11 @@ - + + + + + diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/com.mbeddr.formal.req.base.mpl b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/com.mbeddr.formal.req.base.mpl index c08098295..a61161e25 100644 --- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/com.mbeddr.formal.req.base.mpl +++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/com.mbeddr.formal.req.base.mpl @@ -68,6 +68,7 @@ d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -116,6 +117,7 @@ + diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/editor.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/editor.mps index 760bd1c9c..7095d8783 100644 --- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/editor.mps +++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/editor.mps @@ -31,6 +31,7 @@ + @@ -477,7 +478,7 @@ - + @@ -624,7 +625,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/com.mbeddr.formal.req.scenarios.mpl b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/com.mbeddr.formal.req.scenarios.mpl index 390f20a0e..3ab185a45 100644 --- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/com.mbeddr.formal.req.scenarios.mpl +++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/com.mbeddr.formal.req.scenarios.mpl @@ -70,6 +70,7 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) 0deccdfd-196b-4d8c-895e-0d6cb8014dfd(com.mbeddr.formal.req.base) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -117,6 +118,7 @@ + diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/models/com.mbeddr.formal.req.scenarios.editor.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/models/com.mbeddr.formal.req.scenarios.editor.mps index 9f8434dcd..d40eefec4 100644 --- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/models/com.mbeddr.formal.req.scenarios.editor.mps +++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/models/com.mbeddr.formal.req.scenarios.editor.mps @@ -10,6 +10,7 @@ + @@ -188,7 +189,7 @@ - + @@ -238,7 +239,7 @@ - + @@ -302,7 +303,7 @@ - + @@ -401,7 +402,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.behavior.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.behavior.mps index b3c77363d..d9f3da4b8 100644 --- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.behavior.mps +++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.behavior.mps @@ -1337,10 +1337,15 @@ - - - - + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.odd.sandbox/com.fasten.req.odd.sandbox.msd b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.odd.sandbox/com.fasten.req.odd.sandbox.msd index 3c2b0f644..34d02da8c 100644 --- a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.odd.sandbox/com.fasten.req.odd.sandbox.msd +++ b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.odd.sandbox/com.fasten.req.odd.sandbox.msd @@ -19,7 +19,8 @@ - + + diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.odd.sandbox/models/com.fasten.req.odd.sandbox._010_init_odd.mps b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.odd.sandbox/models/com.fasten.req.odd.sandbox._010_init_odd.mps index 1530154bc..8d25e0275 100644 --- a/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.odd.sandbox/models/com.fasten.req.odd.sandbox._010_init_odd.mps +++ b/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.odd.sandbox/models/com.fasten.req.odd.sandbox._010_init_odd.mps @@ -2,10 +2,7 @@ - - - - + @@ -61,6 +58,11 @@ + + + + + diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/com.mbeddr.formal.req.sandbox.msd b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/com.mbeddr.formal.req.sandbox.msd index 08394e99b..d8a8c3554 100644 --- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/com.mbeddr.formal.req.sandbox.msd +++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/com.mbeddr.formal.req.sandbox.msd @@ -13,6 +13,7 @@ + diff --git a/code/languages/com.mbeddr.formal.req/tests/test.com.fasten.req.odd/models/test.com.fasten.req.odd._010_smoke@tests.mps b/code/languages/com.mbeddr.formal.req/tests/test.com.fasten.req.odd/models/test.com.fasten.req.odd._010_smoke@tests.mps new file mode 100644 index 000000000..97ba83f3d --- /dev/null +++ b/code/languages/com.mbeddr.formal.req/tests/test.com.fasten.req.odd/models/test.com.fasten.req.odd._010_smoke@tests.mps @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.req/tests/test.com.fasten.req.odd/models/test.com.fasten.req.odd.test_data_utils.mps b/code/languages/com.mbeddr.formal.req/tests/test.com.fasten.req.odd/models/test.com.fasten.req.odd.test_data_utils.mps new file mode 100644 index 000000000..ef4e108ba --- /dev/null +++ b/code/languages/com.mbeddr.formal.req/tests/test.com.fasten.req.odd/models/test.com.fasten.req.odd.test_data_utils.mps @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.req/tests/test.com.fasten.req.odd/test.com.fasten.req.odd.msd b/code/languages/com.mbeddr.formal.req/tests/test.com.fasten.req.odd/test.com.fasten.req.odd.msd new file mode 100644 index 000000000..9a281723a --- /dev/null +++ b/code/languages/com.mbeddr.formal.req/tests/test.com.fasten.req.odd/test.com.fasten.req.odd.msd @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns._020_patterns_with_smv_expressions@tests.mps b/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns._020_patterns_with_smv_expressions@tests.mps index eb8127aa1..363297402 100644 --- a/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns._020_patterns_with_smv_expressions@tests.mps +++ b/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/models/test.com.mbeddr.formal.req.tl_patterns._020_patterns_with_smv_expressions@tests.mps @@ -18,7 +18,9 @@ - + + + @@ -499,6 +501,7 @@ + diff --git a/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/test.com.mbeddr.formal.req.tl_patterns.msd b/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/test.com.mbeddr.formal.req.tl_patterns.msd index 0877f11fc..edd6d8e04 100644 --- a/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/test.com.mbeddr.formal.req.tl_patterns.msd +++ b/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/test.com.mbeddr.formal.req.tl_patterns.msd @@ -19,6 +19,7 @@ 5ff577d1-1817-495b-9d6c-ff7b52c68609(com.mbeddr.formal.req.tl_patterns) + diff --git a/code/languages/com.mbeddr.formal.safety/.mps/libraries.xml b/code/languages/com.mbeddr.formal.safety/.mps/libraries.xml index feb4b0a83..ff4485823 100644 --- a/code/languages/com.mbeddr.formal.safety/.mps/libraries.xml +++ b/code/languages/com.mbeddr.formal.safety/.mps/libraries.xml @@ -51,6 +51,14 @@ + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/.mps/modules.xml b/code/languages/com.mbeddr.formal.safety/.mps/modules.xml index a64fc49f2..a5a6648de 100644 --- a/code/languages/com.mbeddr.formal.safety/.mps/modules.xml +++ b/code/languages/com.mbeddr.formal.safety/.mps/modules.xml @@ -68,7 +68,6 @@ - diff --git a/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.gsn.modelquery/fasten.safety.gsn.modelquery.devkit b/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.gsn.modelquery/fasten.safety.gsn.modelquery.devkit index 57e7f5a40..83ed1bbe6 100644 --- a/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.gsn.modelquery/fasten.safety.gsn.modelquery.devkit +++ b/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.gsn.modelquery/fasten.safety.gsn.modelquery.devkit @@ -1,14 +1,12 @@ - - + + + b64463ba-ae31-4cf7-be7b-afc13cab4daa(fasten.safety.gsn) + fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) - - 28c9d1d8-7af8-472d-8679-9b314648c201(com.mbeddr.formal.safety.argument.modelquery.genplan) - - diff --git a/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.gsn.runtime/fasten.safety.gsn.runtime.devkit b/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.gsn.runtime/fasten.safety.gsn.runtime.devkit index e96a19cbe..58485fdaa 100644 --- a/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.gsn.runtime/fasten.safety.gsn.runtime.devkit +++ b/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.gsn.runtime/fasten.safety.gsn.runtime.devkit @@ -2,6 +2,7 @@ + b64463ba-ae31-4cf7-be7b-afc13cab4daa(fasten.safety.gsn) diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/com.fasten.process.review.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/com.fasten.process.review.mpl index 0777dfed5..c99428709 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/com.fasten.process.review.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/com.fasten.process.review.mpl @@ -14,6 +14,7 @@ 92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -66,6 +67,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.editor.mps index 382e0fc6d..4bfa6e0ec 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.editor.mps @@ -13,6 +13,7 @@ + @@ -244,7 +245,7 @@ - + @@ -490,7 +491,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl index 93fed6e88..bcb7f826c 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl @@ -1,7 +1,7 @@ - + @@ -12,9 +12,10 @@ - 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) + 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) @@ -61,7 +62,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps index a8a3cdd7a..55388b0a5 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps @@ -9,11 +9,11 @@ - + @@ -437,7 +437,7 @@ - + @@ -464,7 +464,7 @@ - + @@ -511,7 +511,7 @@ - + @@ -602,7 +602,7 @@ - + @@ -694,7 +694,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/com.fasten.safety.fmea.iso26262.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/com.fasten.safety.fmea.iso26262.mpl index a8e7acd02..d9cc39019 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/com.fasten.safety.fmea.iso26262.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/com.fasten.safety.fmea.iso26262.mpl @@ -15,6 +15,7 @@ 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) 92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -64,6 +65,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps index c36f83bae..6e74ce3eb 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps @@ -3,7 +3,6 @@ - @@ -13,6 +12,7 @@ + @@ -191,13 +191,13 @@ - + - + @@ -223,7 +223,7 @@ - + @@ -263,7 +263,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl index 78d0e383e..637ae89cd 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl @@ -1,7 +1,7 @@ - + @@ -13,7 +13,7 @@ 92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext) - 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -59,7 +59,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps index 2ccfc3ee9..aacd08136 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps @@ -10,7 +10,7 @@ - + @@ -260,7 +260,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/com.fasten.safety.ft.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/com.fasten.safety.ft.mpl index 74954f6d7..93aca860e 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/com.fasten.safety.ft.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/com.fasten.safety.ft.mpl @@ -24,6 +24,7 @@ 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) 6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -84,6 +85,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps index 3a7284814..46ab1d9c8 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps @@ -23,6 +23,7 @@ + @@ -637,7 +638,7 @@ - + @@ -3086,7 +3087,7 @@ - + @@ -3554,7 +3555,7 @@ - + @@ -3609,7 +3610,7 @@ - + @@ -3651,7 +3652,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/com.fasten.safety.hazop.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/com.fasten.safety.hazop.mpl index c3e929f90..39b3bb430 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/com.fasten.safety.hazop.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/com.fasten.safety.hazop.mpl @@ -14,6 +14,7 @@ 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -60,6 +61,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.editor.mps index 086316382..dff948300 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/models/com.fasten.safety.hazop.editor.mps @@ -9,6 +9,7 @@ + @@ -61,7 +62,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps index ab9a239a3..a641a250a 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps @@ -16,6 +16,7 @@ + @@ -41,6 +42,9 @@ + + + @@ -113,12 +117,6 @@ - - - - - - @@ -240,6 +238,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/com.mbeddr.formal.safety.argument.jira_integration.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/com.mbeddr.formal.safety.argument.jira_integration.mpl index 215d94d5a..7bf638776 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/com.mbeddr.formal.safety.argument.jira_integration.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/com.mbeddr.formal.safety.argument.jira_integration.mpl @@ -18,6 +18,7 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 56f134c7-a829-428d-9119-715369c69768(org.mpsqa.treemap.lib) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -67,6 +68,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/models/com.mbeddr.formal.safety.argument.jira_integration.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/models/com.mbeddr.formal.safety.argument.jira_integration.editor.mps index 41515814f..b12ec8a28 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/models/com.mbeddr.formal.safety.argument.jira_integration.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/models/com.mbeddr.formal.safety.argument.jira_integration.editor.mps @@ -7,8 +7,8 @@ + - @@ -47,7 +47,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl index 1aeac585f..308d23518 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl @@ -26,6 +26,7 @@ e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn) + 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) @@ -81,11 +82,12 @@ e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) + 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) @@ -137,6 +139,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/generator/templates/com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/generator/templates/com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator.mps index 0167a0aad..3e0afad44 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/generator/templates/com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/generator/templates/com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator.mps @@ -11,6 +11,7 @@ + @@ -74,6 +75,7 @@ + @@ -258,7 +260,6 @@ - @@ -319,6 +320,13 @@ + + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.behavior.mps index cd5edc8f0..ecabc8445 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.behavior.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.behavior.mps @@ -10,6 +10,7 @@ + @@ -58,11 +59,19 @@ + + + + + + + + @@ -151,10 +160,28 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps index 10b49dc65..7e8d14e5a 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps @@ -7,7 +7,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -252,7 +252,7 @@ - + @@ -272,7 +272,7 @@ - + @@ -385,7 +385,7 @@ - + @@ -405,7 +405,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.typesystem.mps index ee0d04c85..689ae4aac 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.typesystem.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.typesystem.mps @@ -9,6 +9,7 @@ + @@ -21,6 +22,9 @@ + + + @@ -34,7 +38,6 @@ - @@ -51,10 +54,17 @@ + + + + + + + @@ -199,7 +209,6 @@ - @@ -223,24 +232,40 @@ + + + + + + + - - + + + + + + + - - - + + + + + + + + - diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.util.mps index b4d4fa44a..ddb2a8285 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.util.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.util.mps @@ -10,6 +10,7 @@ + @@ -83,7 +84,9 @@ - + + + @@ -112,6 +115,13 @@ + + + + + + + @@ -222,13 +232,37 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -298,8 +332,8 @@ - + @@ -457,7 +491,19 @@ - + + + + + + + + + + + + + @@ -472,17 +518,26 @@ - + + + + + + + - - - - + + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/com.mbeddr.formal.safety.argument.process.artefacts.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/com.mbeddr.formal.safety.argument.process.artefacts.mpl index fbf563449..af7a10f52 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/com.mbeddr.formal.safety.argument.process.artefacts.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/com.mbeddr.formal.safety.argument.process.artefacts.mpl @@ -19,6 +19,7 @@ 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -68,6 +69,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.editor.mps index 664775989..9c98f7cb0 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.editor.mps @@ -13,6 +13,7 @@ + @@ -677,7 +678,7 @@ - + @@ -1487,7 +1488,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/com.mbeddr.formal.safety.argument.process.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/com.mbeddr.formal.safety.argument.process.mpl index d0c0d6570..b2ae0ad64 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/com.mbeddr.formal.safety.argument.process.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/com.mbeddr.formal.safety.argument.process.mpl @@ -15,6 +15,7 @@ e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn) 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -63,6 +64,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.editor.mps index b79c42ce3..b5bdbaf91 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/models/com.mbeddr.formal.safety.argument.process.editor.mps @@ -10,6 +10,7 @@ + @@ -168,7 +169,7 @@ - + @@ -186,7 +187,7 @@ - + @@ -260,7 +261,7 @@ - + @@ -402,7 +403,7 @@ - + @@ -569,7 +570,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/com.mbeddr.formal.safety.argument.runtime.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/com.mbeddr.formal.safety.argument.runtime.mpl index a84b85de6..07fd32345 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/com.mbeddr.formal.safety.argument.runtime.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/com.mbeddr.formal.safety.argument.runtime.mpl @@ -21,6 +21,7 @@ 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) 81f324e1-38b1-44b1-85d2-19432dece3f6(com.mbeddr.formal.safety.argument.runtime.pluginSolution) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -78,6 +79,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.editor.mps index 809cc304e..cce30518b 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.editor.mps @@ -14,6 +14,7 @@ + @@ -161,7 +162,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/com.mbeddr.formal.safety.argument.spi.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/com.mbeddr.formal.safety.argument.spi.mpl index 0df4ccceb..002bd3abe 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/com.mbeddr.formal.safety.argument.spi.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/com.mbeddr.formal.safety.argument.spi.mpl @@ -11,11 +11,72 @@ + + + + + + + + + + + + + + + 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) + f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn) 13744753-c81f-424a-9c1b-cf8943bf4e86(jetbrains.mps.lang.sharedConcepts) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) + 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) + 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) + 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) @@ -63,6 +124,7 @@ + @@ -75,11 +137,18 @@ + + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/generator/templates/com.mbeddr.formal.safety.argument.spi.generator00.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/generator/templates/com.mbeddr.formal.safety.argument.spi.generator00.templates@generator.mps new file mode 100644 index 000000000..40e54f9fb --- /dev/null +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/generator/templates/com.mbeddr.formal.safety.argument.spi.generator00.templates@generator.mps @@ -0,0 +1,435 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.behavior.mps index c77c3c0a1..47d005228 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.behavior.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.behavior.mps @@ -14,10 +14,13 @@ + + + @@ -29,6 +32,8 @@ + + @@ -52,6 +57,9 @@ + + + @@ -63,6 +71,7 @@ + @@ -97,6 +106,7 @@ + @@ -116,17 +126,28 @@ + + + + + + + + + + + @@ -138,6 +159,7 @@ + @@ -147,6 +169,9 @@ + + + @@ -238,7 +263,25 @@ - + + + + + + + + + + + + + + + + + + + @@ -476,5 +519,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.editor.mps index c5aa08553..47ddd0ed8 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.editor.mps @@ -8,6 +8,7 @@ + @@ -67,7 +68,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.typesystem.mps index 6fb5cd500..c133f24c0 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.typesystem.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.typesystem.mps @@ -5,7 +5,238 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.util.mps new file mode 100644 index 000000000..999074492 --- /dev/null +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.spi/models/com.mbeddr.formal.safety.argument.spi.util.mps @@ -0,0 +1,586 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl index f05fffb5b..0eeb35d78 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl @@ -1,7 +1,7 @@ - + @@ -13,7 +13,6 @@ e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn) - 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 56f134c7-a829-428d-9119-715369c69768(org.mpsqa.treemap.lib) 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) @@ -21,6 +20,7 @@ 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -68,6 +68,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps index 95a1121ce..23b6f8cd0 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps @@ -8,7 +8,6 @@ - @@ -30,6 +29,7 @@ + @@ -436,7 +436,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/com.mbeddr.formal.safety.gsn.confidence.acp.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/com.mbeddr.formal.safety.gsn.confidence.acp.mpl index 1ee9169bd..474071788 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/com.mbeddr.formal.safety.gsn.confidence.acp.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/com.mbeddr.formal.safety.gsn.confidence.acp.mpl @@ -16,6 +16,7 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -69,6 +70,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.editor.mps index 04fa2168c..fea4b4b75 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/models/com.mbeddr.formal.safety.gsn.confidence.acp.editor.mps @@ -8,6 +8,7 @@ + @@ -111,7 +112,7 @@ - + @@ -155,7 +156,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.mpl index 2ae3524d8..7174cbda4 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.mpl @@ -17,6 +17,7 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -71,6 +72,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.editor.mps index 9ec790a09..780be0338 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.editor.mps @@ -13,8 +13,8 @@ + - @@ -683,7 +683,7 @@ - + @@ -1162,7 +1162,7 @@ - + @@ -1194,7 +1194,7 @@ - + @@ -1213,7 +1213,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/com.mbeddr.formal.safety.gsn.ext.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/com.mbeddr.formal.safety.gsn.ext.mpl index 5c8bedf2d..502a8d0f0 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/com.mbeddr.formal.safety.gsn.ext.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/com.mbeddr.formal.safety.gsn.ext.mpl @@ -23,6 +23,7 @@ e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -83,6 +84,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps index d3909d66b..9dbcff6a6 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps @@ -14,10 +14,12 @@ - + + + @@ -52,6 +54,7 @@ + @@ -72,9 +75,11 @@ + + @@ -90,6 +95,9 @@ + + + @@ -105,7 +113,9 @@ + + @@ -116,6 +126,9 @@ + + + @@ -144,6 +157,10 @@ + + + + @@ -163,6 +180,7 @@ + @@ -332,91 +350,205 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - + + + + - + - + - - - + + + + + + + + + + - - + + + + - - - + + + - - - - - - + + + + + + + + + + + + + + - - - + + + - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + - - - + + + + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.editor.mps index 06e4a9ef5..b05e4eb1b 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.editor.mps @@ -19,6 +19,7 @@ + @@ -386,7 +387,7 @@ - + @@ -1247,7 +1248,7 @@ - + @@ -1294,7 +1295,7 @@ - + @@ -1308,7 +1309,7 @@ - + @@ -1328,7 +1329,7 @@ - + @@ -1357,7 +1358,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl index 2577b34c0..554e6686f 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl @@ -21,6 +21,7 @@ c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text) 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) 6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -73,6 +74,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps index 121f8fcec..ecd52ac70 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps @@ -19,6 +19,7 @@ + @@ -1096,7 +1097,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/com.mbeddr.formal.safety.gsn.pdfexport.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/com.mbeddr.formal.safety.gsn.pdfexport.mpl index 18352204d..e80d7e0c2 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/com.mbeddr.formal.safety.gsn.pdfexport.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/com.mbeddr.formal.safety.gsn.pdfexport.mpl @@ -14,6 +14,7 @@ e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn) bc7d0863-298c-41cf-984f-a0421e757da5(com.mpsbasics.pdfbox) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -60,6 +61,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.behavior.mps index 8dd4ce898..f2f321dc9 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.behavior.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.behavior.mps @@ -147,7 +147,15 @@ + + + + + + + + @@ -156,10 +164,25 @@ - - + + + + + + + + + + + + + + + + + @@ -251,21 +274,48 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + @@ -273,7 +323,12 @@ - + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.editor.mps index ce4699572..173791387 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.editor.mps @@ -8,9 +8,9 @@ + - @@ -67,7 +67,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl index 533d6c66f..4c888f47c 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl @@ -25,6 +25,7 @@ 8da51702-0e05-44c8-96db-8f11d1457c0c(com.mpsbasics.snode.utils) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) 6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -83,6 +84,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps index 69983b703..6f568fc60 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps @@ -47,6 +47,7 @@ + @@ -833,7 +834,7 @@ - + @@ -5845,7 +5846,7 @@ - + @@ -10396,7 +10397,7 @@ - + @@ -11726,7 +11727,7 @@ - + @@ -13024,7 +13025,7 @@ - + @@ -13740,7 +13741,7 @@ - + @@ -14266,7 +14267,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/com.mbeddr.formal.safety.hara.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/com.mbeddr.formal.safety.hara.mpl index 8d87e36fc..4f9a7a781 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/com.mbeddr.formal.safety.hara.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/com.mbeddr.formal.safety.hara.mpl @@ -13,6 +13,7 @@ 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -60,6 +61,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps index b774df282..308b8d4a3 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/models/com.mbeddr.formal.safety.hara.editor.mps @@ -11,6 +11,7 @@ + @@ -102,7 +103,7 @@ - + @@ -201,7 +202,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl index 74488c6ce..e6ce1e411 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl @@ -1,7 +1,7 @@ - + @@ -13,8 +13,8 @@ 17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara) - 83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base) c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -63,9 +63,9 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps index 05ea3a8e0..f73d85480 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps @@ -9,7 +9,7 @@ - + @@ -243,7 +243,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -368,7 +368,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/com.mbeddr.formal.safety.stamp.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/com.mbeddr.formal.safety.stamp.mpl index ec57e29aa..ef259ff32 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/com.mbeddr.formal.safety.stamp.mpl +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/com.mbeddr.formal.safety.stamp.mpl @@ -20,6 +20,7 @@ e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling) 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) 6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -80,6 +81,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.editor.mps index 8d70ad580..3e467c3ee 100644 --- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.editor.mps +++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.editor.mps @@ -22,6 +22,7 @@ + @@ -497,7 +498,7 @@ - + @@ -1371,7 +1372,7 @@ - + @@ -1765,7 +1766,7 @@ - + @@ -1817,7 +1818,7 @@ - + @@ -2452,7 +2453,7 @@ - + @@ -2603,7 +2604,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps index 587f13816..30e433223 100644 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps +++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps @@ -605,6 +605,12 @@ + + + + + + @@ -779,6 +785,9 @@ + + + @@ -2095,6 +2104,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2195,6 +2261,11 @@ + + + + + @@ -2606,71 +2677,74 @@ - - - - + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + - - - - + + + + + + + + + + @@ -2697,11 +2771,6 @@ - - - - - @@ -2940,6 +3009,11 @@ + + + + + @@ -3035,6 +3109,11 @@ + + + + + @@ -3235,6 +3314,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3396,6 +3583,11 @@ + + + + + @@ -3549,6 +3741,11 @@ + + + + + @@ -3663,6 +3860,11 @@ + + + + + @@ -4098,6 +4300,11 @@ + + + + + @@ -4247,6 +4454,11 @@ + + + + + @@ -4359,11 +4571,6 @@ - - - - - @@ -4402,6 +4609,16 @@ + + + + + + + + + + @@ -4539,6 +4756,11 @@ + + + + + @@ -4644,6 +4866,11 @@ + + + + + @@ -4772,6 +4999,11 @@ + + + + + @@ -5095,6 +5327,11 @@ + + + + + @@ -5190,6 +5427,11 @@ + + + + + @@ -5278,6 +5520,11 @@ + + + + + @@ -5366,6 +5613,11 @@ + + + + + @@ -5542,11 +5794,6 @@ - - - - - @@ -5610,6 +5857,11 @@ + + + + + @@ -5640,6 +5892,16 @@ + + + + + + + + + + @@ -5820,61 +6082,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6143,6 +6350,11 @@ + + + + + @@ -6195,11 +6407,6 @@ - - - - - @@ -6243,6 +6450,11 @@ + + + + + @@ -6334,6 +6546,11 @@ + + + + + @@ -6435,6 +6652,11 @@ + + + + + @@ -6520,6 +6742,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6761,6 +7052,11 @@ + + + + + @@ -6826,16 +7122,16 @@ - - - - - + + + + + @@ -6901,6 +7197,11 @@ + + + + + @@ -7004,6 +7305,11 @@ + + + + + @@ -7200,6 +7506,11 @@ + + + + + @@ -7421,11 +7732,6 @@ - - - - - @@ -7469,6 +7775,11 @@ + + + + + @@ -7544,6 +7855,11 @@ + + + + + @@ -7674,6 +7990,9 @@ + + + @@ -7983,14 +8302,49 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/models/com.fasten.safety.hiphops.sandbox._010_smoke.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/models/com.fasten.safety.hiphops.sandbox._010_smoke.mps index d78d39f7f..8580ca59c 100644 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/models/com.fasten.safety.hiphops.sandbox._010_smoke.mps +++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/models/com.fasten.safety.hiphops.sandbox._010_smoke.mps @@ -1125,7 +1125,7 @@ - + @@ -1143,7 +1143,7 @@ - + @@ -1161,7 +1161,7 @@ - + @@ -1178,21 +1178,13 @@ - - + + - - - - - - - - @@ -1201,7 +1193,7 @@ - + @@ -1218,21 +1210,13 @@ - - + + - - - - - - - - @@ -1261,6 +1245,18 @@ + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/com.fasten.safety.rcp.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/com.fasten.safety.rcp.pluginSolution.msd index 96958aa52..7c9d0f9d5 100644 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/com.fasten.safety.rcp.pluginSolution.msd +++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/com.fasten.safety.rcp.pluginSolution.msd @@ -30,6 +30,10 @@ 65ed2ac6-4499-4751-951e-3819684a4b8d(com.fasten.req.ontology) 3460ac43-6f59-4f61-b134-9fa2f799c2d3(com.mbeddr.formal.req.scenarios) 81f6a079-965e-4523-87c3-8e6194f66585(com.fasten.base.msc) + f52452b6-7f99-441b-98f9-a98c52b92236(com.fasten.req.odd) + 6f31bc85-cbcc-4dcf-ada4-35da43e6832c(com.symo.plantuml) + 1118d03f-f774-4a18-9e75-2357f8563d46(com.mbeddr.formal.safety.argument.spi) + 546ac349-3106-438d-b92b-7d2ebfa2ade8(com.mbeddr.formal.safety.argument.runtime) @@ -60,6 +64,7 @@ + @@ -69,10 +74,13 @@ + + + @@ -86,6 +94,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/models/com.fasten.safety.rcp.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/models/com.fasten.safety.rcp.pluginSolution.plugin.mps index 82643ec34..a817fcef0 100644 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/models/com.fasten.safety.rcp.pluginSolution.plugin.mps +++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/models/com.fasten.safety.rcp.pluginSolution.plugin.mps @@ -31,6 +31,10 @@ + + + + @@ -1000,6 +1004,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -1040,6 +1067,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -1376,6 +1426,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/com.mbeddr.formal.safety.argument.modelquery.genplan.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/com.mbeddr.formal.safety.argument.modelquery.genplan.msd deleted file mode 100644 index 5be5aa627..000000000 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/com.mbeddr.formal.safety.argument.modelquery.genplan.msd +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/models/com.mbeddr.formal.safety.argument.modelquery.genplan.genplan.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/models/com.mbeddr.formal.safety.argument.modelquery.genplan.genplan.mps deleted file mode 100644 index 8a81a8257..000000000 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/models/com.mbeddr.formal.safety.argument.modelquery.genplan.genplan.mps +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/com.mbeddr.formal.safety.argument.spi.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/com.mbeddr.formal.safety.argument.spi.sandbox.msd index ed4f43930..83d152fca 100644 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/com.mbeddr.formal.safety.argument.spi.sandbox.msd +++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/com.mbeddr.formal.safety.argument.spi.sandbox.msd @@ -10,6 +10,9 @@ + + 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) + @@ -29,6 +32,9 @@ + + + diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/models/com.mbeddr.formal.safety.argument.spi.sandbox._010_smoke.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/models/com.mbeddr.formal.safety.argument.spi.sandbox._010_smoke.mps index 0d5837663..a8de92fd6 100644 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/models/com.mbeddr.formal.safety.argument.spi.sandbox._010_smoke.mps +++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.spi.sandbox/models/com.mbeddr.formal.safety.argument.spi.sandbox._010_smoke.mps @@ -4,7 +4,10 @@ - + + + + @@ -22,18 +25,35 @@ + + + - - + + + + + + + + + + + + + + + + @@ -102,12 +122,12 @@ - + - + @@ -116,9 +136,21 @@ - - - + + + + + + + + + + + + + + + @@ -138,9 +170,19 @@ - - - + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/com.mbeddr.formal.safety.build.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/com.mbeddr.formal.safety.build.msd index c82d8b232..77e7488f2 100644 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/com.mbeddr.formal.safety.build.msd +++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/com.mbeddr.formal.safety.build.msd @@ -20,6 +20,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps index 109dab8ff..d99b5d97a 100644 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps +++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps @@ -1,10 +1,12 @@ + - + + @@ -27,6 +29,7 @@ + @@ -49,6 +52,13 @@ + + + + + + + @@ -86,6 +96,10 @@ + + + + @@ -101,6 +115,9 @@ + + + @@ -155,6 +172,22 @@ + + + + + + + + + + + + + + + + @@ -177,6 +210,9 @@ + + + @@ -230,6 +266,7 @@ + @@ -243,6 +280,8 @@ + + @@ -638,11 +677,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -758,6 +832,12 @@ + + + + + + @@ -1086,6 +1166,9 @@ + + + @@ -1133,6 +1216,9 @@ + + + @@ -2323,6 +2409,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2423,6 +2566,11 @@ + + + + + @@ -2834,71 +2982,74 @@ - - - - + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + - - - - + + + + + + + + + + @@ -2925,11 +3076,6 @@ - - - - - @@ -3037,6 +3183,11 @@ + + + + + @@ -3117,6 +3268,289 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3445,6 +3879,11 @@ + + + + + @@ -3543,6 +3982,11 @@ + + + + + @@ -3688,7 +4132,7 @@ - + @@ -3766,6 +4210,11 @@ + + + + + @@ -4540,6 +4989,11 @@ + + + + + @@ -4575,6 +5029,9 @@ + + + @@ -4810,6 +5267,11 @@ + + + + + @@ -4983,6 +5445,11 @@ + + + + + @@ -5304,6 +5771,11 @@ + + + + + @@ -5487,6 +5959,11 @@ + + + + + @@ -5665,6 +6142,11 @@ + + + + + @@ -6272,6 +6754,11 @@ + + + + + @@ -6425,6 +6912,11 @@ + + + + + @@ -6525,6 +7017,11 @@ + + + + + @@ -6630,6 +7127,11 @@ + + + + + @@ -6744,6 +7246,11 @@ + + + + + @@ -7027,6 +7534,11 @@ + + + + + @@ -7461,6 +7973,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7530,6 +8140,11 @@ + + + + + @@ -7670,6 +8285,11 @@ + + + + + @@ -7748,6 +8368,11 @@ + + + + + @@ -8310,6 +8935,11 @@ + + + + + @@ -8619,6 +9249,11 @@ + + + + + @@ -8831,6 +9466,11 @@ + + + + + @@ -9842,6 +10482,11 @@ + + + + + @@ -10187,6 +10832,11 @@ + + + + + @@ -10292,6 +10942,11 @@ + + + + + @@ -10420,6 +11075,11 @@ + + + + + @@ -10757,6 +11417,11 @@ + + + + + @@ -10845,6 +11510,11 @@ + + + + + @@ -11525,6 +12195,11 @@ + + + + + @@ -11620,6 +12295,11 @@ + + + + + @@ -11662,11 +12342,6 @@ - - - - - @@ -11730,6 +12405,11 @@ + + + + + @@ -11760,6 +12440,16 @@ + + + + + + + + + + @@ -11991,11 +12681,6 @@ - - - - - @@ -12039,6 +12724,11 @@ + + + + + @@ -12130,6 +12820,11 @@ + + + + + @@ -12337,6 +13032,11 @@ + + + + + @@ -12405,16 +13105,16 @@ - - - - - + + + + + @@ -12518,6 +13218,11 @@ + + + + + @@ -12736,6 +13441,11 @@ + + + + + @@ -12898,16 +13608,16 @@ - - - - - + + + + + @@ -13066,6 +13776,11 @@ + + + + + @@ -13329,6 +14044,11 @@ + + + + + @@ -13405,61 +14125,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14234,6 +14899,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -14438,6 +15123,11 @@ + + + + + @@ -14465,9 +15155,9 @@ - - - + + + @@ -14508,6 +15198,11 @@ + + + + + @@ -14704,6 +15399,11 @@ + + + + + @@ -14789,6 +15489,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -15176,14 +15945,49 @@ - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + @@ -16042,7 +16846,7 @@ - + @@ -16529,7 +17333,34 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16558,627 +17389,604 @@ - - - - + + + + + + + + + + - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - + + + + + + + + + - - - - + + + + + + + + - - - - - - - + + + + + + + + - - + + - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + - - + + - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17437,11 +18245,6 @@ - - - - - @@ -17560,21 +18363,11 @@ - - - - - - - - - - @@ -17908,6 +18701,11 @@ + + + + + @@ -17926,11 +18724,6 @@ - - - - - @@ -17956,11 +18749,6 @@ - - - - - @@ -18116,6 +18904,21 @@ + + + + + + + + + + + + + + + @@ -18305,6 +19108,12 @@ + + + + + + @@ -18468,6 +19277,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -19120,32 +19999,167 @@ - + - - - - - - + + + + + - - - - + + + + - - - + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -19195,6 +20209,11 @@ + + + + + @@ -19217,8 +20236,12 @@ - - + + + + + + @@ -19244,5 +20267,1083 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd index bbf446dd0..3f9aceb7a 100644 --- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd +++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd @@ -18,6 +18,7 @@ + diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_tests@tests.mps index 9ed8be0cb..2eb91d750 100644 --- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_tests@tests.mps +++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_tests@tests.mps @@ -166,10 +166,14 @@ + + + + @@ -246,6 +250,14 @@ + + + + + + + + @@ -301,6 +313,10 @@ + + + + @@ -350,6 +366,10 @@ + + + + @@ -399,6 +419,10 @@ + + + + @@ -448,6 +472,10 @@ + + + + @@ -497,6 +525,10 @@ + + + + @@ -634,6 +666,10 @@ + + + + @@ -683,6 +719,10 @@ + + + + @@ -1209,6 +1249,9 @@ + + + @@ -1225,6 +1268,12 @@ + + + + + + @@ -1514,10 +1563,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._100_gsn_documents_testdata.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._100_gsn_documents_testdata.mps index 77ce281b6..d7e392700 100644 --- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._100_gsn_documents_testdata.mps +++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._100_gsn_documents_testdata.mps @@ -221,7 +221,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test_witness/_100_node_references.docx b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test_witness/_100_node_references.docx index 68f888bae..3eb4cd9fe 100644 Binary files a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test_witness/_100_node_references.docx and b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test_witness/_100_node_references.docx differ diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test_witness/_110_argument_over_hazards.docx b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test_witness/_110_argument_over_hazards.docx index 1fa148fbc..e6a9f9209 100644 Binary files a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test_witness/_110_argument_over_hazards.docx and b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test_witness/_110_argument_over_hazards.docx differ diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_testcode.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_testcode.mps index 7336d4311..634a71d65 100644 --- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_testcode.mps +++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_testcode.mps @@ -192,7 +192,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_testdata.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_testdata.mps index 28c91b8b3..512df541e 100644 --- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_testdata.mps +++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_testdata.mps @@ -2,22 +2,18 @@ - - - - - - - - - - + + + + + + @@ -38,13 +34,16 @@ - + + + + @@ -58,6 +57,9 @@ + + + @@ -73,6 +75,12 @@ + + + + + + @@ -507,21 +515,31 @@ - - - - - + + + + + + - - - + + + + + + + + + + + + + + + - - - @@ -539,8 +557,23 @@ - - + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_tests@tests.mps index b1f2153e8..c218b2d86 100644 --- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_tests@tests.mps +++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_tests@tests.mps @@ -11,7 +11,9 @@ + + @@ -31,6 +33,9 @@ + + + @@ -55,6 +60,7 @@ + @@ -66,6 +72,7 @@ + @@ -201,7 +208,6 @@ - @@ -215,15 +221,38 @@ + + + + + + + + + + + + + + + + + + - - + + + + + + + diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/test.mbeddr.formal.safety.argument.modelquery.msd b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/test.mbeddr.formal.safety.argument.modelquery.msd index 807b4479b..f71399a33 100644 --- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/test.mbeddr.formal.safety.argument.modelquery.msd +++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/test.mbeddr.formal.safety.argument.modelquery.msd @@ -16,25 +16,61 @@ 17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 57ecebe4-dfb8-4fef-9175-0008e04a3684(com.mbeddr.formal.safety.argument.modelquery) + 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -47,6 +83,7 @@ + diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/com.mbeddr.formal.smtlib.mpl b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/com.mbeddr.formal.smtlib.mpl index 373b0689e..82caa63e9 100644 --- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/com.mbeddr.formal.smtlib.mpl +++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/com.mbeddr.formal.smtlib.mpl @@ -17,6 +17,7 @@ 03458680-b827-4dcd-a8ca-ad82e7bdf60e(com.mbeddr.formal.smtlib.z3.rt) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) f7821750-33bf-489c-8f64-0850d86d540d(com.mbeddr.formal.smtlib.z3.lib) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -74,6 +75,7 @@ + diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/editor.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/editor.mps index a98c31291..93de97d07 100644 --- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/editor.mps +++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/models/editor.mps @@ -13,6 +13,7 @@ + @@ -210,7 +211,7 @@ - + @@ -219,13 +220,13 @@ - + - + @@ -265,13 +266,13 @@ - + - + @@ -325,7 +326,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/com.mbeddr.formal.spin.c.core.mpl b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/com.mbeddr.formal.spin.c.core.mpl index 8fb5de756..b14a2f9f2 100644 --- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/com.mbeddr.formal.spin.c.core.mpl +++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/com.mbeddr.formal.spin.c.core.mpl @@ -18,6 +18,7 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) ef89f137-f966-4966-a202-ab9ea26e79fe(com.mbeddr.formal.spin.c.core) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -77,6 +78,7 @@ + diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/editor.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/editor.mps index a7adde8a0..682f15ed8 100644 --- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/editor.mps +++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/models/editor.mps @@ -13,6 +13,7 @@ + @@ -217,7 +218,7 @@ - + @@ -282,7 +283,7 @@ - + @@ -305,7 +306,7 @@ - + @@ -418,7 +419,7 @@ - + @@ -465,7 +466,7 @@ - + @@ -525,7 +526,7 @@ - + @@ -658,7 +659,7 @@ - + @@ -896,7 +897,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl index 75ce0e8ca..0a8a27d02 100644 --- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl +++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl @@ -152,6 +152,7 @@ 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) 628c1bba-6b54-4c71-927c-3cff044349e4(com.mbeddr.formal.spin.hdl) ef89f137-f966-4966-a202-ab9ea26e79fe(com.mbeddr.formal.spin.c.core) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -223,6 +224,7 @@ + diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/editor.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/editor.mps index 1e0cf9760..9601bbd5a 100644 --- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/editor.mps +++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/editor.mps @@ -15,6 +15,7 @@ + @@ -195,7 +196,7 @@ - + @@ -247,7 +248,7 @@ - + @@ -292,7 +293,7 @@ - + @@ -323,7 +324,7 @@ - + @@ -387,7 +388,7 @@ - + @@ -498,7 +499,7 @@ - + @@ -661,7 +662,7 @@ - + @@ -731,7 +732,7 @@ - + @@ -755,7 +756,7 @@ - + @@ -799,7 +800,7 @@ - + diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl index a7a4b0d61..52b2307e6 100644 --- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl +++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl @@ -81,6 +81,7 @@ d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker) ad8d48af-022b-40dc-8979-2b76074fb438(com.mbeddr.formal.spin) 39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty) + 792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core) @@ -151,6 +152,7 @@ + diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/editor.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/editor.mps index 13cf5b857..2ea03373d 100644 --- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/editor.mps +++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/editor.mps @@ -12,6 +12,7 @@ + @@ -222,7 +223,7 @@ - + @@ -248,7 +249,7 @@ - + @@ -367,7 +368,7 @@ - + @@ -391,7 +392,7 @@ - + @@ -632,7 +633,7 @@ - + @@ -854,7 +855,7 @@ - + @@ -868,7 +869,7 @@ - + @@ -885,7 +886,7 @@ - + @@ -904,7 +905,7 @@ - + @@ -914,7 +915,7 @@ - + @@ -933,7 +934,7 @@ - + @@ -978,7 +979,7 @@ - + @@ -1055,7 +1056,7 @@ - + @@ -1069,7 +1070,7 @@ - + @@ -1108,7 +1109,7 @@ - + @@ -1187,7 +1188,7 @@ - + @@ -1201,7 +1202,7 @@ - + @@ -1214,7 +1215,7 @@ - + @@ -1241,7 +1242,7 @@ - + @@ -1348,7 +1349,7 @@ - + @@ -1636,7 +1637,7 @@ - + @@ -1700,7 +1701,7 @@ - + @@ -1741,7 +1742,7 @@ - + @@ -1822,7 +1823,7 @@ - + @@ -1886,7 +1887,7 @@ - + @@ -2070,7 +2071,7 @@ - + diff --git a/code/languages/com.mpsbasics/.mps/modules.xml b/code/languages/com.mpsbasics/.mps/modules.xml index 114a6c14c..188be065e 100644 --- a/code/languages/com.mpsbasics/.mps/modules.xml +++ b/code/languages/com.mpsbasics/.mps/modules.xml @@ -2,11 +2,11 @@ + - diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.core/com.mpsbasics.core.mpl b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/com.mpsbasics.core.mpl new file mode 100644 index 000000000..ef13593d7 --- /dev/null +++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/com.mpsbasics.core.mpl @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + 848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime) + 8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.behavior.mps b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.behavior.mps new file mode 100644 index 000000000..30c95d15d --- /dev/null +++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.behavior.mps @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.constraints.mps b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.constraints.mps new file mode 100644 index 000000000..5da7c7685 --- /dev/null +++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.constraints.mps @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.editor.mps b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.editor.mps new file mode 100644 index 000000000..7d4d7322d --- /dev/null +++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.editor.mps @@ -0,0 +1,1164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.structure.mps b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.structure.mps new file mode 100644 index 000000000..a305e0979 --- /dev/null +++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.structure.mps @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.typesystem.mps b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.typesystem.mps new file mode 100644 index 000000000..eab343431 --- /dev/null +++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.core/models/com.mpsbasics.core.typesystem.mps @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/com.mpsbasics.pdfexporter.mpl b/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/com.mpsbasics.pdfexporter.mpl index 27a5638c5..6b2fccf45 100644 --- a/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/com.mpsbasics.pdfexporter.mpl +++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/com.mpsbasics.pdfexporter.mpl @@ -21,6 +21,7 @@ 6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils) 34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime) 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) + 39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty) @@ -67,6 +68,7 @@ + diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.behavior.mps b/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.behavior.mps index 89db3762b..13918f81f 100644 --- a/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.behavior.mps +++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.behavior.mps @@ -5,6 +5,7 @@ + @@ -33,6 +34,12 @@ + + + + + + @@ -114,7 +121,6 @@ - @@ -150,6 +156,9 @@ + + + @@ -188,10 +197,12 @@ + + @@ -215,6 +226,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -227,6 +262,9 @@ + + + @@ -241,6 +279,9 @@ + + + @@ -272,6 +313,22 @@ + + + + + + + + + + + + + + + + @@ -279,7 +336,7 @@ - + @@ -287,8 +344,29 @@ - + + + + + + + + + + + + + + + + + + + + + + @@ -300,8 +378,8 @@ - - + + @@ -436,28 +514,13 @@ - - - - - - - - - - - - - - - - - - - - + + + + + - + @@ -612,9 +675,7 @@ - - - + @@ -719,6 +780,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -726,7 +811,12 @@ - + + + + + + @@ -735,23 +825,36 @@ - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -765,21 +868,69 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -790,7 +941,12 @@ - + + + + + + @@ -799,8 +955,8 @@ - - + + @@ -830,6 +986,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -837,7 +1017,12 @@ - + + + + + + @@ -860,9 +1045,7 @@ - - - + @@ -964,16 +1147,6 @@ - - - - - - - - - - @@ -1106,8 +1279,9 @@ - - + + + @@ -1395,14 +1569,15 @@ - + - + - - + + + @@ -1465,8 +1640,16 @@ + + + + + + + + @@ -1480,7 +1663,9 @@ - + + + @@ -1847,8 +2032,6 @@ - - @@ -1857,15 +2040,6 @@ - - - - - - - - - @@ -1927,8 +2101,6 @@ - - @@ -1954,8 +2126,9 @@ - - + + + @@ -2243,8 +2416,16 @@ + + + + + + + + @@ -2258,12 +2439,354 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.editor.mps b/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.editor.mps index 0eecc8c5a..1aafa27e4 100644 --- a/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.editor.mps +++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.editor.mps @@ -93,6 +93,7 @@ + @@ -223,6 +224,16 @@ + + + + + + + + + + @@ -367,5 +378,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.structure.mps b/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.structure.mps index fcd358c91..51749f56e 100644 --- a/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.structure.mps +++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.structure.mps @@ -99,6 +99,11 @@ + + + + + @@ -149,5 +154,20 @@ + + + + + + + + + + + + + + + diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/com.mpsbasics.docx4j.diffx.lib.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/com.mpsbasics.docx4j.diffx.lib.msd deleted file mode 100644 index ecdcc49e3..000000000 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/com.mpsbasics.docx4j.diffx.lib.msd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - 71bb25aa-20fa-4c18-8954-1b176576f52d(com.mpsbasics.docx4j.lib) - - - - - - - - - - - - - - diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd index eb751678e..90878d834 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd @@ -1,7 +1,7 @@ - + @@ -13,16 +13,17 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 71bb25aa-20fa-4c18-8954-1b176576f52d(com.mpsbasics.docx4j.lib) - 1cb48442-05da-4cad-b5c5-e31ddd69e322(com.mpsbasics.docx4j.diffx.lib) + + + - diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/models/com.mpsbasics.docx4j.testutils.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/models/com.mpsbasics.docx4j.testutils.mps index c3a6123d4..848d0bd40 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/models/com.mpsbasics.docx4j.testutils.mps +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/models/com.mpsbasics.docx4j.testutils.mps @@ -5,37 +5,41 @@ + + - - - - - - + + + + + + + + + + + - - - @@ -47,11 +51,10 @@ - + - - - + + @@ -63,6 +66,7 @@ + @@ -82,7 +86,12 @@ - + + + + + + @@ -91,9 +100,7 @@ - - - + @@ -101,7 +108,6 @@ - @@ -112,33 +118,55 @@ + + + + + + + + + + + + + + + + - - - + + + + + + + - - - + + + + - - + + + @@ -147,13 +175,7 @@ - - - - - - - + @@ -198,7 +220,7 @@ - + @@ -211,284 +233,441 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - + + - - - - - - + + + + + + + - - - - - - + + + + + - - - + + + + + + + + + - - - - - + + + + + - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + + + + - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + - - + + + + + - - + + + + + + + + + + + + + - - + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + - - - - + + + + - - - - - - @@ -503,6 +682,12 @@ + + + + + + diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.notifications.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.notifications.mps index f87927458..6f192c4ed 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.notifications.mps +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.notifications.mps @@ -79,7 +79,6 @@ - @@ -177,7 +176,6 @@ - @@ -187,7 +185,7 @@ - + @@ -205,7 +203,6 @@ - diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox.sandbox/models/com.mpsbasics.pdfbox.sandbox._010_smoke.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox.sandbox/models/com.mpsbasics.pdfbox.sandbox._010_smoke.mps index e5cc0f2c3..890ce569c 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox.sandbox/models/com.mpsbasics.pdfbox.sandbox._010_smoke.mps +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox.sandbox/models/com.mpsbasics.pdfbox.sandbox._010_smoke.mps @@ -16,10 +16,14 @@ + + + + @@ -46,6 +50,7 @@ + @@ -63,18 +68,285 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/com.mpsbasics.pdfbox.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/com.mpsbasics.pdfbox.msd index a4b5b9a17..36e8acfb5 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/com.mpsbasics.pdfbox.msd +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/com.mpsbasics.pdfbox.msd @@ -1,20 +1,29 @@ - + - - + - - + + + + + + + + + + + + @@ -30,11 +39,13 @@ + + @@ -48,7 +59,6 @@ - diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/lib/openhtmltopdf-core-1.1.23.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/lib/openhtmltopdf-core-1.1.23.jar new file mode 100644 index 000000000..364aef30a Binary files /dev/null and b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/lib/openhtmltopdf-core-1.1.23.jar differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/lib/openhtmltopdf-pdfbox-1.1.23.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/lib/openhtmltopdf-pdfbox-1.1.23.jar new file mode 100644 index 000000000..be126cb5f Binary files /dev/null and b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/lib/openhtmltopdf-pdfbox-1.1.23.jar differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/lib/xmpbox-3.0.1.jar b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/lib/xmpbox-3.0.1.jar new file mode 100644 index 000000000..ac0717662 Binary files /dev/null and b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/lib/xmpbox-3.0.1.jar differ diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/models/com.mpsbasics.pdfbox.utils.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/models/com.mpsbasics.pdfbox.utils.mps index 3aa0adb34..e003135e7 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/models/com.mpsbasics.pdfbox.utils.mps +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/models/com.mpsbasics.pdfbox.utils.mps @@ -5,6 +5,10 @@ + + + + @@ -15,17 +19,35 @@ - - - + + + + + + + + + + + + + + + + + + + + + @@ -34,9 +56,14 @@ + + + + + @@ -45,8 +72,13 @@ + + + + + @@ -60,6 +92,7 @@ + @@ -70,13 +103,22 @@ + + + + + + + + + @@ -90,6 +132,7 @@ + @@ -98,6 +141,7 @@ + @@ -105,10 +149,12 @@ + + @@ -116,16 +162,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -145,6 +239,13 @@ + + + + + + + @@ -153,6 +254,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -176,6 +297,20 @@ + + + + + + + + + + + + + + @@ -188,6 +323,7 @@ + @@ -195,12 +331,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -211,21 +373,66 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -344,8 +551,315 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -376,25 +890,16 @@ - - + + + + + + - - - - - - - - - - - - - - - + + @@ -445,6 +950,1152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.project.utils/models/com.mpsbasics.project.utils.project_finder.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.project.utils/models/com.mpsbasics.project.utils.project_finder.mps index 0d610ee15..63ac45c2b 100644 --- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.project.utils/models/com.mpsbasics.project.utils.project_finder.mps +++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.project.utils/models/com.mpsbasics.project.utils.project_finder.mps @@ -22,6 +22,8 @@ + + @@ -128,6 +130,9 @@ + + + @@ -181,6 +186,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -194,9 +228,8 @@ - - - + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/com.mbeddr.formal.safety.tutorial.msd b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/com.mbeddr.formal.safety.tutorial.msd index 580c9e01e..a79ec56b8 100644 --- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/com.mbeddr.formal.safety.tutorial.msd +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/com.mbeddr.formal.safety.tutorial.msd @@ -20,12 +20,15 @@ 56f134c7-a829-428d-9119-715369c69768(org.mpsqa.treemap.lib) fde86f49-830f-414f-9c22-2a9e300eaba6(com.mpsbasics.jira) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) + 17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara) + 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) + @@ -63,8 +66,11 @@ + + + @@ -97,17 +103,28 @@ + + + + + + + + + + + @@ -121,12 +138,15 @@ + + + @@ -134,7 +154,11 @@ + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_features._110_checkable_assurance_demo_modelquery/.model b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_features._110_checkable_assurance_demo_modelquery/.model new file mode 100644 index 000000000..e016658d2 --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_features._110_checkable_assurance_demo_modelquery/.model @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_features._110_checkable_assurance_demo_modelquery/_010_hazards.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_features._110_checkable_assurance_demo_modelquery/_010_hazards.mpsr new file mode 100644 index 000000000..4aa5326b0 --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_features._110_checkable_assurance_demo_modelquery/_010_hazards.mpsr @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_features._110_checkable_assurance_demo_modelquery/_020_safety_reqs.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_features._110_checkable_assurance_demo_modelquery/_020_safety_reqs.mpsr new file mode 100644 index 000000000..4dddf8808 --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_features._110_checkable_assurance_demo_modelquery/_020_safety_reqs.mpsr @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_features._110_checkable_assurance_demo_modelquery/_100_argument_over_hazards.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_features._110_checkable_assurance_demo_modelquery/_100_argument_over_hazards.mpsr new file mode 100644 index 000000000..eec665d2a --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_features._110_checkable_assurance_demo_modelquery/_100_argument_over_hazards.mpsr @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_features._110_checkable_assurance_demo_modelquery/_100_argument_over_hazards_checks.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_features._110_checkable_assurance_demo_modelquery/_100_argument_over_hazards_checks.mpsr new file mode 100644 index 000000000..4e84b3bc6 --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_features._110_checkable_assurance_demo_modelquery/_100_argument_over_hazards_checks.mpsr @@ -0,0 +1,579 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.avsc_lexicon.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.avsc_lexicon.mps new file mode 100644 index 000000000..eb7bd8b76 --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.avsc_lexicon.mps @@ -0,0 +1,519 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.bsi.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.bsi.mps new file mode 100644 index 000000000..2972f61fa --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.bsi.mps @@ -0,0 +1,920 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.czarnecki_operational_world_model_for_ads.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.czarnecki_operational_world_model_for_ads.mps new file mode 100644 index 000000000..090686bf3 --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.czarnecki_operational_world_model_for_ads.mps @@ -0,0 +1,2878 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.phil_koopman_odd_paper.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.phil_koopman_odd_paper.mps new file mode 100644 index 000000000..cdc921bcc --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.phil_koopman_odd_paper.mps @@ -0,0 +1,315 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.wordnet.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.wordnet.mps new file mode 100644 index 000000000..0301ec982 --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.wordnet.mps @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd/.model b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd/.model new file mode 100644 index 000000000..d4ddf7701 --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd/.model @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd/_010_odd_example.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd/_010_odd_example.mpsr new file mode 100644 index 000000000..738864eed --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd/_010_odd_example.mpsr @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_system_models/.model b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_system_models/.model new file mode 100644 index 000000000..63eb1e818 --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_system_models/.model @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_system_models/_010_usecase_diagram.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_system_models/_010_usecase_diagram.mpsr new file mode 100644 index 000000000..553dc50fb --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_system_models/_010_usecase_diagram.mpsr @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_system_models/_020_component_diagram.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_system_models/_020_component_diagram.mpsr new file mode 100644 index 000000000..2d9e0c879 --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_system_models/_020_component_diagram.mpsr @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/_015_cross_referencing_goal_structure.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/_015_cross_referencing_goal_structure.mpsr index d229884fa..026acca9d 100644 --- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/_015_cross_referencing_goal_structure.mpsr +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/_015_cross_referencing_goal_structure.mpsr @@ -702,40 +702,40 @@ - + - - + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -743,59 +743,59 @@ - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -803,12 +803,12 @@ - - + + - - + + @@ -828,12 +828,12 @@ - - + + - - + + @@ -853,12 +853,12 @@ - - + + - - + + @@ -878,12 +878,12 @@ - - + + - - + + @@ -902,20 +902,20 @@ - - - - + + + + - - - - + + + + @@ -923,12 +923,12 @@ - - + + - - + + @@ -948,12 +948,12 @@ - - + + - - + + @@ -990,12 +990,12 @@ - - + + - - + + @@ -1032,12 +1032,12 @@ - - + + - - + + @@ -1057,12 +1057,12 @@ - - + + - - + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._080_assurance_cases_linked_to_jira.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._080_assurance_cases_linked_to_jira.mps deleted file mode 100644 index 75e8e1e34..000000000 --- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._080_assurance_cases_linked_to_jira.mps +++ /dev/null @@ -1,398 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._090_assurance_cases_linked_to_runtime/.model b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._090_assurance_cases_linked_to_runtime/.model new file mode 100644 index 000000000..acbe8a09e --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._090_assurance_cases_linked_to_runtime/.model @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._090_assurance_cases_linked_to_runtime/_010_solutions_linked_with_runtime_data.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._090_assurance_cases_linked_to_runtime/_010_solutions_linked_with_runtime_data.mpsr new file mode 100644 index 000000000..95d06ebcb --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._090_assurance_cases_linked_to_runtime/_010_solutions_linked_with_runtime_data.mpsr @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._090_assurance_cases_linked_to_runtime/_010_solutions_linked_with_runtime_data_CONFIG.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._090_assurance_cases_linked_to_runtime/_010_solutions_linked_with_runtime_data_CONFIG.mpsr new file mode 100644 index 000000000..1f18f7eed --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._090_assurance_cases_linked_to_runtime/_010_solutions_linked_with_runtime_data_CONFIG.mpsr @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._090_assurance_cases_linked_to_runtime/_020_SPIs_catalogue.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._090_assurance_cases_linked_to_runtime/_020_SPIs_catalogue.mpsr new file mode 100644 index 000000000..5565f81ac --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._090_assurance_cases_linked_to_runtime/_020_SPIs_catalogue.mpsr @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._090_assurance_cases_linked_to_runtime/_020_assurance_case_linked_to_SPIs.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._090_assurance_cases_linked_to_runtime/_020_assurance_case_linked_to_SPIs.mpsr new file mode 100644 index 000000000..4516e5bdf --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._090_assurance_cases_linked_to_runtime/_020_assurance_case_linked_to_SPIs.mpsr @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_200_autonomy_safety_arguments_catalogue._010_oascf/.model b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_200_autonomy_safety_arguments_catalogue._010_oascf/.model new file mode 100644 index 000000000..79eadd0d0 --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_200_autonomy_safety_arguments_catalogue._010_oascf/.model @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_200_autonomy_safety_arguments_catalogue._010_oascf/OASCF_G1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_200_autonomy_safety_arguments_catalogue._010_oascf/OASCF_G1.mpsr new file mode 100644 index 000000000..772acb13e --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_200_autonomy_safety_arguments_catalogue._010_oascf/OASCF_G1.mpsr @@ -0,0 +1,1475 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_200_autonomy_safety_arguments_catalogue._010_oascf/OASCF_G2.1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_200_autonomy_safety_arguments_catalogue._010_oascf/OASCF_G2.1.mpsr new file mode 100644 index 000000000..90518a653 --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_200_autonomy_safety_arguments_catalogue._010_oascf/OASCF_G2.1.mpsr @@ -0,0 +1,466 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_200_autonomy_safety_arguments_catalogue._010_oascf/OASCF_G2.2.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_200_autonomy_safety_arguments_catalogue._010_oascf/OASCF_G2.2.mpsr new file mode 100644 index 000000000..b35f7947c --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_200_autonomy_safety_arguments_catalogue._010_oascf/OASCF_G2.2.mpsr @@ -0,0 +1,1146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_200_autonomy_safety_arguments_catalogue._010_oascf/OASCF_G2.3.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_200_autonomy_safety_arguments_catalogue._010_oascf/OASCF_G2.3.mpsr new file mode 100644 index 000000000..77911b80e --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_200_autonomy_safety_arguments_catalogue._010_oascf/OASCF_G2.3.mpsr @@ -0,0 +1,692 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/_010_uber_atg_safety_case_top.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/_010_uber_atg_safety_case_top.mpsr index 5c59e6502..bce2a1e3f 100644 --- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/_010_uber_atg_safety_case_top.mpsr +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/_010_uber_atg_safety_case_top.mpsr @@ -116837,320 +116837,316 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - @@ -117164,10 +117160,6 @@ - - - - @@ -117187,12 +117179,12 @@ - - + + - - + + @@ -117231,12 +117223,12 @@ - - + + - - + + @@ -117257,12 +117249,12 @@ - - + + - - + + @@ -117270,12 +117262,12 @@ - - + + - - + + @@ -117296,12 +117288,12 @@ - - + + - - + + @@ -117334,6 +117326,14 @@ + + + + + + + + @@ -117370,18 +117370,26 @@ + + + + + + + + - - + + - - + + @@ -117402,12 +117410,12 @@ - - + + - - + + @@ -117428,12 +117436,12 @@ - - + + - - + + @@ -117454,12 +117462,12 @@ - - + + - - + + @@ -117480,8 +117488,8 @@ - - + + @@ -117497,8 +117505,8 @@ - - + + @@ -117518,18 +117526,26 @@ + + + + + + + + - - + + - - + + @@ -117550,8 +117566,8 @@ - - + + @@ -117567,8 +117583,8 @@ - - + + @@ -117588,6 +117604,14 @@ + + + + + + + + @@ -117607,12 +117631,12 @@ - - + + - - + + @@ -117632,14 +117656,22 @@ + + + + + + + + - - + + @@ -117655,8 +117687,8 @@ - - + + @@ -117676,14 +117708,22 @@ + + + + + + + + - - + + @@ -117699,8 +117739,8 @@ - - + + @@ -117720,18 +117760,26 @@ + + + + + + + + - - + + - - + + @@ -117752,8 +117800,8 @@ - - + + @@ -117769,8 +117817,8 @@ - - + + @@ -117778,12 +117826,12 @@ - - + + - - + + @@ -117804,12 +117852,12 @@ - - + + - - + + @@ -117842,6 +117890,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.1.mpsr index de839a5d2..e79db6c50 100644 --- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.1.mpsr +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.1.mpsr @@ -75,23 +75,23 @@ - - + + - - + + - + @@ -99,63 +99,63 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -163,56 +163,56 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -288,180 +288,180 @@ - + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -469,12 +469,12 @@ - - + + - - + + @@ -513,12 +513,12 @@ - - + + - - + + @@ -539,12 +539,12 @@ - - + + - - + + @@ -565,12 +565,12 @@ - - + + - - + + @@ -591,12 +591,12 @@ - - + + - - + + @@ -616,14 +616,6 @@ - - - - - - - - @@ -655,6 +647,14 @@ + + + + + + + + @@ -673,19 +673,19 @@ + + + + + + + + - - - - - - - - @@ -717,18 +717,26 @@ + + + + + + + + - - + + - - + + @@ -749,12 +757,12 @@ - - + + - - + + @@ -787,18 +795,26 @@ + + + + + + + + - - + + - - + + @@ -819,12 +835,12 @@ - - + + - - + + @@ -845,12 +861,12 @@ - - + + - - + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.4.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.4.mpsr index 830d5602a..8bd89fcb9 100644 --- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.4.mpsr +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.4.mpsr @@ -14,11 +14,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -42,71 +66,71 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -114,48 +138,48 @@ - - + + - - + + - - + + - - + + - - + + - - + + @@ -215,6 +239,340 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.9.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.9.mpsr index cc7a5df9a..c519adc7e 100644 --- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.9.mpsr +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.9.mpsr @@ -14,11 +14,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -42,31 +66,31 @@ - - + + - - + + - - + + - + @@ -74,31 +98,31 @@ - - + + - - + + - - + + - + @@ -106,95 +130,95 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -202,40 +226,40 @@ - - + + - - + + - - + + - - + + - - + + @@ -335,6 +359,552 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.mpsr index 52df974a8..0ae12ba8a 100644 --- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.mpsr +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.1.mpsr @@ -78,8 +78,8 @@ - - + + @@ -88,23 +88,23 @@ - - + + - - + + - + @@ -112,31 +112,31 @@ - - + + - - + + - - + + - + @@ -146,63 +146,63 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -210,7 +210,7 @@ - + @@ -218,47 +218,47 @@ - - + + - - + + - - + + - - + + - - + + - + @@ -266,31 +266,31 @@ - - + + - - + + - - + + - + @@ -298,39 +298,39 @@ - - + + - - + + - - + + - - + + - + @@ -338,8 +338,8 @@ - - + + @@ -348,63 +348,63 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -412,7 +412,7 @@ - + @@ -585,149 +585,149 @@ - + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + @@ -735,59 +735,59 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + @@ -795,159 +795,159 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + @@ -955,50 +955,50 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -1006,11 +1006,11 @@ - + - + @@ -1044,18 +1044,26 @@ + + + + + + + + - - + + - - + + @@ -1076,12 +1084,12 @@ - - + + - - + + @@ -1114,17 +1122,25 @@ + + + + + + + + - + - + @@ -1164,11 +1180,11 @@ - + - + @@ -1190,11 +1206,11 @@ - + - + @@ -1228,18 +1244,26 @@ + + + + + + + + - - + + - - + + @@ -1260,11 +1284,11 @@ - + - + @@ -1286,12 +1310,12 @@ - - + + - - + + @@ -1324,18 +1348,26 @@ + + + + + + + + - - + + - - + + @@ -1356,12 +1388,12 @@ - - + + - - + + @@ -1382,12 +1414,12 @@ - - + + - - + + @@ -1408,11 +1440,11 @@ - + - + @@ -1434,12 +1466,12 @@ - - + + - - + + @@ -1460,12 +1492,12 @@ - - + + - - + + @@ -1486,12 +1518,12 @@ - - + + - - + + @@ -1524,18 +1556,26 @@ + + + + + + + + - - + + - - + + @@ -1556,12 +1596,12 @@ - - + + - - + + @@ -1582,12 +1622,12 @@ - - + + - - + + @@ -1608,12 +1648,12 @@ - - + + - - + + @@ -1634,11 +1674,11 @@ - + - + @@ -1672,18 +1712,26 @@ + + + + + + + + - - + + - - + + @@ -1704,12 +1752,12 @@ - - + + - - + + @@ -1730,12 +1778,12 @@ - - + + - - + + @@ -1756,12 +1804,12 @@ - - + + - - + + @@ -1782,11 +1830,11 @@ - + - + @@ -1808,11 +1856,11 @@ - + - + @@ -1846,6 +1894,14 @@ + + + + + + + + @@ -1864,18 +1920,26 @@ + + + + + + + + - - + + - - + + @@ -1896,12 +1960,12 @@ - - + + - - + + @@ -1934,18 +1998,26 @@ + + + + + + + + - - + + - - + + @@ -1966,12 +2038,12 @@ - - + + - - + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.2.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.2.mpsr index 640a80fd7..35af84048 100644 --- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.2.mpsr +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.2.mpsr @@ -75,96 +75,96 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -216,120 +216,120 @@ - + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -349,18 +349,26 @@ + + + + + + + + - - + + - - + + @@ -381,12 +389,12 @@ - - + + - - + + @@ -419,18 +427,26 @@ + + + + + + + + - - + + - - + + @@ -451,12 +467,12 @@ - - + + - - + + @@ -489,18 +505,26 @@ + + + + + + + + - - + + - - + + @@ -521,12 +545,12 @@ - - + + - - + + @@ -547,12 +571,12 @@ - - + + - - + + @@ -573,12 +597,12 @@ - - + + - - + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.3.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.3.mpsr index e9f54e8dc..abcf2b043 100644 --- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.3.mpsr +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.3.mpsr @@ -75,15 +75,15 @@ - - + + - + @@ -91,87 +91,87 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -179,56 +179,56 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -312,200 +312,200 @@ - + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -513,12 +513,12 @@ - - + + - - + + @@ -539,12 +539,12 @@ - - + + - - + + @@ -565,12 +565,12 @@ - - + + - - + + @@ -591,12 +591,12 @@ - - + + - - + + @@ -629,18 +629,26 @@ + + + + + + + + - - + + - - + + @@ -660,14 +668,6 @@ - - - - - - - - @@ -687,12 +687,12 @@ - - + + - - + + @@ -712,14 +712,6 @@ - - - - - - - - @@ -739,12 +731,12 @@ - - + + - - + + @@ -777,6 +769,14 @@ + + + + + + + + @@ -795,18 +795,26 @@ + + + + + + + + - - + + - - + + @@ -845,12 +853,12 @@ - - + + - - + + @@ -871,12 +879,12 @@ - - + + - - + + @@ -897,12 +905,12 @@ - - + + - - + + @@ -923,12 +931,12 @@ - - + + - - + + @@ -949,12 +957,12 @@ - - + + - - + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.mpsr index b5adecef6..b73d2db36 100644 --- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.mpsr +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/extract_from_G1.4.mpsr @@ -98,10 +98,10 @@ - + - - + + @@ -1412,12 +1412,12 @@ - - + + - - + + @@ -4006,12 +4006,12 @@ - - + + - - + + @@ -4510,30 +4510,30 @@ - - - - + + + + - - - - + + + + - - - - + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/pdf_export_demo.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/pdf_export_demo.mpsr index 9e5834768..cc088e487 100644 --- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/pdf_export_demo.mpsr +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/pdf_export_demo.mpsr @@ -11,6 +11,7 @@ + @@ -42,6 +43,7 @@ + @@ -57,11 +59,28 @@ + + + + + + + + + + + + + + + + + - + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_pdf_export.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_pdf_export.mps deleted file mode 100644 index 61cb8edbb..000000000 --- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_pdf_export.mps +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_pdf_export/.model b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_pdf_export/.model new file mode 100644 index 000000000..efc246fd6 --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_pdf_export/.model @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_pdf_export/operations_export.mpsr b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_pdf_export/operations_export.mpsr new file mode 100644 index 000000000..1ff301bc9 --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_pdf_export/operations_export.mpsr @@ -0,0 +1,460 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_visualization/.model b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_visualization/.model new file mode 100644 index 000000000..cc1287ba3 --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_visualization/.model @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_visualization.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_visualization/_010_legs_without_evidence.mpsr similarity index 90% rename from code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_visualization.mps rename to code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_visualization/_010_legs_without_evidence.mpsr index 34877dea4..44ebf4d04 100644 --- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_visualization.mps +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_visualization/_010_legs_without_evidence.mpsr @@ -1,12 +1,9 @@ - + - - - - - + + diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/runtime_linking/_010_solutions_linked_with_runtime_data_AGGREGATED_DATA.csv b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/runtime_linking/_010_solutions_linked_with_runtime_data_AGGREGATED_DATA.csv new file mode 100644 index 000000000..20c1817ca --- /dev/null +++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/runtime_linking/_010_solutions_linked_with_runtime_data_AGGREGATED_DATA.csv @@ -0,0 +1 @@ +counter-evidence, S01 \ No newline at end of file diff --git a/gradle.lockfile b/gradle.lockfile index 1d1e96135..55a31a659 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -7,7 +7,7 @@ com.fasterxml.jackson.core:jackson-databind:2.13.5=modelcheckBackend com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.5=modelcheckBackend com.fasterxml.jackson:jackson-bom:2.13.5=modelcheckBackend com.fasterxml.woodstox:woodstox-core:6.4.0=modelcheckBackend -com.jetbrains.jdk:jbr_jcef:17.0.11-b1207.30=jbrLinux,jbrMac,jbrWin +com.jetbrains.jdk:jbr_jcef:17.0.8.1-b1000.32=jbrLinux,jbrMac,jbrWin com.jetbrains:mps:2024.1.1=mps com.mbeddr:platform:2024.1.24974.4be9b18=languageLibs com.xenomachina:kotlin-argparser:2.0.7=executeBackend,generateBackend,modelcheckBackend,remigrateBackend @@ -29,5 +29,5 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21=executeBackend,generateBackend,mo org.jetbrains.kotlin:kotlin-stdlib:1.6.21=executeBackend,generateBackend,modelcheckBackend,remigrateBackend org.jetbrains.kotlin:kotlin-test:1.6.21=modelcheckBackend org.jetbrains:annotations:13.0=executeBackend,generateBackend,modelcheckBackend,remigrateBackend -org.mpsqa:all-in-one:2024.1.832.579f392=languageLibs +org.mpsqa:all-in-one:2024.1.927.5609a81=languageLibs empty= diff --git a/rcp_resources/bin/fasten.bat b/rcp_resources/bin/fasten.bat index 1a41ef6f6..7ac35753f 100644 --- a/rcp_resources/bin/fasten.bat +++ b/rcp_resources/bin/fasten.bat @@ -4,14 +4,14 @@ :: JetBrains MPS startup script. :: Generated by MPS ::---------------------------------------------------------------------- -SET IDEA_PATHS_SELECTOR=MPS2022.2 -SET PRODUCT=MPS +SET IDEA_PATHS_SELECTOR=MPS2023.2 +SET PRODUCT=mps :: --------------------------------------------------------------------- :: Ensure IDE_HOME points to the directory where the IDE is installed. :: --------------------------------------------------------------------- SET IDE_BIN_DIR=%~dp0 -FOR /F "delims=" %%i in ("%IDE_BIN_DIR%\..") DO SET IDE_HOME=%%~fi +FOR /F "delims=" %%i in ("%IDE_BIN_DIR%\..") DO SET "IDE_HOME=%%~fi" IF "%IDE_BIN_DIR:~-8%" == "bin\win\" ( echo. @@ -31,34 +31,30 @@ IF "%IDE_BIN_DIR:~-8%" == "bin\win\" ( SET JDK= SET IDEA_VENDOR_NAME=JetBrains -IF EXIST "%MPS_JDK%" SET JDK=%MPS_JDK% +IF EXIST "%MPS_JDK%" SET "JDK=%MPS_JDK%" IF EXIST "%JDK%" GOTO check SET BITS=64 -SET USER_JDK64_FILE=%APPDATA%\%IDEA_VENDOR_NAME%\MPS2022.2\mps%BITS%.exe.jdk +SET USER_JDK64_FILE=%APPDATA%\%IDEA_VENDOR_NAME%\MPS2023.2\mps%BITS%.exe.jdk SET BITS= -SET USER_JDK_FILE=%APPDATA%\%IDEA_VENDOR_NAME%\MPS2022.2\mps%BITS%.exe.jdk +SET USER_JDK_FILE=%APPDATA%\%IDEA_VENDOR_NAME%\MPS2023.2\mps%BITS%.exe.jdk IF EXIST "%USER_JDK64_FILE%" ( SET /P JDK=<%USER_JDK64_FILE% ) ELSE ( IF EXIST "%USER_JDK_FILE%" SET /P JDK=<%USER_JDK_FILE% ) IF NOT "%JDK%" == "" ( - IF NOT EXIST "%JDK%" SET JDK="%IDE_HOME%\%JDK%" + IF NOT EXIST "%JDK%" SET "JDK=%IDE_HOME%\%JDK%" IF EXIST "%JDK%" GOTO check ) -IF "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( - IF EXIST "%IDE_HOME%\jbr" SET JDK=%IDE_HOME%\jbr - IF EXIST "%JDK%" GOTO check -) -IF EXIST "%IDE_HOME%\jbr-x86" SET JDK=%IDE_HOME%\jbr-x86 +IF EXIST "%IDE_HOME%\jbr" SET "JDK=%IDE_HOME%\jbr" IF EXIST "%JDK%" GOTO check -IF EXIST "%JDK_HOME%" SET JDK=%JDK_HOME% +IF EXIST "%JDK_HOME%" SET "JDK=%JDK_HOME%" IF EXIST "%JDK%" GOTO check -IF EXIST "%JAVA_HOME%" SET JDK=%JAVA_HOME% +IF EXIST "%JAVA_HOME%" SET "JDK=%JAVA_HOME%" :check SET JAVA_EXE=%JDK%\bin\javaw.exe @@ -69,7 +65,7 @@ IF NOT EXIST "%JAVA_EXE%" ( ) SET JRE=%JDK% -IF EXIST "%JRE%\jre" SET JRE=%JDK%\jre +IF EXIST "%JRE%\jre" SET "JRE=%JDK%\jre" SET BITS= FINDSTR /B /C:"OS_ARCH=\"x86_64\"" "%JRE%\release" > NUL @@ -131,7 +127,7 @@ IF "%VM_OPTIONS_FILE%%USER_VM_OPTIONS_FILE%" == "" ( SET COMMON_JVM_ARGS="-XX:ErrorFile=%USERPROFILE%\java_error_in_%PRODUCT%_%%p.log" "-XX:HeapDumpPath=%USERPROFILE%\java_error_in_%PRODUCT%.hprof" -Didea.paths.selector=%IDEA_PATHS_SELECTOR% -Didea.vendor.name="%IDEA_VENDOR_NAME%" %IDE_PROPERTIES_PROPERTY% -SET IDE_JVM_ARGS=-Didea.platform.prefix=Idea -Didea.jre.check=true -Djava.system.class.loader=com.intellij.util.lang.PathClassLoader +SET IDE_JVM_ARGS=-Didea.platform.prefix=Idea -Didea.jre.check=true -Dpty4j.preferred.native.folder="%IDE_HOME%/lib/pty4j" -Djna.boot.library.path="%IDE_HOME%/lib/jna" -Djava.system.class.loader=com.intellij.util.lang.PathClassLoader SET ALL_JVM_ARGS=%ACC% %COMMON_JVM_ARGS% %IDE_JVM_ARGS% SET CLASS_PATH=%IDE_HOME%\lib\* @@ -147,7 +143,7 @@ start "" "%JAVA_EXE%" ^ %ALL_JVM_ARGS% ^ -Didea.main.class.name=%MAIN_CLASS% ^ -cp "%CLASS_PATH%" ^ - --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/jdk.internal.vm=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.security.ssl=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.desktop/java.awt=ALL-UNNAMED --add-opens=java.desktop/java.awt.dnd.peer=ALL-UNNAMED --add-opens=java.desktop/java.awt.event=ALL-UNNAMED --add-opens=java.desktop/java.awt.image=ALL-UNNAMED --add-opens=java.desktop/java.awt.peer=ALL-UNNAMED --add-opens=java.desktop/javax.swing=ALL-UNNAMED --add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens=java.desktop/sun.awt.datatransfer=ALL-UNNAMED --add-opens=java.desktop/sun.awt.image=ALL-UNNAMED --add-opens=java.desktop/sun.awt=ALL-UNNAMED --add-opens=java.desktop/sun.font=ALL-UNNAMED --add-opens=java.desktop/sun.java2d=ALL-UNNAMED --add-opens=java.desktop/sun.swing=ALL-UNNAMED --add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED --add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-opens=jdk.jdi/com.sun.tools.jdi=ALL-UNNAMED --add-opens=java.desktop/sun.awt.windows=ALL-UNNAMED ^ + --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/jdk.internal.vm=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.nio.fs=ALL-UNNAMED --add-opens=java.base/sun.security.ssl=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.desktop/java.awt=ALL-UNNAMED --add-opens=java.desktop/java.awt.dnd.peer=ALL-UNNAMED --add-opens=java.desktop/java.awt.event=ALL-UNNAMED --add-opens=java.desktop/java.awt.image=ALL-UNNAMED --add-opens=java.desktop/java.awt.peer=ALL-UNNAMED --add-opens=java.desktop/javax.swing=ALL-UNNAMED --add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens=java.desktop/sun.awt.datatransfer=ALL-UNNAMED --add-opens=java.desktop/sun.awt.image=ALL-UNNAMED --add-opens=java.desktop/sun.awt=ALL-UNNAMED --add-opens=java.desktop/sun.font=ALL-UNNAMED --add-opens=java.desktop/sun.java2d=ALL-UNNAMED --add-opens=java.desktop/sun.swing=ALL-UNNAMED --add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED --add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-opens=jdk.jdi/com.sun.tools.jdi=ALL-UNNAMED --add-opens=java.desktop/sun.awt.windows=ALL-UNNAMED ^ %MAIN_CLASS% ^ %* diff --git a/rcp_resources/icons/fasten16.svg b/rcp_resources/icons/fasten16.svg new file mode 100644 index 000000000..aea999826 --- /dev/null +++ b/rcp_resources/icons/fasten16.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/rcp_resources/icons/fasten32.svg b/rcp_resources/icons/fasten32.svg new file mode 100644 index 000000000..1d0a0f0ad --- /dev/null +++ b/rcp_resources/icons/fasten32.svg @@ -0,0 +1 @@ + \ No newline at end of file