Skip to content

Commit 298b9e1

Browse files
alexanderpannalexanderpann
authored
Merge pull request #1446 from IETS3/bugfix/string_representations
2 parents de6e43a + f41a0c9 commit 298b9e1

File tree

72 files changed

+5751
-423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+5751
-423
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project are documented in this file.
55
Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66
The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
77

8+
## September 2025
9+
10+
### Fixed
11+
12+
- The renderReadable/getPresentation implementations were improved and are now equivalent in all concepts.
13+
814
## July 2025
915

1016
### Fixed

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/behavior.mps‎

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
<import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
2121
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
2222
<import index="dzyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.time.temporal(JDK/)" />
23+
<import index="ao3" ref="7124e466-fc92-4803-a656-d7a6b7eb3910/java:jetbrains.mps.text(MPS.TextGen/)" />
24+
<import index="kpbf" ref="7124e466-fc92-4803-a656-d7a6b7eb3910/java:jetbrains.mps.text.impl(MPS.TextGen/)" />
25+
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
2326
</imports>
2427
<registry>
2528
<language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -1533,10 +1536,185 @@
15331536
</node>
15341537
</node>
15351538
</node>
1539+
<node concept="13i0hz" id="4oS6BnMaYjr" role="13h7CS">
1540+
<property role="TrG5h" value="getPresentation" />
1541+
<ref role="13i0hy" to="tpcu:hEwIMiw" resolve="getPresentation" />
1542+
<node concept="3Tm1VV" id="4oS6BnMaYjQ" role="1B3o_S" />
1543+
<node concept="3clFbS" id="4oS6BnMaYjR" role="3clF47">
1544+
<node concept="3cpWs8" id="4oS6BnMfgFk" role="3cqZAp">
1545+
<node concept="3cpWsn" id="4oS6BnMfgFl" role="3cpWs9">
1546+
<property role="TrG5h" value="text" />
1547+
<node concept="3uibUv" id="4oS6BnMfgFm" role="1tU5fm">
1548+
<ref role="3uigEE" to="xfg9:4oS6BnMcix1" resolve="StringRepresentation" />
1549+
</node>
1550+
<node concept="2YIFZM" id="4oS6BnMfk5a" role="33vP2m">
1551+
<ref role="37wK5l" to="xfg9:4oS6BnMcjBJ" resolve="forShortSentence" />
1552+
<ref role="1Pybhc" to="xfg9:4oS6BnMcix1" resolve="StringRepresentation" />
1553+
</node>
1554+
</node>
1555+
</node>
1556+
<node concept="3clFbF" id="4oS6BnMfkeX" role="3cqZAp">
1557+
<node concept="2OqwBi" id="4oS6BnMfkyQ" role="3clFbG">
1558+
<node concept="37vLTw" id="4oS6BnMfkeV" role="2Oq$k0">
1559+
<ref role="3cqZAo" node="4oS6BnMfgFl" resolve="text" />
1560+
</node>
1561+
<node concept="liA8E" id="4oS6BnMfkVv" role="2OqNvi">
1562+
<ref role="37wK5l" to="kpbf:~TextAreaImpl.append(java.lang.CharSequence)" resolve="append" />
1563+
<node concept="Xl_RD" id="4oS6BnMb3gG" role="37wK5m">
1564+
<property role="Xl_RC" value="@solver:" />
1565+
</node>
1566+
</node>
1567+
</node>
1568+
</node>
1569+
<node concept="3clFbF" id="4oS6BnMgE_V" role="3cqZAp">
1570+
<node concept="2OqwBi" id="4oS6BnMgEUO" role="3clFbG">
1571+
<node concept="37vLTw" id="4oS6BnMgE_T" role="2Oq$k0">
1572+
<ref role="3cqZAo" node="4oS6BnMfgFl" resolve="text" />
1573+
</node>
1574+
<node concept="liA8E" id="4oS6BnMgFmw" role="2OqNvi">
1575+
<ref role="37wK5l" to="xfg9:4oS6BnMgQjs" resolve="appendWithSpace" />
1576+
<node concept="2OqwBi" id="4oS6BnMgFQ3" role="37wK5m">
1577+
<node concept="13iPFW" id="4oS6BnMgFsl" role="2Oq$k0" />
1578+
<node concept="3TrcHB" id="4oS6BnMgGdX" role="2OqNvi">
1579+
<ref role="3TsBF5" to="l80j:17Nm8oCo8O2" resolve="mode" />
1580+
</node>
1581+
</node>
1582+
</node>
1583+
</node>
1584+
</node>
1585+
<node concept="3clFbJ" id="4oS6BnMblFd" role="3cqZAp">
1586+
<node concept="3clFbS" id="4oS6BnMblFf" role="3clFbx">
1587+
<node concept="3clFbF" id="4oS6BnMhFv7" role="3cqZAp">
1588+
<node concept="2OqwBi" id="4oS6BnMhGpr" role="3clFbG">
1589+
<node concept="37vLTw" id="4oS6BnMhFv6" role="2Oq$k0">
1590+
<ref role="3cqZAo" node="4oS6BnMfgFl" resolve="text" />
1591+
</node>
1592+
<node concept="liA8E" id="4oS6BnMhGX4" role="2OqNvi">
1593+
<ref role="37wK5l" to="xfg9:4oS6BnMfnH9" resolve="appendWithSpace" />
1594+
<node concept="Xl_RD" id="4oS6BnMhH2z" role="37wK5m">
1595+
<property role="Xl_RC" value="with timeout = " />
1596+
</node>
1597+
</node>
1598+
</node>
1599+
</node>
1600+
<node concept="3clFbF" id="4oS6BnMhIE_" role="3cqZAp">
1601+
<node concept="2OqwBi" id="4oS6BnMhIGD" role="3clFbG">
1602+
<node concept="37vLTw" id="4oS6BnMhIEz" role="2Oq$k0">
1603+
<ref role="3cqZAo" node="4oS6BnMfgFl" resolve="text" />
1604+
</node>
1605+
<node concept="liA8E" id="4oS6BnMhIQh" role="2OqNvi">
1606+
<ref role="37wK5l" to="xfg9:4oS6BnMjbhG" resolve="append" />
1607+
<node concept="2OqwBi" id="4oS6BnMhKwZ" role="37wK5m">
1608+
<node concept="13iPFW" id="4oS6BnMhIWM" role="2Oq$k0" />
1609+
<node concept="3TrcHB" id="4oS6BnMhKTQ" role="2OqNvi">
1610+
<ref role="3TsBF5" to="l80j:2GQBRFCFk_3" resolve="timeout" />
1611+
</node>
1612+
</node>
1613+
</node>
1614+
</node>
1615+
</node>
1616+
<node concept="3clFbF" id="4oS6BnMiTlf" role="3cqZAp">
1617+
<node concept="2OqwBi" id="4oS6BnMiTMH" role="3clFbG">
1618+
<node concept="37vLTw" id="4oS6BnMiTld" role="2Oq$k0">
1619+
<ref role="3cqZAo" node="4oS6BnMfgFl" resolve="text" />
1620+
</node>
1621+
<node concept="liA8E" id="4oS6BnMiURh" role="2OqNvi">
1622+
<ref role="37wK5l" to="kpbf:~TextAreaImpl.append(java.lang.CharSequence)" resolve="append" />
1623+
<node concept="Xl_RD" id="4oS6BnMiUZY" role="37wK5m">
1624+
<property role="Xl_RC" value="s" />
1625+
</node>
1626+
</node>
1627+
</node>
1628+
</node>
1629+
</node>
1630+
<node concept="3eOSWO" id="2ZalWa8IAb0" role="3clFbw">
1631+
<node concept="2OqwBi" id="2ZalWa8IzFd" role="3uHU7B">
1632+
<node concept="13iPFW" id="4oS6BnMbmOb" role="2Oq$k0" />
1633+
<node concept="3TrcHB" id="2ZalWa8I$e6" role="2OqNvi">
1634+
<ref role="3TsBF5" to="l80j:2GQBRFCFk_3" resolve="timeout" />
1635+
</node>
1636+
</node>
1637+
<node concept="3cmrfG" id="2ZalWa8IAom" role="3uHU7w">
1638+
<property role="3cmrfH" value="0" />
1639+
</node>
1640+
</node>
1641+
</node>
1642+
<node concept="3clFbF" id="4oS6BnMbZ39" role="3cqZAp">
1643+
<node concept="2OqwBi" id="4oS6BnMc0xy" role="3clFbG">
1644+
<node concept="37vLTw" id="4oS6BnMbZ37" role="2Oq$k0">
1645+
<ref role="3cqZAo" node="4oS6BnMfgFl" resolve="text" />
1646+
</node>
1647+
<node concept="liA8E" id="4oS6BnMc1M8" role="2OqNvi">
1648+
<ref role="37wK5l" to="xfg9:4oS6BnMUIdM" resolve="toString" />
1649+
</node>
1650+
</node>
1651+
</node>
1652+
</node>
1653+
<node concept="17QB3L" id="4oS6BnMaYjS" role="3clF45" />
1654+
</node>
15361655
</node>
15371656
<node concept="13h7C7" id="XhdFKvYcsC">
15381657
<property role="3GE5qa" value="adapter" />
15391658
<ref role="13h7C2" to="l80j:XhdFKvXQxo" resolve="ErrorSolverTask" />
1659+
<node concept="13i0hz" id="4oS6BnMakhZ" role="13h7CS">
1660+
<property role="TrG5h" value="getPresentation" />
1661+
<ref role="13i0hy" to="tpcu:hEwIMiw" resolve="getPresentation" />
1662+
<node concept="3Tm1VV" id="4oS6BnMakiq" role="1B3o_S" />
1663+
<node concept="3clFbS" id="4oS6BnMakir" role="3clF47">
1664+
<node concept="3cpWs8" id="4oS6BnMcKyQ" role="3cqZAp">
1665+
<node concept="3cpWsn" id="4oS6BnMcKyR" role="3cpWs9">
1666+
<property role="TrG5h" value="text" />
1667+
<node concept="3uibUv" id="4oS6BnMcKyS" role="1tU5fm">
1668+
<ref role="3uigEE" to="xfg9:4oS6BnMcix1" resolve="StringRepresentation" />
1669+
</node>
1670+
<node concept="2YIFZM" id="4oS6BnMdltY" role="33vP2m">
1671+
<ref role="37wK5l" to="xfg9:4oS6BnMcl4R" resolve="forMultipleSentences" />
1672+
<ref role="1Pybhc" to="xfg9:4oS6BnMcix1" resolve="StringRepresentation" />
1673+
</node>
1674+
</node>
1675+
</node>
1676+
<node concept="3clFbF" id="4oS6BnMdlA3" role="3cqZAp">
1677+
<node concept="2OqwBi" id="4oS6BnMdmE0" role="3clFbG">
1678+
<node concept="37vLTw" id="4oS6BnMdlA1" role="2Oq$k0">
1679+
<ref role="3cqZAo" node="4oS6BnMcKyR" resolve="text" />
1680+
</node>
1681+
<node concept="liA8E" id="4oS6BnMdn4D" role="2OqNvi">
1682+
<ref role="37wK5l" to="kpbf:~TextAreaImpl.append(java.lang.CharSequence)" resolve="append" />
1683+
<node concept="Xl_RD" id="4oS6BnMan87" role="37wK5m">
1684+
<property role="Xl_RC" value="Errors during task creation:" />
1685+
</node>
1686+
</node>
1687+
</node>
1688+
</node>
1689+
<node concept="3clFbF" id="4oS6BnMdnOn" role="3cqZAp">
1690+
<node concept="2OqwBi" id="4oS6BnMdoIl" role="3clFbG">
1691+
<node concept="37vLTw" id="4oS6BnMdnOl" role="2Oq$k0">
1692+
<ref role="3cqZAo" node="4oS6BnMcKyR" resolve="text" />
1693+
</node>
1694+
<node concept="liA8E" id="4oS6BnMdW2n" role="2OqNvi">
1695+
<ref role="37wK5l" to="xfg9:4oS6BnMeeyx" resolve="appendVertically" />
1696+
<node concept="2OqwBi" id="4oS6BnMdWvC" role="37wK5m">
1697+
<node concept="13iPFW" id="4oS6BnMdW6k" role="2Oq$k0" />
1698+
<node concept="3Tsc0h" id="4oS6BnMdWP_" role="2OqNvi">
1699+
<ref role="3TtcxE" to="l80j:XhdFKvXSNY" resolve="errors" />
1700+
</node>
1701+
</node>
1702+
</node>
1703+
</node>
1704+
</node>
1705+
<node concept="3clFbF" id="4oS6BnMaH9B" role="3cqZAp">
1706+
<node concept="2OqwBi" id="4oS6BnMaHrn" role="3clFbG">
1707+
<node concept="37vLTw" id="4oS6BnMaH9_" role="2Oq$k0">
1708+
<ref role="3cqZAo" node="4oS6BnMcKyR" resolve="text" />
1709+
</node>
1710+
<node concept="liA8E" id="4oS6BnMaH$3" role="2OqNvi">
1711+
<ref role="37wK5l" to="xfg9:4oS6BnMUIdM" resolve="toString" />
1712+
</node>
1713+
</node>
1714+
</node>
1715+
</node>
1716+
<node concept="17QB3L" id="4oS6BnMakis" role="3clF45" />
1717+
</node>
15401718
<node concept="13hLZK" id="XhdFKvYcsD" role="13h7CW">
15411719
<node concept="3clFbS" id="XhdFKvYcsE" role="2VODD2" />
15421720
</node>
@@ -2047,5 +2225,28 @@
20472225
<node concept="3clFbS" id="1ScogIcAG8g" role="2VODD2" />
20482226
</node>
20492227
</node>
2228+
<node concept="13h7C7" id="4oS6BnMai2W">
2229+
<property role="3GE5qa" value="adapter" />
2230+
<ref role="13h7C2" to="l80j:XhdFKvXSNr" resolve="ErrorMessage" />
2231+
<node concept="13hLZK" id="4oS6BnMai2X" role="13h7CW">
2232+
<node concept="3clFbS" id="4oS6BnMai2Y" role="2VODD2" />
2233+
</node>
2234+
<node concept="13i0hz" id="4oS6BnMai3f" role="13h7CS">
2235+
<property role="TrG5h" value="getPresentation" />
2236+
<ref role="13i0hy" to="tpcu:hEwIMiw" resolve="getPresentation" />
2237+
<node concept="3Tm1VV" id="4oS6BnMai3E" role="1B3o_S" />
2238+
<node concept="3clFbS" id="4oS6BnMai3F" role="3clF47">
2239+
<node concept="3clFbF" id="4oS6BnMaiRX" role="3cqZAp">
2240+
<node concept="2OqwBi" id="4oS6BnMaj3W" role="3clFbG">
2241+
<node concept="13iPFW" id="4oS6BnMaiRS" role="2Oq$k0" />
2242+
<node concept="3TrcHB" id="4oS6BnMajhj" role="2OqNvi">
2243+
<ref role="3TsBF5" to="l80j:XhdFKvXSNs" resolve="msg" />
2244+
</node>
2245+
</node>
2246+
</node>
2247+
</node>
2248+
<node concept="17QB3L" id="4oS6BnMai3G" role="3clF45" />
2249+
</node>
2250+
</node>
20502251
</model>
20512252

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/org.iets3.analysis.base.mpl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
<dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
2222
<dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
2323
<dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
24+
<dependency reexport="false">7124e466-fc92-4803-a656-d7a6b7eb3910(MPS.TextGen)</dependency>
25+
<dependency reexport="false">dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)</dependency>
2426
</dependencies>
2527
<languageVersions>
2628
<language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
@@ -76,6 +78,7 @@
7678
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
7779
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
7880
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
81+
<module reference="7124e466-fc92-4803-a656-d7a6b7eb3910(MPS.TextGen)" version="0" />
7982
<module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
8083
<module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
8184
<module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
@@ -112,6 +115,7 @@
112115
<module reference="db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)" version="1" />
113116
<module reference="7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)" version="0" />
114117
<module reference="cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)" version="20" />
118+
<module reference="dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)" version="0" />
115119
</dependencyVersions>
116120
<extendedLanguages>
117121
<extendedLanguage>7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)</extendedLanguage>

0 commit comments

Comments
 (0)