Merge branch 'shadowmodels'

JetBrains · Mar 12, 2019 · 7c9a83c · 7c9a83c
2 parents f856efe + 690c6d7
commit 7c9a83c
Show file tree

Hide file tree

Showing 8 changed files with 1,362 additions and 732 deletions.
diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/constraints.mps b/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/constraints.mps
@@ -467,7 +467,7 @@
   </node>
   <node concept="1M2fIO" id="4EhVFrYZew3">
     <property role="3GE5qa" value="macros" />
-    <ref role="1M2myG" to="oyp0:4EhVFrYZevB" resolve="LocalLabelReferenceExpression" />
+    <ref role="1M2myG" to="oyp0:4EhVFrYZevB" resolve="LocalLabelReference" />
     <node concept="1N5Pfh" id="4EhVFrYZew4" role="1Mr941">
       <ref role="1N5Vy1" to="oyp0:4EhVFrYZevC" resolve="label" />
       <node concept="3dgokm" id="4EhVFrYZew6" role="1N6uqs">

diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/editor.mps b/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/editor.mps
@@ -1421,7 +1421,7 @@
   </node>
   <node concept="24kQdi" id="4EhVFrYZevM">
     <property role="3GE5qa" value="macros" />
-    <ref role="1XX52x" to="oyp0:4EhVFrYZevB" resolve="LocalLabelReferenceExpression" />
+    <ref role="1XX52x" to="oyp0:4EhVFrYZevB" resolve="LocalLabelReference" />
     <node concept="3EZMnI" id="4EhVFrZo2V$" role="2wV5jI">
       <node concept="l2Vlx" id="4EhVFrZo2V_" role="2iSdaV" />
       <node concept="1iCGBv" id="4EhVFrYZevO" role="3EZMnx">

diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/structure.mps b/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/structure.mps
@@ -404,8 +404,8 @@
   <node concept="1TIwiD" id="4EhVFrYZevB">
     <property role="EcuMT" value="5373338300159158247" />
     <property role="3GE5qa" value="macros" />
-    <property role="TrG5h" value="LocalLabelReferenceExpression" />
-    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
+    <property role="TrG5h" value="LocalLabelReference" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="4EhVFrYZevC" role="1TKVEi">
       <property role="IQ2ns" value="5373338300159158248" />
       <property role="20lmBu" value="reference" />

diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.debugview/models/pf.mps b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.debugview/models/pf.mps
diff --git a/...mps.shadowmodels.modelcheck.runtime/models/de.q60.mps.shadowmodels.modelcheck.runtime.mps b/...mps.shadowmodels.modelcheck.runtime/models/de.q60.mps.shadowmodels.modelcheck.runtime.mps
@@ -1261,19 +1261,19 @@
             <ref role="3cqZAo" node="5lWcBwJFmHz" resolve="shadowRoots" />
           </node>
           <node concept="3clFbS" id="5lWcBwKwSEn" role="2LFqv$">
-            <node concept="1QHqEK" id="5lWcBwKRw1r" role="3cqZAp">
-              <node concept="1QHqEC" id="5lWcBwKRw1t" role="1QHqEI">
-                <node concept="3clFbS" id="5lWcBwKRw1v" role="1bW5cS">
-                  <node concept="3clFbF" id="4S3q4Yl4cz2" role="3cqZAp">
-                    <node concept="2OqwBi" id="4S3q4Yl4fjr" role="3clFbG">
-                      <node concept="2YIFZM" id="4S3q4Yl4dUJ" role="2Oq$k0">
-                        <ref role="37wK5l" to="l6bp:7YhLqbpg02T" resolve="getInstance" />
-                        <ref role="1Pybhc" to="l6bp:7YhLqbpfZWY" resolve="RepositoryModulesManager" />
-                      </node>
-                      <node concept="liA8E" id="4S3q4Yl4gGf" role="2OqNvi">
-                        <ref role="37wK5l" to="l6bp:5G4qAEn6Il4" resolve="runRead" />
-                        <node concept="1bVj0M" id="4S3q4Yl4hXt" role="37wK5m">
-                          <node concept="3clFbS" id="4S3q4Yl4hXu" role="1bW5cS">
+            <node concept="3clFbF" id="4S3q4Yl4cz2" role="3cqZAp">
+              <node concept="2OqwBi" id="4S3q4Yl4fjr" role="3clFbG">
+                <node concept="2YIFZM" id="4S3q4Yl4dUJ" role="2Oq$k0">
+                  <ref role="37wK5l" to="l6bp:7YhLqbpg02T" resolve="getInstance" />
+                  <ref role="1Pybhc" to="l6bp:7YhLqbpfZWY" resolve="RepositoryModulesManager" />
+                </node>
+                <node concept="liA8E" id="4S3q4Yl4gGf" role="2OqNvi">
+                  <ref role="37wK5l" to="l6bp:5G4qAEn6Il4" resolve="runRead" />
+                  <node concept="1bVj0M" id="4S3q4Yl4hXt" role="37wK5m">
+                    <node concept="3clFbS" id="4S3q4Yl4hXu" role="1bW5cS">
+                      <node concept="1QHqEK" id="5lWcBwKRw1r" role="3cqZAp">
+                        <node concept="1QHqEC" id="5lWcBwKRw1t" role="1QHqEI">
+                          <node concept="3clFbS" id="5lWcBwKRw1v" role="1bW5cS">
                             <node concept="3clFbJ" id="739BlCoQO6M" role="3cqZAp">
                               <node concept="3clFbS" id="739BlCoQO6O" role="3clFbx">
                                 <node concept="3cpWs6" id="739BlCoTAb9" role="3cqZAp" />
@@ -1983,14 +1983,14 @@
                             </node>
                           </node>
                         </node>
+                        <node concept="37vLTw" id="5lWcBwKRyQL" role="ukAjM">
+                          <ref role="3cqZAo" node="5lWcBwJGihM" resolve="repository" />
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="37vLTw" id="5lWcBwKRyQL" role="ukAjM">
-                <ref role="3cqZAo" node="5lWcBwJGihM" resolve="repository" />
-              </node>
             </node>
           </node>
         </node>