Skip to content

Commit

Permalink
Merge pull request #2467 from mbeddr/merge/mps20223
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexanderpann
alexanderpann authored Aug 13, 2024
2 parents 386ed54 + e8d1d70 commit b9dd807
Show file tree
Hide file tree
Showing 7 changed files with 585 additions and 412 deletions.
77 changes: 25 additions & 52 deletions ...guages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/intentions.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@
</concept>
</language>
<language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
<concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
<concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
<child id="1199569906740" name="parameter" index="1bW2Oz" />
<child id="1199569916463" name="body" index="1bW5cS" />
Expand Down Expand Up @@ -273,10 +272,10 @@
<concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
<reference id="1153944258490" name="variable" index="2Gs0qQ" />
</concept>
<concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
<concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
<concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
<concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
<concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
<concept id="1184963466173" name="jetbrains.mps.baseLanguage.collections.structure.ToArrayOperation" flags="nn" index="3_kTaI" />
<concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
<child id="1197932505799" name="map" index="3ElQJh" />
Expand Down Expand Up @@ -801,38 +800,12 @@
<node concept="2ShNRf" id="2yaxsm5o3KY" role="37wK5m">
<node concept="1pGfFk" id="jgTeXj2AHS" role="2ShVmc">
<ref role="37wK5l" to="2ahs:2yaxsm5jILI" resolve="CombinedInterpreter" />
<node concept="2OqwBi" id="48h5VLcj6ZO" role="37wK5m">
<node concept="2OqwBi" id="48h5VLcj6ZP" role="2Oq$k0">
<node concept="2OqwBi" id="48h5VLcj6ZQ" role="2Oq$k0">
<node concept="2YIFZM" id="48h5VLcj6ZR" role="2Oq$k0">
<ref role="1Pybhc" to="2ahs:6t6gMvcKSR1" resolve="CachedInterpreterFinder" />
<ref role="37wK5l" to="2ahs:6t6gMvcMFOM" resolve="getInstance" />
</node>
<node concept="liA8E" id="48h5VLcj6ZS" role="2OqNvi">
<ref role="37wK5l" to="2ahs:6t6gMvcMGib" resolve="findAllInterpreters" />
</node>
</node>
<node concept="3$u5V9" id="48h5VLcj6ZU" role="2OqNvi">
<node concept="1bVj0M" id="48h5VLcj6ZV" role="23t8la">
<node concept="3clFbS" id="48h5VLcj6ZW" role="1bW5cS">
<node concept="3clFbF" id="48h5VLcj6ZX" role="3cqZAp">
<node concept="2YIFZM" id="48h5VLcj6ZY" role="3clFbG">
<ref role="1Pybhc" to="2ahs:4jkUBhBVMPS" resolve="InterpreterRegistry" />
<ref role="37wK5l" to="2ahs:4jkUBhBVOKX" resolve="getInterpreterExecutable" />
<node concept="37vLTw" id="48h5VLcj6ZZ" role="37wK5m">
<ref role="3cqZAo" node="2SR9xrsN1rO" resolve="it" />
</node>
</node>
</node>
</node>
<node concept="gl6BB" id="2SR9xrsN1rO" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="2SR9xrsN1rP" role="1tU5fm" />
</node>
</node>
</node>
<node concept="2OqwBi" id="2PA_oGfbOk5" role="37wK5m">
<node concept="3_kTaI" id="2PA_oGfbQWl" role="2OqNvi" />
<node concept="2YIFZM" id="2PA_oGfbFGC" role="2Oq$k0">
<ref role="37wK5l" to="2ahs:2PA_oGfak8K" resolve="findAllInterpreterExecutables" />
<ref role="1Pybhc" to="2ahs:4jkUBhBVMPS" resolve="InterpreterRegistry" />
</node>
<node concept="3_kTaI" id="48h5VLcj702" role="2OqNvi" />
</node>
</node>
</node>
Expand Down Expand Up @@ -1007,15 +980,15 @@
<node concept="3clFbF" id="4yPv6wmQBIT" role="3cqZAp">
<node concept="2OqwBi" id="4yPv6wmQBXP" role="3clFbG">
<node concept="37vLTw" id="4yPv6wmQBIS" role="2Oq$k0">
<ref role="3cqZAo" node="2SR9xrsN1rQ" resolve="it" />
<ref role="3cqZAo" node="4yPv6wmQBkB" resolve="it" />
</node>
<node concept="2Rf3mk" id="4yPv6wmQCO$" role="2OqNvi" />
</node>
</node>
</node>
<node concept="gl6BB" id="2SR9xrsN1rQ" role="1bW2Oz">
<node concept="Rh6nW" id="4yPv6wmQBkB" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="2SR9xrsN1rR" role="1tU5fm" />
<node concept="2jxLKc" id="4yPv6wmQBkC" role="1tU5fm" />
</node>
</node>
</node>
Expand All @@ -1036,7 +1009,7 @@
<node concept="2OqwBi" id="4rj4sdBt67j" role="3clFbG">
<node concept="2JrnkZ" id="4rj4sdBt67k" role="2Oq$k0">
<node concept="37vLTw" id="4rj4sdBt67l" role="2JrQYb">
<ref role="3cqZAo" node="2SR9xrsN1rS" resolve="it" />
<ref role="3cqZAo" node="4rj4sdBt67o" resolve="it" />
</node>
</node>
<node concept="liA8E" id="4rj4sdBt67m" role="2OqNvi">
Expand All @@ -1048,9 +1021,9 @@
</node>
</node>
</node>
<node concept="gl6BB" id="2SR9xrsN1rS" role="1bW2Oz">
<node concept="Rh6nW" id="4rj4sdBt67o" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="2SR9xrsN1rT" role="1tU5fm" />
<node concept="2jxLKc" id="4rj4sdBt67p" role="1tU5fm" />
</node>
</node>
</node>
Expand Down Expand Up @@ -1088,7 +1061,7 @@
<node concept="liA8E" id="3$DH87aKa4T" role="2OqNvi">
<ref role="37wK5l" to="qdxw:3$DH87aGXjx" resolve="clearDependentNodes" />
<node concept="37vLTw" id="3$DH87aKa7P" role="37wK5m">
<ref role="3cqZAo" node="2SR9xrsN1rW" resolve="debuggable" />
<ref role="3cqZAo" node="3$DH87aK9L_" resolve="debuggable" />
</node>
</node>
</node>
Expand All @@ -1111,7 +1084,7 @@
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
<node concept="3cpWs3" id="4rj4sdBt5Dk" role="37wK5m">
<node concept="37vLTw" id="4rj4sdBt5Wg" role="3uHU7w">
<ref role="3cqZAo" node="2SR9xrsN1rU" resolve="dependency" />
<ref role="3cqZAo" node="4rj4sdBsE8U" resolve="dependency" />
</node>
<node concept="3cpWs3" id="4rj4sdBt4Sw" role="3uHU7B">
<node concept="3cpWs3" id="5TykNF$uAAK" role="3uHU7B">
Expand All @@ -1120,7 +1093,7 @@
</node>
<node concept="2OqwBi" id="6tcu$9nt9wv" role="3uHU7w">
<node concept="37vLTw" id="5TykNF$uABm" role="2Oq$k0">
<ref role="3cqZAo" node="2SR9xrsN1rW" resolve="debuggable" />
<ref role="3cqZAo" node="3$DH87aK9L_" resolve="debuggable" />
</node>
<node concept="2Iv5rx" id="6tcu$9nt9ww" role="2OqNvi" />
</node>
Expand All @@ -1141,10 +1114,10 @@
<node concept="liA8E" id="3$DH87aKb58" role="2OqNvi">
<ref role="37wK5l" to="qdxw:3$DH87aGNdp" resolve="registerDependentNode" />
<node concept="37vLTw" id="3$DH87aKb8Q" role="37wK5m">
<ref role="3cqZAo" node="2SR9xrsN1rW" resolve="debuggable" />
<ref role="3cqZAo" node="3$DH87aK9L_" resolve="debuggable" />
</node>
<node concept="37vLTw" id="4rj4sdBsF3T" role="37wK5m">
<ref role="3cqZAo" node="2SR9xrsN1rU" resolve="dependency" />
<ref role="3cqZAo" node="4rj4sdBsE8U" resolve="dependency" />
</node>
</node>
</node>
Expand All @@ -1157,7 +1130,7 @@
<node concept="liA8E" id="3$DH87aKbQF" role="2OqNvi">
<ref role="37wK5l" to="qdxw:3$DH87aG$ie" resolve="setShowDebugger" />
<node concept="37vLTw" id="3$DH87aKbU6" role="37wK5m">
<ref role="3cqZAo" node="2SR9xrsN1rW" resolve="debuggable" />
<ref role="3cqZAo" node="3$DH87aK9L_" resolve="debuggable" />
</node>
<node concept="37vLTw" id="3$DH87aKc0t" role="37wK5m">
<ref role="3cqZAo" node="3$DH87aKbhg" resolve="expanded" />
Expand All @@ -1166,18 +1139,18 @@
</node>
</node>
</node>
<node concept="gl6BB" id="2SR9xrsN1rU" role="1bW2Oz">
<node concept="Rh6nW" id="4rj4sdBsE8U" role="1bW2Oz">
<property role="TrG5h" value="dependency" />
<node concept="2jxLKc" id="2SR9xrsN1rV" role="1tU5fm" />
<node concept="2jxLKc" id="4rj4sdBsE8V" role="1tU5fm" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="gl6BB" id="2SR9xrsN1rW" role="1bW2Oz">
<node concept="Rh6nW" id="3$DH87aK9L_" role="1bW2Oz">
<property role="TrG5h" value="debuggable" />
<node concept="2jxLKc" id="2SR9xrsN1rX" role="1tU5fm" />
<node concept="2jxLKc" id="3$DH87aK9LA" role="1tU5fm" />
</node>
</node>
</node>
Expand Down Expand Up @@ -1347,7 +1320,7 @@
<node concept="3clFbF" id="$bJ0jgVdgU" role="3cqZAp">
<node concept="2OqwBi" id="$bJ0jgVdgW" role="3clFbG">
<node concept="37vLTw" id="$bJ0jgVdgX" role="2Oq$k0">
<ref role="3cqZAo" node="2SR9xrsN1rY" resolve="it" />
<ref role="3cqZAo" node="$bJ0jgVdh1" resolve="it" />
</node>
<node concept="2qgKlT" id="dfV14BYJk0" role="2OqNvi">
<ref role="37wK5l" to="hkt1:dfV14BYish" resolve="setDebuggedTest" />
Expand All @@ -1356,9 +1329,9 @@
</node>
</node>
</node>
<node concept="gl6BB" id="2SR9xrsN1rY" role="1bW2Oz">
<node concept="Rh6nW" id="$bJ0jgVdh1" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="2SR9xrsN1rZ" role="1tU5fm" />
<node concept="2jxLKc" id="$bJ0jgVdh2" role="1tU5fm" />
</node>
</node>
</node>
Expand Down
54 changes: 35 additions & 19 deletions code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
<import index="eoo2" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.nio.file(JDK/)" />
<import index="btm1" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.lang3(org.apache.commons/)" />
<import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
<import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
<import index="ddhc" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide(MPS.IDEA/)" />
<import index="b9kz" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.wm.ex(MPS.IDEA/)" />
<import index="ddhc" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide(MPS.IDEA/)" />
<import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
<import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
<import index="6xgk" ref="r:6e9ad488-5df2-49e4-8c01-8a7f3812adf7(jetbrains.mps.lang.scopes.runtime)" />
<import index="z1c5" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
Expand Down Expand Up @@ -132,7 +132,7 @@
<concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
</concept>
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
<child id="1188208488637" name="annotation" index="2AJF6D" />
</concept>
<concept id="1188220165133" name="jetbrains.mps.baseLanguage.structure.ArrayLiteral" flags="nn" index="2BsdOp">
Expand Down Expand Up @@ -287,7 +287,7 @@
<child id="1160998896846" name="condition" index="1gVkn0" />
<child id="1160998916832" name="message" index="1gVpfI" />
</concept>
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
</concept>
Expand Down Expand Up @@ -324,7 +324,7 @@
<concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
<child id="1184953288404" name="expression" index="3$I4v7" />
</concept>
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
<child id="1178549979242" name="visibility" index="1B3o_S" />
</concept>
<concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
Expand Down Expand Up @@ -540,7 +540,7 @@
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
</concept>
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
</language>
Expand All @@ -560,7 +560,7 @@
<property id="568377005202317272" name="default" index="3MtHw7" />
<property id="568377005202317271" name="technicalKey" index="3MtHw8" />
</concept>
<concept id="2510545900188083931" name="com.mbeddr.mpsutil.multilingual.common.structure.IMessageKeyHolder" flags="ngI" index="3ZOmrE">
<concept id="2510545900188083931" name="com.mbeddr.mpsutil.multilingual.common.structure.IMessageKeyHolder" flags="ng" index="3ZOmrE">
<reference id="2510545900188083932" name="key" index="3ZOmrH" />
</concept>
</language>
Expand Down Expand Up @@ -15949,23 +15949,39 @@
</node>
</node>
</node>
<node concept="3clFbJ" id="2F9YZd59Z3T" role="3cqZAp">
<node concept="3clFbS" id="2F9YZd59Z3V" role="3clFbx">
<node concept="3clFbF" id="2F9YZd5a4XN" role="3cqZAp">
<node concept="2OqwBi" id="2F9YZd5a76C" role="3clFbG">
<node concept="37vLTw" id="2F9YZd5a4XL" role="2Oq$k0">
<ref role="3cqZAo" node="17fjvcLCH2p" resolve="queue" />
</node>
<node concept="2Ke9KJ" id="2F9YZd5abU5" role="2OqNvi">
<node concept="2GrUjf" id="2F9YZd5ad39" role="25WWJ7">
<ref role="2Gs0qQ" node="17fjvcLCJUC" resolve="target" />
</node>
</node>
</node>
</node>
</node>
<node concept="3fqX7Q" id="2F9YZd59Z_x" role="3clFbw">
<node concept="2OqwBi" id="2F9YZd5a1Nb" role="3fr31v">
<node concept="37vLTw" id="2F9YZd5a0um" role="2Oq$k0">
<ref role="3cqZAo" node="17fjvcLCGZa" resolve="visited" />
</node>
<node concept="3JPx81" id="2F9YZd5a3mA" role="2OqNvi">
<node concept="2GrUjf" id="2F9YZd5a3H_" role="25WWJ7">
<ref role="2Gs0qQ" node="17fjvcLCJUC" resolve="target" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="37vLTw" id="17fjvcLCK9D" role="2GsD0m">
<ref role="3cqZAo" node="17fjvcLCJL_" resolve="targets" />
</node>
</node>
<node concept="3clFbF" id="17fjvcLCKcX" role="3cqZAp">
<node concept="2OqwBi" id="17fjvcLCKll" role="3clFbG">
<node concept="37vLTw" id="17fjvcLCKcV" role="2Oq$k0">
<ref role="3cqZAo" node="17fjvcLCH2p" resolve="queue" />
</node>
<node concept="X8dFx" id="17fjvcLCK$4" role="2OqNvi">
<node concept="37vLTw" id="17fjvcLCKAN" role="25WWJ7">
<ref role="3cqZAo" node="17fjvcLCJL_" resolve="targets" />
</node>
</node>
</node>
</node>
</node>
<node concept="3fqX7Q" id="17fjvcLCIBh" role="3clFbw">
<node concept="2OqwBi" id="17fjvcLCIPi" role="3fr31v">
Expand Down
Loading

0 comments on commit b9dd807

Please sign in to comment.