Skip to content

Commit 5606582

Browse files
slissonslisson
committed
Merge branch 'shadowmodels'
2 parents 7c9a83c + c4e2c3f commit 5606582

File tree

8 files changed

+586
-157
lines changed

8 files changed

+586
-157
lines changed

‎code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/generator/template/[email protected]‎

Lines changed: 81 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,11 @@
200200
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
201201
<child id="1178549979242" name="visibility" index="1B3o_S" />
202202
</concept>
203+
<concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
204+
<child id="1163668914799" name="condition" index="3K4Cdx" />
205+
<child id="1163668922816" name="ifTrue" index="3K4E3e" />
206+
<child id="1163668934364" name="ifFalse" index="3K4GZi" />
207+
</concept>
203208
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
204209
<concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
205210
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
@@ -7329,7 +7334,7 @@
73297334
</node>
73307335
<node concept="3aamgX" id="4JmkJs3C3MX" role="3aUrZf">
73317336
<property role="36QftV" value="true" />
7332-
<ref role="30HIoZ" to="oyp0:4EhVFrYZevB" resolve="LocalLabelReferenceExpression" />
7337+
<ref role="30HIoZ" to="oyp0:4EhVFrYZevB" resolve="LocalLabelReference" />
73337338
<node concept="gft3U" id="4JmkJs3C4Xz" role="1lVwrX">
73347339
<node concept="Xl_RD" id="4JmkJs3C4XD" role="gfFT$">
73357340
<property role="Xl_RC" value="label" />
@@ -7429,6 +7434,81 @@
74297434
</node>
74307435
</node>
74317436
</node>
7437+
<node concept="3aamgX" id="7POzUCrg1Ez" role="3aUrZf">
7438+
<property role="36QftV" value="true" />
7439+
<ref role="30HIoZ" to="oyp0:7POzUCrfqiz" resolve="IfTarget" />
7440+
<node concept="gft3U" id="7POzUCrg1E$" role="1lVwrX">
7441+
<node concept="1eOMI4" id="7POzUCrg6b2" role="gfFT$">
7442+
<node concept="3K4zz7" id="7POzUCrg6aI" role="1eOMHV">
7443+
<node concept="1eOMI4" id="7POzUCrg6bp" role="3K4Cdx">
7444+
<node concept="3clFbT" id="7POzUCrg6bF" role="1eOMHV">
7445+
<property role="3clFbU" value="true" />
7446+
<node concept="29HgVG" id="7POzUCrg6sx" role="lGtFl">
7447+
<node concept="3NFfHV" id="7POzUCrg6sy" role="3NFExx">
7448+
<node concept="3clFbS" id="7POzUCrg6sz" role="2VODD2">
7449+
<node concept="3clFbF" id="7POzUCrg6sD" role="3cqZAp">
7450+
<node concept="2OqwBi" id="7POzUCrg6s$" role="3clFbG">
7451+
<node concept="3TrEf2" id="7POzUCrg6sB" role="2OqNvi">
7452+
<ref role="3Tt5mk" to="oyp0:7POzUCrfqiA" resolve="condition" />
7453+
</node>
7454+
<node concept="30H73N" id="7POzUCrg6sC" role="2Oq$k0" />
7455+
</node>
7456+
</node>
7457+
</node>
7458+
</node>
7459+
</node>
7460+
</node>
7461+
</node>
7462+
<node concept="1eOMI4" id="7POzUCrg6bP" role="3K4E3e">
7463+
<node concept="3clFbT" id="7POzUCrg6c9" role="1eOMHV">
7464+
<property role="3clFbU" value="true" />
7465+
<node concept="1sPUBX" id="7POzUCri2qD" role="lGtFl">
7466+
<ref role="v9R2y" node="1cIlazwRV1T" resolve="switch_toReferenceTarget" />
7467+
<node concept="3NFfHV" id="7POzUCri2z4" role="1sPUBK">
7468+
<node concept="3clFbS" id="7POzUCri2z5" role="2VODD2">
7469+
<node concept="3clFbF" id="7POzUCri2Ga" role="3cqZAp">
7470+
<node concept="2OqwBi" id="7POzUCri2Sa" role="3clFbG">
7471+
<node concept="30H73N" id="7POzUCri2G9" role="2Oq$k0" />
7472+
<node concept="3TrEf2" id="7POzUCri3fx" role="2OqNvi">
7473+
<ref role="3Tt5mk" to="oyp0:7POzUCrfqiB" resolve="then" />
7474+
</node>
7475+
</node>
7476+
</node>
7477+
</node>
7478+
</node>
7479+
<node concept="v3LJS" id="7POzUCri48M" role="v9R3O">
7480+
<ref role="v3LJV" node="3fc1D1nk8eE" resolve="isContainment" />
7481+
</node>
7482+
</node>
7483+
</node>
7484+
</node>
7485+
<node concept="1eOMI4" id="7POzUCrg6ck" role="3K4GZi">
7486+
<node concept="3clFbT" id="7POzUCrg6cH" role="1eOMHV">
7487+
<property role="3clFbU" value="true" />
7488+
<node concept="1sPUBX" id="7POzUCri4hW" role="lGtFl">
7489+
<ref role="v9R2y" node="1cIlazwRV1T" resolve="switch_toReferenceTarget" />
7490+
<node concept="v3LJS" id="7POzUCri61B" role="v9R3O">
7491+
<ref role="v3LJV" node="3fc1D1nk8eE" resolve="isContainment" />
7492+
</node>
7493+
<node concept="3NFfHV" id="7POzUCri6St" role="1sPUBK">
7494+
<node concept="3clFbS" id="7POzUCri6Su" role="2VODD2">
7495+
<node concept="3clFbF" id="7POzUCri7JF" role="3cqZAp">
7496+
<node concept="2OqwBi" id="7POzUCri7VF" role="3clFbG">
7497+
<node concept="30H73N" id="7POzUCri7JE" role="2Oq$k0" />
7498+
<node concept="3TrEf2" id="7POzUCri8j2" role="2OqNvi">
7499+
<ref role="3Tt5mk" to="oyp0:7POzUCrfqiC" resolve="else" />
7500+
</node>
7501+
</node>
7502+
</node>
7503+
</node>
7504+
</node>
7505+
</node>
7506+
</node>
7507+
</node>
7508+
</node>
7509+
</node>
7510+
</node>
7511+
</node>
74327512
<node concept="3aamgX" id="6TeLv_H8ap" role="3aUrZf">
74337513
<property role="36QftV" value="true" />
74347514
<ref role="30HIoZ" to="oyp0:7X4ppfYk3aY" resolve="ParameterReference" />

