Skip to content

Merge maintenance/mps20232 into master #1228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexanderpann merged 11 commits into from
Mar 6, 2025
Merged

Merge maintenance/mps20232 into master #1228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0ec7c86
ran migrations
enikao Feb 26, 2025
01d5060
fix for mixing nix and tuple types
enikao Feb 26, 2025
d00a5b7
added test for alt type calculation
enikao Feb 26, 2025
0ccd05c
updated build models
enikao Feb 26, 2025
a8ec28e
fixed dead references
enikao Feb 26, 2025
31945b8
added EmptyType to Pluggable Type Facade
enikao Feb 26, 2025
82eba9f
keep first empty type alive during supertype calculation
enikao Feb 26, 2025
ff7d1fe
updated changelog
enikao Feb 26, 2025
bafb130
Merge pull request #1227 from IETS3/bugfix/nix-vs-tuples
enikao Feb 26, 2025
3dca2d8
Merge remote-tracking branch 'refs/remotes/origin/master' into merge/…
Mar 5, 2025
5f18fba
regenerate build-allscripts
Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
### Added

- a new approach to run interpreter test case from command line (and inside MPS) directly without invoking JUnit code generation
- Added EmptyType to Pluggable Type Facade (PTF). If your language has some kind of _NixType_, you should override `PrimitiveTypeMapper.isEmptyType()` to recognize your _NixType_.

### Fixed

Expand Down
48 changes: 1 addition & 47 deletions build/scripts/build-allScripts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
<module ref="e70ad515-8ff0-4a50-8cb4-41406f14e348(org.iets3.opensource.build.gentests.rt)" kind="rt" />
<module ref="3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)" kind="cl" />
<module ref="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)" kind="cl" />
<module ref="9d000fbd-bdca-4a46-b39b-c5ba9e79b38c(org.iets3.opensource.build.gentests)" kind="cl" />
</dependencies>
<uses>
<language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
Expand Down Expand Up @@ -151,7 +150,7 @@

<target name="makeDependents" />

