Skip to content

Commit

Permalink
Merge branch 'refactor/su'
Browse files Browse the repository at this point in the history
  • Loading branch information
Tamas Szabo committed Jan 28, 2016
2 parents 2a7cc73 + c22d98a commit 136c141
Show file tree
Hide file tree
Showing 20 changed files with 2,069 additions and 2,798 deletions.
14 changes: 10 additions & 4 deletions ...uages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<model ref="r:742f344d-4dc4-4862-992c-4bc94b094870(com.mbeddr.mpsutil.dev.build)">
<persistence version="9" />
<languages>
<use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="0" />
<use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="1" />
<use id="479c7a8c-02f9-43b5-9139-d910cb22f298" name="jetbrains.mps.core.xml" version="0" />
<use id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests" version="0" />
<use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="-1" />
<use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="-1" />
<use id="479c7a8c-02f9-43b5-9139-d910cb22f298" name="jetbrains.mps.core.xml" version="-1" />
<use id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests" version="-1" />
</languages>
<imports>
<import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
Expand Down Expand Up @@ -9140,6 +9140,12 @@
<ref role="3bR37D" to="90a9:7klUZA6XM5K" resolve="de.slisson.mps.conditionalEditor.runtime" />
</node>
</node>
<node concept="1SiIV0" id="4e_ywBK8_oI" role="3bR37C">
<node concept="3bR9La" id="4e_ywBK8_oJ" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" node="5GUwywcVeK8" resolve="com.mbeddr.mpsutil.common" />
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="7Pr7tifzjKW" role="3989C9">
Expand Down
2 changes: 2 additions & 0 deletions code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/base.mpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
<dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
<dependency reexport="false">9d368018-badb-4569-9884-4b463e4f6696(de.slisson.mps.conditionalEditor.runtime)</dependency>
<dependency reexport="false">c7a315e6-1d93-4186-85bc-2dfafd1ccc21(com.mbeddr.mpsutil.common)</dependency>
</dependencies>
<usedDevKits>
<usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
Expand Down Expand Up @@ -157,6 +158,7 @@
<module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
<module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
<module reference="fd28f7ed-d277-425b-a282-684ac4cbead6(com.mbeddr.mpsutil.breadcrumb.runtime)" version="0" />
<module reference="c7a315e6-1d93-4186-85bc-2dfafd1ccc21(com.mbeddr.mpsutil.common)" version="0" />
<module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
<module reference="1338ba73-5059-479b-a929-de86597a62b8(com.mbeddr.mpsutil.jung.pluginSolution)" version="0" />
<module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
Expand Down
679 changes: 568 additions & 111 deletions code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
View file

Large diffs are not rendered by default.

