Merge remote-tracking branch 'origin/maintenance/mps20193'

# Conflicts: # code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageAccessories/com/mbeddr/core/modules/util.mps # code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/behavior.mps
mbeddr · Dec 31, 2020 · af28224 · af28224
2 parents 00f1f3a + 37c58d8
commit af28224
Show file tree

Hide file tree

Showing 6 changed files with 459 additions and 325 deletions.
diff --git a/...m.mbeddr.core/languages/com.mbeddr.core.modules.gen/generator/template/[email protected] b/...m.mbeddr.core/languages/com.mbeddr.core.modules.gen/generator/template/[email protected]
diff --git a/...guages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/structure.mps b/...guages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/structure.mps
@@ -162,7 +162,7 @@
       <property role="IQ2ns" value="1317894735999388455" />
       <ref role="20lvS9" node="1x_Jrt9Mwpu" resolve="GenModuleH" />
     </node>
-    <node concept="PrWs8" id="6clJcrKkzPu" role="PzmwI">
+    <node concept="PrWs8" id="4zr6ozueESC" role="PzmwI">
       <ref role="PrY4T" to="vs0r:6clJcrJZLbn" resolve="IChunkDependency" />
     </node>
   </node>
@@ -223,7 +223,7 @@
       <property role="IQ2ns" value="9066372830133005542" />
       <ref role="20lvS9" node="7RiewQ_kN5M" resolve="GenExtModule" />
     </node>
-    <node concept="PrWs8" id="6clJcrKkyyF" role="PzmwI">
+    <node concept="PrWs8" id="4zr6ozufee$" role="PzmwI">
       <ref role="PrY4T" to="vs0r:6clJcrJZLbn" resolve="IChunkDependency" />
     </node>
   </node>
@@ -369,7 +369,7 @@
       <property role="20lbJX" value="fLJekj4/_1" />
       <ref role="20lvS9" to="x27k:5jyom5fOqJ1" resolve="ExternalModule" />
     </node>
-    <node concept="PrWs8" id="1NwarDnRXZW" role="PzmwI">
+    <node concept="PrWs8" id="4zr6ozufeON" role="PzmwI">
       <ref role="PrY4T" to="vs0r:6clJcrJZLbn" resolve="IChunkDependency" />
     </node>
   </node>