Skip to content

Merge maintenance/mps20232 into maintenance/mps20241 #1435

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
arimer merged 4 commits into from
Sep 8, 2025
Merged

Merge maintenance/mps20232 into maintenance/mps20241 #1435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4fc1d5a
issue warning for bang operator in case of non-option expression type
wsafonov Jul 15, 2025
cb394c7
Merge pull request #1394 from IETS3/feature/bangop-usage-check
arimer Sep 8, 2025
c3ab750
Merge branch 'maintenance/mps20241' into merge/mps20232
arimer Sep 8, 2025
896e1bb
migrate remigrate
arimer Sep 8, 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 @@ -25,6 +25,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
- CI tests for InterpreterCoverageAssQuery which make use use the calculated coverage data
- Solver: Add test infrastructure to ensure that errors computed by any solver are converted to editor messages properly.
- Variability: APIs for FilterParams (configuration of filter&instantiate process) and skeleton tree data structure were extended
- Warning for BangOp in case type is not OptionType


## June 2025
Expand Down
44 changes: 44 additions & 0 deletions code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,9 @@
</concept>
</language>
<language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
<concept id="1207055528241" name="jetbrains.mps.lang.typesystem.structure.WarningStatement" flags="nn" index="a7r0C">
<child id="1207055552304" name="warningText" index="a7wSD" />
</concept>
<concept id="1766949807893567867" name="jetbrains.mps.lang.typesystem.structure.OverridesConceptFunction" flags="ig" index="bXqS6" />
<concept id="1185788614172" name="jetbrains.mps.lang.typesystem.structure.NormalTypeClause" flags="ng" index="mw_s8">
<child id="1185788644032" name="normalType" index="mwGJk" />
Expand Down Expand Up @@ -11144,5 +11147,46 @@
</node>
<node concept="3Tm1VV" id="3eH6BL2UU3s" role="1B3o_S" />
</node>
<node concept="18kY7G" id="6rS$_kMPZL2">
<property role="TrG5h" value="check_BangOp" />
<node concept="3clFbS" id="6rS$_kMPZL3" role="18ibNy">
<node concept="3clFbJ" id="6rS$_kMQ0WU" role="3cqZAp">
<node concept="3fqX7Q" id="6rS$_kMQ2_Q" role="3clFbw">
<node concept="2OqwBi" id="6rS$_kMQ2_S" role="3fr31v">
<node concept="2OqwBi" id="6rS$_kMQ2_T" role="2Oq$k0">
<node concept="2OqwBi" id="6rS$_kMQ2_U" role="2Oq$k0">
<node concept="1YBJjd" id="6rS$_kMQ2_V" role="2Oq$k0">
<ref role="1YBMHb" node="6rS$_kMPZL5" resolve="bangOp" />
</node>
<node concept="3TrEf2" id="6rS$_kMQ2_W" role="2OqNvi">
<ref role="3Tt5mk" to="hm2y:3G_qVqIw4zp" resolve="expr" />
</node>
</node>
<node concept="3JvlWi" id="6rS$_kMQ2_X" role="2OqNvi" />
</node>
<node concept="1mIQ4w" id="6rS$_kMQ2_Y" role="2OqNvi">
<node concept="chp4Y" id="6rS$_kMQ2_Z" role="cj9EA">
<ref role="cht4Q" to="hm2y:2rOWEwsEjcg" resolve="OptionType" />
</node>
</node>
</node>
</node>
<node concept="3clFbS" id="6rS$_kMQ0WW" role="3clFbx">
<node concept="a7r0C" id="6rS$_kMQ2Ju" role="3cqZAp">
<node concept="Xl_RD" id="6rS$_kMQ2JB" role="a7wSD">
<property role="Xl_RC" value="Bang operator applied for an expression of a non-option type" />
</node>
<node concept="1YBJjd" id="6rS$_kMQ2UR" role="1urrMF">
<ref role="1YBMHb" node="6rS$_kMPZL5" resolve="bangOp" />
</node>
</node>
</node>
</node>
</node>
<node concept="1YaCAy" id="6rS$_kMPZL5" role="1YuTPh">
<property role="TrG5h" value="bangOp" />
<ref role="1YaFvo" to="hm2y:24Fec4173Us" resolve="BangOp" />
</node>
</node>
</model>