110 changes: 89 additions & 21 deletions code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/typesystem.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<model ref="r:1b0f275e-bd62-4f6e-8c4b-51b05d651a63(com.mbeddr.core.base.typesystem)">
<persistence version="9" />
<languages>
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="2" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
</languages>
<imports>
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
Expand All @@ -15,6 +15,7 @@
<import index="u78q" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typesystem.inference(MPS.Core/)" />
<import index="bdcd" ref="r:d5deda81-7a35-4c2b-bda1-1fdc1db99e3b(com.mbeddr.mpsutil.suppresswarning.structure)" />
<import index="dqn8" ref="r:6f177fc3-8a05-4826-8d08-fd8676623247(com.mbeddr.mpsutil.suppresswarning.behavior)" />
<import index="gtp9" ref="r:007d0985-20e2-4d70-80f1-d0de1aff1076(com.mbeddr.mpsutil.common.graph)" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
<import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
</imports>
Expand Down Expand Up @@ -97,7 +98,7 @@
<child id="1068580123161" name="ifTrue" index="3clFbx" />
<child id="1206060520071" name="elsifClauses" index="3eNLev" />
</concept>
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" index="3clFbS">
<child id="1068581517665" name="statement" index="3cqZAp" />
</concept>
<concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
Expand Down Expand Up @@ -2110,32 +2111,99 @@
<node concept="18kY7G" id="59HbAIOYAvY">
<property role="TrG5h" value="check_IDetectCycle" />
<node concept="3clFbS" id="59HbAIOYAvZ" role="18ibNy">
<node concept="3clFbJ" id="59HbAIOYAF5" role="3cqZAp">
<node concept="3clFbS" id="59HbAIOYAF6" role="3clFbx">
<node concept="2MkqsV" id="59HbAIOYAV$" role="3cqZAp">
<node concept="Xl_RD" id="59HbAIOYAWE" role="2MkJ7o">
<property role="Xl_RC" value="cycle detected" />
<node concept="3cpWs8" id="4ISByPoWlUh" role="3cqZAp">
<node concept="3cpWsn" id="4ISByPoWlUi" role="3cpWs9">
<property role="TrG5h" value="scc" />
<node concept="2hMVRd" id="4ISByPoWlU7" role="1tU5fm">
<node concept="3Tqbb2" id="4ISByPoWlUa" role="2hN53Y">
<ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
</node>
<node concept="1YBJjd" id="59HbAIOYAXC" role="2OEOjV">
<ref role="1YBMHb" node="59HbAIOYAw1" resolve="idc" />
</node>
<node concept="2OqwBi" id="4ISByPoWlUj" role="33vP2m">
<node concept="1YBJjd" id="4ISByPoWlUk" role="2Oq$k0">
<ref role="1YBMHb" node="59HbAIOYAw1" resolve="source" />
</node>
<node concept="2ODE4t" id="59HbAIP5dwa" role="2OEWyd">
<ref role="2ODJFN" to="tpck:h0TrG11" resolve="name" />
<node concept="2qgKlT" id="4ISByPoWlUl" role="2OqNvi">
<ref role="37wK5l" to="hwgx:17fjvcLFUH5" resolve="getCyclicDependencyElements" />
</node>
</node>
</node>
<node concept="2OqwBi" id="59HbAIOYAGX" role="3clFbw">
<node concept="1YBJjd" id="59HbAIOYAFn" role="2Oq$k0">
<ref role="1YBMHb" node="59HbAIOYAw1" resolve="idc" />
</node>
<node concept="3clFbJ" id="4ISByPoWn0U" role="3cqZAp">
<node concept="3clFbS" id="4ISByPoWn0W" role="3clFbx">
<node concept="2Gpval" id="17fjvcLFeoG" role="3cqZAp">
<node concept="2GrKxI" id="17fjvcLFeoI" role="2Gsz3X">
<property role="TrG5h" value="target" />
</node>
<node concept="3clFbS" id="17fjvcLFeoK" role="2LFqv$">
<node concept="3cpWs8" id="4ISByPoZ7jd" role="3cqZAp">
<node concept="3cpWsn" id="4ISByPoZ7je" role="3cpWs9">
<property role="TrG5h" value="elements" />
<node concept="2hMVRd" id="4ISByPoZ7j5" role="1tU5fm">
<node concept="3Tqbb2" id="4ISByPoZ7j8" role="2hN53Y" />
</node>
<node concept="2OqwBi" id="4ISByPoZ7jf" role="33vP2m">
<node concept="1YBJjd" id="4ISByPoZ7jg" role="2Oq$k0">
<ref role="1YBMHb" node="59HbAIOYAw1" resolve="source" />
</node>
<node concept="2qgKlT" id="4ISByPoZ7jh" role="2OqNvi">
<ref role="37wK5l" to="hwgx:17fjvcLF7UR" resolve="traceBackElementInCycle" />
<node concept="2GrUjf" id="4ISByPoZ7ji" role="37wK5m">
<ref role="2Gs0qQ" node="17fjvcLFeoI" resolve="target" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="17fjvcLFfxj" role="3cqZAp">
<node concept="3clFbS" id="17fjvcLFfxl" role="3clFbx">
<node concept="2Gpval" id="4ISByPoZ7Gn" role="3cqZAp">
<node concept="2GrKxI" id="4ISByPoZ7Gp" role="2Gsz3X">
<property role="TrG5h" value="element" />
</node>
<node concept="3clFbS" id="4ISByPoZ7Gr" role="2LFqv$">
<node concept="2MkqsV" id="17fjvcLFfFc" role="3cqZAp">
<node concept="2OqwBi" id="2G8yZXxNY_o" role="2MkJ7o">
<node concept="1YBJjd" id="2G8yZXxNYya" role="2Oq$k0">
<ref role="1YBMHb" node="59HbAIOYAw1" resolve="source" />
</node>
<node concept="2qgKlT" id="2G8yZXxNYJK" role="2OqNvi">
<ref role="37wK5l" to="hwgx:2G8yZXxNStd" resolve="getErrorMessageForElementInCycle" />
</node>
</node>
<node concept="2GrUjf" id="4ISByPoZ7HO" role="2OEOjV">
<ref role="2Gs0qQ" node="4ISByPoZ7Gp" resolve="element" />
</node>
</node>
</node>
<node concept="37vLTw" id="4ISByPoZ7GS" role="2GsD0m">
<ref role="3cqZAo" node="4ISByPoZ7je" resolve="elements" />
</node>
</node>
</node>
<node concept="3y3z36" id="17fjvcLFfEP" role="3clFbw">
<node concept="10Nm6u" id="17fjvcLFfEW" role="3uHU7w" />
<node concept="37vLTw" id="4ISByPoZ7FW" role="3uHU7B">
<ref role="3cqZAo" node="4ISByPoZ7je" resolve="elements" />
</node>
</node>
</node>
</node>
<node concept="37vLTw" id="4ISByPoWmU4" role="2GsD0m">
<ref role="3cqZAo" node="4ISByPoWlUi" resolve="scc" />
</node>
</node>
<node concept="2qgKlT" id="59HbAIOYAV5" role="2OqNvi">
<ref role="37wK5l" to="hwgx:59HbAIOYtvQ" resolve="isInvolvedInCycle" />
</node>
<node concept="3y3z36" id="4ISByPp7iyt" role="3clFbw">
<node concept="10Nm6u" id="4ISByPp7i_n" role="3uHU7w" />
<node concept="37vLTw" id="4ISByPp7il1" role="3uHU7B">
<ref role="3cqZAo" node="4ISByPoWlUi" resolve="scc" />
</node>
</node>
</node>
</node>
<node concept="1YaCAy" id="59HbAIOYAw1" role="1YuTPh">
<property role="TrG5h" value="idc" />
<property role="TrG5h" value="source" />
<ref role="1YaFvo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
</node>
</node>
Expand Down
69 changes: 0 additions & 69 deletions ...languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/typesystem.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1217,75 +1217,6 @@
</node>
</node>
</node>
<node concept="3clFbH" id="5KjzTW_mKUS" role="3cqZAp" />
<node concept="3clFbJ" id="6Kj2zNCr69C" role="3cqZAp">
<node concept="3clFbS" id="6Kj2zNCr69D" role="3clFbx">
<node concept="3cpWs8" id="69lKCLH_PZL" role="3cqZAp">
<node concept="3cpWsn" id="69lKCLH_PZM" role="3cpWs9">
<property role="TrG5h" value="allImports" />
<node concept="3uibUv" id="69lKCLH_PZN" role="1tU5fm">
<ref role="3uigEE" to="33ny:~Set" resolve="Set" />
<node concept="3Tqbb2" id="69lKCLH_PZO" role="11_B2D">
<ref role="ehGHo" to="x27k:5_l8w1EmTcX" resolve="Module" />
</node>
</node>
<node concept="2OqwBi" id="69lKCLH_PZP" role="33vP2m">
<node concept="1YBJjd" id="69lKCLH_PZQ" role="2Oq$k0">
<ref role="1YBMHb" node="6OxpEKG0kA5" resolve="mod" />
</node>
<node concept="2qgKlT" id="69lKCLH_PZR" role="2OqNvi">
<ref role="37wK5l" to="qd6m:35JkqCBlGGT" resolve="getAllImportedModules" />
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="69lKCLH_PZU" role="3cqZAp">
<node concept="3clFbS" id="69lKCLH_PZV" role="3clFbx">
<node concept="a7r0C" id="69lKCLH_Q0r" role="3cqZAp">
<node concept="3cpWs3" id="69lKCLHA2be" role="a7wSD">
<node concept="3cpWsa" id="69lKCLHA2bh" role="3uHU7w">
<ref role="3cqZAo" node="69lKCLH_PZM" resolve="allImports" />
</node>
<node concept="Xl_RD" id="69lKCLH_Q0u" role="3uHU7B">
<property role="Xl_RC" value="circular import detected (use visualization to see the path): " />
</node>
</node>
<node concept="1YBJjd" id="69lKCLH_Q0v" role="2OEOjV">
<ref role="1YBMHb" node="6OxpEKG0kA5" resolve="mod" />
</node>
<node concept="2ODE4t" id="69lKCLH_Q0y" role="2OEWyd">
<ref role="2ODJFN" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
<node concept="2OqwBi" id="69lKCLH_Q0j" role="3clFbw">
<node concept="3cpWsa" id="69lKCLH_PZY" role="2Oq$k0">
<ref role="3cqZAo" node="69lKCLH_PZM" resolve="allImports" />
</node>
<node concept="liA8E" id="69lKCLH_Q0p" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Set.contains(java.lang.Object):boolean" resolve="contains" />
<node concept="1YBJjd" id="69lKCLH_Q0q" role="37wK5m">
<ref role="1YBMHb" node="6OxpEKG0kA5" resolve="mod" />
</node>
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="6Kj2zNCr69E" role="3clFbw">
<node concept="2qgKlT" id="6Kj2zNCr69G" role="2OqNvi">
<ref role="37wK5l" to="dqn8:7U3Fobb_8Eq" resolve="isNotSuppressed" />
<node concept="1YBJjd" id="6Kj2zNCr6BL" role="37wK5m">
<ref role="1YBMHb" node="6OxpEKG0kA5" resolve="mod" />
</node>
</node>
<node concept="35c_gC" id="1vun1LW1xKU" role="2Oq$k0">
<ref role="35c_gD" to="bdcd:7U3Fobb_8El" resolve="SuppressWarnings" />
</node>
</node>
</node>
<node concept="3clFbH" id="6Kj2zNCrV$q" role="3cqZAp" />
<node concept="3clFbH" id="69lKCLH_PZi" role="3cqZAp" />
<node concept="3clFbH" id="69lKCLH_PZj" role="3cqZAp" />
</node>
<node concept="1YaCAy" id="6OxpEKG0kA5" role="1YuTPh">
<property role="TrG5h" value="mod" />
Expand Down
Loading

0 comments on commit 136c141

Please sign in to comment.