Skip to content

Commit 7fb76a6

Browse files
HeikoBeckerHeikoBecker
authored
Merge pull request #705 from IETS3/feature/cascading_merge_20212_20213_0723
Merge 2021.2 into 2021.3
2 parents 721e8d9 + 75b38fb commit 7fb76a6

File tree

34 files changed

+10084
-1102
lines changed

34 files changed

+10084
-1102
lines changed

‎CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Changelog
2+
3+
All notable changes to this project are documented in this file.
4+
5+
Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
6+
The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
7+
8+
9+
10+
## July 2023
11+
12+
### Fixed
13+
14+
- Computation of the least-common-supertype for expressions with different return types has been fixed. The typesystem now correctly infers a join type (c.f. [original issue](https://github.com/IETS3/iets3.opensource/issues/505))
15+
- Naming constraint of IValidNamedConcept is customizable [original request](https://github.com/IETS3/iets3.opensource/pull/631)
16+
- Made transformation action [applyCommentsToIDocumentable](http://127.0.0.1:63320/node?ref=r%3A80fb0853-eb3b-4e84-aebd-cc7fdb011d97%28org.iets3.core.base.editor%29%2F5981628904839421072) only applicable if documentation is allowed [original request](https://github.com/IETS3/iets3.opensource/pull/626)
17+
18+
### Added
19+
20+
- Tuples are now handled within the typesystem.
21+
Instead of allowing JoinTypes within tuples we merge different tuple types by JoinTypes.
22+
- Each subconcept of IValidNamedConcept can now contribute and customize naming constraints

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
<modulePath path="$PROJECT_DIR$/languages/org.iets3.req.core/org.iets3.req.core.mpl" folder="req" />
7575
<modulePath path="$PROJECT_DIR$/languages/org.iets3.req.plugin/org.iets3.req.plugin.msd" folder="req" />
7676
<modulePath path="$PROJECT_DIR$/languages/test.iest3.component.attribute/test.iest3.component.attribute.mpl" folder="comp" />
77+
<modulePath path="$PROJECT_DIR$/languages/test.ts.expr.os.validNameConcept/test.ts.expr.os.validNameConcept.mpl" folder="expr.tests" />
7778
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.components.core.interpreter/org.iets3.components.core.interpreter.msd" folder="comp" />
7879
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.components.core.sandbox/org.iets3.components.core.sandbox.msd" folder="comp" />
7980
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.adt.interpreter/org.iets3.core.expr.adt.interpreter.msd" folder="expr.lang-advanced" />

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

Lines changed: 177 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,11 @@
202202
<child id="8276990574886367510" name="catchClause" index="1zxBo5" />
203203
<child id="8276990574886367508" name="body" index="1zxBo7" />
204204
</concept>
205+
<concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
206+
<child id="1163668914799" name="condition" index="3K4Cdx" />
207+
<child id="1163668922816" name="ifTrue" index="3K4E3e" />
208+
<child id="1163668934364" name="ifFalse" index="3K4GZi" />
209+
</concept>
205210
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
206211
<child id="8356039341262087992" name="line" index="1aUNEU" />
207212
</concept>
@@ -1770,6 +1775,177 @@
17701775
</node>
17711776
</node>
17721777
</node>
1778+
<node concept="13i0hz" id="6OMpQn6QxQe" role="13h7CS">
1779+
<property role="TrG5h" value="allowApostrophe" />
1780+
<property role="2Ki8OM" value="true" />
1781+
<property role="13i0it" value="true" />
1782+
<node concept="3Tm1VV" id="6OMpQn6QxQf" role="1B3o_S" />
1783+
<node concept="10P_77" id="6OMpQn6QxQg" role="3clF45" />
1784+
<node concept="3clFbS" id="6OMpQn6QxQh" role="3clF47">
1785+
<node concept="3clFbF" id="6OMpQn6QxQi" role="3cqZAp">
1786+
<node concept="3clFbT" id="6OMpQn6QxQj" role="3clFbG">
1787+
<property role="3clFbU" value="true" />
1788+
</node>
1789+
</node>
1790+
</node>
1791+
</node>
1792+
<node concept="13i0hz" id="6OMpQn6XNJW" role="13h7CS">
1793+
<property role="13i0it" value="true" />
1794+
<property role="TrG5h" value="getRegExFirstLetter" />
1795+
<property role="2Ki8OM" value="true" />
1796+
<node concept="3Tm1VV" id="6OMpQn6XNJX" role="1B3o_S" />
1797+
<node concept="17QB3L" id="6OMpQn6XNUd" role="3clF45" />
1798+
<node concept="3clFbS" id="6OMpQn6XNJZ" role="3clF47">
1799+
<node concept="3cpWs8" id="4ZH31cjGTqJ" role="3cqZAp">
1800+
<node concept="3cpWsn" id="4ZH31cjGTqM" role="3cpWs9">
1801+
<property role="TrG5h" value="uml" />
1802+
<node concept="17QB3L" id="4ZH31cjGTqH" role="1tU5fm" />
1803+
<node concept="3K4zz7" id="4ZH31cjGVOs" role="33vP2m">
1804+
<node concept="Xl_RD" id="4ZH31cjGVVu" role="3K4E3e">
1805+
<property role="Xl_RC" value="äöüßÄÖÜ" />
1806+
</node>
1807+
<node concept="Xl_RD" id="4ZH31cjGWfU" role="3K4GZi">
1808+
<property role="Xl_RC" value="" />
1809+
</node>
1810+
<node concept="BsUDl" id="6OMpQn6XQey" role="3K4Cdx">
1811+
<ref role="37wK5l" node="5YygIlbih$m" resolve="allowUmlaute" />
1812+
</node>
1813+
</node>
1814+
</node>
1815+
</node>
1816+
<node concept="3clFbF" id="6OMpQn6XS_R" role="3cqZAp">
1817+
<node concept="3cpWs3" id="4ZH31cjH0b2" role="3clFbG">
1818+
<node concept="3cpWs3" id="4ZH31cjH15y" role="3uHU7B">
1819+
<node concept="37vLTw" id="4ZH31cjH1a0" role="3uHU7w">
1820+
<ref role="3cqZAo" node="4ZH31cjGTqM" resolve="uml" />
1821+
</node>
1822+
<node concept="Xl_RD" id="4ZH31cjH0b8" role="3uHU7B">
1823+
<property role="Xl_RC" value="[a-zA-Z$_" />
1824+
</node>
1825+
</node>
1826+
<node concept="Xl_RD" id="6OMpQn6XRp3" role="3uHU7w">
1827+
<property role="Xl_RC" value="]" />
1828+
</node>
1829+
</node>
1830+
</node>
1831+
</node>
1832+
</node>
1833+
<node concept="13i0hz" id="6OMpQn6XSaI" role="13h7CS">
1834+
<property role="13i0it" value="true" />
1835+
<property role="TrG5h" value="getRegExOtherThanFirstLetter" />
1836+
<property role="2Ki8OM" value="true" />
1837+
<node concept="3Tm1VV" id="6OMpQn6XSaJ" role="1B3o_S" />
1838+
<node concept="17QB3L" id="6OMpQn6XSaK" role="3clF45" />
1839+
<node concept="3clFbS" id="6OMpQn6XSaL" role="3clF47">
1840+
<node concept="3cpWs8" id="6OMpQn6XSaM" role="3cqZAp">
1841+
<node concept="3cpWsn" id="6OMpQn6XSaN" role="3cpWs9">
1842+
<property role="TrG5h" value="uml" />
1843+
<node concept="17QB3L" id="6OMpQn6XSaO" role="1tU5fm" />
1844+
<node concept="3K4zz7" id="6OMpQn6XSaP" role="33vP2m">
1845+
<node concept="Xl_RD" id="6OMpQn6XSaQ" role="3K4E3e">
1846+
<property role="Xl_RC" value="äöüßÄÖÜ" />
1847+
</node>
1848+
<node concept="Xl_RD" id="6OMpQn6XSaR" role="3K4GZi">
1849+
<property role="Xl_RC" value="" />
1850+
</node>
1851+
<node concept="BsUDl" id="6OMpQn6XSaS" role="3K4Cdx">
1852+
<ref role="37wK5l" node="5YygIlbih$m" resolve="allowUmlaute" />
1853+
</node>
1854+
</node>
1855+
</node>
1856+
</node>
1857+
<node concept="3cpWs8" id="6OMpQn6XSaT" role="3cqZAp">
1858+
<node concept="3cpWsn" id="6OMpQn6XSaU" role="3cpWs9">
1859+
<property role="TrG5h" value="par" />
1860+
<node concept="17QB3L" id="6OMpQn6XSaV" role="1tU5fm" />
1861+
<node concept="3K4zz7" id="6OMpQn6XSaW" role="33vP2m">
1862+
<node concept="Xl_RD" id="6OMpQn6XSaX" role="3K4E3e">
1863+
<property role="Xl_RC" value="§" />
1864+
</node>
1865+
<node concept="Xl_RD" id="6OMpQn6XSaY" role="3K4GZi">
1866+
<property role="Xl_RC" value="" />
1867+
</node>
1868+
<node concept="BsUDl" id="6OMpQn6XSaZ" role="3K4Cdx">
1869+
<ref role="37wK5l" node="4ZH31cjGRan" resolve="allowParagraph" />
1870+
</node>
1871+
</node>
1872+
</node>
1873+
</node>
1874+
<node concept="3cpWs8" id="6OMpQn6XSb0" role="3cqZAp">
1875+
<node concept="3cpWsn" id="6OMpQn6XSb1" role="3cpWs9">
1876+
<property role="TrG5h" value="apostrophe" />
1877+
<node concept="17QB3L" id="6OMpQn6XSb2" role="1tU5fm" />
1878+
<node concept="3K4zz7" id="6OMpQn6XSb3" role="33vP2m">
1879+
<node concept="Xl_RD" id="6OMpQn6XSb4" role="3K4E3e">
1880+
<property role="Xl_RC" value="'" />
1881+
</node>
1882+
<node concept="Xl_RD" id="6OMpQn6XSb5" role="3K4GZi">
1883+
<property role="Xl_RC" value="" />
1884+
</node>
1885+
<node concept="BsUDl" id="6OMpQn6XSb6" role="3K4Cdx">
1886+
<ref role="37wK5l" node="6OMpQn6QxQe" resolve="allowApostrophe" />
1887+
</node>
1888+
</node>
1889+
</node>
1890+
</node>
1891+
<node concept="3clFbF" id="6OMpQn6XUgS" role="3cqZAp">
1892+
<node concept="3cpWs3" id="6OMpQn6QvNV" role="3clFbG">
1893+
<node concept="3cpWs3" id="6OMpQn6QvCj" role="3uHU7B">
1894+
<node concept="3cpWs3" id="4ZH31cjH3l3" role="3uHU7B">
1895+
<node concept="3cpWs3" id="4A2d0p4bud5" role="3uHU7B">
1896+
<node concept="37vLTw" id="4A2d0p4buzw" role="3uHU7w">
1897+
<ref role="3cqZAo" node="6OMpQn6XSaN" resolve="uml" />
1898+
</node>
1899+
<node concept="Xl_RD" id="4A2d0p4buNi" role="3uHU7B">
1900+
<property role="Xl_RC" value="[a-zA-Z0-9$_" />
1901+
</node>
1902+
</node>
1903+
<node concept="37vLTw" id="4ZH31cjH3tR" role="3uHU7w">
1904+
<ref role="3cqZAo" node="6OMpQn6XSaU" resolve="par" />
1905+
</node>
1906+
</node>
1907+
<node concept="37vLTw" id="6OMpQn6Q$ts" role="3uHU7w">
1908+
<ref role="3cqZAo" node="6OMpQn6XSb1" resolve="apostrophe" />
1909+
</node>
1910+
</node>
1911+
<node concept="Xl_RD" id="6OMpQn6QvO3" role="3uHU7w">
1912+
<property role="Xl_RC" value="]*" />
1913+
</node>
1914+
</node>
1915+
</node>
1916+
</node>
1917+
</node>
1918+
<node concept="13i0hz" id="39ERoteujbz" role="13h7CS">
1919+
<property role="13i0it" value="true" />
1920+
<property role="TrG5h" value="isValidName" />
1921+
<property role="2Ki8OM" value="true" />
1922+
<node concept="3Tm1VV" id="39ERoteujb$" role="1B3o_S" />
1923+
<node concept="10P_77" id="39ERoteujS3" role="3clF45" />
1924+
<node concept="3clFbS" id="39ERoteujbA" role="3clF47">
1925+
<node concept="3clFbF" id="39ERoteukW3" role="3cqZAp">
1926+
<node concept="2OqwBi" id="39ERoteulk_" role="3clFbG">
1927+
<node concept="37vLTw" id="39ERoteukXW" role="2Oq$k0">
1928+
<ref role="3cqZAo" node="39ERoteujSR" resolve="name" />
1929+
</node>
1930+
<node concept="liA8E" id="39ERoteul$j" role="2OqNvi">
1931+
<ref role="37wK5l" to="wyt6:~String.matches(java.lang.String)" resolve="matches" />
1932+
<node concept="3cpWs3" id="39ERoteulSt" role="37wK5m">
1933+
<node concept="BsUDl" id="39ERoteulX8" role="3uHU7w">
1934+
<ref role="37wK5l" node="6OMpQn6XSaI" resolve="getRegExOtherThanFirstLetter" />
1935+
</node>
1936+
<node concept="BsUDl" id="39ERoteul_K" role="3uHU7B">
1937+
<ref role="37wK5l" node="6OMpQn6XNJW" resolve="getRegExFirstLetter" />
1938+
</node>
1939+
</node>
1940+
</node>
1941+
</node>
1942+
</node>
1943+
</node>
1944+
<node concept="37vLTG" id="39ERoteujSR" role="3clF46">
1945+
<property role="TrG5h" value="name" />
1946+
<node concept="17QB3L" id="39ERoteujSQ" role="1tU5fm" />
1947+
</node>
1948+
</node>
17731949
<node concept="13i0hz" id="7NEp8pMMUwS" role="13h7CS">
17741950
<property role="13i0iv" value="false" />
17751951
<property role="13i0it" value="true" />
@@ -1992,7 +2168,7 @@
19922168
<node concept="liA8E" id="7JoR4kgoOOw" role="2OqNvi">
19932169
<ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String)" resolve="replaceAll" />
19942170
<node concept="Xl_RD" id="7JoR4kgoOOx" role="37wK5m">
1995-
<property role="Xl_RC" value="[^a-zA-Z0-9$[_]]" />
2171+
<property role="Xl_RC" value="[^a-zA-Z0-9$_]" />
19962172
</node>
19972173
<node concept="Xl_RD" id="7JoR4kgoOOy" role="37wK5m">
19982174
<property role="Xl_RC" value="_" />

0 commit comments

Comments
 (0)