<target name="java.compile.org.iets3.opensource.build" depends="java.compile.org.iets3.opensource.build.gentests, java.compile.org.iets3.opensource.build.gentests.rt, fetchDependencies">
<target name="java.compile.org.iets3.opensource.build" depends="java.compile.org.iets3.opensource.build.gentests.rt, fetchDependencies">
<mkdir dir="${iets3.lang.opensource}/solutions/org.iets3.opensource.build/source_gen" />
<mkdir dir="${build.tmp}/java/out/org.iets3.opensource.build" />
<javac destdir="${build.tmp}/java/out/org.iets3.opensource.build" fork="false" encoding="utf8" includeantruntime="false" debug="true">
Expand All @@ -160,56 +159,11 @@
<path location="${iets3.lang.opensource}/solutions/org.iets3.opensource.build/source_gen" />
</src>
<classpath>
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
<fileset file="${artifacts.mps}/lib/mps-context.jar" />
<fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-problem.jar" />
<fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
<fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
<fileset file="${artifacts.mps}/lib/mps-references.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-generator.jar" />
<fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
<fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
<pathelement path="${build.tmp}/java/out/org.iets3.opensource.build.gentests" />
<pathelement path="${build.tmp}/java/out/org.iets3.opensource.build.gentests.rt" />
<fileset file="${iets3.lang.opensource}/solutions/org.iets3.opensource.build.gentests.rt/lib/takari-cpsuite-1.2.7.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset file="${artifacts.mps}/lib/app.jar" />
<fileset file="${artifacts.mps}/lib/app-client.jar" />
<fileset file="${artifacts.mps}/lib/lib.jar" />
<fileset file="${artifacts.mps}/lib/lib-client.jar" />
<fileset file="${artifacts.mps}/lib/util.jar" />
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
<fileset file="${artifacts.mps}/lib/util-8.jar" />
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
<fileset file="${artifacts.mps}/lib/java-frontback.jar" />
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
<fileset file="${artifacts.mps}/lib/stats.jar" />
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
<fileset file="${artifacts.mps}/lib/trove.jar" />
<fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.platform.jar" />
<fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.extensions.build/languages/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.jar" />
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.mps.runner.jar" />
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.workflow.jar" />
<fileset file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
</classpath>
</javac>
<copy todir="${build.tmp}/java/out/org.iets3.opensource.build">
Expand Down
61 changes: 53 additions & 8 deletions code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:6c6155f0-4bbe-4af5-8c26-244d570e21e4(org.iets3.core.expr.base.plugin)">
<persistence version="9" />
<attribute name="doNotGenerate" value="false" />
<languages>
<use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="-1" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
Expand Down Expand Up @@ -49,11 +48,11 @@
<import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
<import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" />
<import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
<import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
<import index="ciba" ref="r:11b7cdb2-cc58-456e-bb9a-ce45b78edd2f(jetbrains.mps.ide.httpsupport.runtime.base)" />
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
<import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
<import index="rfhd" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util.registry(MPS.IDEA/)" />
<import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
<import index="ciba" ref="r:11b7cdb2-cc58-456e-bb9a-ce45b78edd2f(jetbrains.mps.ide.httpsupport.runtime.base)" />
</imports>
<registry>
<language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
Expand Down Expand Up @@ -104,7 +103,7 @@
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
<child id="1188214630783" name="value" index="2B76xF" />
</concept>
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
<child id="1188208488637" name="annotation" index="2AJF6D" />
</concept>
<concept id="1188214545140" name="jetbrains.mps.baseLanguage.structure.AnnotationInstanceValue" flags="ng" index="2B6LJw">
Expand Down Expand Up @@ -185,7 +184,7 @@
<property id="1176718929932" name="isFinal" index="3TUv4t" />
<child id="1068431790190" name="initializer" index="33vP2m" />
</concept>
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
</concept>
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
Expand Down Expand Up @@ -252,7 +251,7 @@
<concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
<child id="1081516765348" name="expression" index="3fr31v" />
</concept>
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
</concept>
Expand Down Expand Up @@ -281,7 +280,7 @@
</concept>
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
<concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
<child id="1178549979242" name="visibility" index="1B3o_S" />
</concept>
<concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
Expand Down Expand Up @@ -493,7 +492,7 @@
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
</concept>
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
<concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
Expand Down Expand Up @@ -1124,6 +1123,15 @@
<node concept="3Tm1VV" id="2Qbt$1tSx2G" role="1B3o_S" />
<node concept="3clFbS" id="2Qbt$1tSx2H" role="3clF47" />
</node>
<node concept="3clFb_" id="1$atYL2NvF5" role="jymVt">
<property role="TrG5h" value="createEmptyType" />
<property role="1EzhhJ" value="true" />
<node concept="3Tqbb2" id="1$atYL2NvF6" role="3clF45">
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
</node>
<node concept="3Tm1VV" id="1$atYL2NvF7" role="1B3o_S" />
<node concept="3clFbS" id="1$atYL2NvF8" role="3clF47" />
</node>
<node concept="3clFb_" id="3tudP__T$3q" role="jymVt">
<property role="TrG5h" value="createNumberLiteral" />
<property role="1EzhhJ" value="true" />
Expand Down Expand Up @@ -1302,6 +1310,43 @@
</node>
<node concept="3Tm1VV" id="2q0DACtKs0c" role="1B3o_S" />
</node>
<node concept="2tJIrI" id="1$atYL2Myu6" role="jymVt" />
<node concept="3clFb_" id="1$atYL2M_8d" role="jymVt">
<property role="TrG5h" value="isEmptyType" />
<node concept="3clFbS" id="1$atYL2M_8g" role="3clF47">
<node concept="3clFbF" id="1$atYL2Nwo1" role="3cqZAp">
<node concept="2OqwBi" id="1$atYL2Nwo2" role="3clFbG">
<node concept="2OqwBi" id="1$atYL2Nwo3" role="2Oq$k0">
<node concept="2YIFZM" id="1$atYL2Nwo4" role="2Oq$k0">
<ref role="37wK5l" to="u78q:~TypeChecker.getInstance()" resolve="getInstance" />
<ref role="1Pybhc" to="u78q:~TypeChecker" resolve="TypeChecker" />
</node>
<node concept="liA8E" id="1$atYL2Nwo5" role="2OqNvi">
<ref role="37wK5l" to="u78q:~TypeChecker.getSubtypingManager()" resolve="getSubtypingManager" />
</node>
</node>
<node concept="liA8E" id="1$atYL2Nwo6" role="2OqNvi">
<ref role="37wK5l" to="u78q:~SubtypingManager.isSubtype(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.model.SNode)" resolve="isSubtype" />
<node concept="37vLTw" id="1$atYL2Nwo7" role="37wK5m">
<ref role="3cqZAo" node="1$atYL2M_AZ" resolve="type" />
</node>
<node concept="2YIFZM" id="1$atYL2N$yE" role="37wK5m">
<ref role="37wK5l" to="xfg9:1$atYL2Nr$T" resolve="createEmptyType" />
<ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
</node>
</node>
</node>
</node>
</node>
<node concept="3Tm1VV" id="1$atYL2Mzcw" role="1B3o_S" />
<node concept="10P_77" id="1$atYL2M_6r" role="3clF45" />
<node concept="37vLTG" id="1$atYL2M_AZ" role="3clF46">
<property role="TrG5h" value="type" />
<node concept="3Tqbb2" id="1$atYL2M_AY" role="1tU5fm">
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
</node>
</node>
</node>
<node concept="2tJIrI" id="2q0DACtJfg1" role="jymVt" />
<node concept="3clFb_" id="2oUyrt$Q$EB" role="jymVt">
<property role="TrG5h" value="useCommaInsteadOfDotForDecimals" />
Expand Down
Loading