Skip to content

Commit

Permalink
mbeddr.core: refactoring the code to fix the MPS generation error (#2157
Browse files Browse the repository at this point in the history 
)

Co-authored-by: Daniel Ratiu <[email protected]>
  • Loading branch information
@bkolb @danielratiu
bkolb and danielratiu authored Jan 5, 2021
1 parent a67e399 commit 24d4136
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 54 deletions.
10 changes: 10 additions & 0 deletions code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5260,6 +5260,16 @@
<ref role="3bR37D" node="7uZw0yZ43L9" resolve="com.mbeddr.core.modules" />
</node>
</node>
<node concept="1SiIV0" id="48sN3l9KUch" role="3bR37C">
<node concept="3bR9La" id="48sN3l9KUci" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
</node>
</node>
<node concept="1SiIV0" id="48sN3l9KUcj" role="3bR37C">
<node concept="3bR9La" id="48sN3l9KUck" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6L0h" resolve="jetbrains.mps.baseLanguage.collections" />
</node>
</node>
</node>
<node concept="1SiIV0" id="3xxBtygh0L0" role="3bR37C">
<node concept="3bR9La" id="3xxBtygh0L1" role="1SiIV1">
Expand Down
2 changes: 2 additions & 0 deletions code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/buildconfig.mpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
<dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
<dependency reexport="false">d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)</dependency>
<dependency reexport="false">6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules)</dependency>
<dependency reexport="false">83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)</dependency>
<dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
</dependencies>
<languageVersions>
<language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="5" />
Expand Down
124 changes: 70 additions & 54 deletions ...m.mbeddr.core/languages/com.mbeddr.core.buildconfig/generator/template/[email protected]
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
<import index="48kf" ref="r:5f41c82d-84d1-4fb1-a1cf-6697d2365854(com.mbeddr.mpsutil.filepicker.behavior)" />
<import index="qd6m" ref="r:c4c3f7d3-0acf-4671-a134-5fab66c4e637(com.mbeddr.core.modules.behavior)" />
<import index="8oaq" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.io(org.apache.commons/)" />
<import index="tp2q" ref="r:00000000-0000-4000-0000-011c8959032e(jetbrains.mps.baseLanguage.collections.structure)" />
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
<import index="68mc" ref="r:2a10821d-612f-4a73-b7b0-ed6b57106321(com.mbeddr.mpsutil.filepicker.structure)" implicit="true" />
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
<import index="tp2q" ref="r:00000000-0000-4000-0000-011c8959032e(jetbrains.mps.baseLanguage.collections.structure)" implicit="true" />
</imports>
<registry>
<language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
Expand Down Expand Up @@ -478,6 +478,9 @@
<concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
<child id="1151688676805" name="elementType" index="_ZDj9" />
</concept>
<concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
<child id="1151689745422" name="elementType" index="A3Ik2" />
</concept>
<concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
<concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
<child id="1153944400369" name="variable" index="2Gsz3X" />
Expand Down Expand Up @@ -10660,69 +10663,82 @@
</node>
</node>
</node>
<node concept="3cpWs8" id="3ptpjvRmU3w" role="3cqZAp">
<node concept="3cpWsn" id="3ptpjvRmU3x" role="3cpWs9">
<property role="TrG5h" value="greediestPrefixedBy" />
<node concept="3Tqbb2" id="3ptpjvRmU3y" role="1tU5fm">
<ref role="ehGHo" to="tp2q:hzMilkf" resolve="MapEntry" />
<node concept="3cpWs8" id="3B7r_P3Nibl" role="3cqZAp">
<node concept="3cpWsn" id="3B7r_P3Nibm" role="3cpWs9">
<property role="TrG5h" value="myVariables" />
<node concept="A3Dl8" id="3B7r_P3NhTz" role="1tU5fm">
<node concept="3Tqbb2" id="3B7r_P3NhTA" role="A3Ik2">
<ref role="ehGHo" to="tp2q:hzMilkf" resolve="MapEntry" />
</node>
</node>
<node concept="2OqwBi" id="3ptpjvRmU3z" role="33vP2m">
<node concept="2OqwBi" id="3ptpjvRmU3$" role="2Oq$k0">
<node concept="2OqwBi" id="3ptpjvRmU3_" role="2Oq$k0">
<node concept="2OqwBi" id="3ptpjvRmU3A" role="2Oq$k0">
<node concept="1iwH7S" id="3ptpjvRmU3B" role="2Oq$k0" />
<node concept="1psM6Z" id="3ptpjvRmU3C" role="2OqNvi">
<ref role="1psM6Y" node="3ptpjvRn7kK" resolve="variables" />
</node>
</node>
<node concept="3zZkjj" id="3ptpjvRmU3D" role="2OqNvi">
<node concept="1bVj0M" id="3ptpjvRmU3E" role="23t8la">
<node concept="3clFbS" id="3ptpjvRmU3F" role="1bW5cS">
<node concept="3clFbF" id="3ptpjvRmU3G" role="3cqZAp">
<node concept="17QLQc" id="3ptpjvRmU3H" role="3clFbG">
<node concept="2OqwBi" id="3ptpjvRmU3I" role="3uHU7w">
<node concept="1PxgMI" id="3ptpjvRmU3J" role="2Oq$k0">
<node concept="chp4Y" id="3ptpjvRmU3K" role="3oSUPX">
<ref role="cht4Q" to="tpee:f$Xl_Og" resolve="StringLiteral" />
</node>
<node concept="2OqwBi" id="3ptpjvRmU3L" role="1m5AlR">
<node concept="30H73N" id="3ptpjvRmU3M" role="2Oq$k0" />
<node concept="3TrEf2" id="3ptpjvRmU3N" role="2OqNvi">
<ref role="3Tt5mk" to="tp2q:hzMiK3c" resolve="key" />
</node>
</node>
</node>
<node concept="3TrcHB" id="3ptpjvRmU3O" role="2OqNvi">
<ref role="3TsBF5" to="tpee:f$Xl_Oh" resolve="value" />
<node concept="2OqwBi" id="3B7r_P3Nibn" role="33vP2m">
<node concept="2OqwBi" id="3B7r_P3Nibo" role="2Oq$k0">
<node concept="1iwH7S" id="3B7r_P3Nibp" role="2Oq$k0" />
<node concept="1psM6Z" id="3B7r_P3Nibq" role="2OqNvi">
<ref role="1psM6Y" node="3ptpjvRn7kK" resolve="variables" />
</node>
</node>
<node concept="3zZkjj" id="3B7r_P3Nibr" role="2OqNvi">
<node concept="1bVj0M" id="3B7r_P3Nibs" role="23t8la">
<node concept="3clFbS" id="3B7r_P3Nibt" role="1bW5cS">
<node concept="3clFbF" id="3B7r_P3Nibu" role="3cqZAp">
<node concept="17QLQc" id="3B7r_P3Nibv" role="3clFbG">
<node concept="2OqwBi" id="3B7r_P3Nibw" role="3uHU7w">
<node concept="1PxgMI" id="3B7r_P3Nibx" role="2Oq$k0">
<node concept="chp4Y" id="3B7r_P3Niby" role="3oSUPX">
<ref role="cht4Q" to="tpee:f$Xl_Og" resolve="StringLiteral" />
</node>
<node concept="2OqwBi" id="3B7r_P3Nibz" role="1m5AlR">
<node concept="30H73N" id="3B7r_P3Nib$" role="2Oq$k0" />
<node concept="3TrEf2" id="3B7r_P3Nib_" role="2OqNvi">
<ref role="3Tt5mk" to="tp2q:hzMiK3c" resolve="key" />
</node>
</node>
<node concept="2OqwBi" id="3ptpjvRmU3P" role="3uHU7B">
<node concept="1PxgMI" id="3ptpjvRmU3Q" role="2Oq$k0">
<node concept="chp4Y" id="3ptpjvRmU3R" role="3oSUPX">
<ref role="cht4Q" to="tpee:f$Xl_Og" resolve="StringLiteral" />
</node>
<node concept="2OqwBi" id="3ptpjvRmU3S" role="1m5AlR">
<node concept="37vLTw" id="3ptpjvRmU3T" role="2Oq$k0">
<ref role="3cqZAo" node="3ptpjvRmU3W" resolve="it" />
</node>
<node concept="3TrEf2" id="3ptpjvRmU3U" role="2OqNvi">
<ref role="3Tt5mk" to="tp2q:hzMiK3c" resolve="key" />
</node>
</node>
</node>
<node concept="3TrcHB" id="3B7r_P3NibA" role="2OqNvi">
<ref role="3TsBF5" to="tpee:f$Xl_Oh" resolve="value" />
</node>
</node>
<node concept="2OqwBi" id="3B7r_P3NibB" role="3uHU7B">
<node concept="1PxgMI" id="3B7r_P3NibC" role="2Oq$k0">
<node concept="chp4Y" id="3B7r_P3NibD" role="3oSUPX">
<ref role="cht4Q" to="tpee:f$Xl_Og" resolve="StringLiteral" />
</node>
<node concept="2OqwBi" id="3B7r_P3NibE" role="1m5AlR">
<node concept="37vLTw" id="3B7r_P3NibF" role="2Oq$k0">
<ref role="3cqZAo" node="3B7r_P3NibI" resolve="it" />
</node>
<node concept="3TrcHB" id="3ptpjvRmU3V" role="2OqNvi">
<ref role="3TsBF5" to="tpee:f$Xl_Oh" resolve="value" />
<node concept="3TrEf2" id="3B7r_P3NibG" role="2OqNvi">
<ref role="3Tt5mk" to="tp2q:hzMiK3c" resolve="key" />
</node>
</node>
</node>
<node concept="3TrcHB" id="3B7r_P3NibH" role="2OqNvi">
<ref role="3TsBF5" to="tpee:f$Xl_Oh" resolve="value" />
</node>
</node>
</node>
<node concept="Rh6nW" id="3ptpjvRmU3W" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="3ptpjvRmU3X" role="1tU5fm" />
</node>
</node>
</node>
<node concept="Rh6nW" id="3B7r_P3NibI" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="3B7r_P3NibJ" role="1tU5fm" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="3ptpjvRmU3w" role="3cqZAp">
<node concept="3cpWsn" id="3ptpjvRmU3x" role="3cpWs9">
<property role="TrG5h" value="greediestPrefixedBy" />
<node concept="3Tqbb2" id="3ptpjvRmU3y" role="1tU5fm">
<ref role="ehGHo" to="tp2q:hzMilkf" resolve="MapEntry" />
</node>
<node concept="2OqwBi" id="3ptpjvRmU3z" role="33vP2m">
<node concept="2OqwBi" id="3ptpjvRmU3$" role="2Oq$k0">
<node concept="37vLTw" id="3B7r_P3NibK" role="2Oq$k0">
<ref role="3cqZAo" node="3B7r_P3Nibm" resolve="myVariables" />
</node>
<node concept="3zZkjj" id="3ptpjvRmU3Y" role="2OqNvi">
<node concept="1bVj0M" id="3ptpjvRmU3Z" role="23t8la">
Expand Down

0 comments on commit 24d4136

Please sign in to comment.