2 changes: 1 addition & 1 deletion ...e/tests/test.iets3.core.tracequery/models/test/iets3/core/tracequery/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="6" />
<use id="be5191a9-3476-47ca-b2a7-a426623add55" name="org.iets3.core.assessment" version="-1" />
<use id="f47b95d4-5e73-4c04-9204-18076950153b" name="de.itemis.mps.compare" version="-1" />
<use id="9eff3336-14d7-46c5-afe1-dcbad13c14c3" name="org.iets3.core.trace.test" version="0" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
<use id="9eff3336-14d7-46c5-afe1-dcbad13c14c3" name="org.iets3.core.trace.test" version="0" />
</languages>
<imports>
<import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" />
Expand Down
23 changes: 19 additions & 4 deletions .../languages/org.iets3.opensource/tests/test.ts.expr.os/models/test/ts/expr/os/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
<import index="ym7l" ref="r:050f6d52-a81b-4b31-9a1c-531c1a04708e(org.iets3.core.expr.simpleTypes.typesystem)" />
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
<import index="h60k" ref="r:2ef874f0-eb83-423c-afd2-f0c0921489b8(org.iets3.core.expr.simpleTypes.migration)" />
<import index="1ka" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typechecking(MPS.Core/)" />
<import index="cp9o" ref="r:df6d55ea-0ac0-4364-9581-8cb45ef224d6(test.ts.expr.os.plugin)" />
<import index="1ka" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typechecking(MPS.Core/)" />
<import index="n0yb" ref="r:1fd78142-d7d8-42c9-9cbb-0609b1bc5311(org.iets3.core.expr.collections.typesystem)" implicit="true" />
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" implicit="true" />
<import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
Expand Down Expand Up @@ -18698,9 +18698,7 @@
<node concept="_iOnV" id="3N4k0eSJKEP" role="1qenE9">
<property role="TrG5h" value="options" />
<node concept="7CXmI" id="3N4k0eSJKJc" role="lGtFl">
<node concept="7OXhh" id="3N4k0eSJKJd" role="7EUXB">
<property role="G7GLP" value="true" />
</node>
<node concept="7OXhh" id="3N4k0eSJKJd" role="7EUXB" />
</node>
<node concept="2zPypq" id="3N4k0eSJPou" role="_iOnC">
<property role="TrG5h" value="x" />
Expand Down Expand Up @@ -18864,6 +18862,23 @@
</node>
</node>
</node>
<node concept="2zPypq" id="6rS$_kMYE5Q" role="_iOnC">
<property role="TrG5h" value="xDeOptedTwice" />
<node concept="wdKpt" id="6rS$_kMYGUP" role="2lDidJ">
<node concept="wdKpt" id="6rS$_kMYH78" role="2lDidJ">
<node concept="_emDc" id="6rS$_kMYGUt" role="2lDidJ">
<ref role="_emDf" node="3N4k0eSJPou" resolve="x" />
</node>
</node>
<node concept="7CXmI" id="4OZmL8HJRId" role="lGtFl">
<node concept="29bkU" id="4OZmL8HJS8e" role="7EUXB">
<node concept="2PQEqo" id="4OZmL8HJS8f" role="3lydCh">
<ref role="39XzEq" to="t4jv:6rS$_kMQ2Ju" />
</node>
</node>
</node>
</node>
</node>
<node concept="_ixoA" id="24Fec41awem" role="_iOnC" />
<node concept="_ixoA" id="3N4k0eSJWQ3" role="_iOnC" />
</node>
Expand Down