‎code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/behavior.mps‎

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2218,5 +2218,146 @@
22182218
</node>
22192219
</node>
22202220
</node>
2221+
<node concept="13h7C7" id="7POzUCrfyNW">
2222+
<property role="3GE5qa" value="macros" />
2223+
<ref role="13h7C2" to="oyp0:7POzUCrfyNV" resolve="IIfMacro" />
2224+
<node concept="13i0hz" id="7POzUCrfyO7" role="13h7CS">
2225+
<property role="13i0iv" value="true" />
2226+
<property role="13i0it" value="true" />
2227+
<property role="TrG5h" value="getCondition" />
2228+
<node concept="3Tm1VV" id="7POzUCrfyO8" role="1B3o_S" />
2229+
<node concept="3Tqbb2" id="7POzUCrfyOf" role="3clF45" />
2230+
<node concept="3clFbS" id="7POzUCrfyOa" role="3clF47" />
2231+
</node>
2232+
<node concept="13i0hz" id="7POzUCrfyOi" role="13h7CS">
2233+
<property role="13i0iv" value="true" />
2234+
<property role="13i0it" value="true" />
2235+
<property role="TrG5h" value="getThenPart" />
2236+
<node concept="3Tm1VV" id="7POzUCrfyOj" role="1B3o_S" />
2237+
<node concept="3Tqbb2" id="7POzUCrfyOk" role="3clF45" />
2238+
<node concept="3clFbS" id="7POzUCrfyOl" role="3clF47" />
2239+
</node>
2240+
<node concept="13i0hz" id="7POzUCrfyOu" role="13h7CS">
2241+
<property role="13i0iv" value="true" />
2242+
<property role="13i0it" value="true" />
2243+
<property role="TrG5h" value="getElsePart" />
2244+
<node concept="3Tm1VV" id="7POzUCrfyOv" role="1B3o_S" />
2245+
<node concept="3Tqbb2" id="7POzUCrfyOw" role="3clF45" />
2246+
<node concept="3clFbS" id="7POzUCrfyOx" role="3clF47" />
2247+
</node>
2248+
<node concept="13hLZK" id="7POzUCrfyNX" role="13h7CW">
2249+
<node concept="3clFbS" id="7POzUCrfyNY" role="2VODD2" />
2250+
</node>
2251+
</node>
2252+
<node concept="13h7C7" id="7POzUCrg6Qa">
2253+
<property role="3GE5qa" value="macros" />
2254+
<ref role="13h7C2" to="oyp0:1cIlazx0TJC" resolve="IfMacro" />
2255+
<node concept="13hLZK" id="7POzUCrg6Qb" role="13h7CW">
2256+
<node concept="3clFbS" id="7POzUCrg6Qc" role="2VODD2" />
2257+
</node>
2258+
<node concept="13i0hz" id="7POzUCrg6Ql" role="13h7CS">
2259+
<property role="TrG5h" value="getCondition" />
2260+
<ref role="13i0hy" node="7POzUCrfyO7" resolve="getCondition" />
2261+
<node concept="3Tm1VV" id="7POzUCrg6Qm" role="1B3o_S" />
2262+
<node concept="3clFbS" id="7POzUCrg6Qp" role="3clF47">
2263+
<node concept="3clFbF" id="7POzUCrg6QO" role="3cqZAp">
2264+
<node concept="2OqwBi" id="7POzUCrg711" role="3clFbG">
2265+
<node concept="13iPFW" id="7POzUCrg6QN" role="2Oq$k0" />
2266+
<node concept="3TrEf2" id="7POzUCrg7FG" role="2OqNvi">
2267+
<ref role="3Tt5mk" to="oyp0:1cIlazx0TJF" resolve="condition" />
2268+
</node>
2269+
</node>
2270+
</node>
2271+
</node>
2272+
<node concept="3Tqbb2" id="7POzUCrg6Qq" role="3clF45" />
2273+
</node>
2274+
<node concept="13i0hz" id="7POzUCrg6Qr" role="13h7CS">
2275+
<property role="TrG5h" value="getElsePart" />
2276+
<ref role="13i0hy" node="7POzUCrfyOu" resolve="getElsePart" />
2277+
<node concept="3Tm1VV" id="7POzUCrg6Qs" role="1B3o_S" />
2278+
<node concept="3clFbS" id="7POzUCrg6Qv" role="3clF47">
2279+
<node concept="3clFbF" id="7POzUCrg7IT" role="3cqZAp">
2280+
<node concept="2OqwBi" id="7POzUCrg7T6" role="3clFbG">
2281+
<node concept="13iPFW" id="7POzUCrg7IS" role="2Oq$k0" />
2282+
<node concept="3TrEf2" id="7POzUCrg8ik" role="2OqNvi">
2283+
<ref role="3Tt5mk" to="oyp0:1cIlazx0TJK" resolve="else" />
2284+
</node>
2285+
</node>
2286+
</node>
2287+
</node>
2288+
<node concept="3Tqbb2" id="7POzUCrg6Qw" role="3clF45" />
2289+
</node>
2290+
<node concept="13i0hz" id="7POzUCrg6Qx" role="13h7CS">
2291+
<property role="TrG5h" value="getThenPart" />
2292+
<ref role="13i0hy" node="7POzUCrfyOi" resolve="getThenPart" />
2293+
<node concept="3Tm1VV" id="7POzUCrg6Qy" role="1B3o_S" />
2294+
<node concept="3clFbS" id="7POzUCrg6Q_" role="3clF47">
2295+
<node concept="3clFbF" id="7POzUCrg8CE" role="3cqZAp">
2296+
<node concept="2OqwBi" id="7POzUCrg8MR" role="3clFbG">
2297+
<node concept="13iPFW" id="7POzUCrg8CD" role="2Oq$k0" />
2298+
<node concept="3TrEf2" id="7POzUCrg9c5" role="2OqNvi">
2299+
<ref role="3Tt5mk" to="oyp0:1cIlazx0TJH" resolve="then" />
2300+
</node>
2301+
</node>
2302+
</node>
2303+
</node>
2304+
<node concept="3Tqbb2" id="7POzUCrg6QA" role="3clF45" />
2305+
</node>
2306+
</node>
2307+
<node concept="13h7C7" id="7POzUCrg9gZ">
2308+
<property role="3GE5qa" value="macros" />
2309+
<ref role="13h7C2" to="oyp0:7POzUCrfqiz" resolve="IfTarget" />
2310+
<node concept="13i0hz" id="7POzUCrg9ha" role="13h7CS">
2311+
<property role="TrG5h" value="getCondition" />
2312+
<ref role="13i0hy" node="7POzUCrfyO7" resolve="getCondition" />
2313+
<node concept="3Tm1VV" id="7POzUCrg9hb" role="1B3o_S" />
2314+
<node concept="3clFbS" id="7POzUCrg9hc" role="3clF47">
2315+
<node concept="3clFbF" id="7POzUCrg9hd" role="3cqZAp">
2316+
<node concept="2OqwBi" id="7POzUCrg9he" role="3clFbG">
2317+
<node concept="13iPFW" id="7POzUCrg9hf" role="2Oq$k0" />
2318+
<node concept="3TrEf2" id="7POzUCrg9hg" role="2OqNvi">
2319+
<ref role="3Tt5mk" to="oyp0:7POzUCrfqiA" resolve="condition" />
2320+
</node>
2321+
</node>
2322+
</node>
2323+
</node>
2324+
<node concept="3Tqbb2" id="7POzUCrg9hh" role="3clF45" />
2325+
</node>
2326+
<node concept="13i0hz" id="7POzUCrg9hi" role="13h7CS">
2327+
<property role="TrG5h" value="getElsePart" />
2328+
<ref role="13i0hy" node="7POzUCrfyOu" resolve="getElsePart" />
2329+
<node concept="3Tm1VV" id="7POzUCrg9hj" role="1B3o_S" />
2330+
<node concept="3clFbS" id="7POzUCrg9hk" role="3clF47">
2331+
<node concept="3clFbF" id="7POzUCrg9hl" role="3cqZAp">
2332+
<node concept="2OqwBi" id="7POzUCrg9hm" role="3clFbG">
2333+
<node concept="13iPFW" id="7POzUCrg9hn" role="2Oq$k0" />
2334+
<node concept="3TrEf2" id="7POzUCrg9ho" role="2OqNvi">
2335+
<ref role="3Tt5mk" to="oyp0:7POzUCrfqiC" resolve="else" />
2336+
</node>
2337+
</node>
2338+
</node>
2339+
</node>
2340+
<node concept="3Tqbb2" id="7POzUCrg9hp" role="3clF45" />
2341+
</node>
2342+
<node concept="13i0hz" id="7POzUCrg9hq" role="13h7CS">
2343+
<property role="TrG5h" value="getThenPart" />
2344+
<ref role="13i0hy" node="7POzUCrfyOi" resolve="getThenPart" />
2345+
<node concept="3Tm1VV" id="7POzUCrg9hr" role="1B3o_S" />
2346+
<node concept="3clFbS" id="7POzUCrg9hs" role="3clF47">
2347+
<node concept="3clFbF" id="7POzUCrg9ht" role="3cqZAp">
2348+
<node concept="2OqwBi" id="7POzUCrg9hu" role="3clFbG">
2349+
<node concept="13iPFW" id="7POzUCrg9hv" role="2Oq$k0" />
2350+
<node concept="3TrEf2" id="7POzUCrg9hw" role="2OqNvi">
2351+
<ref role="3Tt5mk" to="oyp0:7POzUCrfqiB" resolve="then" />
2352+
</node>
2353+
</node>
2354+
</node>
2355+
</node>
2356+
<node concept="3Tqbb2" id="7POzUCrg9hx" role="3clF45" />
2357+
</node>
2358+
<node concept="13hLZK" id="7POzUCrg9h0" role="13h7CW">
2359+
<node concept="3clFbS" id="7POzUCrg9h1" role="2VODD2" />
2360+
</node>
2361+
</node>
22212362
</model>
22222363

