Commit b55899e6 authored by André Pacak's avatar André Pacak
Browse files

reordered transformation steps to avoid generating context adt if inlining is possible

parent bd74c190
......@@ -88,7 +88,7 @@
<lesser-priority-mapping>
<generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
<external-mapping>
<mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="7984092366528910010" />
<mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="7868621431052230593" />
</external-mapping>
</lesser-priority-mapping>
</mapping-priority-rule>
......@@ -116,7 +116,7 @@
<lesser-priority-mapping>
<generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
<external-mapping>
<mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="7868621431058667671" />
<mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="7984092366528910010" />
</external-mapping>
</lesser-priority-mapping>
</mapping-priority-rule>
......@@ -124,13 +124,13 @@
<greater-priority-mapping>
<generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
<external-mapping>
<mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="3001671298539037239" />
<mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="7984092366528910010" />
</external-mapping>
</greater-priority-mapping>
<lesser-priority-mapping>
<generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
<external-mapping>
<mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="7868621431052230593" />
<mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="3001671298539037239" />
</external-mapping>
</lesser-priority-mapping>
</mapping-priority-rule>
......@@ -150,29 +150,15 @@
</mapping-priority-rule>
<mapping-priority-rule kind="strictly_before">
<greater-priority-mapping>
<generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
<external-mapping>
<mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="7984092366528910010" />
</external-mapping>
</greater-priority-mapping>
<lesser-priority-mapping>
<generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
<external-mapping>
<mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="3001671298539037239" />
</external-mapping>
</lesser-priority-mapping>
</mapping-priority-rule>
<mapping-priority-rule kind="strictly_before">
<greater-priority-mapping>
<generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
<external-mapping>
<mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="7868621431052230593" />
</external-mapping>
</greater-priority-mapping>
<lesser-priority-mapping>
<generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
<external-mapping>
<mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="3840304548834665052" />
<mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="7868621431058667671" />
</external-mapping>
</lesser-priority-mapping>
</mapping-priority-rule>
......@@ -188,6 +174,7 @@
<dependency reexport="false">ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71(TypeLang)</dependency>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="false">446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)</dependency>
<dependency reexport="false">3a1c1f85-c745-4d04-a210-f97a7e31f9cc(org.inca.extensions)</dependency>
</dependencies>
<languageVersions>
<language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="0" />
......
......@@ -149,6 +149,9 @@
<concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
<child id="1144230900587" name="variable" index="1Duv9x" />
</concept>
<concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
<reference id="5497648299878491909" name="baseVariableDeclaration" index="1M0zk5" />
</concept>
<concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
<concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
<property id="6329021646629104958" name="text" index="3SKdUp" />
......@@ -228,6 +231,14 @@
<concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
<reference id="1145383142433" name="elementConcept" index="2I9WkF" />
</concept>
<concept id="1883223317721008708" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfStatement" flags="nn" index="Jncv_">
<reference id="1883223317721008712" name="nodeConcept" index="JncvD" />
<child id="1883223317721008709" name="body" index="Jncv$" />
<child id="1883223317721008711" name="variable" index="JncvA" />
<child id="1883223317721008710" name="nodeExpression" index="JncvB" />
</concept>
<concept id="1883223317721008713" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVariable" flags="ng" index="JncvC" />
<concept id="1883223317721107059" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVarReference" flags="nn" index="Jnkvi" />
<concept id="7504436213544206332" name="jetbrains.mps.lang.smodel.structure.Node_ContainingLinkOperation" flags="nn" index="2NL2c5" />
<concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
<concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
......@@ -3551,52 +3562,96 @@
<ref role="3cqZAo" node="2AC52hTUL3x" resolve="projectionDecls" />
</node>
<node concept="3clFbS" id="2AC52hU4T$i" role="2LFqv$">
<node concept="3cpWs8" id="2AC52hU4YBW" role="3cqZAp">
<node concept="3cpWsn" id="2AC52hU4YBX" role="3cpWs9">
<property role="TrG5h" value="sort" />
<node concept="1PxgMI" id="2AC52hU9_Dq" role="33vP2m">
<node concept="chp4Y" id="2AC52hU9A_r" role="3oSUPX">
<ref role="cht4Q" to="b83y:2U2uJPpguJc" resolve="SortLattice" />
</node>
<node concept="2OqwBi" id="2AC52hU50gQ" role="1m5AlR">
<node concept="2OqwBi" id="2AC52hU4YBY" role="2Oq$k0">
<node concept="2GrUjf" id="2AC52hU4YBZ" role="2Oq$k0">
<ref role="2Gs0qQ" node="2AC52hU4T$e" resolve="decl" />
<node concept="3cpWs8" id="3g6selKPZqR" role="3cqZAp">
<node concept="3cpWsn" id="3g6selKPZqU" role="3cpWs9">
<property role="TrG5h" value="name" />
<node concept="17QB3L" id="3g6selKPZqP" role="1tU5fm" />
<node concept="10Nm6u" id="3g6selKQ7Lq" role="33vP2m" />
</node>
</node>
<node concept="Jncv_" id="3g6selKPWPn" role="3cqZAp">
<ref role="JncvD" to="b83y:2U2uJPpguJc" resolve="SortLattice" />
<node concept="3clFbS" id="3g6selKPWPr" role="Jncv$">
<node concept="3clFbF" id="3g6selKQ01C" role="3cqZAp">
<node concept="37vLTI" id="3g6selKQ0oV" role="3clFbG">
<node concept="37vLTw" id="3g6selKQ01A" role="37vLTJ">
<ref role="3cqZAo" node="3g6selKPZqU" resolve="name" />
</node>
<node concept="2OqwBi" id="3g6selKQ3Ne" role="37vLTx">
<node concept="2OqwBi" id="3g6selKQ2L6" role="2Oq$k0">
<node concept="2OqwBi" id="3g6selKQ1Y8" role="2Oq$k0">
<node concept="Jnkvi" id="3g6selKQ1LC" role="2Oq$k0">
<ref role="1M0zk5" node="3g6selKPWPt" resolve="sortLattice" />
</node>
<node concept="3TrEf2" id="3g6selKQ2qk" role="2OqNvi">
<ref role="3Tt5mk" to="b83y:2U2uJPplZWT" resolve="lattice" />
</node>
</node>
<node concept="3TrEf2" id="3g6selKQ3in" role="2OqNvi">
<ref role="3Tt5mk" to="uu1k:6fy2FM6nETA" resolve="constructor" />
</node>
</node>
<node concept="2qgKlT" id="2AC52hU4YC0" role="2OqNvi">
<ref role="37wK5l" to="pgas:2AC52hU4WDH" resolve="getOutputSorts" />
<node concept="3TrcHB" id="3g6selKQ4ai" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
<node concept="1uHKPH" id="2AC52hU51ru" role="2OqNvi" />
</node>
</node>
<node concept="3Tqbb2" id="2AC52hU51YL" role="1tU5fm">
<ref role="ehGHo" to="b83y:2U2uJPpguJc" resolve="SortLattice" />
</node>
<node concept="JncvC" id="3g6selKPWPt" role="JncvA">
<property role="TrG5h" value="sortLattice" />
<node concept="2jxLKc" id="3g6selKPWPu" role="1tU5fm" />
</node>
<node concept="2OqwBi" id="3g6selKPX7M" role="JncvB">
<node concept="2OqwBi" id="3g6selKPX7N" role="2Oq$k0">
<node concept="2GrUjf" id="3g6selKPX7O" role="2Oq$k0">
<ref role="2Gs0qQ" node="2AC52hU4T$e" resolve="decl" />
</node>
<node concept="2qgKlT" id="3g6selKPX7P" role="2OqNvi">
<ref role="37wK5l" to="pgas:2AC52hU4WDH" resolve="getOutputSorts" />
</node>
</node>
<node concept="1uHKPH" id="3g6selKPX7Q" role="2OqNvi" />
</node>
</node>
<node concept="3cpWs8" id="2AC52hU9JXI" role="3cqZAp">
<node concept="3cpWsn" id="2AC52hU9JXJ" role="3cpWs9">
<property role="TrG5h" value="name" />
<node concept="17QB3L" id="2AC52hU9JWl" role="1tU5fm" />
<node concept="2OqwBi" id="2AC52hU9JXK" role="33vP2m">
<node concept="2OqwBi" id="2AC52hU9JXL" role="2Oq$k0">
<node concept="2OqwBi" id="2AC52hU9JXM" role="2Oq$k0">
<node concept="37vLTw" id="2AC52hU9JXN" role="2Oq$k0">
<ref role="3cqZAo" node="2AC52hU4YBX" resolve="sort" />
<node concept="Jncv_" id="3g6selKPYvY" role="3cqZAp">
<ref role="JncvD" to="b83y:2_58u12cYwo" resolve="SortConcept" />
<node concept="3clFbS" id="3g6selKPYw2" role="Jncv$">
<node concept="3clFbF" id="3g6selKQ4mP" role="3cqZAp">
<node concept="37vLTI" id="3g6selKQ4Cm" role="3clFbG">
<node concept="2OqwBi" id="3g6selKQ5A_" role="37vLTx">
<node concept="2OqwBi" id="3g6selKQ4Nj" role="2Oq$k0">
<node concept="Jnkvi" id="3g6selKQ4CN" role="2Oq$k0">
<ref role="1M0zk5" node="3g6selKPYw4" resolve="sortConcept" />
</node>
<node concept="3TrEf2" id="3g6selKQ54F" role="2OqNvi">
<ref role="3Tt5mk" to="b83y:2_58u12cYws" resolve="sort" />
</node>
</node>
<node concept="3TrEf2" id="2AC52hU9JXO" role="2OqNvi">
<ref role="3Tt5mk" to="b83y:2U2uJPplZWT" resolve="lattice" />
<node concept="3TrcHB" id="3g6selKQ63w" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
<node concept="3TrEf2" id="2AC52hU9JXP" role="2OqNvi">
<ref role="3Tt5mk" to="uu1k:6fy2FM6nETA" resolve="constructor" />
<node concept="37vLTw" id="3g6selKQ4mO" role="37vLTJ">
<ref role="3cqZAo" node="3g6selKPZqU" resolve="name" />
</node>
</node>
<node concept="3TrcHB" id="2AC52hU9JXQ" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
<node concept="JncvC" id="3g6selKPYw4" role="JncvA">
<property role="TrG5h" value="sortConcept" />
<node concept="2jxLKc" id="3g6selKPYw5" role="1tU5fm" />
</node>
<node concept="2OqwBi" id="3g6selKPYFc" role="JncvB">
<node concept="2OqwBi" id="3g6selKPYFd" role="2Oq$k0">
<node concept="2GrUjf" id="3g6selKPYFe" role="2Oq$k0">
<ref role="2Gs0qQ" node="2AC52hU4T$e" resolve="decl" />
</node>
<node concept="2qgKlT" id="3g6selKPYFf" role="2OqNvi">
<ref role="37wK5l" to="pgas:2AC52hU4WDH" resolve="getOutputSorts" />
</node>
</node>
<node concept="1uHKPH" id="3g6selKPYFg" role="2OqNvi" />
</node>
</node>
<node concept="3cpWs8" id="2AC52hU5a7$" role="3cqZAp">
......@@ -3608,8 +3663,8 @@
</node>
</node>
<node concept="3EllGN" id="2AC52hU5a7A" role="33vP2m">
<node concept="37vLTw" id="2AC52hU9JXR" role="3ElVtu">
<ref role="3cqZAo" node="2AC52hU9JXJ" resolve="name" />
<node concept="37vLTw" id="3g6selKQ7c_" role="3ElVtu">
<ref role="3cqZAo" node="3g6selKPZqU" resolve="name" />
</node>
<node concept="37vLTw" id="2AC52hU5a7G" role="3ElQJh">
<ref role="3cqZAo" node="2AC52hU4PW8" resolve="groupedBySort" />
......@@ -3629,8 +3684,8 @@
</node>
</node>
<node concept="3EllGN" id="2AC52hU5iiK" role="37vLTJ">
<node concept="37vLTw" id="2AC52hU9KEZ" role="3ElVtu">
<ref role="3cqZAo" node="2AC52hU9JXJ" resolve="name" />
<node concept="37vLTw" id="3g6selKQ85z" role="3ElVtu">
<ref role="3cqZAo" node="3g6selKPZqU" resolve="name" />
</node>
<node concept="37vLTw" id="2AC52hU5hAX" role="3ElQJh">
<ref role="3cqZAo" node="2AC52hU4PW8" resolve="groupedBySort" />
......@@ -3641,8 +3696,8 @@
<node concept="3clFbF" id="2AC52hU5lgZ" role="3cqZAp">
<node concept="2OqwBi" id="2AC52hU5pl1" role="3clFbG">
<node concept="3EllGN" id="2AC52hU5lAP" role="2Oq$k0">
<node concept="37vLTw" id="2AC52hU9KGt" role="3ElVtu">
<ref role="3cqZAo" node="2AC52hU9JXJ" resolve="name" />
<node concept="37vLTw" id="3g6selKQ85B" role="3ElVtu">
<ref role="3cqZAo" node="3g6selKPZqU" resolve="name" />
</node>
<node concept="37vLTw" id="2AC52hU5lgX" role="3ElQJh">
<ref role="3cqZAo" node="2AC52hU4PW8" resolve="groupedBySort" />
......@@ -3672,8 +3727,8 @@
</node>
</node>
<node concept="3EllGN" id="13xoOqI1$QO" role="2Oq$k0">
<node concept="37vLTw" id="13xoOqI1_qr" role="3ElVtu">
<ref role="3cqZAo" node="2AC52hU9JXJ" resolve="name" />
<node concept="37vLTw" id="3g6selKQ8Fm" role="3ElVtu">
<ref role="3cqZAo" node="3g6selKPZqU" resolve="name" />
</node>
<node concept="37vLTw" id="13xoOqI1zFO" role="3ElQJh">
<ref role="3cqZAo" node="2AC52hU4PW8" resolve="groupedBySort" />
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment