Skip to content

Commit 8805e92

Browse files
mgronovermgronover
authored
Merge pull request #1230 from IETS3/merge/mps20232
Merge maintenance/mps20232 into master
2 parents a3b43d7 + bccd28f commit 8805e92

File tree

6 files changed

+2118
-184
lines changed

6 files changed

+2118
-184
lines changed

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

Lines changed: 218 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
6767
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
6868
</concept>
69-
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
69+
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
7070
<child id="1188208488637" name="annotation" index="2AJF6D" />
7171
</concept>
7272
<concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -169,7 +169,7 @@
169169
<child id="1154542793668" name="componentType" index="3g7fb8" />
170170
<child id="1154542803372" name="initValue" index="3g7hyw" />
171171
</concept>
172-
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
172+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
173173
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
174174
<child id="1068499141038" name="actualArgument" index="37wK5m" />
175175
</concept>
@@ -187,7 +187,7 @@
187187
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
188188
</concept>
189189
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
190-
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
190+
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
191191
<child id="1178549979242" name="visibility" index="1B3o_S" />
192192
</concept>
193193
<concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -327,7 +327,7 @@
327327
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
328328
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
329329
</concept>
330-
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
330+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
331331
<property id="1169194664001" name="name" index="TrG5h" />
332332
</concept>
333333
<concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -1766,6 +1766,220 @@
17661766
</node>
17671767
</node>
17681768
</node>
1769+
<node concept="13i0hz" id="5s__jxCq8Sv" role="13h7CS">
1770+
<property role="TrG5h" value="putLambdaArg" />
1771+
<node concept="3Tm1VV" id="5s__jxCq8Sw" role="1B3o_S" />
1772+
<node concept="3cqZAl" id="5s__jxCq8Sx" role="3clF45" />
1773+
<node concept="3clFbS" id="5s__jxCq8Sy" role="3clF47">
1774+
<node concept="3clFbF" id="5s__jxCq8Sz" role="3cqZAp">
1775+
<node concept="2OqwBi" id="5s__jxCq8S$" role="3clFbG">
1776+
<node concept="2JrnkZ" id="5s__jxCq8S_" role="2Oq$k0">
1777+
<node concept="13iPFW" id="5s__jxCq8SA" role="2JrQYb" />
1778+
</node>
1779+
<node concept="liA8E" id="5s__jxCq8SB" role="2OqNvi">
1780+
<ref role="37wK5l" to="mhbf:~SNode.putUserObject(java.lang.Object,java.lang.Object)" resolve="putUserObject" />
1781+
<node concept="10M0yZ" id="5s__jxCqbTx" role="37wK5m">
1782+
<ref role="3cqZAo" to="sxpq:5s__jxCpjNV" resolve="USER_OBJECT_KEY_LAMBDAARG" />
1783+
<ref role="1PxDUh" to="sxpq:5s__jxCoQMv" resolve="ShortLambdaValue" />
1784+
</node>
1785+
<node concept="37vLTw" id="5s__jxCq8SD" role="37wK5m">
1786+
<ref role="3cqZAo" node="5s__jxCqaIo" resolve="lambdaArg" />
1787+
</node>
1788+
</node>
1789+
</node>
1790+
</node>
1791+
</node>
1792+
<node concept="37vLTG" id="5s__jxCqaIo" role="3clF46">
1793+
<property role="TrG5h" value="lambdaArg" />
1794+
<node concept="3Tqbb2" id="5s__jxCqaIn" role="1tU5fm">
1795+
<ref role="ehGHo" to="zzzn:6zmBjqUkwse" resolve="LambdaArg" />
1796+
</node>
1797+
</node>
1798+
</node>
1799+
<node concept="13i0hz" id="5s__jxCqcBE" role="13h7CS">
1800+
<property role="TrG5h" value="getLambdaArg" />
1801+
<node concept="3Tm1VV" id="5s__jxCqcBF" role="1B3o_S" />
1802+
<node concept="3clFbS" id="5s__jxCqcBH" role="3clF47">
1803+
<node concept="3clFbF" id="5s__jxCqcBI" role="3cqZAp">
1804+
<node concept="1eOMI4" id="5s__jxCqhoK" role="3clFbG">
1805+
<node concept="10QFUN" id="5s__jxCqhoH" role="1eOMHV">
1806+
<node concept="3Tqbb2" id="5s__jxCqhwO" role="10QFUM">
1807+
<ref role="ehGHo" to="zzzn:6zmBjqUkwse" resolve="LambdaArg" />
1808+
</node>
1809+
<node concept="1eOMI4" id="5s__jxCqhcE" role="10QFUP">
1810+
<node concept="2OqwBi" id="5s__jxCqcBJ" role="1eOMHV">
1811+
<node concept="2JrnkZ" id="5s__jxCqcBK" role="2Oq$k0">
1812+
<node concept="13iPFW" id="5s__jxCqcBL" role="2JrQYb" />
1813+
</node>
1814+
<node concept="liA8E" id="5s__jxCqcBM" role="2OqNvi">
1815+
<ref role="37wK5l" to="mhbf:~SNode.getUserObject(java.lang.Object)" resolve="getUserObject" />
1816+
<node concept="10M0yZ" id="5s__jxCqcBN" role="37wK5m">
1817+
<ref role="3cqZAo" to="sxpq:5s__jxCpjNV" resolve="USER_OBJECT_KEY_LAMBDAARG" />
1818+
<ref role="1PxDUh" to="sxpq:5s__jxCoQMv" resolve="ShortLambdaValue" />
1819+
</node>
1820+
</node>
1821+
</node>
1822+
</node>
1823+
</node>
1824+
</node>
1825+
</node>
1826+
</node>
1827+
<node concept="3Tqbb2" id="5s__jxCqcBQ" role="3clF45">
1828+
<ref role="ehGHo" to="zzzn:6zmBjqUkwse" resolve="LambdaArg" />
1829+
</node>
1830+
</node>
1831+
<node concept="13i0hz" id="XbOhLk5ekn" role="13h7CS">
1832+
<property role="TrG5h" value="putLambda" />
1833+
<node concept="3Tm1VV" id="XbOhLk5eko" role="1B3o_S" />
1834+
<node concept="3cqZAl" id="XbOhLk5ekp" role="3clF45" />
1835+
<node concept="3clFbS" id="XbOhLk5ekq" role="3clF47">
1836+
<node concept="3clFbF" id="XbOhLk5ekr" role="3cqZAp">
1837+
<node concept="2OqwBi" id="XbOhLk5eks" role="3clFbG">
1838+
<node concept="2JrnkZ" id="XbOhLk5ekt" role="2Oq$k0">
1839+
<node concept="13iPFW" id="XbOhLk5eku" role="2JrQYb" />
1840+
</node>
1841+
<node concept="liA8E" id="XbOhLk5ekv" role="2OqNvi">
1842+
<ref role="37wK5l" to="mhbf:~SNode.putUserObject(java.lang.Object,java.lang.Object)" resolve="putUserObject" />
1843+
<node concept="10M0yZ" id="XbOhLk5fLj" role="37wK5m">
1844+
<ref role="3cqZAo" to="sxpq:XbOhLk4Bsh" resolve="USER_OBJECT_KEY_LAMBDA" />
1845+
<ref role="1PxDUh" to="sxpq:5s__jxCoQMv" resolve="ShortLambdaValue" />
1846+
</node>
1847+
<node concept="37vLTw" id="XbOhLk5ekx" role="37wK5m">
1848+
<ref role="3cqZAo" node="XbOhLk5eky" resolve="lambdaArg" />
1849+
</node>
1850+
</node>
1851+
</node>
1852+
</node>
1853+
</node>
1854+
<node concept="37vLTG" id="XbOhLk5eky" role="3clF46">
1855+
<property role="TrG5h" value="lambdaArg" />
1856+
<node concept="3Tqbb2" id="XbOhLk5ekz" role="1tU5fm">
1857+
<ref role="ehGHo" to="zzzn:6zmBjqUkws6" resolve="LambdaExpression" />
1858+
</node>
1859+
</node>
1860+
</node>
1861+
<node concept="13i0hz" id="XbOhLk5ek9" role="13h7CS">
1862+
<property role="TrG5h" value="getLambda" />
1863+
<node concept="3Tm1VV" id="XbOhLk5eka" role="1B3o_S" />
1864+
<node concept="3clFbS" id="XbOhLk5ekb" role="3clF47">
1865+
<node concept="3clFbF" id="XbOhLk5ekc" role="3cqZAp">
1866+
<node concept="1eOMI4" id="XbOhLk5ekd" role="3clFbG">
1867+
<node concept="10QFUN" id="XbOhLk5eke" role="1eOMHV">
1868+
<node concept="3Tqbb2" id="XbOhLk5ekf" role="10QFUM">
1869+
<ref role="ehGHo" to="zzzn:6zmBjqUkwse" resolve="LambdaArg" />
1870+
</node>
1871+
<node concept="1eOMI4" id="XbOhLk5ekg" role="10QFUP">
1872+
<node concept="2OqwBi" id="XbOhLk5ekh" role="1eOMHV">
1873+
<node concept="2JrnkZ" id="XbOhLk5eki" role="2Oq$k0">
1874+
<node concept="13iPFW" id="XbOhLk5ekj" role="2JrQYb" />
1875+
</node>
1876+
<node concept="liA8E" id="XbOhLk5ekk" role="2OqNvi">
1877+
<ref role="37wK5l" to="mhbf:~SNode.getUserObject(java.lang.Object)" resolve="getUserObject" />
1878+
<node concept="10M0yZ" id="XbOhLk5gsG" role="37wK5m">
1879+
<ref role="3cqZAo" to="sxpq:XbOhLk4Bsh" resolve="USER_OBJECT_KEY_LAMBDA" />
1880+
<ref role="1PxDUh" to="sxpq:5s__jxCoQMv" resolve="ShortLambdaValue" />
1881+
</node>
1882+
</node>
1883+
</node>
1884+
</node>
1885+
</node>
1886+
</node>
1887+
</node>
1888+
</node>
1889+
<node concept="3Tqbb2" id="XbOhLk5ekm" role="3clF45">
1890+
<ref role="ehGHo" to="zzzn:6zmBjqUkws6" resolve="LambdaExpression" />
1891+
</node>
1892+
</node>
1893+
<node concept="13i0hz" id="5s__jxDLZVE" role="13h7CS">
1894+
<property role="TrG5h" value="getNodeMapping" />
1895+
<node concept="3Tm1VV" id="5s__jxDLZVF" role="1B3o_S" />
1896+
<node concept="3rvAFt" id="5s__jxDLZVG" role="3clF45">
1897+
<node concept="3Tqbb2" id="5s__jxDLZVH" role="3rvQeY" />
1898+
<node concept="3Tqbb2" id="5s__jxDLZVI" role="3rvSg0" />
1899+
</node>
1900+
<node concept="3clFbS" id="5s__jxDLZVJ" role="3clF47">
1901+
<node concept="3clFbJ" id="5s__jxDLZVK" role="3cqZAp">
1902+
<node concept="3clFbS" id="5s__jxDLZVL" role="3clFbx">
1903+
<node concept="3cpWs6" id="5s__jxDLZVM" role="3cqZAp">
1904+
<node concept="10QFUN" id="5s__jxDLZVN" role="3cqZAk">
1905+
<node concept="3rvAFt" id="5s__jxDLZVO" role="10QFUM">
1906+
<node concept="3Tqbb2" id="5s__jxDLZVP" role="3rvQeY" />
1907+
<node concept="3Tqbb2" id="5s__jxDLZVQ" role="3rvSg0" />
1908+
</node>
1909+
<node concept="1eOMI4" id="5s__jxDLZVR" role="10QFUP">
1910+
<node concept="2OqwBi" id="5s__jxDLZVS" role="1eOMHV">
1911+
<node concept="2JrnkZ" id="5s__jxDLZVT" role="2Oq$k0">
1912+
<node concept="13iPFW" id="5s__jxDLZVU" role="2JrQYb" />
1913+
</node>
1914+
<node concept="liA8E" id="5s__jxDLZVV" role="2OqNvi">
1915+
<ref role="37wK5l" to="mhbf:~SNode.getUserObject(java.lang.Object)" resolve="getUserObject" />
1916+
<node concept="10M0yZ" id="5s__jxDLZVW" role="37wK5m">
1917+
<ref role="3cqZAo" to="sxpq:6ITtBskT0za" resolve="USER_OBJECT_KEY" />
1918+
<ref role="1PxDUh" to="sxpq:$yb$20f$a5" resolve="LambdaValue" />
1919+
</node>
1920+
</node>
1921+
</node>
1922+
</node>
1923+
</node>
1924+
</node>
1925+
</node>
1926+
<node concept="2ZW3vV" id="5s__jxDLZVX" role="3clFbw">
1927+
<node concept="2OqwBi" id="5s__jxDLZVY" role="2ZW6bz">
1928+
<node concept="2JrnkZ" id="5s__jxDLZVZ" role="2Oq$k0">
1929+
<node concept="13iPFW" id="5s__jxDLZW0" role="2JrQYb" />
1930+
</node>
1931+
<node concept="liA8E" id="5s__jxDLZW1" role="2OqNvi">
1932+
<ref role="37wK5l" to="mhbf:~SNode.getUserObject(java.lang.Object)" resolve="getUserObject" />
1933+
<node concept="10M0yZ" id="5s__jxDLZW2" role="37wK5m">
1934+
<ref role="3cqZAo" to="sxpq:6ITtBskT0za" resolve="USER_OBJECT_KEY" />
1935+
<ref role="1PxDUh" to="sxpq:$yb$20f$a5" resolve="LambdaValue" />
1936+
</node>
1937+
</node>
1938+
</node>
1939+
<node concept="3uibUv" id="5s__jxDLZW3" role="2ZW6by">
1940+
<ref role="3uigEE" to="33ny:~Map" resolve="Map" />
1941+
</node>
1942+
</node>
1943+
</node>
1944+
<node concept="3cpWs6" id="5s__jxDLZW4" role="3cqZAp">
1945+
<node concept="10Nm6u" id="5s__jxDLZW5" role="3cqZAk" />
1946+
</node>
1947+
</node>
1948+
<node concept="2AHcQZ" id="5s__jxDLZW6" role="2AJF6D">
1949+
<ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
1950+
</node>
1951+
</node>
1952+
<node concept="13i0hz" id="5s__jxDLZW7" role="13h7CS">
1953+
<property role="TrG5h" value="putNodeMapping" />
1954+
<node concept="3Tm1VV" id="5s__jxDLZW8" role="1B3o_S" />
1955+
<node concept="3cqZAl" id="5s__jxDLZW9" role="3clF45" />
1956+
<node concept="3clFbS" id="5s__jxDLZWa" role="3clF47">
1957+
<node concept="3clFbF" id="5s__jxDLZWb" role="3cqZAp">
1958+
<node concept="2OqwBi" id="5s__jxDLZWc" role="3clFbG">
1959+
<node concept="2JrnkZ" id="5s__jxDLZWd" role="2Oq$k0">
1960+
<node concept="13iPFW" id="5s__jxDLZWe" role="2JrQYb" />
1961+
</node>
1962+
<node concept="liA8E" id="5s__jxDLZWf" role="2OqNvi">
1963+
<ref role="37wK5l" to="mhbf:~SNode.putUserObject(java.lang.Object,java.lang.Object)" resolve="putUserObject" />
1964+
<node concept="10M0yZ" id="5s__jxDLZWg" role="37wK5m">
1965+
<ref role="3cqZAo" to="sxpq:6ITtBskT0za" resolve="USER_OBJECT_KEY" />
1966+
<ref role="1PxDUh" to="sxpq:$yb$20f$a5" resolve="LambdaValue" />
1967+
</node>
1968+
<node concept="37vLTw" id="5s__jxDLZWh" role="37wK5m">
1969+
<ref role="3cqZAo" node="5s__jxDLZWi" resolve="map" />
1970+
</node>
1971+
</node>
1972+
</node>
1973+
</node>
1974+
</node>
1975+
<node concept="37vLTG" id="5s__jxDLZWi" role="3clF46">
1976+
<property role="TrG5h" value="map" />
1977+
<node concept="3rvAFt" id="5s__jxDLZWj" role="1tU5fm">
1978+
<node concept="3Tqbb2" id="5s__jxDLZWk" role="3rvQeY" />
1979+
<node concept="3Tqbb2" id="5s__jxDLZWl" role="3rvSg0" />
1980+
</node>
1981+
</node>
1982+
</node>
17691983
</node>
17701984
<node concept="13h7C7" id="6zmBjqUmsve">
17711985
<property role="3GE5qa" value="lambda" />

0 commit comments

Comments
 (0)