‎code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/editor.mps‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3104,5 +3104,48 @@
31043104
</node>
31053105
</node>
31063106
</node>
3107+
<node concept="24kQdi" id="7POzUCrfqiO">
3108+
<property role="3GE5qa" value="macros" />
3109+
<ref role="1XX52x" to="oyp0:7POzUCrfqiz" resolve="IfTarget" />
3110+
<node concept="3EZMnI" id="7POzUCrfqiQ" role="2wV5jI">
3111+
<node concept="3EZMnI" id="7POzUCrfqiR" role="3EZMnx">
3112+
<node concept="VPM3Z" id="7POzUCrfqiS" role="3F10Kt">
3113+
<property role="VOm3f" value="false" />
3114+
</node>
3115+
<node concept="3F0ifn" id="7POzUCrfqiT" role="3EZMnx">
3116+
<property role="3F0ifm" value="if " />
3117+
</node>
3118+
<node concept="3F1sOY" id="7POzUCrfqiU" role="3EZMnx">
3119+
<ref role="1NtTu8" to="oyp0:7POzUCrfqiA" resolve="condition" />
3120+
</node>
3121+
<node concept="2iRfu4" id="7POzUCrfqiV" role="2iSdaV" />
3122+
</node>
3123+
<node concept="3EZMnI" id="7POzUCrfqiW" role="3EZMnx">
3124+
<node concept="VPM3Z" id="7POzUCrfqiX" role="3F10Kt">
3125+
<property role="VOm3f" value="false" />
3126+
</node>
3127+
<node concept="3F0ifn" id="7POzUCrfqiY" role="3EZMnx">
3128+
<property role="3F0ifm" value="then" />
3129+
</node>
3130+
<node concept="3F1sOY" id="7POzUCrfqiZ" role="3EZMnx">
3131+
<ref role="1NtTu8" to="oyp0:7POzUCrfqiB" resolve="then" />
3132+
</node>
3133+
<node concept="2iRfu4" id="7POzUCrfqj0" role="2iSdaV" />
3134+
</node>
3135+
<node concept="3EZMnI" id="7POzUCrfqj1" role="3EZMnx">
3136+
<node concept="VPM3Z" id="7POzUCrfqj2" role="3F10Kt">
3137+
<property role="VOm3f" value="false" />
3138+
</node>
3139+
<node concept="3F0ifn" id="7POzUCrfqj3" role="3EZMnx">
3140+
<property role="3F0ifm" value="else" />
3141+
</node>
3142+
<node concept="3F1sOY" id="7POzUCrfqj4" role="3EZMnx">
3143+
<ref role="1NtTu8" to="oyp0:7POzUCrfqiC" resolve="else" />
3144+
</node>
3145+
<node concept="2iRfu4" id="7POzUCrfqj5" role="2iSdaV" />
3146+
</node>
3147+
<node concept="2iRkQZ" id="7POzUCrfqj6" role="2iSdaV" />
3148+
</node>
3149+
</node>
31073150
</model>
31083151

