Skip to content

Commit

Permalink
core: ran outstanding migrations
Browse files Browse the repository at this point in the history
  • Loading branch information
@stephaneberle9
stephaneberle9 committed Nov 17, 2020
1 parent 4c83883 commit e27cea3
Show file tree
Hide file tree
Showing 8 changed files with 84 additions and 88 deletions.
4 changes: 0 additions & 4 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 @@ -117,15 +117,11 @@
<dependency reexport="false">86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)</dependency>
</dependencies>
<languageVersions>
<language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="5" />
<language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
<language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
<language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
<language slang="l:b92f861d-0184-446d-b88b-6dcf0e070241:com.mbeddr.mpsutil.intentions" version="0" />
<language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
<language slang="l:d2a1d976-43a2-462f-ac3a-9b258ced839d:com.mbeddr.mpsutil.multilingual.baseLanguage" version="0" />
<language slang="l:23f985f2-965f-4af1-aee8-a32677429514:com.mbeddr.mpsutil.multilingual.common" version="0" />
<language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
<language slang="l:442d3b7d-fe4a-4293-a7c1-6744d440ecaa:com.mbeddr.mpsutil.richstring" version="0" />
<language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
<language slang="l:1919c723-b60b-4592-9318-9ce96d91da44:de.itemis.mps.editor.celllayout" version="0" />
Expand Down
18 changes: 9 additions & 9 deletions ...languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2838,7 +2838,7 @@
<node concept="3clFbF" id="2cvVnUv6DBS" role="3cqZAp">
<node concept="2OqwBi" id="2cvVnUv6DBT" role="3clFbG">
<node concept="37vLTw" id="2cvVnUv6DBU" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6DBK" />
<ref role="3cqZAo" node="2cvVnUv6DBK" resolve="container" />
</node>
<node concept="3Tsc0h" id="2cvVnUv6DBV" role="2OqNvi">
<ref role="3TtcxE" to="51wr:7$0wAVob45Q" resolve="templates" />
Expand Down Expand Up @@ -2894,7 +2894,7 @@
</node>
<node concept="2OqwBi" id="2cvVnUv6DD9" role="33vP2m">
<node concept="37vLTw" id="2cvVnUv6DDa" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6DCX" />
<ref role="3cqZAo" node="2cvVnUv6DCX" resolve="preferenceModel" />
</node>
<node concept="liA8E" id="2cvVnUv6DDb" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getReference()" resolve="getReference" />
Expand Down Expand Up @@ -2925,7 +2925,7 @@
<node concept="10QFUN" id="2cvVnUv6DDn" role="1eOMHV">
<node concept="2OqwBi" id="2cvVnUv6DDo" role="10QFUP">
<node concept="37vLTw" id="2cvVnUv6DDp" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6DDe" />
<ref role="3cqZAo" node="2cvVnUv6DDe" resolve="myModel" />
</node>
<node concept="liA8E" id="2cvVnUv6DDq" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
Expand All @@ -2941,14 +2941,14 @@
<node concept="3clFbF" id="2cvVnUv6DDs" role="3cqZAp">
<node concept="2OqwBi" id="2cvVnUv6DDt" role="3clFbG">
<node concept="37vLTw" id="2cvVnUv6DDu" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6DDk" />
<ref role="3cqZAo" node="2cvVnUv6DDk" resolve="module" />
</node>
<node concept="liA8E" id="2cvVnUv6DDv" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~AbstractModule.addDependency(org.jetbrains.mps.openapi.module.SModuleReference,boolean)" resolve="addDependency" />
<node concept="2OqwBi" id="2cvVnUv6DDw" role="37wK5m">
<node concept="2OqwBi" id="2cvVnUv6DDx" role="2Oq$k0">
<node concept="37vLTw" id="2cvVnUv6DDy" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6DCX" />
<ref role="3cqZAo" node="2cvVnUv6DCX" resolve="preferenceModel" />
</node>
<node concept="liA8E" id="2cvVnUv6DDz" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
Expand All @@ -2969,7 +2969,7 @@
<node concept="1eOMI4" id="2cvVnUv6DDC" role="2Oq$k0">
<node concept="10QFUN" id="2cvVnUv6DDD" role="1eOMHV">
<node concept="37vLTw" id="2cvVnUv6DDE" role="10QFUP">
<ref role="3cqZAo" node="2cvVnUv6DDe" />
<ref role="3cqZAo" node="2cvVnUv6DDe" resolve="myModel" />
</node>
<node concept="3uibUv" id="2cvVnUv6DDF" role="10QFUM">
<ref role="3uigEE" to="w1kc:~SModelInternal" resolve="SModelInternal" />
Expand All @@ -2979,7 +2979,7 @@
<node concept="liA8E" id="2cvVnUv6DDG" role="2OqNvi">
<ref role="37wK5l" to="w1kc:~SModelInternal.addModelImport(org.jetbrains.mps.openapi.model.SModelReference)" resolve="addModelImport" />
<node concept="37vLTw" id="2cvVnUv6DDH" role="37wK5m">
<ref role="3cqZAo" node="2cvVnUv6DD7" />
<ref role="3cqZAo" node="2cvVnUv6DD7" resolve="sPrefModelRef" />
</node>
</node>
</node>
Expand All @@ -3006,7 +3006,7 @@
<node concept="2ZBlsa" id="2cvVnUv6DE3" role="37vLTx" />
<node concept="2OqwBi" id="2cvVnUv6DDU" role="37vLTJ">
<node concept="37vLTw" id="2cvVnUv6DDV" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6DDM" />
<ref role="3cqZAo" node="2cvVnUv6DDM" resolve="node" />
</node>
<node concept="3TrEf2" id="2cvVnUv6DDW" role="2OqNvi">
<ref role="3Tt5mk" to="51wr:7$0wAVofq6m" resolve="template" />
Expand All @@ -3017,7 +3017,7 @@
<node concept="3clFbH" id="2cvVnUv6DDX" role="3cqZAp" />
<node concept="3clFbF" id="2cvVnUv6DDY" role="3cqZAp">
<node concept="37vLTw" id="2cvVnUv6DDZ" role="3clFbG">
<ref role="3cqZAo" node="2cvVnUv6DDM" />
<ref role="3cqZAo" node="2cvVnUv6DDM" resolve="node" />
</node>
</node>
<node concept="3clFbH" id="2cvVnUv6DE0" role="3cqZAp" />
Expand Down
28 changes: 14 additions & 14 deletions ...languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3446,7 +3446,7 @@
<node concept="3fqX7Q" id="2cvVnUv6Eq8" role="3uHU7B">
<node concept="2OqwBi" id="2cvVnUv6Eq9" role="3fr31v">
<node concept="37vLTw" id="2cvVnUv6Eqa" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6EpX" />
<ref role="3cqZAo" node="2cvVnUv6EpX" resolve="upperCase" />
</node>
<node concept="liA8E" id="2cvVnUv6Eqb" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
Expand All @@ -3459,7 +3459,7 @@
<node concept="3fqX7Q" id="2cvVnUv6Eqd" role="3uHU7w">
<node concept="2OqwBi" id="2cvVnUv6Eqe" role="3fr31v">
<node concept="37vLTw" id="2cvVnUv6Eqf" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6EpX" />
<ref role="3cqZAo" node="2cvVnUv6EpX" resolve="upperCase" />
</node>
<node concept="liA8E" id="2cvVnUv6Eqg" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
Expand All @@ -3473,7 +3473,7 @@
<node concept="3fqX7Q" id="2cvVnUv6Eqi" role="3uHU7w">
<node concept="2OqwBi" id="2cvVnUv6Eqj" role="3fr31v">
<node concept="37vLTw" id="2cvVnUv6Eqk" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6EpX" />
<ref role="3cqZAo" node="2cvVnUv6EpX" resolve="upperCase" />
</node>
<node concept="liA8E" id="2cvVnUv6Eql" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
Expand All @@ -3487,7 +3487,7 @@
<node concept="3fqX7Q" id="2cvVnUv6Eqn" role="3uHU7w">
<node concept="2OqwBi" id="2cvVnUv6Eqo" role="3fr31v">
<node concept="37vLTw" id="2cvVnUv6Eqp" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6EpX" />
<ref role="3cqZAo" node="2cvVnUv6EpX" resolve="upperCase" />
</node>
<node concept="liA8E" id="2cvVnUv6Eqq" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
Expand Down Expand Up @@ -3537,7 +3537,7 @@
</node>
<node concept="2OqwBi" id="2cvVnUv6EqJ" role="37vLTJ">
<node concept="37vLTw" id="2cvVnUv6EqK" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6Eq_" />
<ref role="3cqZAo" node="2cvVnUv6Eq_" resolve="sciNum" />
</node>
<node concept="3TrcHB" id="2cvVnUv6EqL" role="2OqNvi">
<ref role="3TsBF5" to="mj1l:1sHR4zGBFPp" resolve="prefix" />
Expand All @@ -3549,7 +3549,7 @@
<node concept="3clFbF" id="2cvVnUv6EqN" role="3cqZAp">
<node concept="2OqwBi" id="2cvVnUv6EqO" role="3clFbG">
<node concept="37vLTw" id="2cvVnUv6EqP" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6Eq_" />
<ref role="3cqZAo" node="2cvVnUv6Eq_" resolve="sciNum" />
</node>
<node concept="1OKiuA" id="2cvVnUv6EqQ" role="2OqNvi">
<node concept="1Q80Hx" id="2cvVnUv6EqY" role="lBI5i" />
Expand All @@ -3563,7 +3563,7 @@
<node concept="3clFbF" id="2cvVnUv6Er4" role="3cqZAp">
<node concept="2OqwBi" id="2cvVnUv6EqZ" role="3clFbG">
<node concept="37vLTw" id="2cvVnUv6EqV" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6Eq_" />
<ref role="3cqZAo" node="2cvVnUv6Eq_" resolve="sciNum" />
</node>
<node concept="1OKiuA" id="2cvVnUv6Er0" role="2OqNvi">
<node concept="1Q80Hx" id="2cvVnUv6Er1" role="lBI5i" />
Expand Down Expand Up @@ -3610,7 +3610,7 @@
<node concept="3fqX7Q" id="2cvVnUv6Ero" role="3uHU7B">
<node concept="2OqwBi" id="2cvVnUv6Erp" role="3fr31v">
<node concept="37vLTw" id="2cvVnUv6Erq" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6Erd" />
<ref role="3cqZAo" node="2cvVnUv6Erd" resolve="upperCase" />
</node>
<node concept="liA8E" id="2cvVnUv6Err" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
Expand All @@ -3623,7 +3623,7 @@
<node concept="3fqX7Q" id="2cvVnUv6Ert" role="3uHU7w">
<node concept="2OqwBi" id="2cvVnUv6Eru" role="3fr31v">
<node concept="37vLTw" id="2cvVnUv6Erv" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6Erd" />
<ref role="3cqZAo" node="2cvVnUv6Erd" resolve="upperCase" />
</node>
<node concept="liA8E" id="2cvVnUv6Erw" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
Expand All @@ -3637,7 +3637,7 @@
<node concept="3fqX7Q" id="2cvVnUv6Ery" role="3uHU7w">
<node concept="2OqwBi" id="2cvVnUv6Erz" role="3fr31v">
<node concept="37vLTw" id="2cvVnUv6Er$" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6Erd" />
<ref role="3cqZAo" node="2cvVnUv6Erd" resolve="upperCase" />
</node>
<node concept="liA8E" id="2cvVnUv6Er_" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
Expand All @@ -3651,7 +3651,7 @@
<node concept="3fqX7Q" id="2cvVnUv6ErB" role="3uHU7w">
<node concept="2OqwBi" id="2cvVnUv6ErC" role="3fr31v">
<node concept="37vLTw" id="2cvVnUv6ErD" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6Erd" />
<ref role="3cqZAo" node="2cvVnUv6Erd" resolve="upperCase" />
</node>
<node concept="liA8E" id="2cvVnUv6ErE" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
Expand Down Expand Up @@ -3701,7 +3701,7 @@
</node>
<node concept="2OqwBi" id="2cvVnUv6ErZ" role="37vLTJ">
<node concept="37vLTw" id="2cvVnUv6Es0" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6ErP" />
<ref role="3cqZAo" node="2cvVnUv6ErP" resolve="sciNum" />
</node>
<node concept="3TrcHB" id="2cvVnUv6Es1" role="2OqNvi">
<ref role="3TsBF5" to="mj1l:1sHR4zGBFPp" resolve="prefix" />
Expand All @@ -3713,7 +3713,7 @@
<node concept="3clFbF" id="2cvVnUv6Es3" role="3cqZAp">
<node concept="2OqwBi" id="2cvVnUv6Es4" role="3clFbG">
<node concept="37vLTw" id="2cvVnUv6Es5" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6ErP" />
<ref role="3cqZAo" node="2cvVnUv6ErP" resolve="sciNum" />
</node>
<node concept="1OKiuA" id="2cvVnUv6Es6" role="2OqNvi">
<node concept="1Q80Hx" id="2cvVnUv6Ese" role="lBI5i" />
Expand All @@ -3727,7 +3727,7 @@
<node concept="3clFbF" id="2cvVnUv6Esk" role="3cqZAp">
<node concept="2OqwBi" id="2cvVnUv6Esf" role="3clFbG">
<node concept="37vLTw" id="2cvVnUv6Esb" role="2Oq$k0">
<ref role="3cqZAo" node="2cvVnUv6ErP" />
<ref role="3cqZAo" node="2cvVnUv6ErP" resolve="sciNum" />
</node>
<node concept="1OKiuA" id="2cvVnUv6Esg" role="2OqNvi">
<node concept="1Q80Hx" id="2cvVnUv6Esh" role="lBI5i" />
Expand Down
12 changes: 6 additions & 6 deletions code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,7 @@
<node concept="2OqwBi" id="l3KBCjLr7e" role="3clFbG">
<node concept="2OqwBi" id="l3KBCjLr7f" role="2Oq$k0">
<node concept="37vLTw" id="l3KBCjLr7g" role="2Oq$k0">
<ref role="3cqZAo" node="l3KBCjLr7j" />
<ref role="3cqZAo" node="l3KBCjLr7j" resolve="it" />
</node>
<node concept="3n3YKJ" id="l3KBCjLr7h" role="2OqNvi" />
</node>
Expand All @@ -1368,7 +1368,7 @@
<node concept="3clFbF" id="4QnOXkAYNP2" role="3cqZAp">
<node concept="2OqwBi" id="4QnOXkAYNP3" role="3clFbG">
<node concept="37vLTw" id="4QnOXkAYNP4" role="2Oq$k0">
<ref role="3cqZAo" node="4QnOXkAYNP6" />
<ref role="3cqZAo" node="4QnOXkAYNP6" resolve="it" />
</node>
<node concept="3n3YKJ" id="4QnOXkAYNP5" role="2OqNvi" />
</node>
Expand All @@ -1388,7 +1388,7 @@
<node concept="17R0WA" id="4QnOXkAYNPc" role="3clFbG">
<node concept="ub8z3" id="4QnOXkAYNPd" role="3uHU7w" />
<node concept="37vLTw" id="4QnOXkAYNPe" role="3uHU7B">
<ref role="3cqZAo" node="4QnOXkAYNPf" />
<ref role="3cqZAo" node="4QnOXkAYNPf" resolve="it" />
</node>
</node>
</node>
Expand Down Expand Up @@ -1493,7 +1493,7 @@
<node concept="2OqwBi" id="1zVqtvfWALW" role="3clFbG">
<node concept="2OqwBi" id="1zVqtvfWALX" role="2Oq$k0">
<node concept="37vLTw" id="1zVqtvfWALY" role="2Oq$k0">
<ref role="3cqZAo" node="l3KBCjLkU3" />
<ref role="3cqZAo" node="l3KBCjLkU3" resolve="it" />
</node>
<node concept="3n3YKJ" id="1zVqtvfWALZ" role="2OqNvi" />
</node>
Expand All @@ -1514,7 +1514,7 @@
<node concept="3clFbF" id="4QnOXkBj5Py" role="3cqZAp">
<node concept="2OqwBi" id="4QnOXkBj5Pz" role="3clFbG">
<node concept="37vLTw" id="4QnOXkBj5P$" role="2Oq$k0">
<ref role="3cqZAo" node="4QnOXkBj5PA" />
<ref role="3cqZAo" node="4QnOXkBj5PA" resolve="it" />
</node>
<node concept="3n3YKJ" id="4QnOXkBj5P_" role="2OqNvi" />
</node>
Expand All @@ -1534,7 +1534,7 @@
<node concept="17R0WA" id="4QnOXkBj5PG" role="3clFbG">
<node concept="ub8z3" id="4QnOXkBj5PH" role="3uHU7w" />
<node concept="37vLTw" id="4QnOXkBj5PI" role="3uHU7B">
<ref role="3cqZAo" node="4QnOXkBj5PJ" />
<ref role="3cqZAo" node="4QnOXkBj5PJ" resolve="it" />
</node>
</node>
</node>
Expand Down
Loading

0 comments on commit e27cea3

Please sign in to comment.