‎code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/structure.mps‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -617,6 +617,9 @@
617617
<node concept="PrWs8" id="1cIlazx0TJD" role="PzmwI">
618618
<ref role="PrY4T" node="6ndA7L_LuUC" resolve="INodeSpec" />
619619
</node>
620+
<node concept="PrWs8" id="7POzUCrfyOL" role="PzmwI">
621+
<ref role="PrY4T" node="7POzUCrfyNV" resolve="IIfMacro" />
622+
</node>
620623
</node>
621624
<node concept="1TIwiD" id="2ePp5XuNSQz">
622625
<property role="EcuMT" value="2573073122887437731" />
@@ -1652,5 +1655,44 @@
16521655
<ref role="20lvS9" node="5lWcBwL7BRW" resolve="OperationParameterDecl" />
16531656
</node>
16541657
</node>
1658+
<node concept="1TIwiD" id="7POzUCrfqiz">
1659+
<property role="EcuMT" value="9040008312803665059" />
1660+
<property role="3GE5qa" value="macros" />
1661+
<property role="TrG5h" value="IfTarget" />
1662+
<property role="34LRSv" value="if" />
1663+
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
1664+
<node concept="1TJgyj" id="7POzUCrfqiA" role="1TKVEi">
1665+
<property role="IQ2ns" value="9040008312803665062" />
1666+
<property role="20lmBu" value="aggregation" />
1667+
<property role="20kJfa" value="condition" />
1668+
<property role="20lbJX" value="1" />
1669+
<ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
1670+
</node>
1671+
<node concept="1TJgyj" id="7POzUCrfqiB" role="1TKVEi">
1672+
<property role="IQ2ns" value="9040008312803665063" />
1673+
<property role="20lmBu" value="aggregation" />
1674+
<property role="20kJfa" value="then" />
1675+
<property role="20lbJX" value="1" />
1676+
<ref role="20lvS9" node="6ndA7L_LuUK" resolve="ITargetSpec" />
1677+
</node>
1678+
<node concept="1TJgyj" id="7POzUCrfqiC" role="1TKVEi">
1679+
<property role="IQ2ns" value="9040008312803665064" />
1680+
<property role="20lmBu" value="aggregation" />
1681+
<property role="20kJfa" value="else" />
1682+
<property role="20lbJX" value="1" />
1683+
<ref role="20lvS9" node="6ndA7L_LuUK" resolve="ITargetSpec" />
1684+
</node>
1685+
<node concept="PrWs8" id="7POzUCrfqi$" role="PzmwI">
1686+
<ref role="PrY4T" node="6ndA7L_LuUK" resolve="ITargetSpec" />
1687+
</node>
1688+
<node concept="PrWs8" id="7POzUCrfyOS" role="PzmwI">
1689+
<ref role="PrY4T" node="7POzUCrfyNV" resolve="IIfMacro" />
1690+
</node>
1691+
</node>
1692+
<node concept="PlHQZ" id="7POzUCrfyNV">
1693+
<property role="EcuMT" value="9040008312803699963" />
1694+
<property role="3GE5qa" value="macros" />
1695+
<property role="TrG5h" value="IIfMacro" />
1696+
</node>
16551697
</model>
16561698

0 commit comments

Comments
 (0)