natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply all available automatic migrations.

This commit is contained in:
Fedor Isakov 2019-05-22 15:01:16 +02:00
parent 57de11c3fe
commit 17ed4642ae
104 changed files with 2622 additions and 2579 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.mps/migration.xml
View File

@ -8,6 +8,8 @@
<entry key="jetbrains.mps.fixMig_33_331" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v172.JUnitLibsRepackaging" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v182.ReapplyPatternMigration" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v191.SaveAllJavaStubMethodRefsToShortForeignFormat" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v191.UpdateJavaStubMethodRefs" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v33.UpdateModuleUsedLang" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v34.EngagedLanguagesImports" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v35.EditorGeneratorRefactoring" value="executed" />

82
coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
View File

@ -3,12 +3,12 @@
<persistence version="9" />
<languages>
<use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="2" />
<use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="-1" />
<use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="1" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="-1" />
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="96ee7a94-411d-4cf8-9b94-96cad7e52411" name="jetbrains.mps.baseLanguage.jdk7" version="-1" />
<use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
<use id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage" version="-1" />
@ -16,7 +16,7 @@
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
<use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
<use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="1" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
<imports>
@ -908,7 +908,7 @@
<ref role="3cqZAo" node="36tQV5A_uY9" resolve="trackMap" />
</node>
<node concept="liA8E" id="36tQV5A_uYq" role="2OqNvi">
<ref role="37wK5l" to="5zyv:~ConcurrentHashMap.putIfAbsent(java.lang.Object,java.lang.Object):java.lang.Object" resolve="putIfAbsent" />
<ref role="37wK5l" to="5zyv:~ConcurrentHashMap.putIfAbsent(java.lang.Object,java.lang.Object)" resolve="putIfAbsent" />
<node concept="2OqwBi" id="36tQV5A_uYr" role="37wK5m">
<node concept="30H73N" id="36tQV5A_uYs" role="2Oq$k0" />
<node concept="3TrcHB" id="36tQV5A_uYt" role="2OqNvi">
@ -3759,7 +3759,7 @@
</node>
</node>
<node concept="liA8E" id="18kNIl1hGyL" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
<ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
<node concept="2OqwBi" id="18kNIl1hGyM" role="37wK5m">
<node concept="2JrnkZ" id="18kNIl1hGyN" role="2Oq$k0">
<node concept="2OqwBi" id="18kNIl1hGyO" role="2JrQYb">
@ -3768,7 +3768,7 @@
</node>
</node>
<node concept="liA8E" id="18kNIl1hGyR" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -3805,7 +3805,7 @@
<property role="Xl_RC" value="generated" />
</node>
<node concept="liA8E" id="18kNIl1hIia" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="18kNIl1hIib" role="37wK5m">
<node concept="2OqwBi" id="18kNIl1hIic" role="2Oq$k0">
<node concept="37vLTw" id="18kNIl1hIid" role="2Oq$k0">
@ -4622,7 +4622,7 @@
</node>
</node>
<node concept="liA8E" id="7smgEqgB$P1" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -6137,11 +6137,11 @@
<node concept="30H73N" id="4MEOIDEhSL0" role="2JrQYb" />
</node>
<node concept="liA8E" id="4MEOIDEhVEp" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
<ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
</node>
</node>
<node concept="liA8E" id="4MEOIDEhWxu" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -6253,11 +6253,11 @@
<ref role="1Pybhc" to="psr6:4MEOIDEhyPY" resolve="MacroTemplate.ID" />
<node concept="2OqwBi" id="4MEOIDEWUYy" role="37wK5m">
<node concept="2YIFZM" id="4MEOIDEWUOF" role="2Oq$k0">
<ref role="37wK5l" to="dush:~PersistenceFacade.getInstance():org.jetbrains.mps.openapi.persistence.PersistenceFacade" resolve="getInstance" />
<ref role="37wK5l" to="dush:~PersistenceFacade.getInstance()" resolve="getInstance" />
<ref role="1Pybhc" to="dush:~PersistenceFacade" resolve="PersistenceFacade" />
</node>
<node concept="liA8E" id="4MEOIDEWV6s" role="2OqNvi">
<ref role="37wK5l" to="dush:~PersistenceFacade.createNodeReference(java.lang.String):org.jetbrains.mps.openapi.model.SNodeReference" resolve="createNodeReference" />
<ref role="37wK5l" to="dush:~PersistenceFacade.createNodeReference(java.lang.String)" resolve="createNodeReference" />
<node concept="Xl_RD" id="4MEOIDEWVa7" role="37wK5m">
<property role="Xl_RC" value="" />
<node concept="17Uvod" id="4MEOIDEWVf0" role="lGtFl">
@ -6268,17 +6268,17 @@
<node concept="3clFbF" id="4MEOIDEWW7p" role="3cqZAp">
<node concept="2OqwBi" id="4MEOIDEX0Aw" role="3clFbG">
<node concept="2YIFZM" id="4MEOIDEX0m5" role="2Oq$k0">
<ref role="37wK5l" to="dush:~PersistenceFacade.getInstance():org.jetbrains.mps.openapi.persistence.PersistenceFacade" resolve="getInstance" />
<ref role="37wK5l" to="dush:~PersistenceFacade.getInstance()" resolve="getInstance" />
<ref role="1Pybhc" to="dush:~PersistenceFacade" resolve="PersistenceFacade" />
</node>
<node concept="liA8E" id="4MEOIDEX0Pn" role="2OqNvi">
<ref role="37wK5l" to="dush:~PersistenceFacade.asString(org.jetbrains.mps.openapi.model.SNodeReference):java.lang.String" resolve="asString" />
<ref role="37wK5l" to="dush:~PersistenceFacade.asString(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="asString" />
<node concept="2OqwBi" id="4MEOIDEWZ8Y" role="37wK5m">
<node concept="2JrnkZ" id="4MEOIDEWYPH" role="2Oq$k0">
<node concept="30H73N" id="4MEOIDEWW7o" role="2JrQYb" />
</node>
<node concept="liA8E" id="4MEOIDEX1Sy" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -6540,7 +6540,7 @@
<node concept="3cpWs3" id="36tQV5AHe9F" role="3clFbG">
<node concept="2OqwBi" id="36tQV5AHe9G" role="3uHU7w">
<node concept="2YIFZM" id="36tQV5AHe9H" role="2Oq$k0">
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<node concept="2OqwBi" id="36tQV5AHe9I" role="37wK5m">
<node concept="2JrnkZ" id="36tQV5AHe9J" role="2Oq$k0">
@ -6606,12 +6606,12 @@
</node>
</node>
<node concept="liA8E" id="36tQV5AHea1" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
<ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
</node>
</node>
</node>
<node concept="liA8E" id="36tQV5AHea2" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String):java.lang.String" resolve="replaceAll" />
<ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String)" resolve="replaceAll" />
<node concept="Xl_RD" id="36tQV5AHea3" role="37wK5m">
<property role="Xl_RC" value="~" />
</node>
@ -6827,7 +6827,7 @@
</node>
<node concept="2YIFZM" id="36tQV5AHrgC" role="3uHU7w">
<ref role="1Pybhc" to="18ew:~NameUtil" resolve="NameUtil" />
<ref role="37wK5l" to="18ew:~NameUtil.escapeString(java.lang.String):java.lang.String" resolve="escapeString" />
<ref role="37wK5l" to="18ew:~NameUtil.escapeString(java.lang.String)" resolve="escapeString" />
<node concept="2OqwBi" id="36tQV5AHrgD" role="37wK5m">
<node concept="2JrnkZ" id="36tQV5AHrgE" role="2Oq$k0">
<node concept="2OqwBi" id="36tQV5AHs61" role="2JrQYb">
@ -6892,7 +6892,7 @@
</node>
</node>
<node concept="liA8E" id="36tQV5AHrgW" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getName():java.lang.String" resolve="getName" />
<ref role="37wK5l" to="mhbf:~SNode.getName()" resolve="getName" />
</node>
</node>
</node>
@ -6904,7 +6904,7 @@
<node concept="2OqwBi" id="36tQV5AHrgY" role="3uHU7w">
<node concept="2YIFZM" id="36tQV5AHrgZ" role="2Oq$k0">
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
<node concept="2OqwBi" id="36tQV5AHrh0" role="37wK5m">
<node concept="2JrnkZ" id="36tQV5AHrh1" role="2Oq$k0">
<node concept="2OqwBi" id="7lt0LtPM62Z" role="2JrQYb">
@ -6969,12 +6969,12 @@
</node>
</node>
<node concept="liA8E" id="36tQV5AHrhj" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
<ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
</node>
</node>
</node>
<node concept="liA8E" id="36tQV5AHrhk" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String):java.lang.String" resolve="replaceAll" />
<ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String)" resolve="replaceAll" />
<node concept="Xl_RD" id="36tQV5AHrhl" role="37wK5m">
<property role="Xl_RC" value="~" />
</node>
@ -7590,7 +7590,7 @@
<node concept="3clFbF" id="7HUwyZaPVcS" role="3cqZAp">
<node concept="2OqwBi" id="7HUwyZaPVgJ" role="3clFbG">
<node concept="liA8E" id="7HUwyZaPVif" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int):jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="logicalAt" />
<ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int)" resolve="logicalAt" />
<node concept="3cmrfG" id="7HUwyZaPVje" role="37wK5m">
<property role="3cmrfH" value="0" />
<node concept="29HgVG" id="7HUwyZaPVjf" role="lGtFl">
@ -8523,7 +8523,7 @@
</node>
</node>
<node concept="liA8E" id="7HUwyZaWNV2" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int):jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="logicalAt" />
<ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int)" resolve="logicalAt" />
<node concept="3cmrfG" id="452KZTbxZd8" role="37wK5m">
<property role="3cmrfH" value="1" />
<node concept="29HgVG" id="452KZTbxZd9" role="lGtFl">
@ -11552,11 +11552,11 @@
<ref role="1Pybhc" to="psr6:4MEOIDEhyPY" resolve="MacroTemplate.ID" />
<node concept="2OqwBi" id="7kTeLbPzWAn" role="37wK5m">
<node concept="2YIFZM" id="7kTeLbPzWAo" role="2Oq$k0">
<ref role="37wK5l" to="dush:~PersistenceFacade.getInstance():org.jetbrains.mps.openapi.persistence.PersistenceFacade" resolve="getInstance" />
<ref role="37wK5l" to="dush:~PersistenceFacade.getInstance()" resolve="getInstance" />
<ref role="1Pybhc" to="dush:~PersistenceFacade" resolve="PersistenceFacade" />
</node>
<node concept="liA8E" id="7kTeLbPzWAp" role="2OqNvi">
<ref role="37wK5l" to="dush:~PersistenceFacade.createNodeReference(java.lang.String):org.jetbrains.mps.openapi.model.SNodeReference" resolve="createNodeReference" />
<ref role="37wK5l" to="dush:~PersistenceFacade.createNodeReference(java.lang.String)" resolve="createNodeReference" />
<node concept="Xl_RD" id="7kTeLbPzWAq" role="37wK5m">
<property role="Xl_RC" value="" />
<node concept="17Uvod" id="7kTeLbPzWAr" role="lGtFl">
@ -11568,10 +11568,10 @@
<node concept="2OqwBi" id="7kTeLbPzWAv" role="3clFbG">
<node concept="2YIFZM" id="7kTeLbPzWAw" role="2Oq$k0">
<ref role="1Pybhc" to="dush:~PersistenceFacade" resolve="PersistenceFacade" />
<ref role="37wK5l" to="dush:~PersistenceFacade.getInstance():org.jetbrains.mps.openapi.persistence.PersistenceFacade" resolve="getInstance" />
<ref role="37wK5l" to="dush:~PersistenceFacade.getInstance()" resolve="getInstance" />
</node>
<node concept="liA8E" id="7kTeLbPzWAx" role="2OqNvi">
<ref role="37wK5l" to="dush:~PersistenceFacade.asString(org.jetbrains.mps.openapi.model.SNodeReference):java.lang.String" resolve="asString" />
<ref role="37wK5l" to="dush:~PersistenceFacade.asString(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="asString" />
<node concept="2OqwBi" id="7kTeLbPzWAy" role="37wK5m">
<node concept="2JrnkZ" id="7kTeLbPzWAz" role="2Oq$k0">
<node concept="2OqwBi" id="7kTeLbPzWA$" role="2JrQYb">
@ -11582,7 +11582,7 @@
</node>
</node>
<node concept="liA8E" id="7kTeLbPzWAB" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -13199,7 +13199,7 @@
</node>
</node>
<node concept="2YIFZM" id="36tQV5AoEXV" role="37wK5m">
<ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String):org.jetbrains.mps.openapi.model.SNodeReference" resolve="deserialize" />
<ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
<ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
<node concept="Xl_RD" id="36tQV5AoEXW" role="37wK5m">
<property role="Xl_RC" value="" />
@ -13220,11 +13220,11 @@
</node>
</node>
<node concept="liA8E" id="36tQV5AoEY8" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
<node concept="liA8E" id="36tQV5AoEY9" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -14262,7 +14262,7 @@
</node>
<node concept="2OqwBi" id="1FOQehwQzuX" role="37wK5m">
<node concept="liA8E" id="1FOQehwQzWd" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
<node concept="2JrnkZ" id="1FOQehwQzv2" role="2Oq$k0">
<node concept="37vLTw" id="1FOQehwQy9N" role="2JrQYb">
@ -14379,7 +14379,7 @@
</node>
<node concept="2OqwBi" id="1FOQehwQB0Z" role="37wK5m">
<node concept="liA8E" id="1FOQehwQB10" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
<node concept="2JrnkZ" id="1FOQehwQB11" role="2Oq$k0">
<node concept="37vLTw" id="1FOQehwQB12" role="2JrQYb">
@ -14699,7 +14699,7 @@
</node>
<node concept="2YIFZM" id="6tPOoeT3TgF" role="37vLTx">
<ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
<ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String):org.jetbrains.mps.openapi.model.SNodeReference" resolve="deserialize" />
<ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
<node concept="Xl_RD" id="6tPOoeT3TgG" role="37wK5m">
<property role="Xl_RC" value="" />
<node concept="17Uvod" id="6tPOoeT3TgH" role="lGtFl">
@ -14719,11 +14719,11 @@
</node>
</node>
<node concept="liA8E" id="6tPOoeT3TgS" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
<node concept="liA8E" id="6tPOoeT3TgT" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -15526,7 +15526,7 @@
<node concept="3cpWs3" id="NKt6yobexy" role="3clFbG">
<node concept="3zGtF$" id="NKt6yobeK7" role="3uHU7w" />
<node concept="2YIFZM" id="NKt6yobdr_" role="3uHU7B">
<ref role="37wK5l" to="18ew:~NameUtil.capitalize(java.lang.String):java.lang.String" resolve="capitalize" />
<ref role="37wK5l" to="18ew:~NameUtil.capitalize(java.lang.String)" resolve="capitalize" />
<ref role="1Pybhc" to="18ew:~NameUtil" resolve="NameUtil" />
<node concept="2OqwBi" id="NKt6yoeFjY" role="37wK5m">
<node concept="2OqwBi" id="NKt6yoeDy6" role="2Oq$k0">
@ -15537,11 +15537,11 @@
</node>
</node>
<node concept="liA8E" id="NKt6yoeEWw" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getName():org.jetbrains.mps.openapi.model.SModelName" resolve="getName" />
<ref role="37wK5l" to="mhbf:~SModel.getName()" resolve="getName" />
</node>
</node>
<node concept="liA8E" id="NKt6yoeFUu" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModelName.getSimpleName():java.lang.String" resolve="getSimpleName" />
<ref role="37wK5l" to="mhbf:~SModelName.getSimpleName()" resolve="getSimpleName" />
</node>
</node>
</node>

12
coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
View File

@ -37,12 +37,12 @@
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:69b8a993-9b87-4d96-bf0c-3559f4bb0c63:jetbrains.mps.lang.slanguage" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
@ -122,18 +122,18 @@
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
<language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
<language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />

4
coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
View File

@ -268,7 +268,7 @@
<ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
<ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
<node concept="2YIFZM" id="36tQV5AKxYp" role="37wK5m">
<ref role="37wK5l" to="33ny:~Collections.singletonList(java.lang.Object):java.util.List" resolve="singletonList" />
<ref role="37wK5l" to="33ny:~Collections.singletonList(java.lang.Object)" resolve="singletonList" />
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
<node concept="2OqwBi" id="36tQV5AKxYq" role="37wK5m">
<node concept="2OqwBi" id="36tQV5AKxYr" role="2Oq$k0">
@ -585,7 +585,7 @@
<ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
<node concept="2YIFZM" id="6DOfTm$zRH3" role="37wK5m">
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
<ref role="37wK5l" to="33ny:~Collections.singletonList(java.lang.Object):java.util.List" resolve="singletonList" />
<ref role="37wK5l" to="33ny:~Collections.singletonList(java.lang.Object)" resolve="singletonList" />
<node concept="2OqwBi" id="6DOfTm$zUuH" role="37wK5m">
<node concept="37vLTw" id="6DOfTm$zRH6" role="2Oq$k0">
<ref role="3cqZAo" node="6DOfTm$zRGR" resolve="macroDecl" />

2
coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
View File

@ -9,7 +9,7 @@
<use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
<use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="7" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
<imports>

2
coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
View File

@ -2,7 +2,7 @@
<model ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)">
<persistence version="9" />
<languages>
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
</languages>
<imports>

20
coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
View File

@ -389,7 +389,7 @@
</node>
</node>
<node concept="liA8E" id="4cvvxaYhDrT" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
<node concept="2tJFMh" id="4cvvxaYhE4e" role="3uHU7w">
@ -533,7 +533,7 @@
</node>
</node>
<node concept="liA8E" id="4cvvxaYh_7T" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
<node concept="2tJFMh" id="4cvvxaYhA_C" role="3uHU7w">
@ -698,11 +698,11 @@
<ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
</node>
<node concept="liA8E" id="1zN1RIlskpt" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Enum.name():java.lang.String" resolve="name" />
<ref role="37wK5l" to="wyt6:~Enum.name()" resolve="name" />
</node>
</node>
<node concept="liA8E" id="1zN1RIlsm1c" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="1zN1RIlsmbm" role="37wK5m">
<node concept="37vLTw" id="1zN1RIlsm31" role="2Oq$k0">
<ref role="3cqZAo" node="1zN1RIls0zx" resolve="methKind" />
@ -758,11 +758,11 @@
<ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
</node>
<node concept="liA8E" id="1zN1RIlsnkv" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Enum.name():java.lang.String" resolve="name" />
<ref role="37wK5l" to="wyt6:~Enum.name()" resolve="name" />
</node>
</node>
<node concept="liA8E" id="1zN1RIlsnkw" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="1zN1RIlsnkx" role="37wK5m">
<node concept="37vLTw" id="1zN1RIlsnky" role="2Oq$k0">
<ref role="3cqZAo" node="1zN1RIls0zx" resolve="methKind" />
@ -802,11 +802,11 @@
<ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
</node>
<node concept="liA8E" id="1zN1RIlsntH" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Enum.name():java.lang.String" resolve="name" />
<ref role="37wK5l" to="wyt6:~Enum.name()" resolve="name" />
</node>
</node>
<node concept="liA8E" id="1zN1RIlsntI" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="1zN1RIlsntJ" role="37wK5m">
<node concept="37vLTw" id="1zN1RIlsntK" role="2Oq$k0">
<ref role="3cqZAo" node="1zN1RIls0zx" resolve="methKind" />
@ -846,11 +846,11 @@
<ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
</node>
<node concept="liA8E" id="1zN1RIlsnBj" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Enum.name():java.lang.String" resolve="name" />
<ref role="37wK5l" to="wyt6:~Enum.name()" resolve="name" />
</node>
</node>
<node concept="liA8E" id="1zN1RIlsnBk" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="1zN1RIlsnBl" role="37wK5m">
<node concept="37vLTw" id="1zN1RIlsnBm" role="2Oq$k0">
<ref role="3cqZAo" node="1zN1RIls0zx" resolve="methKind" />

18
coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps
View File

@ -6,7 +6,7 @@
<use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
<use id="96ee7a94-411d-4cf8-9b94-96cad7e52411" name="jetbrains.mps.baseLanguage.jdk7" version="0" />
<use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="2" />
<use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
<use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="1" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
<imports>
@ -256,7 +256,7 @@
<property role="Xl_RC" value="kind" />
</node>
<node concept="liA8E" id="18kNIl1dMWQ" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="18kNIl1dMWR" role="37wK5m">
<node concept="37vLTw" id="18kNIl1dMWS" role="2Oq$k0">
<ref role="3cqZAo" node="18kNIl1dMWU" resolve="it" />
@ -490,7 +490,7 @@
<property role="Xl_RC" value="generated" />
</node>
<node concept="liA8E" id="18kNIl1dUkI" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="18kNIl1dUkJ" role="37wK5m">
<node concept="37vLTw" id="18kNIl1dUkK" role="2Oq$k0">
<ref role="3cqZAo" node="18kNIl1dUkM" resolve="it" />
@ -606,11 +606,11 @@
<node concept="3cpWs6" id="18kNIl1e6DC" role="3cqZAp">
<node concept="1Wc70l" id="18kNIl1eaG8" role="3cqZAk">
<node concept="2YIFZM" id="18kNIl1edvc" role="3uHU7w">
<ref role="37wK5l" to="wyt6:~Boolean.valueOf(java.lang.String):java.lang.Boolean" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~Boolean.valueOf(java.lang.String)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~Boolean" resolve="Boolean" />
<node concept="2YIFZM" id="18kNIl1ejJ5" role="37wK5m">
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<ref role="37wK5l" to="wyt6:~String.valueOf(boolean):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(boolean)" resolve="valueOf" />
<node concept="2OqwBi" id="18kNIl1h0L1" role="37wK5m">
<node concept="1PxgMI" id="18kNIl1gZvI" role="2Oq$k0">
<property role="1BlNFB" value="true" />
@ -681,7 +681,7 @@
</node>
</node>
<node concept="liA8E" id="18kNIl1dQP9" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
<ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
<node concept="2OqwBi" id="18kNIl1dQPa" role="37wK5m">
<node concept="2JrnkZ" id="18kNIl1dQPb" role="2Oq$k0">
<node concept="2OqwBi" id="18kNIl1dQPc" role="2JrQYb">
@ -692,7 +692,7 @@
</node>
</node>
<node concept="liA8E" id="18kNIl1dQPf" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -707,7 +707,7 @@
<ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
<node concept="2YIFZM" id="18kNIl1dQPl" role="37wK5m">
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
<node concept="Xl_RD" id="18kNIl1dQPm" role="37wK5m">
<property role="Xl_RC" value="could not resolve %s" />
</node>
@ -720,7 +720,7 @@
</node>
</node>
<node concept="liA8E" id="18kNIl1dQPp" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
<ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId()" resolve="getNodeId" />
</node>
</node>
</node>

2
coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
View File

@ -25,7 +25,7 @@
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
<language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />

104
coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
View File

@ -4,7 +4,7 @@
<languages>
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@ -700,7 +700,7 @@
<ref role="3cqZAo" node="70Wv0dJjilw" resolve="originIdxRef" />
</node>
<node concept="liA8E" id="70Wv0dJjkzh" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object):void" resolve="set" />
<ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object)" resolve="set" />
<node concept="2OqwBi" id="70Wv0dJjkzH" role="37wK5m">
<node concept="37vLTw" id="70Wv0dJjkzI" role="2Oq$k0">
<ref role="3cqZAo" node="70Wv0dJhOMB" resolve="pex" />
@ -730,7 +730,7 @@
<ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
</node>
<node concept="2YIFZM" id="7WKNeR9xpPQ" role="33vP2m">
<ref role="37wK5l" to="w7la:~EvaluationSession.newSession(jetbrains.mps.logic.reactor.program.Program):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="newSession" />
<ref role="37wK5l" to="w7la:~EvaluationSession.newSession(jetbrains.mps.logic.reactor.program.Program)" resolve="newSession" />
<ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
<node concept="37vLTw" id="7WKNeR9xpPR" role="37wK5m">
<ref role="3cqZAo" node="7lt0LtQtD2v" resolve="program" />
@ -892,7 +892,7 @@
<ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
</node>
<node concept="liA8E" id="3GlpCDSD3d3" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationSession$Config.withTrace(jetbrains.mps.logic.reactor.evaluation.EvaluationTrace):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withTrace" />
<ref role="37wK5l" to="w7la:~EvaluationSession$Config.withTrace(jetbrains.mps.logic.reactor.evaluation.EvaluationTrace)" resolve="withTrace" />
<node concept="37vLTw" id="3GlpCDSD3d4" role="37wK5m">
<ref role="3cqZAo" node="24Vro6cQKgF" resolve="tracer" />
</node>
@ -910,7 +910,7 @@
<ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
</node>
<node concept="liA8E" id="5cnt3vh3FQa" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationSession$Config.withStoreView(jetbrains.mps.logic.reactor.evaluation.StoreView):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withStoreView" />
<ref role="37wK5l" to="w7la:~EvaluationSession$Config.withStoreView(jetbrains.mps.logic.reactor.evaluation.StoreView)" resolve="withStoreView" />
<node concept="37vLTw" id="5cnt3vh3FTs" role="37wK5m">
<ref role="3cqZAo" node="5cnt3vh3s4F" resolve="storeView" />
</node>
@ -949,7 +949,7 @@
<ref role="3cqZAo" node="5cnt3vh3s4F" resolve="storeView" />
</node>
<node concept="liA8E" id="5cnt3vheYOW" role="2OqNvi">
<ref role="37wK5l" to="w7la:~StoreView.allOccurrences():java.lang.Iterable" resolve="allOccurrences" />
<ref role="37wK5l" to="w7la:~StoreView.allOccurrences()" resolve="allOccurrences" />
</node>
</node>
</node>
@ -1685,7 +1685,7 @@
<ref role="3cqZAo" node="5mr7UHcbsDS" resolve="evaluationResult" />
</node>
<node concept="liA8E" id="5jCHAT1QTDv" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationResult.storeView():jetbrains.mps.logic.reactor.evaluation.StoreView" resolve="storeView" />
<ref role="37wK5l" to="w7la:~EvaluationResult.storeView()" resolve="storeView" />
</node>
</node>
</node>
@ -1713,7 +1713,7 @@
<ref role="3cqZAo" node="4F3SXIF5J_f" resolve="e" />
</node>
<node concept="liA8E" id="4ZcizIatOSH" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Map$Entry.getValue():java.lang.Object" resolve="getValue" />
<ref role="37wK5l" to="33ny:~Map$Entry.getValue()" resolve="getValue" />
</node>
</node>
</node>
@ -1737,7 +1737,7 @@
<ref role="3cqZAo" node="4F3SXIF5J_f" resolve="e" />
</node>
<node concept="liA8E" id="4F3SXIF5J$V" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Map$Entry.getKey():java.lang.Object" resolve="getKey" />
<ref role="37wK5l" to="33ny:~Map$Entry.getKey()" resolve="getKey" />
</node>
</node>
<node concept="Xl_RD" id="4F3SXIF5J_B" role="3uHU7w">
@ -1758,7 +1758,7 @@
<ref role="3cqZAo" node="4ZcizIatOSE" resolve="value" />
</node>
<node concept="liA8E" id="4ZcizIatRax" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.split(java.lang.String):java.lang.String[]" resolve="split" />
<ref role="37wK5l" to="wyt6:~String.split(java.lang.String)" resolve="split" />
<node concept="Xl_RD" id="4ZcizIatRvw" role="37wK5m">
<property role="Xl_RC" value="\n" />
</node>
@ -1796,7 +1796,7 @@
</node>
</node>
<node concept="liA8E" id="4F3SXIF5J_H" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Map.entrySet():java.util.Set" resolve="entrySet" />
<ref role="37wK5l" to="33ny:~Map.entrySet()" resolve="entrySet" />
</node>
</node>
</node>
@ -1853,7 +1853,7 @@
<ref role="3cqZAo" node="5mr7UHcbsDS" resolve="evaluationResult" />
</node>
<node concept="liA8E" id="5jCHAT1QROI" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationResult.storeView():jetbrains.mps.logic.reactor.evaluation.StoreView" resolve="storeView" />
<ref role="37wK5l" to="w7la:~EvaluationResult.storeView()" resolve="storeView" />
</node>
</node>
</node>
@ -1873,7 +1873,7 @@
<ref role="3cqZAo" node="5mr7UHcc5Jp" resolve="cs" />
</node>
<node concept="liA8E" id="7nkyKX7hbMm" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Symbol.id():java.lang.String" resolve="id" />
<ref role="37wK5l" to="av0y:~Symbol.id()" resolve="id" />
</node>
</node>
</node>
@ -1934,7 +1934,7 @@
<ref role="3cqZAo" node="5jCHAT1QROF" resolve="storeView" />
</node>
<node concept="liA8E" id="5mr7UHcct$i" role="2OqNvi">
<ref role="37wK5l" to="w7la:~StoreView.occurrences(jetbrains.mps.logic.reactor.program.ConstraintSymbol):java.lang.Iterable" resolve="occurrences" />
<ref role="37wK5l" to="w7la:~StoreView.occurrences(jetbrains.mps.logic.reactor.program.ConstraintSymbol)" resolve="occurrences" />
<node concept="37vLTw" id="5mr7UHcctGr" role="37wK5m">
<ref role="3cqZAo" node="5mr7UHcc5Jp" resolve="cs" />
</node>
@ -1953,7 +1953,7 @@
<ref role="3cqZAo" node="5jCHAT1QROF" resolve="storeView" />
</node>
<node concept="liA8E" id="5mr7UHcc6U$" role="2OqNvi">
<ref role="37wK5l" to="w7la:~StoreView.constraintSymbols():java.lang.Iterable" resolve="constraintSymbols" />
<ref role="37wK5l" to="w7la:~StoreView.constraintSymbols()" resolve="constraintSymbols" />
</node>
</node>
</node>
@ -2183,7 +2183,7 @@
<ref role="3cqZAo" node="2tjs8VC16TI" resolve="current" />
</node>
<node concept="liA8E" id="2tjs8VC1bcJ" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~ThreadLocal.get():java.lang.Object" resolve="get" />
<ref role="37wK5l" to="wyt6:~ThreadLocal.get()" resolve="get" />
</node>
</node>
</node>
@ -2268,7 +2268,7 @@
<ref role="3cqZAo" node="2tjs8VC16TI" resolve="current" />
</node>
<node concept="liA8E" id="2tjs8VC1cW0" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~ThreadLocal.get():java.lang.Object" resolve="get" />
<ref role="37wK5l" to="wyt6:~ThreadLocal.get()" resolve="get" />
</node>
</node>
</node>
@ -2279,7 +2279,7 @@
<ref role="3cqZAo" node="2tjs8VC16TI" resolve="current" />
</node>
<node concept="liA8E" id="2tjs8VC1dWX" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~ThreadLocal.set(java.lang.Object):void" resolve="set" />
<ref role="37wK5l" to="wyt6:~ThreadLocal.set(java.lang.Object)" resolve="set" />
<node concept="2ShNRf" id="2tjs8VC1e6B" role="37wK5m">
<node concept="1pGfFk" id="2tjs8VC1exZ" role="2ShVmc">
<ref role="37wK5l" node="2tjs8VC15lz" resolve="Memoizer" />
@ -2310,7 +2310,7 @@
<ref role="3cqZAo" node="2tjs8VC16TI" resolve="current" />
</node>
<node concept="liA8E" id="2tjs8VC1g0H" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~ThreadLocal.get():java.lang.Object" resolve="get" />
<ref role="37wK5l" to="wyt6:~ThreadLocal.get()" resolve="get" />
</node>
</node>
</node>
@ -2338,7 +2338,7 @@
<ref role="3cqZAo" node="2tjs8VC16TI" resolve="current" />
</node>
<node concept="liA8E" id="2tjs8VC1jZK" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~ThreadLocal.set(java.lang.Object):void" resolve="set" />
<ref role="37wK5l" to="wyt6:~ThreadLocal.set(java.lang.Object)" resolve="set" />
<node concept="2OqwBi" id="2tjs8VC1km2" role="37wK5m">
<node concept="37vLTw" id="2tjs8VC1kbj" role="2Oq$k0">
<ref role="3cqZAo" node="2tjs8VC1g0E" resolve="curr" />
@ -2527,7 +2527,7 @@
<ref role="3cqZAo" node="2tjs8VC0WHe" resolve="token2value" />
</node>
<node concept="liA8E" id="2tjs8VC0Ymq" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
<ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
<node concept="37vLTw" id="2tjs8VC0Yrk" role="37wK5m">
<ref role="3cqZAo" node="2tjs8VC0VXg" resolve="token" />
</node>
@ -2583,7 +2583,7 @@
</node>
</node>
<node concept="liA8E" id="2tjs8VC29LN" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Map.get(java.lang.Object):java.lang.Object" resolve="get" />
<ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
<node concept="37vLTw" id="2tjs8VC29LO" role="37wK5m">
<ref role="3cqZAo" node="2tjs8VC1Yjd" resolve="token" />
</node>
@ -2684,7 +2684,7 @@
<ref role="3cqZAo" node="2tjs8VC1Pmh" resolve="defaultValue" />
</node>
<node concept="liA8E" id="2tjs8VC2iz5" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Computable.compute():java.lang.Object" resolve="compute" />
<ref role="37wK5l" to="18ew:~Computable.compute()" resolve="compute" />
</node>
</node>
</node>
@ -2695,7 +2695,7 @@
<ref role="3cqZAo" node="2tjs8VC0WHe" resolve="token2value" />
</node>
<node concept="liA8E" id="2tjs8VC2h3S" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
<ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
<node concept="37vLTw" id="2tjs8VC2hxn" role="37wK5m">
<ref role="3cqZAo" node="2tjs8VC1OGQ" resolve="token" />
</node>
@ -2765,7 +2765,7 @@
<ref role="3cqZAo" node="2tjs8VC0WHe" resolve="token2value" />
</node>
<node concept="liA8E" id="2tjs8VC24Mw" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Map.containsKey(java.lang.Object):boolean" resolve="containsKey" />
<ref role="37wK5l" to="33ny:~Map.containsKey(java.lang.Object)" resolve="containsKey" />
<node concept="37vLTw" id="2tjs8VC24Mx" role="37wK5m">
<ref role="3cqZAo" node="2tjs8VC23ZY" resolve="token" />
</node>
@ -2790,7 +2790,7 @@
<ref role="3cqZAo" node="2tjs8VC0WHe" resolve="token2value" />
</node>
<node concept="liA8E" id="2tjs8VC1mbI" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Map.clear():void" resolve="clear" />
<ref role="37wK5l" to="33ny:~Map.clear()" resolve="clear" />
</node>
</node>
</node>
@ -3006,16 +3006,16 @@
<ref role="37wK5l" node="7Oc59RSEnG3" resolve="errors" />
</node>
<node concept="liA8E" id="7nkyKX7vfHY" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Collection.size():int" resolve="size" />
<ref role="37wK5l" to="33ny:~Collection.size()" resolve="size" />
</node>
</node>
<node concept="3cpWs3" id="7Oc59RSJuJa" role="3uHU7B">
<node concept="2OqwBi" id="7Oc59RSJssQ" role="3uHU7B">
<node concept="1rXfSq" id="7Oc59RSJs9F" role="2Oq$k0">
<ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
<ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
</node>
<node concept="liA8E" id="7Oc59RSJuyR" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Class.getSimpleName():java.lang.String" resolve="getSimpleName" />
<ref role="37wK5l" to="wyt6:~Class.getSimpleName()" resolve="getSimpleName" />
</node>
</node>
<node concept="Xl_RD" id="7Oc59RSJvII" role="3uHU7w">
@ -3094,7 +3094,7 @@
<node concept="3clFbS" id="7Oc59RSJpwm" role="3clF47">
<node concept="3clFbF" id="7nkyKX7v6HU" role="3cqZAp">
<node concept="2YIFZM" id="7nkyKX7v6Kr" role="3clFbG">
<ref role="37wK5l" to="33ny:~Collections.emptyList():java.util.List" resolve="emptyList" />
<ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
</node>
</node>
@ -3149,7 +3149,7 @@
<ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(java.util.Collection)" resolve="ArrayList" />
<node concept="2YIFZM" id="7nkyKX7v2p8" role="37wK5m">
<ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
<ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
<ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...)" resolve="asList" />
<node concept="37vLTw" id="7nkyKX7v2u2" role="37wK5m">
<ref role="3cqZAo" node="7Oc59RSEpH8" resolve="errors" />
</node>
@ -3202,7 +3202,7 @@
<ref role="3cqZAo" node="7Oc59RSEpOr" resolve="errors" />
</node>
<node concept="liA8E" id="7nkyKX7veew" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection):boolean" resolve="addAll" />
<ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection)" resolve="addAll" />
<node concept="2OqwBi" id="7nkyKX7veoK" role="37wK5m">
<node concept="37vLTw" id="7nkyKX7velW" role="2Oq$k0">
<ref role="3cqZAo" node="7nkyKX7vdty" resolve="r" />
@ -3292,7 +3292,7 @@
<node concept="3clFbS" id="7Oc59RSEqG7" role="3clF47">
<node concept="3clFbF" id="7nkyKX7v4QN" role="3cqZAp">
<node concept="2YIFZM" id="7nkyKX7v4VU" role="3clFbG">
<ref role="37wK5l" to="33ny:~Collections.unmodifiableCollection(java.util.Collection):java.util.Collection" resolve="unmodifiableCollection" />
<ref role="37wK5l" to="33ny:~Collections.unmodifiableCollection(java.util.Collection)" resolve="unmodifiableCollection" />
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
<node concept="37vLTw" id="7nkyKX7v5n9" role="37wK5m">
<ref role="3cqZAo" node="7Oc59RSEpOr" resolve="errors" />
@ -3332,7 +3332,7 @@
<ref role="3cqZAo" node="6i42QSsnrzl" resolve="joiner" />
</node>
<node concept="liA8E" id="6i42QSsntDu" role="2OqNvi">
<ref role="37wK5l" to="33ny:~StringJoiner.add(java.lang.CharSequence):java.util.StringJoiner" resolve="add" />
<ref role="37wK5l" to="33ny:~StringJoiner.add(java.lang.CharSequence)" resolve="add" />
<node concept="2OqwBi" id="6i42QSsntSG" role="37wK5m">
<node concept="37vLTw" id="6i42QSsntN$" role="2Oq$k0">
<ref role="3cqZAo" node="6i42QSsns_L" resolve="err" />
@ -3361,7 +3361,7 @@
<ref role="3cqZAo" node="6i42QSsnrzl" resolve="joiner" />
</node>
<node concept="liA8E" id="6i42QSsnwLn" role="2OqNvi">
<ref role="37wK5l" to="33ny:~StringJoiner.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="33ny:~StringJoiner.toString()" resolve="toString" />
</node>
</node>
</node>
@ -3483,7 +3483,7 @@
<ref role="3cqZAo" node="6i42QSs$lhF" resolve="exception" />
</node>
<node concept="liA8E" id="6i42QSs$lhv" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Throwable.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Throwable.toString()" resolve="toString" />
</node>
</node>
</node>
@ -3981,10 +3981,10 @@
<node concept="3cpWs3" id="12yN8DyLiXM" role="3uHU7B">
<node concept="2OqwBi" id="7Oc59RSEbhU" role="3uHU7B">
<node concept="1rXfSq" id="7Oc59RSEaXF" role="2Oq$k0">
<ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
<ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
</node>
<node concept="liA8E" id="7Oc59RSEbW0" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Class.getSimpleName():java.lang.String" resolve="getSimpleName" />
<ref role="37wK5l" to="wyt6:~Class.getSimpleName()" resolve="getSimpleName" />
</node>
</node>
<node concept="Xl_RD" id="12yN8DyLiXU" role="3uHU7w">
@ -4872,11 +4872,11 @@
</node>
</node>
<node concept="liA8E" id="1HWyn8jwRsY" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
</node>
</node>
<node concept="liA8E" id="1HWyn8jwS1m" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
<node concept="37vLTw" id="1HWyn8jwPwV" role="37vLTJ">
@ -5058,7 +5058,7 @@
</node>
</node>
<node concept="liA8E" id="1HWyn8jvsPX" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
</node>
</node>
</node>
@ -5069,7 +5069,7 @@
<ref role="3cqZAo" node="1HWyn8jvsPM" resolve="logical" />
</node>
<node concept="liA8E" id="1HWyn8jvtwx" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
<ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
</node>
</node>
<node concept="9aQIb" id="1HWyn8jvsQo" role="9aQIa">
@ -5087,7 +5087,7 @@
<ref role="3cqZAo" node="1HWyn8jvsPa" resolve="logicalMap" />
</node>
<node concept="liA8E" id="1HWyn8jvJG_" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Map.get(java.lang.Object):java.lang.Object" resolve="get" />
<ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
<node concept="37vLTw" id="1HWyn8jvKfA" role="37wK5m">
<ref role="3cqZAo" node="1HWyn8jvsPM" resolve="logical" />
</node>
@ -5113,13 +5113,13 @@
<ref role="3cqZAo" node="1HWyn8jvsP6" resolve="logicalContext" />
</node>
<node concept="liA8E" id="1HWyn8jvtua" role="2OqNvi">
<ref role="37wK5l" to="bj13:~LogicalContext.variable(jetbrains.mps.logic.reactor.logical.MetaLogical):jetbrains.mps.logic.reactor.logical.Logical" resolve="variable" />
<ref role="37wK5l" to="bj13:~LogicalContext.variable(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="variable" />
<node concept="2OqwBi" id="1HWyn8jvuI2" role="37wK5m">
<node concept="37vLTw" id="1HWyn8jvuI1" role="2Oq$k0">
<ref role="3cqZAo" node="1HWyn8jvsPM" resolve="logical" />
</node>
<node concept="liA8E" id="1HWyn8jvuI3" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.metaLogical():jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="metaLogical" />
<ref role="37wK5l" to="bj13:~Logical.metaLogical()" resolve="metaLogical" />
</node>
</node>
</node>
@ -5132,7 +5132,7 @@
<ref role="3cqZAo" node="1HWyn8jvsPa" resolve="logicalMap" />
</node>
<node concept="liA8E" id="1HWyn8jvMBt" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
<ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
<node concept="37vLTw" id="1HWyn8jvMUM" role="37wK5m">
<ref role="3cqZAo" node="1HWyn8jvsPM" resolve="logical" />
</node>
@ -5169,7 +5169,7 @@
<ref role="3cqZAo" node="1HWyn8jvsPM" resolve="logical" />
</node>
<node concept="liA8E" id="1HWyn8jvt_V" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
</node>
@ -6007,7 +6007,7 @@
<node concept="1pGfFk" id="7kTeLbPnP2q" role="2ShVmc">
<ref role="37wK5l" to="i348:4sSe4$oM2rk" resolve="ConstraintBuilder" />
<node concept="2YIFZM" id="7kTeLbPnP2r" role="37wK5m">
<ref role="37wK5l" to="av0y:~ConstraintSymbol.symbol(java.lang.String,int):jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
<ref role="37wK5l" to="av0y:~ConstraintSymbol.symbol(java.lang.String,int)" resolve="symbol" />
<ref role="1Pybhc" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
<node concept="Xl_RD" id="7kTeLbPnP2s" role="37wK5m">
<property role="Xl_RC" value="main" />
@ -6752,11 +6752,11 @@
</node>
</node>
<node concept="liA8E" id="3pMFS1zdqnP" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
</node>
</node>
<node concept="liA8E" id="3pMFS1zdqnQ" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
<node concept="37vLTw" id="3pMFS1zdqnR" role="37vLTJ">
@ -6807,11 +6807,11 @@
</node>
</node>
<node concept="liA8E" id="3pMFS1zdGE9" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
</node>
</node>
<node concept="liA8E" id="3pMFS1zdGEa" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
</node>

116
coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
View File

@ -4,7 +4,7 @@
<languages>
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
<use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
@ -597,7 +597,7 @@
<node concept="3clFbS" id="4MqhgXUKgMh" role="3clF47">
<node concept="3clFbF" id="4MqhgXUT$0V" role="3cqZAp">
<node concept="2YIFZM" id="4MqhgXUT$36" role="3clFbG">
<ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List):java.util.List" resolve="unmodifiableList" />
<ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List)" resolve="unmodifiableList" />
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
<node concept="37vLTw" id="4MqhgXUT$4h" role="37wK5m">
<ref role="3cqZAo" node="4MqhgXULUc0" resolve="handlers" />
@ -626,10 +626,10 @@
<node concept="3cpWs3" id="7Oc59RSE7HS" role="3uHU7B">
<node concept="2OqwBi" id="7Oc59RSE3ij" role="3uHU7B">
<node concept="1rXfSq" id="7Oc59RSE2Pl" role="2Oq$k0">
<ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
<ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
</node>
<node concept="liA8E" id="7Oc59RSE3pt" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Class.getSimpleName():java.lang.String" resolve="getSimpleName" />
<ref role="37wK5l" to="wyt6:~Class.getSimpleName()" resolve="getSimpleName" />
</node>
</node>
<node concept="Xl_RD" id="7Oc59RSE7MB" role="3uHU7w">
@ -708,14 +708,14 @@
<node concept="3clFbS" id="78CwJJcXKos" role="3clF47">
<node concept="3clFbF" id="78CwJJcXKot" role="3cqZAp">
<node concept="2YIFZM" id="78CwJJcXKou" role="3clFbG">
<ref role="37wK5l" to="33ny:~Collections.unmodifiableSet(java.util.Set):java.util.Set" resolve="unmodifiableSet" />
<ref role="37wK5l" to="33ny:~Collections.unmodifiableSet(java.util.Set)" resolve="unmodifiableSet" />
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
<node concept="2OqwBi" id="78CwJJcXKov" role="37wK5m">
<node concept="37vLTw" id="78CwJJcXKow" role="2Oq$k0">
<ref role="3cqZAo" node="7eGEHDley5W" resolve="constraintArgTypes" />
</node>
<node concept="liA8E" id="78CwJJcXKox" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Map.keySet():java.util.Set" resolve="keySet" />
<ref role="37wK5l" to="33ny:~Map.keySet()" resolve="keySet" />
</node>
</node>
</node>
@ -736,14 +736,14 @@
<node concept="3clFbS" id="78CwJJcXcEw" role="3clF47">
<node concept="3clFbF" id="78CwJJcXfFE" role="3cqZAp">
<node concept="2YIFZM" id="78CwJJcXnYO" role="3clFbG">
<ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List):java.util.List" resolve="unmodifiableList" />
<ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List)" resolve="unmodifiableList" />
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
<node concept="2OqwBi" id="78CwJJcXo6Q" role="37wK5m">
<node concept="37vLTw" id="78CwJJcXo2d" role="2Oq$k0">
<ref role="3cqZAo" node="7eGEHDley5W" resolve="constraintArgTypes" />
</node>
<node concept="liA8E" id="78CwJJcXofr" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Map.get(java.lang.Object):java.lang.Object" resolve="get" />
<ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
<node concept="37vLTw" id="78CwJJcXpeO" role="37wK5m">
<ref role="3cqZAo" node="78CwJJcXom8" resolve="constraintSymbol" />
</node>
@ -772,7 +772,7 @@
<node concept="3clFbS" id="ZqZbw4RIlP" role="3clF47">
<node concept="3clFbF" id="ZqZbw4RKWT" role="3cqZAp">
<node concept="2YIFZM" id="ZqZbw4RKXF" role="3clFbG">
<ref role="37wK5l" to="33ny:~Collections.unmodifiableSet(java.util.Set):java.util.Set" resolve="unmodifiableSet" />
<ref role="37wK5l" to="33ny:~Collections.unmodifiableSet(java.util.Set)" resolve="unmodifiableSet" />
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
<node concept="37vLTw" id="78CwJJcXRtE" role="37wK5m">
<ref role="3cqZAo" node="7ISVfSJtsW" resolve="solvers" />
@ -816,11 +816,11 @@
<ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
</node>
<node concept="liA8E" id="30XHGaOWeZv" role="2OqNvi">
<ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.List" resolve="arguments" />
<ref role="37wK5l" to="av0y:~AndItem.arguments()" resolve="arguments" />
</node>
</node>
<node concept="liA8E" id="30XHGaOWfgx" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
<ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
</node>
</node>
<node concept="2OqwBi" id="7eGEHDlg3RX" role="3uHU7B">
@ -829,11 +829,11 @@
<ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
</node>
<node concept="liA8E" id="30XHGaP5pQG" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
<ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
</node>
</node>
<node concept="liA8E" id="7eGEHDlg3RZ" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Symbol.arity():int" resolve="arity" />
<ref role="37wK5l" to="av0y:~Symbol.arity()" resolve="arity" />
</node>
</node>
</node>
@ -850,13 +850,13 @@
<node concept="3cpWs3" id="7Oc59RSHQew" role="37wK5m">
<node concept="2YIFZM" id="7Oc59RSHQex" role="3uHU7w">
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
<node concept="2OqwBi" id="7Oc59RSHQey" role="37wK5m">
<node concept="37vLTw" id="5uFPQ7BEpeQ" role="2Oq$k0">
<ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
</node>
<node concept="liA8E" id="7Oc59RSHQe$" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
<ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
</node>
</node>
</node>
@ -902,13 +902,13 @@
</node>
<node concept="2YIFZM" id="1zN1RIln3iG" role="3uHU7w">
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
<node concept="2OqwBi" id="1zN1RIln3iH" role="37wK5m">
<node concept="37vLTw" id="5uFPQ7BEsjZ" role="2Oq$k0">
<ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
</node>
<node concept="liA8E" id="1zN1RIln3iJ" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
<ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
</node>
</node>
</node>
@ -922,7 +922,7 @@
<ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
</node>
<node concept="liA8E" id="4sSe4$prSgx" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Constraint.argumentTypes():java.util.List" resolve="argumentTypes" />
<ref role="37wK5l" to="av0y:~Constraint.argumentTypes()" resolve="argumentTypes" />
</node>
</node>
</node>
@ -935,13 +935,13 @@
<ref role="3cqZAo" node="7eGEHDley5W" resolve="constraintArgTypes" />
</node>
<node concept="liA8E" id="4sSe4$prWcT" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Map.get(java.lang.Object):java.lang.Object" resolve="get" />
<ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
<node concept="2OqwBi" id="4sSe4$prWcU" role="37wK5m">
<node concept="37vLTw" id="4sSe4$prWcV" role="2Oq$k0">
<ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
</node>
<node concept="liA8E" id="4sSe4$prWcW" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
<ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
</node>
</node>
</node>
@ -958,23 +958,23 @@
<ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
</node>
<node concept="liA8E" id="78CwJJcX3RX" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Constraint.argumentTypes():java.util.List" resolve="argumentTypes" />
<ref role="37wK5l" to="av0y:~Constraint.argumentTypes()" resolve="argumentTypes" />
</node>
</node>
<node concept="liA8E" id="78CwJJcX49I" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="33ny:~List.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="30XHGaP5H3s" role="37wK5m">
<node concept="37vLTw" id="30XHGaP5H3t" role="2Oq$k0">
<ref role="3cqZAo" node="7eGEHDley5W" resolve="constraintArgTypes" />
</node>
<node concept="liA8E" id="30XHGaP5H3u" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Map.get(java.lang.Object):java.lang.Object" resolve="get" />
<ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
<node concept="2OqwBi" id="30XHGaP5H3v" role="37wK5m">
<node concept="37vLTw" id="5uFPQ7BEs2s" role="2Oq$k0">
<ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
</node>
<node concept="liA8E" id="30XHGaP5H3x" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
<ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
</node>
</node>
</node>
@ -990,13 +990,13 @@
<ref role="3cqZAo" node="7eGEHDley5W" resolve="constraintArgTypes" />
</node>
<node concept="liA8E" id="7eGEHDleLnR" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Map.containsKey(java.lang.Object):boolean" resolve="containsKey" />
<ref role="37wK5l" to="33ny:~Map.containsKey(java.lang.Object)" resolve="containsKey" />
<node concept="2OqwBi" id="7eGEHDleLtw" role="37wK5m">
<node concept="37vLTw" id="5uFPQ7BEppf" role="2Oq$k0">
<ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
</node>
<node concept="liA8E" id="7eGEHDleLzH" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
<ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
</node>
</node>
</node>
@ -1049,13 +1049,13 @@
<node concept="3cpWs3" id="2pvEdquuFKF" role="37wK5m">
<node concept="2YIFZM" id="2pvEdquuFKG" role="3uHU7w">
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
<node concept="2OqwBi" id="2pvEdquuFKH" role="37wK5m">
<node concept="37vLTw" id="5uFPQ7BEvpY" role="2Oq$k0">
<ref role="3cqZAo" node="5uFPQ7BEu6z" resolve="pred" />
</node>
<node concept="liA8E" id="2pvEdquuFKJ" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
<ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
</node>
</node>
</node>
@ -1074,11 +1074,11 @@
<ref role="3cqZAo" node="5uFPQ7BEu6z" resolve="pred" />
</node>
<node concept="liA8E" id="30XHGaOWeEi" role="2OqNvi">
<ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.List" resolve="arguments" />
<ref role="37wK5l" to="av0y:~AndItem.arguments()" resolve="arguments" />
</node>
</node>
<node concept="liA8E" id="30XHGaOWeVo" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
<ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
</node>
</node>
<node concept="2OqwBi" id="2pvEdquuFm4" role="3uHU7w">
@ -1087,11 +1087,11 @@
<ref role="3cqZAo" node="5uFPQ7BEu6z" resolve="pred" />
</node>
<node concept="liA8E" id="2pvEdquuFma" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
<ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
</node>
</node>
<node concept="liA8E" id="2pvEdquuFmb" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Symbol.arity():int" resolve="arity" />
<ref role="37wK5l" to="av0y:~Symbol.arity()" resolve="arity" />
</node>
</node>
</node>
@ -1110,14 +1110,14 @@
<ref role="37wK5l" to="av0y:~InvalidConstraintException.&lt;init&gt;(java.lang.String)" resolve="InvalidConstraintException" />
<node concept="3cpWs3" id="2KVRGowWD$u" role="37wK5m">
<node concept="2YIFZM" id="2KVRGowWDMj" role="3uHU7w">
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<node concept="2OqwBi" id="2KVRGowWE4s" role="37wK5m">
<node concept="37vLTw" id="2KVRGowWDWb" role="2Oq$k0">
<ref role="3cqZAo" node="7eGEHDldphF" resolve="item" />
</node>
<node concept="liA8E" id="2KVRGowWEea" role="2OqNvi">
<ref role="37wK5l" to="av0y:~AndItem.symbol():jetbrains.mps.logic.reactor.program.Symbol" resolve="symbol" />
<ref role="37wK5l" to="av0y:~AndItem.symbol()" resolve="symbol" />
</node>
</node>
</node>
@ -1149,7 +1149,7 @@
<ref role="3cqZAo" node="7eGEHDldphF" resolve="item" />
</node>
<node concept="liA8E" id="2KVRGowW$Kw" role="2OqNvi">
<ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.List" resolve="arguments" />
<ref role="37wK5l" to="av0y:~AndItem.arguments()" resolve="arguments" />
</node>
</node>
</node>
@ -1201,13 +1201,13 @@
<ref role="3cqZAo" node="7eGEHDley5W" resolve="constraintArgTypes" />
</node>
<node concept="liA8E" id="7eGEHDleQZ$" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
<ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
<node concept="2OqwBi" id="7eGEHDleR63" role="37wK5m">
<node concept="37vLTw" id="5uFPQ7BH1JL" role="2Oq$k0">
<ref role="3cqZAo" node="5uFPQ7BH1yJ" resolve="cst" />
</node>
<node concept="liA8E" id="7eGEHDleRaS" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
<ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
</node>
</node>
<node concept="2OqwBi" id="78CwJJcWZ_9" role="37wK5m">
@ -1215,7 +1215,7 @@
<ref role="3cqZAo" node="5uFPQ7BH1yJ" resolve="cst" />
</node>
<node concept="liA8E" id="78CwJJcWZFx" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Constraint.argumentTypes():java.util.List" resolve="argumentTypes" />
<ref role="37wK5l" to="av0y:~Constraint.argumentTypes()" resolve="argumentTypes" />
</node>
</node>
</node>
@ -1263,13 +1263,13 @@
<ref role="3cqZAo" node="7ISVfSJtsW" resolve="solvers" />
</node>
<node concept="liA8E" id="7ISVfSJvtA" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Set.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~Set.add(java.lang.Object)" resolve="add" />
<node concept="2OqwBi" id="78CwJJcX$kh" role="37wK5m">
<node concept="37vLTw" id="78CwJJcX$fr" role="2Oq$k0">
<ref role="3cqZAo" node="5uFPQ7BH2qT" resolve="pred" />
</node>
<node concept="liA8E" id="78CwJJcX$qQ" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
<ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
</node>
</node>
</node>
@ -1587,7 +1587,7 @@
</node>
</node>
<node concept="2YIFZM" id="4MqhgXUNJ$f" role="37vLTx">
<ref role="37wK5l" to="33ny:~Collections.unmodifiableMap(java.util.Map):java.util.Map" resolve="unmodifiableMap" />
<ref role="37wK5l" to="33ny:~Collections.unmodifiableMap(java.util.Map)" resolve="unmodifiableMap" />
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
<node concept="37vLTw" id="4MqhgXUNJJ2" role="37wK5m">
<ref role="3cqZAo" node="4MqhgXUMgHN" resolve="location2rules" />
@ -2778,7 +2778,7 @@
</node>
</node>
<node concept="liA8E" id="2$$Q_FeUWXQ" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="2$$Q_FeUUS1" role="37wK5m">
<node concept="2OqwBi" id="2$$Q_FeUUqF" role="2Oq$k0">
<node concept="2GrUjf" id="2$$Q_FeUUhy" role="2Oq$k0">
@ -3819,7 +3819,7 @@
</node>
</node>
<node concept="liA8E" id="70Wv0dJk23L" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -3987,7 +3987,7 @@
</node>
</node>
<node concept="liA8E" id="70Wv0dJkdpc" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -4307,7 +4307,7 @@
<ref role="3cqZAo" node="4MqhgXUQrZn" resolve="handler" />
</node>
<node concept="liA8E" id="4MqhgXUQtEx" role="2OqNvi">
<ref role="37wK5l" to="av0y:~RulesList.rules():java.lang.Iterable" resolve="rules" />
<ref role="37wK5l" to="av0y:~RulesList.rules()" resolve="rules" />
</node>
</node>
</node>
@ -4331,7 +4331,7 @@
<ref role="3cqZAo" node="4MqhgXUQtfR" resolve="e" />
</node>
<node concept="liA8E" id="4MqhgXUQtUt" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
<ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
</node>
</node>
<node concept="Xl_RD" id="4MqhgXUQtUu" role="3uHU7B">
@ -4409,7 +4409,7 @@
<ref role="3cqZAo" node="7eGEHDldi8e" resolve="rule" />
</node>
<node concept="liA8E" id="7eGEHDldjbN" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.all():java.lang.Iterable" resolve="all" />
<ref role="37wK5l" to="av0y:~Rule.all()" resolve="all" />
</node>
</node>
</node>
@ -4457,7 +4457,7 @@
</node>
</node>
<node concept="liA8E" id="4$YN6QuXrWD" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
<ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
</node>
</node>
</node>
@ -4477,7 +4477,7 @@
<ref role="3cqZAo" node="7eGEHDldi8e" resolve="rule" />
</node>
<node concept="liA8E" id="7eGEHDlf0Ok" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.all():java.lang.Iterable" resolve="all" />
<ref role="37wK5l" to="av0y:~Rule.all()" resolve="all" />
</node>
</node>
</node>
@ -5091,7 +5091,7 @@
<ref role="3cqZAo" node="7nkyKX7nl0T" resolve="e" />
</node>
<node concept="liA8E" id="6i42QSsp6Fm" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
<ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
</node>
</node>
</node>
@ -5714,7 +5714,7 @@
</node>
</node>
<node concept="liA8E" id="19wqdqOfE34" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getModelId():org.jetbrains.mps.openapi.model.SModelId" resolve="getModelId" />
<ref role="37wK5l" to="mhbf:~SModel.getModelId()" resolve="getModelId" />
</node>
</node>
<node concept="3cpWs3" id="19wqdqOfoa3" role="3uHU7B">
@ -5744,7 +5744,7 @@
</node>
</node>
<node concept="liA8E" id="2DKqMqOksM8" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
<ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
</node>
</node>
</node>
@ -5905,7 +5905,7 @@
<property role="TrG5h" value="details" />
<node concept="17QB3L" id="6OXbTDyaL$N" role="1tU5fm" />
<node concept="2YIFZM" id="6OXbTDycVSX" role="33vP2m">
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<node concept="37vLTw" id="6OXbTDyd7qU" role="37wK5m">
<ref role="3cqZAo" node="6OXbTDycbjU" resolve="parameter" />
@ -6710,7 +6710,7 @@
</node>
</node>
<node concept="liA8E" id="2DKqMqOkcAK" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
<ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
</node>
</node>
<node concept="3cpWs3" id="2DKqMqOkcAL" role="3uHU7B">
@ -6758,7 +6758,7 @@
<ref role="3cqZAo" node="tIwzd1I3X5" resolve="e" />
</node>
<node concept="liA8E" id="6i42QSss4RY" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
<ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
</node>
</node>
<node concept="Xl_RD" id="6i42QSss4RZ" role="3uHU7w">
@ -7130,7 +7130,7 @@
<property role="TrG5h" value="details" />
<node concept="17QB3L" id="6OXbTDydY25" role="1tU5fm" />
<node concept="2YIFZM" id="6OXbTDyeyio" role="33vP2m">
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<node concept="37vLTw" id="6OXbTDyeyYP" role="37wK5m">
<ref role="3cqZAo" node="6OXbTDyaDvN" resolve="parameter" />
@ -7161,7 +7161,7 @@
<ref role="3cqZAo" node="6OXbTDydX1x" resolve="e" />
</node>
<node concept="liA8E" id="6OXbTDydY2$" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
<ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
</node>
</node>
<node concept="Xl_RD" id="6OXbTDydY2_" role="3uHU7w">
@ -7170,7 +7170,7 @@
</node>
<node concept="2OqwBi" id="6OXbTDydY2A" role="3uHU7w">
<node concept="liA8E" id="6OXbTDydY2C" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
<node concept="37vLTw" id="6tPOoeTbwWq" role="2Oq$k0">
<ref role="3cqZAo" node="6OXbTDydhIZ" resolve="queryTemplate" />

10
coderules/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl
View File

@ -31,13 +31,13 @@
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:69b8a993-9b87-4d96-bf0c-3559f4bb0c63:jetbrains.mps.lang.slanguage" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
@ -113,9 +113,9 @@
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />

12
coderules/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl
View File

@ -24,12 +24,12 @@
<language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="-1" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
@ -90,16 +90,16 @@
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
<language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />

4
coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
View File

@ -4,8 +4,8 @@
<languages>
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="2" />
<use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage" version="0" />
<devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />

10
coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
View File

@ -39,13 +39,13 @@
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:69b8a993-9b87-4d96-bf0c-3559f4bb0c63:jetbrains.mps.lang.slanguage" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
@ -124,9 +124,9 @@
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />

2
coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps
View File

@ -6,7 +6,7 @@
<use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
<use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
<use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
<imports />

4
coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
View File

@ -4,8 +4,8 @@
<languages>
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
</languages>
<imports>

10
coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
View File

@ -3,11 +3,11 @@
<persistence version="9" />
<languages>
<use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="2" />
<use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
<use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="1" />
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
<use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
@ -428,7 +428,7 @@
<node concept="2OqwBi" id="28ktUhrkeJN" role="3clFbG">
<node concept="2OqwBi" id="28ktUhrke9D" role="2Oq$k0">
<node concept="liA8E" id="28ktUhrkepZ" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
</node>
<node concept="37vLTw" id="74q$MmSc9e2" role="2Oq$k0">
<ref role="3cqZAo" node="74q$MmSc8Yr" resolve="logical" />
@ -449,7 +449,7 @@
</node>
</node>
<node concept="liA8E" id="28ktUhrkfqr" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
<node concept="raruj" id="74q$MmSc9gY" role="lGtFl" />
</node>
@ -1846,7 +1846,7 @@
</node>
</node>
<node concept="liA8E" id="7HUwyZaNQGE" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int):jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="logicalAt" />
<ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int)" resolve="logicalAt" />
<node concept="3cmrfG" id="7HUwyZaNQHA" role="37wK5m">
<property role="3cmrfH" value="0" />
<node concept="29HgVG" id="7HUwyZaNQHB" role="lGtFl">

15
coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
View File

@ -30,10 +30,11 @@
<language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
@ -46,8 +47,6 @@
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
<module reference="985c8c6a-64b4-486d-a91e-7d4112742556(jetbrains.mps.baseLanguage#1129914002933)" version="0" />
<module reference="857d0a79-6f44-4f46-84ed-9c5b42632011(jetbrains.mps.baseLanguage.closures#1199623535494)" version="0" />
<module reference="5f9babc9-8d5d-4825-8e61-17b241ee6272(jetbrains.mps.baseLanguage.collections#1151699677197)" version="0" />
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
@ -110,18 +109,18 @@
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
<language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
<language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />

2
coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
View File

@ -5,7 +5,7 @@
<use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />

2
coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
View File

@ -5,7 +5,7 @@
<use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
<use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
</languages>
<imports>

8
coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
View File

@ -5,7 +5,7 @@
<use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
<use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="12" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
@ -2944,7 +2944,7 @@
</node>
<node concept="2YIFZM" id="5yj19qaZwIW" role="33vP2m">
<ref role="1Pybhc" to="ykok:~ModelConstraints" resolve="ModelConstraints" />
<ref role="37wK5l" to="ykok:~ModelConstraints.getReferenceDescriptor(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.language.SContainmentLink,int,org.jetbrains.mps.openapi.language.SReferenceLink,org.jetbrains.mps.openapi.language.SAbstractConcept):jetbrains.mps.smodel.constraints.ReferenceDescriptor" resolve="getReferenceDescriptor" />
<ref role="37wK5l" to="ykok:~ModelConstraints.getReferenceDescriptor(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.language.SContainmentLink,int,org.jetbrains.mps.openapi.language.SReferenceLink,org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="getReferenceDescriptor" />
<node concept="3bvxqY" id="5yj19qaZwIX" role="37wK5m" />
<node concept="10Nm6u" id="5yj19qaZKuw" role="37wK5m" />
<node concept="3cmrfG" id="5yj19qaZwIZ" role="37wK5m">
@ -2971,11 +2971,11 @@
<ref role="3cqZAo" node="5yj19qaZwIV" resolve="rd" />
</node>
<node concept="liA8E" id="4hPXq9JmeuE" role="2OqNvi">
<ref role="37wK5l" to="ykok:~ReferenceDescriptor.getScope():jetbrains.mps.scope.Scope" resolve="getScope" />
<ref role="37wK5l" to="ykok:~ReferenceDescriptor.getScope()" resolve="getScope" />
</node>
</node>
<node concept="liA8E" id="4hPXq9JmeuF" role="2OqNvi">
<ref role="37wK5l" to="35tq:~Scope.getAvailableElements(java.lang.String):java.lang.Iterable" resolve="getAvailableElements" />
<ref role="37wK5l" to="35tq:~Scope.getAvailableElements(java.lang.String)" resolve="getAvailableElements" />
<node concept="Xl_RD" id="4hPXq9JmeuG" role="37wK5m">
<property role="Xl_RC" value="" />
</node>

8
coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="0" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
<use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@ -211,7 +211,7 @@
</node>
</node>
<node concept="liA8E" id="6dMt3c55VaG" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.createNode(org.jetbrains.mps.openapi.language.SConcept):org.jetbrains.mps.openapi.model.SNode" resolve="createNode" />
<ref role="37wK5l" to="mhbf:~SModel.createNode(org.jetbrains.mps.openapi.language.SConcept)" resolve="createNode" />
<node concept="10QFUN" id="6dMt3c55VaH" role="37wK5m">
<node concept="3uibUv" id="6dMt3c55VaI" role="10QFUM">
<ref role="3uigEE" to="c17a:~SConcept" resolve="SConcept" />
@ -250,7 +250,7 @@
<node concept="3clFbS" id="6dMt3c55sOH" role="2VODD2">
<node concept="3clFbF" id="6dMt3c55sXJ" role="3cqZAp">
<node concept="2YIFZM" id="6dMt3c55th2" role="3clFbG">
<ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
<ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...)" resolve="asList" />
<ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
<node concept="35c_gC" id="6dMt3c55LmV" role="37wK5m">
<ref role="35c_gD" to="5j4j:dfChU1zo4B" resolve="Splice" />
@ -475,7 +475,7 @@
<node concept="2OqwBi" id="2L$SfAAVDFR" role="3clFbG">
<node concept="1XNTG" id="2L$SfAAVCjP" role="2Oq$k0" />
<node concept="liA8E" id="2L$SfAAVEvn" role="2OqNvi">
<ref role="37wK5l" to="cj4x:~EditorContext.selectWRTFocusPolicy(org.jetbrains.mps.openapi.model.SNode):void" resolve="selectWRTFocusPolicy" />
<ref role="37wK5l" to="cj4x:~EditorContext.selectWRTFocusPolicy(org.jetbrains.mps.openapi.model.SNode)" resolve="selectWRTFocusPolicy" />
<node concept="37vLTw" id="2L$SfABaakS" role="37wK5m">
<ref role="3cqZAo" node="2L$SfABaabI" resolve="attr" />
</node>

4
coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
View File

@ -4,8 +4,8 @@
<languages>
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
</languages>
<imports>

5
coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
View File

@ -18,12 +18,13 @@
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:96ee7a94-411d-4cf8-9b94-96cad7e52411:jetbrains.mps.baseLanguage.jdk7" version="0" />
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>

332
coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
View File

File diff suppressed because it is too large Load Diff

488
coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
View File

File diff suppressed because it is too large Load Diff

78
coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps
View File

@ -311,7 +311,7 @@
<ref role="3cqZAo" node="7HUwyZbdNB$" resolve="metaLogical" />
</node>
<node concept="liA8E" id="7HUwyZbdPaE" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MetaLogical.isWildcard():boolean" resolve="isWildcard" />
<ref role="37wK5l" to="bj13:~MetaLogical.isWildcard()" resolve="isWildcard" />
</node>
</node>
</node>
@ -345,11 +345,11 @@
<ref role="3cqZAo" node="7HUwyZbdNB$" resolve="metaLogical" />
</node>
<node concept="liA8E" id="7HUwyZbdW4K" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MetaLogical.type():java.lang.Class" resolve="type" />
<ref role="37wK5l" to="bj13:~MetaLogical.type()" resolve="type" />
</node>
</node>
<node concept="liA8E" id="6OUp3PsSKJ7" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
<node concept="37vLTw" id="6OUp3PsSKQb" role="37wK5m">
<ref role="3cqZAo" node="7HUwyZbdPnp" resolve="klass" />
</node>
@ -446,7 +446,7 @@
<ref role="3cqZAo" node="7HUwyZbdNB$" resolve="metaLogical" />
</node>
<node concept="liA8E" id="4sSe4$pscXp" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MetaLogical.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="bj13:~MetaLogical.toString()" resolve="toString" />
</node>
</node>
</node>
@ -474,7 +474,7 @@
<ref role="3cqZAo" node="7HUwyZbdNB$" resolve="metaLogical" />
</node>
<node concept="liA8E" id="3gNap3ffK22" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.hashCode():int" resolve="hashCode" />
<ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
</node>
</node>
<node concept="3cmrfG" id="3gNap3ffK23" role="3uHU7w">
@ -530,7 +530,7 @@
</node>
</node>
<node concept="liA8E" id="3gNap3ffK2p" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="3gNap3ffK2q" role="37wK5m">
<node concept="1eOMI4" id="3gNap3ffK2r" role="2Oq$k0">
<node concept="10QFUN" id="3gNap3ffK2s" role="1eOMHV">
@ -645,7 +645,7 @@
<ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
</node>
<node concept="liA8E" id="4TCblo5MV1e" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.isWildcard():boolean" resolve="isWildcard" />
<ref role="37wK5l" to="bj13:~Logical.isWildcard()" resolve="isWildcard" />
</node>
</node>
</node>
@ -680,7 +680,7 @@
<ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
</node>
<node concept="liA8E" id="4TCblo5PfRq" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.metaLogical():jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="metaLogical" />
<ref role="37wK5l" to="bj13:~Logical.metaLogical()" resolve="metaLogical" />
</node>
</node>
</node>
@ -693,15 +693,15 @@
<ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
</node>
<node concept="liA8E" id="4TCblo5Pi8Z" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.metaLogical():jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="metaLogical" />
<ref role="37wK5l" to="bj13:~Logical.metaLogical()" resolve="metaLogical" />
</node>
</node>
<node concept="liA8E" id="4TCblo5Pj6t" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MetaLogical.type():java.lang.Class" resolve="type" />
<ref role="37wK5l" to="bj13:~MetaLogical.type()" resolve="type" />
</node>
</node>
<node concept="liA8E" id="6OUp3PsSHqC" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
<node concept="37vLTw" id="6OUp3PsSJNn" role="37wK5m">
<ref role="3cqZAo" node="4TCblo5MWaD" resolve="klass" />
</node>
@ -744,11 +744,11 @@
<ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
</node>
<node concept="liA8E" id="4TCblo5NeWU" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
</node>
</node>
<node concept="liA8E" id="4TCblo5NfQc" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
</node>
@ -759,7 +759,7 @@
<ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
</node>
<node concept="liA8E" id="4TCblo5Ndxq" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
<ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
</node>
</node>
<node concept="9aQIb" id="4TCblo5Nikj" role="9aQIa">
@ -808,7 +808,7 @@
<ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
</node>
<node concept="liA8E" id="4TCblo5MRBz" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
<ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
</node>
</node>
<node concept="9aQIb" id="4TCblo5MQHu" role="9aQIa">
@ -851,7 +851,7 @@
<ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
</node>
<node concept="liA8E" id="3gNap3ffJAC" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
<ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
</node>
</node>
</node>
@ -895,7 +895,7 @@
<ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
</node>
<node concept="liA8E" id="4TCblo5MZKI" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -923,7 +923,7 @@
<ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
</node>
<node concept="liA8E" id="4TCblo5N3Oz" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.hashCode():int" resolve="hashCode" />
<ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
</node>
</node>
<node concept="3cmrfG" id="4TCblo5N55b" role="3uHU7w">
@ -979,7 +979,7 @@
</node>
</node>
<node concept="liA8E" id="4TCblo5N8WJ" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="4TCblo5Na0e" role="37wK5m">
<node concept="1eOMI4" id="4TCblo5N9Mc" role="2Oq$k0">
<node concept="10QFUN" id="4TCblo5N9Md" role="1eOMHV">
@ -1078,7 +1078,7 @@
<ref role="3cqZAo" node="3gNap3fN2iq" resolve="logical" />
</node>
<node concept="liA8E" id="7BhUeN7y$2Z" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
<ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
</node>
</node>
<node concept="3clFbS" id="7BhUeN7yx2g" role="3clFbx">
@ -1089,11 +1089,11 @@
<ref role="3cqZAo" node="3gNap3fN2iq" resolve="logical" />
</node>
<node concept="liA8E" id="7BhUeN7yAJo" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
</node>
</node>
<node concept="liA8E" id="7BhUeN7yB7W" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
</node>
@ -1127,7 +1127,7 @@
<ref role="3cqZAo" node="3gNap3fN2iq" resolve="logical" />
</node>
<node concept="liA8E" id="3gNap3fN2jY" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.isWildcard():boolean" resolve="isWildcard" />
<ref role="37wK5l" to="bj13:~Logical.isWildcard()" resolve="isWildcard" />
</node>
</node>
</node>
@ -1160,7 +1160,7 @@
<ref role="3VsUkX" to="6exd:2xQ7eRAD2dj" resolve="Value" />
</node>
<node concept="liA8E" id="3gNap3fN3Rf" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
<node concept="37vLTw" id="3gNap3fN3SA" role="37wK5m">
<ref role="3cqZAo" node="3gNap3fN2m4" resolve="klass" />
</node>
@ -1227,7 +1227,7 @@
<ref role="3cqZAo" node="3gNap3fN2iq" resolve="logical" />
</node>
<node concept="liA8E" id="7BhUeN7ylN8" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
<ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
</node>
</node>
<node concept="9aQIb" id="7BhUeN7ylX0" role="9aQIa">
@ -1270,7 +1270,7 @@
<ref role="3cqZAo" node="3gNap3fN2iq" resolve="logical" />
</node>
<node concept="liA8E" id="7BhUeN7yoA4" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
<ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
</node>
</node>
</node>
@ -1314,7 +1314,7 @@
<ref role="3cqZAo" node="3gNap3fN2iq" resolve="logical" />
</node>
<node concept="liA8E" id="3gNap3fN7WR" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -1342,7 +1342,7 @@
<ref role="3cqZAo" node="3gNap3fN2iq" resolve="logical" />
</node>
<node concept="liA8E" id="3gNap3fN7X4" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.hashCode():int" resolve="hashCode" />
<ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
</node>
</node>
<node concept="3cmrfG" id="3gNap3fN7X5" role="3uHU7w">
@ -1398,7 +1398,7 @@
</node>
</node>
<node concept="liA8E" id="3gNap3fN7Xr" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="3gNap3fN7Xs" role="37wK5m">
<node concept="1eOMI4" id="3gNap3fN7Xt" role="2Oq$k0">
<node concept="10QFUN" id="3gNap3fN7Xu" role="1eOMHV">
@ -1517,7 +1517,7 @@
<ref role="3cqZAo" node="3gNap3fNdyC" resolve="metaLogical" />
</node>
<node concept="liA8E" id="3gNap3fNd$L" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MetaLogical.isWildcard():boolean" resolve="isWildcard" />
<ref role="37wK5l" to="bj13:~MetaLogical.isWildcard()" resolve="isWildcard" />
</node>
</node>
</node>
@ -1550,7 +1550,7 @@
<ref role="3VsUkX" to="6exd:2xQ7eRAD2dj" resolve="Value" />
</node>
<node concept="liA8E" id="3gNap3fNdAI" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
<node concept="37vLTw" id="3gNap3fNdAJ" role="37wK5m">
<ref role="3cqZAo" node="3gNap3fNd_w" resolve="klass" />
</node>
@ -1647,7 +1647,7 @@
<ref role="3cqZAo" node="3gNap3fNdyC" resolve="metaLogical" />
</node>
<node concept="liA8E" id="3gNap3fNdGf" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MetaLogical.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="bj13:~MetaLogical.toString()" resolve="toString" />
</node>
</node>
</node>
@ -1675,7 +1675,7 @@
<ref role="3cqZAo" node="3gNap3fNdyC" resolve="metaLogical" />
</node>
<node concept="liA8E" id="3gNap3fNdGs" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.hashCode():int" resolve="hashCode" />
<ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
</node>
</node>
<node concept="3cmrfG" id="3gNap3fNdGt" role="3uHU7w">
@ -1731,7 +1731,7 @@
</node>
</node>
<node concept="liA8E" id="3gNap3fNdGN" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="3gNap3fNdGO" role="37wK5m">
<node concept="1eOMI4" id="3gNap3fNdGP" role="2Oq$k0">
<node concept="10QFUN" id="3gNap3fNdGQ" role="1eOMHV">
@ -1806,7 +1806,7 @@
<ref role="3cqZAo" node="7HUwyZb7b7D" resolve="multiMetaLogical" />
</node>
<node concept="liA8E" id="7HUwyZbdR3y" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MultiMetaLogical.cardinality():int" resolve="cardinality" />
<ref role="37wK5l" to="bj13:~MultiMetaLogical.cardinality()" resolve="cardinality" />
</node>
</node>
</node>
@ -1836,7 +1836,7 @@
<ref role="3cqZAo" node="7HUwyZb7b7D" resolve="multiMetaLogical" />
</node>
<node concept="liA8E" id="7HUwyZbdRgZ" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int):jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="logicalAt" />
<ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int)" resolve="logicalAt" />
<node concept="37vLTw" id="7HUwyZbdRiC" role="37wK5m">
<ref role="3cqZAo" node="7HUwyZb7b8h" resolve="i" />
</node>
@ -1862,7 +1862,7 @@
<ref role="3cqZAo" node="7HUwyZb7b7D" resolve="multiMetaLogical" />
</node>
<node concept="liA8E" id="7HUwyZbdR6B" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MultiMetaLogical.cardinality():int" resolve="cardinality" />
<ref role="37wK5l" to="bj13:~MultiMetaLogical.cardinality()" resolve="cardinality" />
</node>
</node>
</node>
@ -2172,7 +2172,7 @@
<ref role="3cqZAo" node="4TCblo5MI7r" resolve="logicalContext" />
</node>
<node concept="liA8E" id="3gNap3fZcZv" role="2OqNvi">
<ref role="37wK5l" to="bj13:~LogicalContext.variable(jetbrains.mps.logic.reactor.logical.MetaLogical):jetbrains.mps.logic.reactor.logical.Logical" resolve="variable" />
<ref role="37wK5l" to="bj13:~LogicalContext.variable(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="variable" />
<node concept="2OqwBi" id="3gNap3fZcZw" role="37wK5m">
<node concept="1eOMI4" id="3gNap3fZcZx" role="2Oq$k0">
<node concept="10QFUN" id="3gNap3fZcZy" role="1eOMHV">
@ -2204,7 +2204,7 @@
<ref role="3cqZAo" node="4TCblo5MI7r" resolve="logicalContext" />
</node>
<node concept="liA8E" id="3gNap3fZcU9" role="2OqNvi">
<ref role="37wK5l" to="bj13:~LogicalContext.variable(jetbrains.mps.logic.reactor.logical.MetaLogical):jetbrains.mps.logic.reactor.logical.Logical" resolve="variable" />
<ref role="37wK5l" to="bj13:~LogicalContext.variable(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="variable" />
<node concept="2OqwBi" id="3gNap3fZcUa" role="37wK5m">
<node concept="1eOMI4" id="3gNap3fZcUb" role="2Oq$k0">
<node concept="10QFUN" id="3gNap3fZcUc" role="1eOMHV">

4
coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
View File

@ -31,9 +31,9 @@
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />

2
coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps
View File

@ -200,7 +200,7 @@
<property role="TrG5h" value="text" />
<node concept="17QB3L" id="1FOQehwZfE_" role="1tU5fm" />
<node concept="2YIFZM" id="7KcYPxpVjXr" role="33vP2m">
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<node concept="2OqwBi" id="7KcYPxpVjXs" role="37wK5m">
<node concept="2Sf5sV" id="7KcYPxpVjXt" role="2Oq$k0" />

12
coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
View File

@ -23,12 +23,12 @@
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
@ -73,16 +73,16 @@
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
<language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />

6
coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps
View File

@ -456,7 +456,7 @@
</node>
<node concept="tyxLq" id="7mB3viLb$9F" role="2OqNvi">
<node concept="2YIFZM" id="7mB3viLb$D4" role="tz02z">
<ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String):java.lang.Integer" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
<node concept="ub8z3" id="7mB3viLb$Lt" role="37wK5m" />
</node>
@ -657,7 +657,7 @@
<node concept="2OqwBi" id="7mB3viLh1na" role="37vLTx">
<node concept="ub8z3" id="7mB3viLh13D" role="2Oq$k0" />
<node concept="liA8E" id="7mB3viLh2bE" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.substring(int):java.lang.String" resolve="substring" />
<ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
<node concept="3cmrfG" id="7mB3viLh2io" role="37wK5m">
<property role="3cmrfH" value="1" />
</node>
@ -675,7 +675,7 @@
<node concept="2OqwBi" id="7mB3viLhw1z" role="3clFbG">
<node concept="1Q80Hx" id="7mB3viLhvtt" role="2Oq$k0" />
<node concept="liA8E" id="7mB3viLhwvk" role="2OqNvi">
<ref role="37wK5l" to="cj4x:~EditorContext.selectWRTFocusPolicy(org.jetbrains.mps.openapi.model.SNode):void" resolve="selectWRTFocusPolicy" />
<ref role="37wK5l" to="cj4x:~EditorContext.selectWRTFocusPolicy(org.jetbrains.mps.openapi.model.SNode)" resolve="selectWRTFocusPolicy" />
<node concept="7Obwk" id="7mB3viLhx3z" role="37wK5m" />
</node>
</node>

6
coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
View File

@ -5,7 +5,7 @@
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="15" />
<use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
@ -509,7 +509,7 @@
<node concept="3wWvb2" id="7mB3viLicin" role="3I6s78">
<node concept="2dkUwp" id="7mB3viLie3k" role="3wWo3s">
<node concept="2YIFZM" id="7mB3viLiciz" role="3uHU7B">
<ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String):java.lang.Integer" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
<node concept="1TmgYN" id="7mB3viLicQJ" role="37wK5m">
<node concept="1nq8_$" id="7mB3viLicSp" role="1Tms7$">
@ -520,7 +520,7 @@
</node>
</node>
<node concept="2YIFZM" id="7mB3viLie5Z" role="3uHU7w">
<ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String):java.lang.Integer" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
<node concept="1TmgYN" id="7mB3viLie60" role="37wK5m">
<node concept="1nq8_$" id="7mB3viLie61" role="1Tms7$">

40
coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd
View File

@ -13,9 +13,47 @@
<dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
<dependency reexport="true">707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)</dependency>
</dependencies>
<languageVersions />
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="8" />
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
<language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
<language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
<language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
<language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="1" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
<language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
<module reference="847a3235-09f9-403c-b6a9-1c294a212e92(Ant)" version="0" />
<module reference="1fd846c3-c5f9-4b9e-9ecc-e716f7149f86(Hamcrest)" version="0" />
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
<module reference="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" version="0" />
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
<module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
<module reference="920eaa0e-ecca-46bc-bee7-4e5c59213dd6(Testbench)" version="0" />
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
<module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
<module reference="f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)" version="0" />
<module reference="c18711cb-f08b-4fae-81b0-1dd840be9c90(jetbrains.mps.coderules.test)" version="0" />
<module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" version="0" />
<module reference="707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)" version="0" />
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
</dependencyVersions>
</solution>

32
coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps
View File

@ -280,7 +280,7 @@
<node concept="10Nm6u" id="2rIdnPwwLKh" role="3uHU7w" />
<node concept="2YIFZM" id="2KEPLp6ICYM" role="3uHU7B">
<ref role="1Pybhc" to="wyt6:~System" resolve="System" />
<ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String):java.lang.String" resolve="getProperty" />
<ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String)" resolve="getProperty" />
<node concept="Xl_RD" id="2KEPLp6ICYN" role="37wK5m">
<property role="Xl_RC" value="mps.test.modules" />
</node>
@ -384,7 +384,7 @@
</node>
<node concept="2YIFZM" id="1Lr58WFTEwF" role="37wK5m">
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
<node concept="1Xw6AR" id="1Lr58WFTEwG" role="37wK5m">
<node concept="1dCxOl" id="1Lr58WFTEwH" role="1XwpL7">
<property role="1XweGQ" value="r:cc1a7719-27fc-407d-bcc3-f0a29456923e" />
@ -502,7 +502,7 @@
<ref role="1PxDUh" to="d6hs:~NodeFlavouredItem" resolve="NodeFlavouredItem" />
</node>
<node concept="liA8E" id="1Lr58WFXFJa" role="2OqNvi">
<ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.tryToGet(jetbrains.mps.errors.item.FlavouredItem):java.lang.Object" resolve="tryToGet" />
<ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.tryToGet(jetbrains.mps.errors.item.FlavouredItem)" resolve="tryToGet" />
<node concept="37vLTw" id="1Lr58WFXIle" role="37wK5m">
<ref role="3cqZAo" node="1Lr58WFXqkn" resolve="reportItem" />
</node>
@ -516,7 +516,7 @@
<ref role="1PxDUh" to="d6hs:~NodeFlavouredItem" resolve="NodeFlavouredItem" />
</node>
<node concept="liA8E" id="1Lr58WFX_tm" role="2OqNvi">
<ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.canGet(jetbrains.mps.errors.item.FlavouredItem):boolean" resolve="canGet" />
<ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.canGet(jetbrains.mps.errors.item.FlavouredItem)" resolve="canGet" />
<node concept="37vLTw" id="1Lr58WFX__e" role="37wK5m">
<ref role="3cqZAo" node="1Lr58WFXqkn" resolve="reportItem" />
</node>
@ -528,7 +528,7 @@
<node concept="3cpWs6" id="1Lr58WFXIuP" role="3cqZAp">
<node concept="2OqwBi" id="1Lr58WFXIuQ" role="3cqZAk">
<node concept="liA8E" id="1Lr58WFXIuS" role="2OqNvi">
<ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.tryToGet(jetbrains.mps.errors.item.FlavouredItem):java.lang.Object" resolve="tryToGet" />
<ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.tryToGet(jetbrains.mps.errors.item.FlavouredItem)" resolve="tryToGet" />
<node concept="37vLTw" id="1Lr58WFXIuT" role="37wK5m">
<ref role="3cqZAo" node="1Lr58WFXqkn" resolve="reportItem" />
</node>
@ -546,7 +546,7 @@
<ref role="1PxDUh" to="d6hs:~ModelFlavouredItem" resolve="ModelFlavouredItem" />
</node>
<node concept="liA8E" id="1Lr58WFXIuW" role="2OqNvi">
<ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.canGet(jetbrains.mps.errors.item.FlavouredItem):boolean" resolve="canGet" />
<ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.canGet(jetbrains.mps.errors.item.FlavouredItem)" resolve="canGet" />
<node concept="37vLTw" id="1Lr58WFXIuX" role="37wK5m">
<ref role="3cqZAo" node="1Lr58WFXqkn" resolve="reportItem" />
</node>
@ -558,7 +558,7 @@
<node concept="3cpWs6" id="1Lr58WFXJex" role="3cqZAp">
<node concept="2OqwBi" id="1Lr58WFXJey" role="3cqZAk">
<node concept="liA8E" id="1Lr58WFXJez" role="2OqNvi">
<ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.tryToGet(jetbrains.mps.errors.item.FlavouredItem):java.lang.Object" resolve="tryToGet" />
<ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.tryToGet(jetbrains.mps.errors.item.FlavouredItem)" resolve="tryToGet" />
<node concept="37vLTw" id="1Lr58WFXJe$" role="37wK5m">
<ref role="3cqZAo" node="1Lr58WFXqkn" resolve="reportItem" />
</node>
@ -576,7 +576,7 @@
<ref role="1PxDUh" to="d6hs:~ModuleFlavouredItem" resolve="ModuleFlavouredItem" />
</node>
<node concept="liA8E" id="1Lr58WFXJeC" role="2OqNvi">
<ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.canGet(jetbrains.mps.errors.item.FlavouredItem):boolean" resolve="canGet" />
<ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.canGet(jetbrains.mps.errors.item.FlavouredItem)" resolve="canGet" />
<node concept="37vLTw" id="1Lr58WFXJeD" role="37wK5m">
<ref role="3cqZAo" node="1Lr58WFXqkn" resolve="reportItem" />
</node>
@ -674,7 +674,7 @@
<node concept="2OqwBi" id="1Lr58WFTIHh" role="2GsD0m">
<node concept="1jxXqW" id="1Lr58WFTIHi" role="2Oq$k0" />
<node concept="liA8E" id="1Lr58WFTIHj" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~IProject.getProjectModules():java.util.List" resolve="getProjectModules" />
<ref role="37wK5l" to="z1c3:~IProject.getProjectModules()" resolve="getProjectModules" />
</node>
</node>
<node concept="3clFbS" id="1Lr58WFTIHk" role="2LFqv$">
@ -741,7 +741,7 @@
<node concept="2OqwBi" id="1Lr58WFTIHJ" role="37wK5m">
<node concept="1jxXqW" id="1Lr58WFTIHK" role="2Oq$k0" />
<node concept="liA8E" id="1Lr58WFTIHL" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
<node concept="37vLTw" id="1Lr58WFTIHM" role="37wK5m">
@ -770,7 +770,7 @@
<ref role="3cqZAo" node="1Lr58WFTIHu" resolve="collectConsumer" />
</node>
<node concept="liA8E" id="1Lr58WFTIHW" role="2OqNvi">
<ref role="37wK5l" to="18ew:~CollectConsumer.getResult():java.util.Collection" resolve="getResult" />
<ref role="37wK5l" to="18ew:~CollectConsumer.getResult()" resolve="getResult" />
</node>
</node>
</node>
@ -794,7 +794,7 @@
<ref role="2Gs0qQ" node="1Lr58WFTIHY" resolve="r" />
</node>
<node concept="liA8E" id="1Lr58WFTII6" role="2OqNvi">
<ref role="37wK5l" to="d6hs:~ReportItem.getSeverity():jetbrains.mps.errors.MessageStatus" resolve="getSeverity" />
<ref role="37wK5l" to="d6hs:~ReportItem.getSeverity()" resolve="getSeverity" />
</node>
</node>
</node>
@ -808,7 +808,7 @@
</node>
<node concept="2OqwBi" id="1Lr58WFTIIx" role="33vP2m">
<node concept="liA8E" id="1Lr58WFTIIz" role="2OqNvi">
<ref role="37wK5l" to="d6hs:~ReportItemBase$SimpleReportItemFlavour.get(jetbrains.mps.errors.item.FlavouredItem):java.lang.Object" resolve="get" />
<ref role="37wK5l" to="d6hs:~ReportItemBase$SimpleReportItemFlavour.get(jetbrains.mps.errors.item.FlavouredItem)" resolve="get" />
<node concept="2GrUjf" id="1Lr58WFTII$" role="37wK5m">
<ref role="2Gs0qQ" node="1Lr58WFTIHY" resolve="r" />
</node>
@ -837,7 +837,7 @@
<ref role="2Gs0qQ" node="1Lr58WFTIHY" resolve="r" />
</node>
<node concept="liA8E" id="1Lr58WFUGgU" role="2OqNvi">
<ref role="37wK5l" to="d6hs:~ReportItem.getMessage():java.lang.String" resolve="getMessage" />
<ref role="37wK5l" to="d6hs:~ReportItem.getMessage()" resolve="getMessage" />
</node>
</node>
<node concept="Xl_RD" id="1Lr58WFUGgV" role="3uHU7w">
@ -855,7 +855,7 @@
<ref role="3cqZAo" node="1Lr58WFTGDC" resolve="myErrorCollector" />
</node>
<node concept="liA8E" id="1Lr58WFUws3" role="2OqNvi">
<ref role="37wK5l" to="a19p:~ErrorCollector.checkThat(java.lang.String,java.lang.Object,org.hamcrest.Matcher):void" resolve="checkThat" />
<ref role="37wK5l" to="a19p:~ErrorCollector.checkThat(java.lang.String,java.lang.Object,org.hamcrest.Matcher)" resolve="checkThat" />
<node concept="37vLTw" id="1Lr58WFUGgW" role="37wK5m">
<ref role="3cqZAo" node="1Lr58WFUGgK" resolve="reason" />
</node>
@ -863,7 +863,7 @@
<ref role="3cqZAo" node="1Lr58WFTII2" resolve="severity" />
</node>
<node concept="2YIFZM" id="1Lr58WFUBmv" role="37wK5m">
<ref role="37wK5l" to="fczk:~IsNot.not(java.lang.Object):org.hamcrest.Matcher" resolve="not" />
<ref role="37wK5l" to="fczk:~IsNot.not(java.lang.Object)" resolve="not" />
<ref role="1Pybhc" to="fczk:~IsNot" resolve="IsNot" />
<node concept="Rm8GO" id="1Lr58WFUBqA" role="37wK5m">
<ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />

4
coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd
View File

@ -31,8 +31,8 @@
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
<language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />

50
coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps
View File

@ -233,14 +233,14 @@
<ref role="3cqZAo" node="3KwBCAAvoo8" resolve="from" />
</node>
<node concept="liA8E" id="3KwBCAAvq5K" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="observeOn" />
<ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler)" resolve="observeOn" />
<node concept="37vLTw" id="3KwBCAAvUzM" role="37wK5m">
<ref role="3cqZAo" node="3KwBCAAvTlq" resolve="scheduler" />
</node>
</node>
</node>
<node concept="liA8E" id="3KwBCAAvrSp" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
<node concept="1bVj0M" id="3KwBCAAvs4S" role="37wK5m">
<node concept="3clFbS" id="3KwBCAAvs4T" role="1bW5cS">
<node concept="3cpWs8" id="3KwBCAAvDKQ" role="3cqZAp">
@ -291,7 +291,7 @@
<node concept="2OqwBi" id="3KwBCAAwANk" role="ukAjM">
<node concept="1jxXqW" id="3KwBCAAwAnn" role="2Oq$k0" />
<node concept="liA8E" id="3KwBCAAwBHn" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -359,14 +359,14 @@
<ref role="3cqZAo" node="3KwBCAAyxIp" resolve="from" />
</node>
<node concept="liA8E" id="3KwBCAAywI_" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="observeOn" />
<ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler)" resolve="observeOn" />
<node concept="37vLTw" id="3KwBCAAywIA" role="37wK5m">
<ref role="3cqZAo" node="3KwBCAAyxIn" resolve="scheduler" />
</node>
</node>
</node>
<node concept="liA8E" id="3KwBCAAywIB" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
<node concept="1bVj0M" id="3KwBCAAywIC" role="37wK5m">
<node concept="3clFbS" id="3KwBCAAywID" role="1bW5cS">
<node concept="3cpWs8" id="3KwBCAAywIE" role="3cqZAp">
@ -417,7 +417,7 @@
<node concept="2OqwBi" id="3KwBCAAz44L" role="ukAjM">
<node concept="1jxXqW" id="3KwBCAAz3xj" role="2Oq$k0" />
<node concept="liA8E" id="3KwBCAAz4P_" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -478,16 +478,16 @@
<node concept="2OqwBi" id="3KwBCAA$IHD" role="33vP2m">
<node concept="2YIFZM" id="3KwBCAA$IHE" role="2Oq$k0">
<ref role="1Pybhc" to="unkn:~Single" resolve="Single" />
<ref role="37wK5l" to="unkn:~Single.just(java.lang.Object):io.reactivex.Single" resolve="just" />
<ref role="37wK5l" to="unkn:~Single.just(java.lang.Object)" resolve="just" />
<node concept="37vLTw" id="3KwBCAA$IHF" role="37wK5m">
<ref role="3cqZAo" node="3KwBCAA$IHu" resolve="list" />
</node>
</node>
<node concept="liA8E" id="3KwBCAA$IHG" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.subscribeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="subscribeOn" />
<ref role="37wK5l" to="unkn:~Single.subscribeOn(io.reactivex.Scheduler)" resolve="subscribeOn" />
<node concept="2YIFZM" id="3KwBCAA$IHH" role="37wK5m">
<ref role="1Pybhc" to="m4y7:~Schedulers" resolve="Schedulers" />
<ref role="37wK5l" to="m4y7:~Schedulers.trampoline():io.reactivex.Scheduler" resolve="trampoline" />
<ref role="37wK5l" to="m4y7:~Schedulers.trampoline()" resolve="trampoline" />
</node>
</node>
</node>
@ -548,7 +548,7 @@
</node>
</node>
<node concept="liA8E" id="3KwBCAA$II6" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.to(io.reactivex.functions.Function):java.lang.Object" resolve="to" />
<ref role="37wK5l" to="unkn:~Single.to(io.reactivex.functions.Function)" resolve="to" />
<node concept="1bVj0M" id="3KwBCAA$II7" role="37wK5m">
<node concept="3clFbS" id="3KwBCAA$II8" role="1bW5cS">
<node concept="3clFbF" id="3KwBCAA$II9" role="3cqZAp">
@ -586,7 +586,7 @@
</node>
</node>
<node concept="liA8E" id="3KwBCAA$IIl" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.timeout(long,java.util.concurrent.TimeUnit):io.reactivex.Single" resolve="timeout" />
<ref role="37wK5l" to="unkn:~Single.timeout(long,java.util.concurrent.TimeUnit)" resolve="timeout" />
<node concept="3cmrfG" id="3KwBCAA$IIm" role="37wK5m">
<property role="3cmrfH" value="1" />
</node>
@ -597,7 +597,7 @@
</node>
</node>
<node concept="liA8E" id="3KwBCAA$IIo" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
<ref role="37wK5l" to="unkn:~Single.blockingGet()" resolve="blockingGet" />
</node>
</node>
</node>
@ -668,7 +668,7 @@
<ref role="3cqZAo" node="3KwBCAAwUO5" resolve="sem" />
</node>
<node concept="liA8E" id="3KwBCAAx$_P" role="2OqNvi">
<ref role="37wK5l" to="5zyv:~Semaphore.acquire():void" resolve="acquire" />
<ref role="37wK5l" to="5zyv:~Semaphore.acquire()" resolve="acquire" />
</node>
</node>
</node>
@ -708,16 +708,16 @@
</node>
<node concept="2OqwBi" id="3KwBCAAye5s" role="33vP2m">
<node concept="2YIFZM" id="3KwBCAAwrbV" role="2Oq$k0">
<ref role="37wK5l" to="unkn:~Single.just(java.lang.Object):io.reactivex.Single" resolve="just" />
<ref role="37wK5l" to="unkn:~Single.just(java.lang.Object)" resolve="just" />
<ref role="1Pybhc" to="unkn:~Single" resolve="Single" />
<node concept="37vLTw" id="3KwBCAAylmt" role="37wK5m">
<ref role="3cqZAo" node="3KwBCAAylmp" resolve="list" />
</node>
</node>
<node concept="liA8E" id="3KwBCAAygkh" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.subscribeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="subscribeOn" />
<ref role="37wK5l" to="unkn:~Single.subscribeOn(io.reactivex.Scheduler)" resolve="subscribeOn" />
<node concept="2YIFZM" id="3KwBCAAyq1I" role="37wK5m">
<ref role="37wK5l" to="m4y7:~Schedulers.trampoline():io.reactivex.Scheduler" resolve="trampoline" />
<ref role="37wK5l" to="m4y7:~Schedulers.trampoline()" resolve="trampoline" />
<ref role="1Pybhc" to="m4y7:~Schedulers" resolve="Schedulers" />
</node>
</node>
@ -779,7 +779,7 @@
</node>
</node>
<node concept="liA8E" id="3KwBCAA$16O" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.to(io.reactivex.functions.Function):java.lang.Object" resolve="to" />
<ref role="37wK5l" to="unkn:~Single.to(io.reactivex.functions.Function)" resolve="to" />
<node concept="1bVj0M" id="3KwBCAA$265" role="37wK5m">
<node concept="3clFbS" id="3KwBCAA$266" role="1bW5cS">
<node concept="3clFbF" id="3KwBCAA$ctG" role="3cqZAp">
@ -817,7 +817,7 @@
</node>
</node>
<node concept="liA8E" id="3KwBCAAwrcc" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.timeout(long,java.util.concurrent.TimeUnit):io.reactivex.Single" resolve="timeout" />
<ref role="37wK5l" to="unkn:~Single.timeout(long,java.util.concurrent.TimeUnit)" resolve="timeout" />
<node concept="3cmrfG" id="3KwBCAAwrcd" role="37wK5m">
<property role="3cmrfH" value="1" />
</node>
@ -828,7 +828,7 @@
</node>
</node>
<node concept="liA8E" id="3KwBCAAwrcf" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
<ref role="37wK5l" to="unkn:~Single.blockingGet()" resolve="blockingGet" />
</node>
</node>
</node>
@ -868,7 +868,7 @@
<ref role="3cqZAo" node="3KwBCAAxblG" resolve="ex" />
</node>
<node concept="liA8E" id="3KwBCAAxnOn" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object):void" resolve="set" />
<ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object)" resolve="set" />
<node concept="37vLTw" id="3KwBCAAxo2e" role="37wK5m">
<ref role="3cqZAo" node="3KwBCAAxfRl" resolve="e" />
</node>
@ -890,7 +890,7 @@
<ref role="3cqZAo" node="3KwBCAAwUO5" resolve="sem" />
</node>
<node concept="liA8E" id="3KwBCAAx5Kf" role="2OqNvi">
<ref role="37wK5l" to="5zyv:~Semaphore.release():void" resolve="release" />
<ref role="37wK5l" to="5zyv:~Semaphore.release()" resolve="release" />
</node>
</node>
</node>
@ -901,7 +901,7 @@
<node concept="2OqwBi" id="3KwBCAAwzoO" role="ukAjM">
<node concept="1jxXqW" id="3KwBCAAwz3E" role="2Oq$k0" />
<node concept="liA8E" id="3KwBCAAw_5s" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -917,7 +917,7 @@
<ref role="3cqZAo" node="3KwBCAAwUO5" resolve="sem" />
</node>
<node concept="liA8E" id="3KwBCAAwZzl" role="2OqNvi">
<ref role="37wK5l" to="5zyv:~Semaphore.acquire():void" resolve="acquire" />
<ref role="37wK5l" to="5zyv:~Semaphore.acquire()" resolve="acquire" />
</node>
</node>
</node>
@ -929,7 +929,7 @@
<ref role="3cqZAo" node="3KwBCAAxblG" resolve="ex" />
</node>
<node concept="liA8E" id="3KwBCAAxvjO" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
<ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
</node>
</node>
</node>
@ -941,7 +941,7 @@
<ref role="3cqZAo" node="3KwBCAAxblG" resolve="ex" />
</node>
<node concept="liA8E" id="3KwBCAAxrG8" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
<ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
</node>
</node>
</node>

70
coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
View File

@ -5,9 +5,9 @@
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
<use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
<use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="1" />
<use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
<use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
@ -425,7 +425,7 @@
<node concept="2OqwBi" id="7mB3viLe1a7" role="Vysub">
<node concept="1jxXqW" id="7mB3viLe1a8" role="2Oq$k0" />
<node concept="liA8E" id="7mB3viLe1a9" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -463,7 +463,7 @@
<node concept="2OqwBi" id="7mB3viLem4a" role="Vysub">
<node concept="1jxXqW" id="7mB3viLem4b" role="2Oq$k0" />
<node concept="liA8E" id="7mB3viLem4c" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -484,7 +484,7 @@
</node>
</node>
<node concept="liA8E" id="14$_tTxzTDA" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -524,7 +524,7 @@
</node>
</node>
<node concept="liA8E" id="443LGHB5PwJ" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -558,7 +558,7 @@
</node>
</node>
<node concept="liA8E" id="4vBwiiVtM9D" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
<node concept="1bVj0M" id="6QH_LDtdXLP" role="37wK5m">
@ -628,7 +628,7 @@
</node>
</node>
<node concept="liA8E" id="7mB3viLet95" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
<node concept="37vLTw" id="7mB3viLetmP" role="37wK5m">
@ -676,7 +676,7 @@
</node>
</node>
<node concept="liA8E" id="4vBwiiVuDfC" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -716,7 +716,7 @@
</node>
</node>
<node concept="liA8E" id="443LGHBdKCp" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -755,7 +755,7 @@
<node concept="2OqwBi" id="14$_tTx$1gb" role="ukAjM">
<node concept="1jxXqW" id="14$_tTx$0Xb" role="2Oq$k0" />
<node concept="liA8E" id="14$_tTx$20w" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -783,7 +783,7 @@
<node concept="2OqwBi" id="6OXbTD_oHcq" role="33vP2m">
<node concept="1jxXqW" id="6OXbTD_oHcr" role="2Oq$k0" />
<node concept="liA8E" id="6OXbTD_oHcs" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1216,7 +1216,7 @@
<node concept="2OqwBi" id="4BHjwwGV8Ht" role="ukAjM">
<node concept="1jxXqW" id="4BHjwwGV81_" role="2Oq$k0" />
<node concept="liA8E" id="4BHjwwGVaBV" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1245,7 +1245,7 @@
<node concept="2OqwBi" id="7mB3viLfkLD" role="Vysub">
<node concept="1jxXqW" id="7mB3viLfkwd" role="2Oq$k0" />
<node concept="liA8E" id="7mB3viLfmjL" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1268,7 +1268,7 @@
</node>
</node>
<node concept="liA8E" id="14$_tTxzzxO" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1293,7 +1293,7 @@
<node concept="2OqwBi" id="7mB3viLf$p5" role="Vysub">
<node concept="1jxXqW" id="7mB3viLf$p6" role="2Oq$k0" />
<node concept="liA8E" id="7mB3viLf$p7" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1399,7 +1399,7 @@
<node concept="2OqwBi" id="14$_tTxy4GA" role="ukAjM">
<node concept="1jxXqW" id="14$_tTxy3dO" role="2Oq$k0" />
<node concept="liA8E" id="14$_tTxy5mA" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1428,7 +1428,7 @@
<node concept="2OqwBi" id="7mB3viLfLnz" role="Vysub">
<node concept="1jxXqW" id="7mB3viLfLn$" role="2Oq$k0" />
<node concept="liA8E" id="7mB3viLfLn_" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1451,7 +1451,7 @@
</node>
</node>
<node concept="liA8E" id="14$_tTxz_CN" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1476,7 +1476,7 @@
<node concept="2OqwBi" id="7mB3viLfNvp" role="Vysub">
<node concept="1jxXqW" id="7mB3viLfNvq" role="2Oq$k0" />
<node concept="liA8E" id="7mB3viLfNvr" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1578,7 +1578,7 @@
<node concept="2OqwBi" id="14$_tTxy6$j" role="ukAjM">
<node concept="1jxXqW" id="14$_tTxy6oh" role="2Oq$k0" />
<node concept="liA8E" id="14$_tTxy86J" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1607,7 +1607,7 @@
<node concept="2OqwBi" id="7mB3viLfUFy" role="Vysub">
<node concept="1jxXqW" id="7mB3viLfUFz" role="2Oq$k0" />
<node concept="liA8E" id="7mB3viLfUF$" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1630,7 +1630,7 @@
</node>
</node>
<node concept="liA8E" id="3IIf9OA4zMU" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1799,7 +1799,7 @@
<node concept="2OqwBi" id="3IIf9OA4zN_" role="ukAjM">
<node concept="1jxXqW" id="3IIf9OA4zNA" role="2Oq$k0" />
<node concept="liA8E" id="3IIf9OA4zNB" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1839,7 +1839,7 @@
<node concept="2OqwBi" id="7mB3viLeGxa" role="Vysub">
<node concept="1jxXqW" id="7mB3viLeGbM" role="2Oq$k0" />
<node concept="liA8E" id="7mB3viLeHoB" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1854,7 +1854,7 @@
<node concept="2OqwBi" id="4BHjwwGTOgy" role="ukAjM">
<node concept="1jxXqW" id="4BHjwwGTO1x" role="2Oq$k0" />
<node concept="liA8E" id="4BHjwwGTOPb" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1960,7 +1960,7 @@
<node concept="2OqwBi" id="4BHjwwGTS2C" role="ukAjM">
<node concept="1jxXqW" id="4BHjwwGTRMU" role="2Oq$k0" />
<node concept="liA8E" id="4BHjwwGTTbX" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -2015,15 +2015,15 @@
<node concept="2OqwBi" id="3KwBCAABqXV" role="2Oq$k0">
<node concept="1jxXqW" id="3KwBCAABq$t" role="2Oq$k0" />
<node concept="liA8E" id="3KwBCAABrtK" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
<node concept="liA8E" id="3KwBCAABrOR" role="2OqNvi">
<ref role="37wK5l" to="lui2:~SRepository.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
<ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
</node>
</node>
<node concept="liA8E" id="3KwBCAABs8l" role="2OqNvi">
<ref role="37wK5l" to="lui2:~ModelAccess.checkWriteAccess():void" resolve="checkWriteAccess" />
<ref role="37wK5l" to="lui2:~ModelAccess.checkWriteAccess()" resolve="checkWriteAccess" />
</node>
</node>
</node>
@ -2043,7 +2043,7 @@
</node>
</node>
<node concept="liA8E" id="3KwBCAABwW0" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -3319,7 +3319,7 @@
</node>
</node>
<node concept="liA8E" id="2dF51l1dtwt" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="37vLTw" id="2dF51l1dBeg" role="37wK5m">
<ref role="3cqZAo" node="2dF51l1d$S6" resolve="foo1" />
</node>
@ -3399,7 +3399,7 @@
</node>
</node>
<node concept="liA8E" id="2dF51l1dNC$" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="37vLTw" id="2dF51l1dNHz" role="37wK5m">
<ref role="3cqZAo" node="2dF51l1dEVg" resolve="foo2" />
</node>
@ -3757,7 +3757,7 @@
</node>
</node>
<node concept="liA8E" id="6SwZmzBzJKn" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
<node concept="1rXfSq" id="6SwZmzBzLb3" role="37wK5m">
<ref role="37wK5l" node="390NiL15T3$" resolve="asTermLogical" />
<node concept="37vLTw" id="6SwZmzBzLhd" role="37wK5m">
@ -4017,7 +4017,7 @@
</node>
</node>
<node concept="liA8E" id="6SwZmzBGFuM" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
<node concept="1rXfSq" id="6SwZmzBGFuN" role="37wK5m">
<ref role="37wK5l" node="390NiL15T3$" resolve="asTermLogical" />
<node concept="37vLTw" id="6SwZmzBGFuO" role="37wK5m">

2
coderules/solutions/jetbrains.mps.coderules.typechecking.ui/jetbrains.mps.coderules.typechecking.ui.msd
View File

@ -37,7 +37,7 @@
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
<language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>

152
coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
View File

@ -9,7 +9,7 @@
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
<use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
@ -584,11 +584,11 @@
<ref role="3cqZAo" node="4n$QnzZQlSY" resolve="query" />
</node>
<node concept="liA8E" id="5mg4ZgLlR8i" role="2OqNvi">
<ref role="37wK5l" to="9erk:~SearchQuery.getObjectHolder():jetbrains.mps.ide.findusages.model.holders.IHolder" resolve="getObjectHolder" />
<ref role="37wK5l" to="9erk:~SearchQuery.getObjectHolder()" resolve="getObjectHolder" />
</node>
</node>
<node concept="liA8E" id="5mg4ZgLlR8j" role="2OqNvi">
<ref role="37wK5l" to="z3o9:~IHolder.getObject():java.lang.Object" resolve="getObject" />
<ref role="37wK5l" to="z3o9:~IHolder.getObject()" resolve="getObject" />
</node>
</node>
</node>
@ -645,13 +645,13 @@
</node>
</node>
<node concept="liA8E" id="5mg4ZgLm5Sb" role="2OqNvi">
<ref role="37wK5l" to="w1kc:~SNodePointer.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
<ref role="37wK5l" to="w1kc:~SNodePointer.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
<node concept="2OqwBi" id="5mg4ZgLm7jM" role="37wK5m">
<node concept="37vLTw" id="5mg4ZgLm6qZ" role="2Oq$k0">
<ref role="3cqZAo" node="6i42QSsghp4" resolve="mpsProject" />
</node>
<node concept="liA8E" id="5mg4ZgLm87g" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -734,13 +734,13 @@
<ref role="3cqZAo" node="6i42QSsgfqT" resolve="templateRef" />
</node>
<node concept="liA8E" id="6i42QSsgonT" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
<ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
<node concept="2OqwBi" id="6i42QSsgjMy" role="37wK5m">
<node concept="37vLTw" id="6i42QSsgiWf" role="2Oq$k0">
<ref role="3cqZAo" node="6i42QSsghp4" resolve="mpsProject" />
</node>
<node concept="liA8E" id="6i42QSsgkvG" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -792,7 +792,7 @@
<node concept="1pGfFk" id="3YJ7yg2MRp0" role="2ShVmc">
<ref role="37wK5l" to="9erk:~SearchResults.&lt;init&gt;(java.util.Collection,java.util.List)" resolve="SearchResults" />
<node concept="2YIFZM" id="3YJ7yg2MyQB" role="37wK5m">
<ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object):java.util.Set" resolve="singleton" />
<ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object)" resolve="singleton" />
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
<node concept="37vLTw" id="3YJ7yg2Mztt" role="37wK5m">
<ref role="3cqZAo" node="4n$QnzZQnen" resolve="node" />
@ -865,7 +865,7 @@
</node>
</node>
<node concept="liA8E" id="6kREIVkWLqU" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getContainingRoot():org.jetbrains.mps.openapi.model.SNode" resolve="getContainingRoot" />
<ref role="37wK5l" to="mhbf:~SNode.getContainingRoot()" resolve="getContainingRoot" />
</node>
</node>
<node concept="37vLTw" id="6kREIVkWNEh" role="37vLTJ">
@ -883,7 +883,7 @@
</node>
</node>
<node concept="liA8E" id="3YJ7yg2LGlJ" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -918,7 +918,7 @@
</node>
</node>
<node concept="liA8E" id="443LGHBTXQ6" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1006,7 +1006,7 @@
</node>
</node>
<node concept="liA8E" id="6kREIVkXK5s" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getScope():jetbrains.mps.project.Project$ProjectScope" resolve="getScope" />
<ref role="37wK5l" to="z1c3:~Project.getScope()" resolve="getScope" />
</node>
</node>
</node>
@ -1028,7 +1028,7 @@
</node>
</node>
<node concept="liA8E" id="5upUcEtjHoz" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1048,26 +1048,26 @@
</node>
</node>
<node concept="liA8E" id="6kREIVkX8wW" role="2OqNvi">
<ref role="37wK5l" to="ngmn:~UsageToolOptions.allowRunAgain(boolean):jetbrains.mps.ide.findusages.view.UsageToolOptions" resolve="allowRunAgain" />
<ref role="37wK5l" to="ngmn:~UsageToolOptions.allowRunAgain(boolean)" resolve="allowRunAgain" />
<node concept="3clFbT" id="6kREIVkX8wX" role="37wK5m" />
</node>
</node>
<node concept="liA8E" id="6kREIVkX8wY" role="2OqNvi">
<ref role="37wK5l" to="ngmn:~UsageToolOptions.navigateIfSingle(boolean):jetbrains.mps.ide.findusages.view.UsageToolOptions" resolve="navigateIfSingle" />
<ref role="37wK5l" to="ngmn:~UsageToolOptions.navigateIfSingle(boolean)" resolve="navigateIfSingle" />
<node concept="3clFbT" id="6kREIVkX8wZ" role="37wK5m">
<property role="3clFbU" value="false" />
</node>
</node>
</node>
<node concept="liA8E" id="6kREIVkX8x0" role="2OqNvi">
<ref role="37wK5l" to="ngmn:~UsageToolOptions.forceNewTab(boolean):jetbrains.mps.ide.findusages.view.UsageToolOptions" resolve="forceNewTab" />
<ref role="37wK5l" to="ngmn:~UsageToolOptions.forceNewTab(boolean)" resolve="forceNewTab" />
<node concept="3clFbT" id="6kREIVkX8x1" role="37wK5m">
<property role="3clFbU" value="false" />
</node>
</node>
</node>
<node concept="liA8E" id="6kREIVkX8x2" role="2OqNvi">
<ref role="37wK5l" to="ngmn:~UsageToolOptions.notFoundMessage(java.lang.String):jetbrains.mps.ide.findusages.view.UsageToolOptions" resolve="notFoundMessage" />
<ref role="37wK5l" to="ngmn:~UsageToolOptions.notFoundMessage(java.lang.String)" resolve="notFoundMessage" />
<node concept="Xl_RD" id="6kREIVkX8x3" role="37wK5m">
<property role="Xl_RC" value="no applicable templates found" />
</node>
@ -1078,7 +1078,7 @@
<node concept="3clFbF" id="6kREIVkX8x4" role="3cqZAp">
<node concept="2YIFZM" id="6kREIVkX8x5" role="3clFbG">
<ref role="1Pybhc" to="ngmn:~UsagesViewTool" resolve="UsagesViewTool" />
<ref role="37wK5l" to="ngmn:~UsagesViewTool.showUsages(com.intellij.openapi.project.Project,jetbrains.mps.ide.findusages.model.IResultProvider,jetbrains.mps.ide.findusages.model.SearchQuery,jetbrains.mps.ide.findusages.view.UsageToolOptions):void" resolve="showUsages" />
<ref role="37wK5l" to="ngmn:~UsagesViewTool.showUsages(com.intellij.openapi.project.Project,jetbrains.mps.ide.findusages.model.IResultProvider,jetbrains.mps.ide.findusages.model.SearchQuery,jetbrains.mps.ide.findusages.view.UsageToolOptions)" resolve="showUsages" />
<node concept="2OqwBi" id="6kREIVkX8x6" role="37wK5m">
<node concept="2WthIp" id="6kREIVkX8x7" role="2Oq$k0" />
<node concept="1DTwFV" id="6kREIVkX8x8" role="2OqNvi">
@ -1086,7 +1086,7 @@
</node>
</node>
<node concept="2YIFZM" id="6kREIVkX8x9" role="37wK5m">
<ref role="37wK5l" to="ngmm:~FindUtils.makeProvider(jetbrains.mps.ide.findusages.findalgorithm.finders.IFinder...):jetbrains.mps.ide.findusages.model.IResultProvider" resolve="makeProvider" />
<ref role="37wK5l" to="ngmm:~FindUtils.makeProvider(jetbrains.mps.ide.findusages.findalgorithm.finders.IFinder...)" resolve="makeProvider" />
<ref role="1Pybhc" to="ngmm:~FindUtils" resolve="FindUtils" />
<node concept="37vLTw" id="6kREIVkXHO8" role="37wK5m">
<ref role="3cqZAo" node="6kREIVkXHNZ" resolve="finder" />
@ -1116,7 +1116,7 @@
<node concept="3clFbS" id="6kREIVkX8xr" role="3clF47">
<node concept="3clFbF" id="6kREIVkX8xs" role="3cqZAp">
<node concept="2YIFZM" id="6kREIVkX8xt" role="3clFbG">
<ref role="37wK5l" to="jkm4:~Messages.showWarningDialog(java.lang.String,java.lang.String):void" resolve="showWarningDialog" />
<ref role="37wK5l" to="jkm4:~Messages.showWarningDialog(java.lang.String,java.lang.String)" resolve="showWarningDialog" />
<ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
<node concept="37vLTw" id="6kREIVkX8xu" role="37wK5m">
<ref role="3cqZAo" node="6kREIVkX8xn" resolve="message" />
@ -1158,7 +1158,7 @@
</node>
</node>
<node concept="liA8E" id="3YJ7yg2LDWD" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getContainingRoot():org.jetbrains.mps.openapi.model.SNode" resolve="getContainingRoot" />
<ref role="37wK5l" to="mhbf:~SNode.getContainingRoot()" resolve="getContainingRoot" />
</node>
</node>
</node>
@ -1173,7 +1173,7 @@
</node>
<node concept="2YIFZM" id="3YJ7yg2LDWJ" role="33vP2m">
<ref role="1Pybhc" to="w1kc:~SModelOperations" resolve="SModelOperations" />
<ref role="37wK5l" to="w1kc:~SModelOperations.getAllLanguageImports(org.jetbrains.mps.openapi.model.SModel):java.util.Set" resolve="getAllLanguageImports" />
<ref role="37wK5l" to="w1kc:~SModelOperations.getAllLanguageImports(org.jetbrains.mps.openapi.model.SModel)" resolve="getAllLanguageImports" />
<node concept="2OqwBi" id="3YJ7yg2LDWK" role="37wK5m">
<node concept="37vLTw" id="3YJ7yg2LDWL" role="2Oq$k0">
<ref role="3cqZAo" node="3YJ7yg2LDWz" resolve="containingRoot" />
@ -1211,7 +1211,7 @@
</node>
</node>
<node concept="liA8E" id="3GlpCDS_tAo" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1345,7 +1345,7 @@
<ref role="3cqZAo" node="Hg6EncbkRS" resolve="prevStep" />
</node>
<node concept="liA8E" id="5lxnBcU085M" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.flatMap(io.reactivex.functions.Function):io.reactivex.Single" resolve="flatMap" />
<ref role="37wK5l" to="unkn:~Single.flatMap(io.reactivex.functions.Function)" resolve="flatMap" />
<node concept="1bVj0M" id="5lxnBcU08CP" role="37wK5m">
<node concept="37vLTG" id="5lxnBcU09rm" role="1bW2Oz">
<property role="TrG5h" value="prev" />
@ -1372,7 +1372,7 @@
</node>
</node>
<node concept="liA8E" id="78H58of3fKh" role="2OqNvi">
<ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode():org.jetbrains.mps.openapi.model.SNode" resolve="getEditedNode" />
<ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode()" resolve="getEditedNode" />
</node>
</node>
<node concept="2OqwBi" id="78H58of3fKi" role="37wK5m">
@ -1471,9 +1471,9 @@
</node>
</node>
<node concept="liA8E" id="5lxnBcU0eq5" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Completable.andThen(io.reactivex.SingleSource):io.reactivex.Single" resolve="andThen" />
<ref role="37wK5l" to="unkn:~Completable.andThen(io.reactivex.SingleSource)" resolve="andThen" />
<node concept="2YIFZM" id="5lxnBcU0gP7" role="37wK5m">
<ref role="37wK5l" to="unkn:~Single.fromCallable(java.util.concurrent.Callable):io.reactivex.Single" resolve="fromCallable" />
<ref role="37wK5l" to="unkn:~Single.fromCallable(java.util.concurrent.Callable)" resolve="fromCallable" />
<ref role="1Pybhc" to="unkn:~Single" resolve="Single" />
<node concept="1bVj0M" id="5lxnBcU0iBX" role="37wK5m">
<node concept="3clFbS" id="5lxnBcU0iBY" role="1bW5cS">
@ -1548,7 +1548,7 @@
<ref role="3cqZAo" node="55Q$YFtIX9v" resolve="mpsProject" />
</node>
<node concept="liA8E" id="443LGHBSEHm" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1581,7 +1581,7 @@
<ref role="3cqZAo" node="55Q$YFtIX9v" resolve="mpsProject" />
</node>
<node concept="liA8E" id="6kREIVkONuP" role="2OqNvi">
<ref role="37wK5l" to="z1c4:~MPSProject.getProject():com.intellij.openapi.project.Project" resolve="getProject" />
<ref role="37wK5l" to="z1c4:~MPSProject.getProject()" resolve="getProject" />
</node>
</node>
</node>
@ -1649,15 +1649,15 @@
<ref role="3cqZAo" node="Hg6Enc6phb" resolve="prevStep" />
</node>
<node concept="liA8E" id="Hg6EncXnuT" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="observeOn" />
<ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler)" resolve="observeOn" />
<node concept="2YIFZM" id="Hg6EncXnuU" role="37wK5m">
<ref role="1Pybhc" to="f4yq:~SwingSchedulers" resolve="SwingSchedulers" />
<ref role="37wK5l" to="f4yq:~SwingSchedulers.edt():io.reactivex.Scheduler" resolve="edt" />
<ref role="37wK5l" to="f4yq:~SwingSchedulers.edt()" resolve="edt" />
</node>
</node>
</node>
<node concept="liA8E" id="Hg6EncXntX" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
<node concept="1bVj0M" id="Hg6EncXntY" role="37wK5m">
<node concept="37vLTG" id="Hg6EncXntZ" role="1bW2Oz">
<property role="TrG5h" value="prev" />
@ -1725,7 +1725,7 @@
<ref role="3cqZAo" node="Hg6EncXnu8" resolve="program" />
</node>
<node concept="liA8E" id="6IQb_Rxph$L" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Program.name():java.lang.String" resolve="name" />
<ref role="37wK5l" to="av0y:~Program.name()" resolve="name" />
</node>
</node>
</node>
@ -1841,7 +1841,7 @@
</node>
</node>
<node concept="liA8E" id="6IQb_Rxsum7" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.doFinally(io.reactivex.functions.Action):io.reactivex.Single" resolve="doFinally" />
<ref role="37wK5l" to="unkn:~Single.doFinally(io.reactivex.functions.Action)" resolve="doFinally" />
<node concept="1bVj0M" id="6IQb_Rxswo2" role="37wK5m">
<node concept="3clFbS" id="6IQb_Rxswo3" role="1bW5cS">
<node concept="3clFbH" id="6IQb_Rxsy3D" role="3cqZAp" />
@ -1920,7 +1920,7 @@
<ref role="3cqZAo" node="443LGHBSGGx" resolve="mpsProject" />
</node>
<node concept="liA8E" id="6IQb_Rxsy6n" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -2011,7 +2011,7 @@
<node concept="3Tqbb2" id="6hqFpWnfbDz" role="1tU5fm" />
<node concept="2OqwBi" id="6hqFpWnfbD$" role="33vP2m">
<node concept="liA8E" id="6hqFpWnfbDC" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getContainingRoot():org.jetbrains.mps.openapi.model.SNode" resolve="getContainingRoot" />
<ref role="37wK5l" to="mhbf:~SNode.getContainingRoot()" resolve="getContainingRoot" />
</node>
<node concept="37vLTw" id="6hqFpWnfcn_" role="2Oq$k0">
<ref role="3cqZAo" node="6hqFpWnfbqG" resolve="node" />
@ -2041,7 +2041,7 @@
<ref role="3cqZAo" node="6hqFpWnfhk_" resolve="mpsProject" />
</node>
<node concept="liA8E" id="7WKNeR8ULi8" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -2071,7 +2071,7 @@
<ref role="3cqZAo" node="6hqFpWnfcD1" resolve="editorComponent" />
</node>
<node concept="liA8E" id="6hqFpWnfbEg" role="2OqNvi">
<ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode():org.jetbrains.mps.openapi.model.SNode" resolve="getEditedNode" />
<ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode()" resolve="getEditedNode" />
</node>
</node>
</node>
@ -2555,7 +2555,7 @@
</node>
</node>
<node concept="liA8E" id="4vBwiiVz_Wc" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -2641,7 +2641,7 @@
</node>
</node>
<node concept="liA8E" id="6kEuCh$5LeT" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
<node concept="37vLTw" id="4vBwiiVAn8l" role="37wK5m">
@ -2690,13 +2690,13 @@
<node concept="2OqwBi" id="4vBwiiVz_Xj" role="3clFbG">
<node concept="2YIFZM" id="4vBwiiVz_Xk" role="2Oq$k0">
<ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
<ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project):com.intellij.openapi.wm.ToolWindowManager" resolve="getInstance" />
<ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
<node concept="37vLTw" id="4vBwiiVz_Xl" role="37wK5m">
<ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
</node>
</node>
<node concept="liA8E" id="4vBwiiVz_Xm" role="2OqNvi">
<ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String):void" resolve="notifyByBalloon" />
<ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String)" resolve="notifyByBalloon" />
<node concept="Xl_RD" id="4vBwiiVz_Xn" role="37wK5m">
<property role="Xl_RC" value="Activation Trace" />
</node>
@ -2717,7 +2717,7 @@
<ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
</node>
<node concept="liA8E" id="4vBwiiVz_Xs" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -2740,13 +2740,13 @@
<node concept="2OqwBi" id="4vBwiiVz_XB" role="3clFbG">
<node concept="2YIFZM" id="4vBwiiVz_XC" role="2Oq$k0">
<ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
<ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project):com.intellij.openapi.wm.ToolWindowManager" resolve="getInstance" />
<ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
<node concept="37vLTw" id="4vBwiiVz_XD" role="37wK5m">
<ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
</node>
</node>
<node concept="liA8E" id="4vBwiiVz_XE" role="2OqNvi">
<ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String):void" resolve="notifyByBalloon" />
<ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String)" resolve="notifyByBalloon" />
<node concept="Xl_RD" id="4vBwiiVz_XF" role="37wK5m">
<property role="Xl_RC" value="Activation Trace" />
</node>
@ -2767,7 +2767,7 @@
<ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
</node>
<node concept="liA8E" id="4vBwiiVz_XK" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -2888,7 +2888,7 @@
</node>
</node>
<node concept="liA8E" id="7WKNeR8SQxO" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -3026,13 +3026,13 @@
<node concept="2OqwBi" id="7WKNeR8SQyQ" role="3clFbG">
<node concept="2YIFZM" id="7WKNeR8SQyR" role="2Oq$k0">
<ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
<ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project):com.intellij.openapi.wm.ToolWindowManager" resolve="getInstance" />
<ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
<node concept="37vLTw" id="7WKNeR8SQyS" role="37wK5m">
<ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
</node>
</node>
<node concept="liA8E" id="7WKNeR8SQyT" role="2OqNvi">
<ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String):void" resolve="notifyByBalloon" />
<ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String)" resolve="notifyByBalloon" />
<node concept="Xl_RD" id="7WKNeR8SQyU" role="37wK5m">
<property role="Xl_RC" value="Activation Trace" />
</node>
@ -3053,7 +3053,7 @@
<ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
</node>
<node concept="liA8E" id="7WKNeR8SQyZ" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -3076,13 +3076,13 @@
<node concept="2OqwBi" id="7WKNeR8SQza" role="3clFbG">
<node concept="2YIFZM" id="7WKNeR8SQzb" role="2Oq$k0">
<ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
<ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project):com.intellij.openapi.wm.ToolWindowManager" resolve="getInstance" />
<ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
<node concept="37vLTw" id="7WKNeR8SQzc" role="37wK5m">
<ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
</node>
</node>
<node concept="liA8E" id="7WKNeR8SQzd" role="2OqNvi">
<ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String):void" resolve="notifyByBalloon" />
<ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String)" resolve="notifyByBalloon" />
<node concept="Xl_RD" id="7WKNeR8SQze" role="37wK5m">
<property role="Xl_RC" value="Activation Trace" />
</node>
@ -3103,7 +3103,7 @@
<ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
</node>
<node concept="liA8E" id="7WKNeR8SQzj" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -3410,15 +3410,15 @@
<ref role="3cqZAo" node="4vBwiiV$adz" resolve="prevStep" />
</node>
<node concept="liA8E" id="6kEuCh$3Be5" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="observeOn" />
<ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler)" resolve="observeOn" />
<node concept="2YIFZM" id="6kEuCh$3DmD" role="37wK5m">
<ref role="37wK5l" to="f4yq:~SwingSchedulers.edt():io.reactivex.Scheduler" resolve="edt" />
<ref role="37wK5l" to="f4yq:~SwingSchedulers.edt()" resolve="edt" />
<ref role="1Pybhc" to="f4yq:~SwingSchedulers" resolve="SwingSchedulers" />
</node>
</node>
</node>
<node concept="liA8E" id="4vBwiiV$cFS" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
<node concept="1bVj0M" id="4vBwiiV$df1" role="37wK5m">
<node concept="3clFbS" id="4vBwiiV$df2" role="1bW5cS">
<node concept="3cpWs8" id="4vBwiiV$vTm" role="3cqZAp">
@ -3473,7 +3473,7 @@
<ref role="3cqZAo" node="4vBwiiV$7vt" resolve="mpsProject" />
</node>
<node concept="liA8E" id="4vBwiiVAGlp" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -3492,11 +3492,11 @@
<ref role="3cqZAo" node="4vBwiiV$vTt" resolve="renderComponent" />
</node>
<node concept="liA8E" id="4vBwiiV$vTP" role="2OqNvi">
<ref role="37wK5l" to="exr9:~EditorComponent.getRootCell():jetbrains.mps.nodeEditor.cells.EditorCell" resolve="getRootCell" />
<ref role="37wK5l" to="exr9:~EditorComponent.getRootCell()" resolve="getRootCell" />
</node>
</node>
<node concept="liA8E" id="4vBwiiV$vTQ" role="2OqNvi">
<ref role="37wK5l" to="f4zo:~EditorCell.renderText():jetbrains.mps.openapi.editor.TextBuilder" resolve="renderText" />
<ref role="37wK5l" to="f4zo:~EditorCell.renderText()" resolve="renderText" />
</node>
</node>
</node>
@ -3517,19 +3517,19 @@
<ref role="3cqZAo" node="4vBwiiV$vTK" resolve="renderText" />
</node>
<node concept="liA8E" id="4vBwiiV$vU2" role="2OqNvi">
<ref role="37wK5l" to="cj4x:~TextBuilder.getLines():java.lang.Iterable" resolve="getLines" />
<ref role="37wK5l" to="cj4x:~TextBuilder.getLines()" resolve="getLines" />
</node>
</node>
<node concept="liA8E" id="4vBwiiV$vU3" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Iterable.iterator():java.util.Iterator" resolve="iterator" />
<ref role="37wK5l" to="wyt6:~Iterable.iterator()" resolve="iterator" />
</node>
</node>
<node concept="liA8E" id="4vBwiiV$vU4" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
<ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
</node>
</node>
<node concept="liA8E" id="4vBwiiV$vU5" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~CharSequence.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~CharSequence.toString()" resolve="toString" />
</node>
</node>
</node>
@ -3548,7 +3548,7 @@
<ref role="3cqZAo" node="4vBwiiV$vTK" resolve="renderText" />
</node>
<node concept="liA8E" id="4vBwiiV$vUb" role="2OqNvi">
<ref role="37wK5l" to="cj4x:~TextBuilder.getSize():int" resolve="getSize" />
<ref role="37wK5l" to="cj4x:~TextBuilder.getSize()" resolve="getSize" />
</node>
</node>
</node>
@ -3561,7 +3561,7 @@
<ref role="3cqZAo" node="4vBwiiV$vTK" resolve="renderText" />
</node>
<node concept="liA8E" id="4vBwiiV$vUi" role="2OqNvi">
<ref role="37wK5l" to="cj4x:~TextBuilder.getText():java.lang.String" resolve="getText" />
<ref role="37wK5l" to="cj4x:~TextBuilder.getText()" resolve="getText" />
</node>
</node>
<node concept="37vLTw" id="4vBwiiV$vUj" role="37vLTJ">
@ -3578,7 +3578,7 @@
<ref role="3cqZAo" node="4vBwiiV$vTt" resolve="renderComponent" />
</node>
<node concept="liA8E" id="4vBwiiV$vUn" role="2OqNvi">
<ref role="37wK5l" to="exr9:~EditorComponent.dispose():void" resolve="dispose" />
<ref role="37wK5l" to="exr9:~EditorComponent.dispose()" resolve="dispose" />
</node>
</node>
</node>
@ -3597,7 +3597,7 @@
<ref role="3cqZAo" node="4vBwiiV$7vt" resolve="mpsProject" />
</node>
<node concept="liA8E" id="4vBwiiV$vp0" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -3625,7 +3625,7 @@
<ref role="3cqZAo" node="4vBwiiV$7my" resolve="editorCell" />
</node>
<node concept="liA8E" id="4vBwiiV_hTu" role="2OqNvi">
<ref role="37wK5l" to="f4zo:~EditorCell.getX():int" resolve="getX" />
<ref role="37wK5l" to="f4zo:~EditorCell.getX()" resolve="getX" />
</node>
</node>
<node concept="1eOMI4" id="4vBwiiV_hTv" role="3uHU7w">
@ -3638,7 +3638,7 @@
<ref role="3cqZAo" node="4vBwiiV$7my" resolve="editorCell" />
</node>
<node concept="liA8E" id="4vBwiiV_hTA" role="2OqNvi">
<ref role="37wK5l" to="f4zo:~EditorCell.getWidth():int" resolve="getWidth" />
<ref role="37wK5l" to="f4zo:~EditorCell.getWidth()" resolve="getWidth" />
</node>
</node>
</node>
@ -3649,7 +3649,7 @@
<ref role="3cqZAo" node="4vBwiiV$7my" resolve="editorCell" />
</node>
<node concept="liA8E" id="4vBwiiV_hTF" role="2OqNvi">
<ref role="37wK5l" to="f4zo:~EditorCell.getY():int" resolve="getY" />
<ref role="37wK5l" to="f4zo:~EditorCell.getY()" resolve="getY" />
</node>
</node>
</node>
@ -3685,11 +3685,11 @@
<node concept="2OqwBi" id="4vBwiiV_rfN" role="33vP2m">
<node concept="2OqwBi" id="4vBwiiV_rfO" role="2Oq$k0">
<node concept="2YIFZM" id="4vBwiiV_rfP" role="2Oq$k0">
<ref role="37wK5l" to="gspm:~JBPopupFactory.getInstance():com.intellij.openapi.ui.popup.JBPopupFactory" resolve="getInstance" />
<ref role="37wK5l" to="gspm:~JBPopupFactory.getInstance()" resolve="getInstance" />
<ref role="1Pybhc" to="gspm:~JBPopupFactory" resolve="JBPopupFactory" />
</node>
<node concept="liA8E" id="4vBwiiV_rfQ" role="2OqNvi">
<ref role="37wK5l" to="gspm:~JBPopupFactory.createHtmlTextBalloonBuilder(java.lang.String,javax.swing.Icon,java.awt.Color,javax.swing.event.HyperlinkListener):com.intellij.openapi.ui.popup.BalloonBuilder" resolve="createHtmlTextBalloonBuilder" />
<ref role="37wK5l" to="gspm:~JBPopupFactory.createHtmlTextBalloonBuilder(java.lang.String,javax.swing.Icon,java.awt.Color,javax.swing.event.HyperlinkListener)" resolve="createHtmlTextBalloonBuilder" />
<node concept="2YIFZM" id="6Yb9hAqy3Rf" role="37wK5m">
<ref role="37wK5l" to="o35r:4vBwiiVrVPy" resolve="escapeHtml" />
<ref role="1Pybhc" to="o35r:4vBwiiVrUlG" resolve="HtmlUtil" />
@ -3704,14 +3704,14 @@
<ref role="1PxDUh" to="jkm4:~MessageType" resolve="MessageType" />
</node>
<node concept="liA8E" id="4vBwiiV_rfW" role="2OqNvi">
<ref role="37wK5l" to="jkm4:~MessageType.getPopupBackground():java.awt.Color" resolve="getPopupBackground" />
<ref role="37wK5l" to="jkm4:~MessageType.getPopupBackground()" resolve="getPopupBackground" />
</node>
</node>
<node concept="10Nm6u" id="4vBwiiV_rfX" role="37wK5m" />
</node>
</node>
<node concept="liA8E" id="4vBwiiV_rfY" role="2OqNvi">
<ref role="37wK5l" to="gspm:~BalloonBuilder.createBalloon():com.intellij.openapi.ui.popup.Balloon" resolve="createBalloon" />
<ref role="37wK5l" to="gspm:~BalloonBuilder.createBalloon()" resolve="createBalloon" />
</node>
</node>
</node>
@ -3719,7 +3719,7 @@
<node concept="3clFbF" id="4vBwiiV_rgb" role="3cqZAp">
<node concept="2YIFZM" id="4vBwiiV_rgc" role="3clFbG">
<ref role="1Pybhc" to="zn9m:~Disposer" resolve="Disposer" />
<ref role="37wK5l" to="zn9m:~Disposer.register(com.intellij.openapi.Disposable,com.intellij.openapi.Disposable):void" resolve="register" />
<ref role="37wK5l" to="zn9m:~Disposer.register(com.intellij.openapi.Disposable,com.intellij.openapi.Disposable)" resolve="register" />
<node concept="37vLTw" id="4vBwiiVAzjK" role="37wK5m">
<ref role="3cqZAo" node="4vBwiiVAxqo" resolve="ideaProject" />
</node>
@ -3734,7 +3734,7 @@
<ref role="3cqZAo" node="4vBwiiV_rfL" resolve="balloon" />
</node>
<node concept="liA8E" id="4vBwiiV_rgk" role="2OqNvi">
<ref role="37wK5l" to="gspm:~Balloon.show(com.intellij.ui.awt.RelativePoint,com.intellij.openapi.ui.popup.Balloon$Position):void" resolve="show" />
<ref role="37wK5l" to="gspm:~Balloon.show(com.intellij.ui.awt.RelativePoint,com.intellij.openapi.ui.popup.Balloon$Position)" resolve="show" />
<node concept="37vLTw" id="4vBwiiV_rgl" role="37wK5m">
<ref role="3cqZAo" node="4vBwiiV_o9b" resolve="relPoint" />
</node>

5
coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
View File

@ -34,14 +34,15 @@
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
<language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
<module reference="1fd846c3-c5f9-4b9e-9ecc-e716f7149f86(Hamcrest)" version="0" />
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
<module reference="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" version="0" />
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
<module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />

2
coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />

2
coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
View File

@ -6,7 +6,7 @@
<use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
<use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />

88
coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
View File

@ -5,7 +5,7 @@
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
<use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
<use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
@ -705,7 +705,7 @@
<ref role="3cqZAo" node="27bTNFfaZ1g" resolve="project" />
</node>
<node concept="liA8E" id="27bTNFfaZ1q" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -929,7 +929,7 @@
<ref role="3cqZAo" node="27bTNFfaZ4f" resolve="it" />
</node>
<node concept="liA8E" id="27bTNFfaZ2R" role="2OqNvi">
<ref role="37wK5l" to="d6hs:~ReportItem.getSeverity():jetbrains.mps.errors.MessageStatus" resolve="getSeverity" />
<ref role="37wK5l" to="d6hs:~ReportItem.getSeverity()" resolve="getSeverity" />
</node>
</node>
<node concept="Rm8GO" id="27bTNFfaZ2S" role="3uHU7B">
@ -972,7 +972,7 @@
<ref role="3cqZAo" node="27bTNFfaZ4f" resolve="it" />
</node>
<node concept="liA8E" id="27bTNFfaZ3a" role="2OqNvi">
<ref role="37wK5l" to="d6hs:~ReportItem.getMessage():java.lang.String" resolve="getMessage" />
<ref role="37wK5l" to="d6hs:~ReportItem.getMessage()" resolve="getMessage" />
</node>
</node>
<node concept="37vLTw" id="27bTNFfaZ3b" role="37wK5m">
@ -1045,7 +1045,7 @@
<ref role="3cqZAo" node="27bTNFfaZ3m" resolve="tri" />
</node>
<node concept="liA8E" id="4ZGicUZ7Icz" role="2OqNvi">
<ref role="37wK5l" to="d6hs:~NodeReportItemBase.getNode():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getNode" />
<ref role="37wK5l" to="d6hs:~NodeReportItemBase.getNode()" resolve="getNode" />
</node>
</node>
</node>
@ -1083,7 +1083,7 @@
<ref role="37wK5l" to="wyt6:~AssertionError.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="AssertionError" />
<node concept="2YIFZM" id="27bTNFfaZ3S" role="37wK5m">
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
<node concept="Xl_RD" id="27bTNFfaZ3T" role="37wK5m">
<property role="Xl_RC" value="Unadvised error in '%s': %s" />
</node>
@ -1095,7 +1095,7 @@
<ref role="3cqZAo" node="27bTNFfaZ3m" resolve="tri" />
</node>
<node concept="liA8E" id="27bTNFfaZ3Z" role="2OqNvi">
<ref role="37wK5l" to="d6hs:~ReportItemBase.getMessage():java.lang.String" resolve="getMessage" />
<ref role="37wK5l" to="d6hs:~ReportItemBase.getMessage()" resolve="getMessage" />
</node>
</node>
</node>
@ -1220,7 +1220,7 @@
<node concept="1pGfFk" id="27bTNFfaZ4L" role="2ShVmc">
<ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
<node concept="2YIFZM" id="27bTNFfaZ4M" role="37wK5m">
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<node concept="Xl_RD" id="27bTNFfaZ4N" role="37wK5m">
<property role="Xl_RC" value="Advised error not triggered in '%s'" />
@ -1307,7 +1307,7 @@
<node concept="1pGfFk" id="4ZGicUZbjmh" role="2ShVmc">
<ref role="37wK5l" to="wyt6:~AssertionError.&lt;init&gt;(java.lang.Object)" resolve="AssertionError" />
<node concept="2YIFZM" id="27bTNFfaZ5l" role="37wK5m">
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<node concept="Xl_RD" id="27bTNFfaZ5m" role="37wK5m">
<property role="Xl_RC" value="Error type of [%s]: [%s]" />
@ -1698,14 +1698,14 @@
<ref role="3cqZAo" node="4ZGicUZ5lIf" resolve="res" />
</node>
<node concept="liA8E" id="4ZGicUZ5t2m" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object):void" resolve="set" />
<ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object)" resolve="set" />
<node concept="22lmx$" id="4ZGicUZc8bB" role="37wK5m">
<node concept="2OqwBi" id="4ZGicUZ5Bg1" role="3uHU7B">
<node concept="37vLTw" id="4ZGicUZ5Bg2" role="2Oq$k0">
<ref role="3cqZAo" node="4ZGicUZ3AX0" resolve="modifier" />
</node>
<node concept="liA8E" id="4ZGicUZ5Bg3" role="2OqNvi">
<ref role="37wK5l" to="ggp6:~IMatchModifier.accept(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.model.SNode):boolean" resolve="accept" />
<ref role="37wK5l" to="ggp6:~IMatchModifier.accept(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.model.SNode)" resolve="accept" />
<node concept="37vLTw" id="4ZGicUZ5Bg4" role="37wK5m">
<ref role="3cqZAo" node="4ZGicUZ1iVl" resolve="a" />
</node>
@ -1716,7 +1716,7 @@
</node>
<node concept="2YIFZM" id="4ZGicUZ5tno" role="3uHU7w">
<ref role="1Pybhc" to="ggp6:~MatchingUtil" resolve="MatchingUtil" />
<ref role="37wK5l" to="ggp6:~MatchingUtil.matchNodes(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.lang.pattern.util.IMatchModifier,boolean):boolean" resolve="matchNodes" />
<ref role="37wK5l" to="ggp6:~MatchingUtil.matchNodes(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.lang.pattern.util.IMatchModifier,boolean)" resolve="matchNodes" />
<node concept="37vLTw" id="4ZGicUZ5tnp" role="37wK5m">
<ref role="3cqZAo" node="4ZGicUZ1iVl" resolve="a" />
</node>
@ -1750,7 +1750,7 @@
<ref role="3cqZAo" node="4ZGicUZ5lIf" resolve="res" />
</node>
<node concept="liA8E" id="4ZGicUZ5vHH" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object):void" resolve="set" />
<ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object)" resolve="set" />
<node concept="3clFbT" id="4ZGicUZ5vRu" role="37wK5m" />
</node>
</node>
@ -1761,13 +1761,13 @@
<ref role="3cqZAo" node="4ZGicUZ6gps" resolve="details" />
</node>
<node concept="liA8E" id="4ZGicUZ6o20" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object):void" resolve="set" />
<ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object)" resolve="set" />
<node concept="2OqwBi" id="4ZGicUZ6oHB" role="37wK5m">
<node concept="37vLTw" id="4ZGicUZ6ojL" role="2Oq$k0">
<ref role="3cqZAo" node="4ZGicUZ5dnL" resolve="cme" />
</node>
<node concept="liA8E" id="4ZGicUZ6pq1" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
<ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
</node>
</node>
</node>
@ -1783,7 +1783,7 @@
<property role="TrG5h" value="msg" />
<node concept="17QB3L" id="4ZGicUZ6838" role="1tU5fm" />
<node concept="2YIFZM" id="4ZGicUZ5ZbB" role="33vP2m">
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<node concept="Xl_RD" id="4ZGicUZ5ZbC" role="37wK5m">
<property role="Xl_RC" value="types of [%s] differ: [%s] and [%s] %s" />
@ -1802,7 +1802,7 @@
<ref role="3cqZAo" node="4ZGicUZ6gps" resolve="details" />
</node>
<node concept="liA8E" id="4ZGicUZ6twv" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
<ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
</node>
</node>
</node>
@ -1814,7 +1814,7 @@
<node concept="3clFbF" id="4ZGicUZ5$_t" role="3cqZAp">
<node concept="2YIFZM" id="4ZGicUZ5_Qf" role="3clFbG">
<ref role="1Pybhc" to="rjhg:~Assert" resolve="Assert" />
<ref role="37wK5l" to="rjhg:~Assert.fail(java.lang.String):void" resolve="fail" />
<ref role="37wK5l" to="rjhg:~Assert.fail(java.lang.String)" resolve="fail" />
<node concept="37vLTw" id="4ZGicUZ5ZBH" role="37wK5m">
<ref role="3cqZAo" node="4ZGicUZ5ZbA" resolve="msg" />
</node>
@ -1843,7 +1843,7 @@
<ref role="3cqZAo" node="4ZGicUZ5lIf" resolve="res" />
</node>
<node concept="liA8E" id="4ZGicUZ5z$Z" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
<ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
</node>
</node>
</node>
@ -3451,7 +3451,7 @@
<ref role="3cqZAo" node="HOeeeUbp7P" resolve="prevStep" />
</node>
<node concept="liA8E" id="HOeeeUbqUm" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
<node concept="1bVj0M" id="HOeeeUbrlt" role="37wK5m">
<node concept="37vLTG" id="HOeeeUbrCB" role="1bW2Oz">
<property role="TrG5h" value="prev" />
@ -3468,11 +3468,11 @@
<node concept="3clFbF" id="HOeeeUbzU4" role="3cqZAp">
<node concept="2OqwBi" id="HOeeeUb$tE" role="3clFbG">
<node concept="2YIFZM" id="HOeeeUb$e9" role="2Oq$k0">
<ref role="37wK5l" to="u78q:~TypeContextManager.getInstance():jetbrains.mps.typesystem.inference.TypeContextManager" resolve="getInstance" />
<ref role="37wK5l" to="u78q:~TypeContextManager.getInstance()" resolve="getInstance" />
<ref role="1Pybhc" to="u78q:~TypeContextManager" resolve="TypeContextManager" />
</node>
<node concept="liA8E" id="HOeeeUb$He" role="2OqNvi">
<ref role="37wK5l" to="u78q:~TypeContextManager.runTypeCheckingAction(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.typesystem.inference.ITypechecking$Action):void" resolve="runTypeCheckingAction" />
<ref role="37wK5l" to="u78q:~TypeContextManager.runTypeCheckingAction(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.typesystem.inference.ITypechecking$Action)" resolve="runTypeCheckingAction" />
<node concept="37vLTw" id="HOeeeUb_1L" role="37wK5m">
<ref role="3cqZAo" node="HOeeeUbutz" resolve="node" />
</node>
@ -3491,7 +3491,7 @@
<ref role="3cqZAo" node="HOeeeUbBLc" resolve="context" />
</node>
<node concept="liA8E" id="HOeeeUbDwZ" role="2OqNvi">
<ref role="37wK5l" to="u78q:~TypeCheckingContext.checkIfNotChecked(org.jetbrains.mps.openapi.model.SNode,boolean):boolean" resolve="checkIfNotChecked" />
<ref role="37wK5l" to="u78q:~TypeCheckingContext.checkIfNotChecked(org.jetbrains.mps.openapi.model.SNode,boolean)" resolve="checkIfNotChecked" />
<node concept="37vLTw" id="HOeeeUbDJH" role="37wK5m">
<ref role="3cqZAo" node="HOeeeUbutz" resolve="node" />
</node>
@ -3614,7 +3614,7 @@
</node>
</node>
<node concept="liA8E" id="78H58of4NWJ" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
<node concept="1bVj0M" id="78H58of4P00" role="37wK5m">
<node concept="3clFbS" id="78H58of4P01" role="1bW5cS">
<node concept="3clFbH" id="78H58of6jpm" role="3cqZAp" />
@ -3684,7 +3684,7 @@
</node>
</node>
<node concept="liA8E" id="oI9YrbF6w" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
<node concept="37vLTw" id="oI9YrbBkn" role="3ElQJh">
@ -4197,11 +4197,11 @@
</node>
</node>
<node concept="liA8E" id="1FOQehxpDnr" role="2OqNvi">
<ref role="37wK5l" to="lui2:~SRepository.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
<ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
</node>
</node>
<node concept="liA8E" id="1FOQehxpDns" role="2OqNvi">
<ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess():void" resolve="checkReadAccess" />
<ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess()" resolve="checkReadAccess" />
</node>
</node>
</node>
@ -4353,11 +4353,11 @@
<ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
</node>
<node concept="liA8E" id="1FOQehxe0t5" role="2OqNvi">
<ref role="37wK5l" to="lui2:~SRepository.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
<ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
</node>
</node>
<node concept="liA8E" id="1FOQehxe0t6" role="2OqNvi">
<ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess():void" resolve="checkReadAccess" />
<ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess()" resolve="checkReadAccess" />
</node>
</node>
</node>
@ -4418,7 +4418,7 @@
</node>
</node>
<node concept="liA8E" id="1FOQehxe23j" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
<node concept="1bVj0M" id="1FOQehxe23k" role="37wK5m">
@ -4502,11 +4502,11 @@
<ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
</node>
<node concept="liA8E" id="1FOQehxnAVG" role="2OqNvi">
<ref role="37wK5l" to="lui2:~SRepository.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
<ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
</node>
</node>
<node concept="liA8E" id="1FOQehxnAVH" role="2OqNvi">
<ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess():void" resolve="checkReadAccess" />
<ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess()" resolve="checkReadAccess" />
</node>
</node>
</node>
@ -4865,7 +4865,7 @@
</node>
</node>
<node concept="liA8E" id="1FOQehxoN4F" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
<ref role="37wK5l" to="unkn:~Single.blockingGet()" resolve="blockingGet" />
</node>
</node>
</node>
@ -4916,7 +4916,7 @@
</node>
</node>
<node concept="liA8E" id="1FOQehxoVgF" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
<node concept="2OqwBi" id="2Qe6u2c8pSd" role="3ElQJh">
@ -5068,7 +5068,7 @@
</node>
</node>
<node concept="liA8E" id="3IIf9O_qVuh" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
<ref role="37wK5l" to="unkn:~Single.blockingGet()" resolve="blockingGet" />
</node>
</node>
</node>
@ -5253,7 +5253,7 @@
</node>
</node>
<node concept="liA8E" id="3IIf9OAgx80" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
<ref role="37wK5l" to="unkn:~Single.blockingGet()" resolve="blockingGet" />
</node>
</node>
</node>
@ -5560,7 +5560,7 @@
<node concept="3cpWs6" id="3IIf9O_tJHF" role="3cqZAp">
<node concept="2YIFZM" id="3IIf9O_tQ$z" role="3cqZAk">
<ref role="1Pybhc" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
<ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance():jetbrains.mps.smodel.MPSModuleRepository" resolve="getInstance" />
<ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance()" resolve="getInstance" />
</node>
</node>
<node concept="3clFbH" id="3IIf9O_tRfg" role="3cqZAp" />
@ -5580,7 +5580,7 @@
</node>
</node>
<node concept="liA8E" id="3IIf9O_tJHO" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -5682,7 +5682,7 @@
</node>
</node>
<node concept="liA8E" id="4t7Xo7iw0Kl" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
<node concept="37vLTw" id="4t7Xo7iw11c" role="37wK5m">
<ref role="3cqZAo" node="4t7Xo7ivP5g" resolve="fqName" />
</node>
@ -5707,7 +5707,7 @@
</node>
</node>
<node concept="liA8E" id="4t7Xo7iw1yk" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
<node concept="37vLTw" id="4t7Xo7iw1yl" role="37wK5m">
<ref role="3cqZAo" node="4t7Xo7ivP5g" resolve="fqName" />
</node>
@ -5777,14 +5777,14 @@
<node concept="2OqwBi" id="4t7Xo7ivWyB" role="3uHU7B">
<node concept="2OqwBi" id="2Mi2iz0Yf4b" role="2Oq$k0">
<node concept="1rXfSq" id="4t7Xo7ivWek" role="2Oq$k0">
<ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
<ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
</node>
<node concept="liA8E" id="2Mi2iz0YfRL" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Class.getPackage():java.lang.Package" resolve="getPackage" />
<ref role="37wK5l" to="wyt6:~Class.getPackage()" resolve="getPackage" />
</node>
</node>
<node concept="liA8E" id="4t7Xo7ivWVU" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Package.getName():java.lang.String" resolve="getName" />
<ref role="37wK5l" to="wyt6:~Package.getName()" resolve="getName" />
</node>
</node>
<node concept="Xl_RD" id="4t7Xo7ivXoD" role="3uHU7w">
@ -5919,7 +5919,7 @@
<ref role="3cqZAo" to="d6hs:~IssueKindReportItem.TYPESYSTEM" resolve="TYPESYSTEM" />
</node>
<node concept="liA8E" id="3Frdzi2HNzf" role="2OqNvi">
<ref role="37wK5l" to="d6hs:~IssueKindReportItem$CheckerCategory.deriveItemKind():jetbrains.mps.errors.item.IssueKindReportItem$ItemKind" resolve="deriveItemKind" />
<ref role="37wK5l" to="d6hs:~IssueKindReportItem$CheckerCategory.deriveItemKind()" resolve="deriveItemKind" />
</node>
</node>
</node>

2
coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
View File

@ -30,7 +30,7 @@
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
<language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>

1022
coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
View File

File diff suppressed because it is too large Load Diff

2
coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd
View File

@ -38,7 +38,7 @@
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
<language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>

2
coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
View File

@ -6,7 +6,7 @@
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
</languages>
<imports>

122
coderules/solutions/jetbrains.mps.coderules/models/service.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
@ -621,7 +621,7 @@
<ref role="3cqZAo" node="Hg6Enc3ZJX" resolve="prevStep" />
</node>
<node concept="liA8E" id="Hg6Enc4hNz" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
<node concept="1bVj0M" id="Hg6Enc4Jpw" role="37wK5m">
<node concept="37vLTG" id="Hg6Enc4Ka2" role="1bW2Oz">
<property role="TrG5h" value="prevStep" />
@ -705,7 +705,7 @@
</node>
<node concept="2YIFZM" id="Hg6Enc4Wbh" role="37vLTx">
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
<node concept="2OqwBi" id="Hg6Enc4Wbi" role="37wK5m">
<node concept="2JrnkZ" id="Hg6Enc4Wbj" role="2Oq$k0">
<node concept="37vLTw" id="7kTeLbPtLvc" role="2JrQYb">
@ -713,7 +713,7 @@
</node>
</node>
<node concept="liA8E" id="Hg6Enc4Wbl" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
<ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
</node>
</node>
</node>
@ -1212,7 +1212,7 @@
</node>
</node>
<node concept="liA8E" id="6kREIVkgMSA" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
<node concept="1bVj0M" id="6kREIVkgMSB" role="37wK5m">
<node concept="37vLTG" id="6kREIVkmlHv" role="1bW2Oz">
<property role="TrG5h" value="prev" />
@ -1224,7 +1224,7 @@
<node concept="3clFbF" id="6kREIVkgMSD" role="3cqZAp">
<node concept="37vLTI" id="6kREIVkgMSE" role="3clFbG">
<node concept="2YIFZM" id="6kREIVkgMSF" role="37vLTx">
<ref role="37wK5l" to="wyt6:~System.nanoTime():long" resolve="nanoTime" />
<ref role="37wK5l" to="wyt6:~System.nanoTime()" resolve="nanoTime" />
<ref role="1Pybhc" to="wyt6:~System" resolve="System" />
</node>
<node concept="2OqwBi" id="6kREIVkgMSG" role="37vLTJ">
@ -1541,7 +1541,7 @@
<ref role="3cqZAo" node="55Q$YFtJK$A" resolve="prevStep" />
</node>
<node concept="liA8E" id="55Q$YFtJUbQ" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
<node concept="1bVj0M" id="55Q$YFtJUbR" role="37wK5m">
<node concept="37vLTG" id="55Q$YFtJUbS" role="1bW2Oz">
<property role="TrG5h" value="prev" />
@ -1616,14 +1616,14 @@
<ref role="3cqZAo" node="55Q$YFtHZC$" resolve="prevStepWithTrace" />
</node>
<node concept="liA8E" id="Hg6End2UXi" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="observeOn" />
<ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler)" resolve="observeOn" />
<node concept="37vLTw" id="Hg6End2Z2Y" role="37wK5m">
<ref role="3cqZAo" node="55Q$YFtIho8" resolve="subscribeScheduler" />
</node>
</node>
</node>
<node concept="liA8E" id="Hg6Enc6FMP" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
<node concept="1bVj0M" id="Hg6Enc6Hx2" role="37wK5m">
<node concept="3clFbS" id="Hg6Enc6Hx3" role="1bW5cS">
<node concept="3clFbH" id="Hg6Enc9KMF" role="3cqZAp" />
@ -1675,10 +1675,10 @@
<ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
</node>
<node concept="2YIFZM" id="23c4kVtm7Im" role="33vP2m">
<ref role="37wK5l" to="wyt6:~Boolean.valueOf(java.lang.String):java.lang.Boolean" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~Boolean.valueOf(java.lang.String)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~Boolean" resolve="Boolean" />
<node concept="2YIFZM" id="23c4kVtm7In" role="37wK5m">
<ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String,java.lang.String):java.lang.String" resolve="getProperty" />
<ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String,java.lang.String)" resolve="getProperty" />
<ref role="1Pybhc" to="wyt6:~System" resolve="System" />
<node concept="Xl_RD" id="23c4kVtm7Io" role="37wK5m">
<property role="Xl_RC" value="logic.profile" />
@ -1697,10 +1697,10 @@
<ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
</node>
<node concept="2YIFZM" id="23c4kVtm90x" role="33vP2m">
<ref role="37wK5l" to="wyt6:~Boolean.valueOf(java.lang.String):java.lang.Boolean" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~Boolean.valueOf(java.lang.String)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~Boolean" resolve="Boolean" />
<node concept="2YIFZM" id="23c4kVtm90y" role="37wK5m">
<ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String,java.lang.String):java.lang.String" resolve="getProperty" />
<ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String,java.lang.String)" resolve="getProperty" />
<ref role="1Pybhc" to="wyt6:~System" resolve="System" />
<node concept="Xl_RD" id="23c4kVtm90z" role="37wK5m">
<property role="Xl_RC" value="logic.checkGarbage" />
@ -1799,7 +1799,7 @@
<ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
</node>
<node concept="liA8E" id="7WKNeR9_puh" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object):void" resolve="set" />
<ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object)" resolve="set" />
<node concept="37vLTw" id="7WKNeR9_pSd" role="37wK5m">
<ref role="3cqZAo" node="7WKNeR9$e5g" resolve="observer" />
</node>
@ -1990,7 +1990,7 @@
<ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
</node>
<node concept="liA8E" id="7WKNeR9_ybk" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
<ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
</node>
</node>
<node concept="liA8E" id="7WKNeR9$NVL" role="2OqNvi">
@ -2017,7 +2017,7 @@
<ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
</node>
<node concept="liA8E" id="7WKNeR9_waj" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
<ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
</node>
</node>
</node>
@ -2098,7 +2098,7 @@
<ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
</node>
<node concept="liA8E" id="7WKNeR9_Cwm" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
<ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
</node>
</node>
<node concept="liA8E" id="7WKNeR9$mx1" role="2OqNvi">
@ -2117,7 +2117,7 @@
<ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
</node>
<node concept="liA8E" id="7WKNeR9__Ke" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
<ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
</node>
</node>
</node>
@ -2197,7 +2197,7 @@
<ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
</node>
<node concept="liA8E" id="7WKNeR9_I5L" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
<ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
</node>
</node>
<node concept="liA8E" id="7WKNeR9$wYC" role="2OqNvi">
@ -2216,7 +2216,7 @@
<ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
</node>
<node concept="liA8E" id="7WKNeR9_FeI" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
<ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
</node>
</node>
</node>
@ -2276,10 +2276,10 @@
<node concept="37vLTI" id="6kREIVky9JE" role="3clFbG">
<node concept="2YIFZM" id="6kREIVky9JF" role="37vLTx">
<ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
<ref role="37wK5l" to="wyt6:~Integer.parseUnsignedInt(java.lang.String):int" resolve="parseUnsignedInt" />
<ref role="37wK5l" to="wyt6:~Integer.parseUnsignedInt(java.lang.String)" resolve="parseUnsignedInt" />
<node concept="2YIFZM" id="6kREIVky9JG" role="37wK5m">
<ref role="1Pybhc" to="wyt6:~System" resolve="System" />
<ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String,java.lang.String):java.lang.String" resolve="getProperty" />
<ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String,java.lang.String)" resolve="getProperty" />
<node concept="Xl_RD" id="6kREIVky9JH" role="37wK5m">
<property role="Xl_RC" value="logic.timeout" />
</node>
@ -2325,7 +2325,7 @@
<property role="3TUv4t" value="true" />
<node concept="3cpWsb" id="6kREIVky9JW" role="1tU5fm" />
<node concept="2YIFZM" id="6kREIVky9JX" role="33vP2m">
<ref role="37wK5l" to="wyt6:~System.currentTimeMillis():long" resolve="currentTimeMillis" />
<ref role="37wK5l" to="wyt6:~System.currentTimeMillis()" resolve="currentTimeMillis" />
<ref role="1Pybhc" to="wyt6:~System" resolve="System" />
</node>
</node>
@ -2374,7 +2374,7 @@
</node>
<node concept="3cpWsd" id="6kREIVkyFHH" role="3uHU7B">
<node concept="2YIFZM" id="6kREIVkyFHI" role="3uHU7B">
<ref role="37wK5l" to="wyt6:~System.currentTimeMillis():long" resolve="currentTimeMillis" />
<ref role="37wK5l" to="wyt6:~System.currentTimeMillis()" resolve="currentTimeMillis" />
<ref role="1Pybhc" to="wyt6:~System" resolve="System" />
</node>
<node concept="37vLTw" id="6kREIVkyFHJ" role="3uHU7w">
@ -2572,7 +2572,7 @@
</node>
</node>
<node concept="liA8E" id="5mg4ZgLcQbL" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationTrace.activate(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence):void" resolve="activate" />
<ref role="37wK5l" to="w7la:~EvaluationTrace.activate(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence)" resolve="activate" />
<node concept="37vLTw" id="5mg4ZgLcRet" role="37wK5m">
<ref role="3cqZAo" node="7nPD14NbLuI" resolve="occurrence" />
</node>
@ -2631,7 +2631,7 @@
</node>
</node>
<node concept="liA8E" id="5mg4ZgLcSnM" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationTrace.reactivate(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence):void" resolve="reactivate" />
<ref role="37wK5l" to="w7la:~EvaluationTrace.reactivate(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence)" resolve="reactivate" />
<node concept="37vLTw" id="5mg4ZgLcSnN" role="37wK5m">
<ref role="3cqZAo" node="7nPD14NbLuQ" resolve="occurrence" />
</node>
@ -2690,7 +2690,7 @@
</node>
</node>
<node concept="liA8E" id="5mg4ZgLcV4z" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationTrace.suspend(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence):void" resolve="suspend" />
<ref role="37wK5l" to="w7la:~EvaluationTrace.suspend(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence)" resolve="suspend" />
<node concept="37vLTw" id="5mg4ZgLcV4$" role="37wK5m">
<ref role="3cqZAo" node="7nPD14NbLuY" resolve="occurrence" />
</node>
@ -2749,7 +2749,7 @@
</node>
</node>
<node concept="liA8E" id="5mg4ZgLcXPi" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationTrace.discard(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence):void" resolve="discard" />
<ref role="37wK5l" to="w7la:~EvaluationTrace.discard(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence)" resolve="discard" />
<node concept="37vLTw" id="5mg4ZgLcXPj" role="37wK5m">
<ref role="3cqZAo" node="7nPD14NbLv6" resolve="occurrence" />
</node>
@ -2808,7 +2808,7 @@
</node>
</node>
<node concept="liA8E" id="5mg4ZgLd0CJ" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationTrace.trying(jetbrains.mps.logic.reactor.evaluation.RuleMatch):void" resolve="trying" />
<ref role="37wK5l" to="w7la:~EvaluationTrace.trying(jetbrains.mps.logic.reactor.evaluation.RuleMatch)" resolve="trying" />
<node concept="37vLTw" id="5mg4ZgLd2rq" role="37wK5m">
<ref role="3cqZAo" node="2UGjFq4bW0h" resolve="matchRule" />
</node>
@ -2867,7 +2867,7 @@
</node>
</node>
<node concept="liA8E" id="5mg4ZgLd4fK" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationTrace.reject(jetbrains.mps.logic.reactor.evaluation.RuleMatch):void" resolve="reject" />
<ref role="37wK5l" to="w7la:~EvaluationTrace.reject(jetbrains.mps.logic.reactor.evaluation.RuleMatch)" resolve="reject" />
<node concept="37vLTw" id="5mg4ZgLd4fL" role="37wK5m">
<ref role="3cqZAo" node="2T1p0CFMVBA" resolve="matchRule" />
</node>
@ -2926,7 +2926,7 @@
</node>
</node>
<node concept="liA8E" id="5mg4ZgLd70F" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationTrace.trigger(jetbrains.mps.logic.reactor.evaluation.RuleMatch):void" resolve="trigger" />
<ref role="37wK5l" to="w7la:~EvaluationTrace.trigger(jetbrains.mps.logic.reactor.evaluation.RuleMatch)" resolve="trigger" />
<node concept="37vLTw" id="5mg4ZgLd70G" role="37wK5m">
<ref role="3cqZAo" node="7nPD14NbLve" resolve="matchRule" />
</node>
@ -2985,7 +2985,7 @@
</node>
</node>
<node concept="liA8E" id="5mg4ZgLd9Lq" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationTrace.retry(jetbrains.mps.logic.reactor.evaluation.RuleMatch):void" resolve="retry" />
<ref role="37wK5l" to="w7la:~EvaluationTrace.retry(jetbrains.mps.logic.reactor.evaluation.RuleMatch)" resolve="retry" />
<node concept="37vLTw" id="5mg4ZgLd9Lr" role="37wK5m">
<ref role="3cqZAo" node="2_NfR5wi4YF" resolve="matchRule" />
</node>
@ -3044,7 +3044,7 @@
</node>
</node>
<node concept="liA8E" id="5mg4ZgLdbU1" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationTrace.finish(jetbrains.mps.logic.reactor.evaluation.RuleMatch):void" resolve="finish" />
<ref role="37wK5l" to="w7la:~EvaluationTrace.finish(jetbrains.mps.logic.reactor.evaluation.RuleMatch)" resolve="finish" />
<node concept="37vLTw" id="5mg4ZgLdbU2" role="37wK5m">
<ref role="3cqZAo" node="2UGjFq4bWOF" resolve="matchRule" />
</node>
@ -3103,7 +3103,7 @@
</node>
</node>
<node concept="liA8E" id="5mg4ZgLde2z" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationTrace.tell(jetbrains.mps.logic.reactor.evaluation.PredicateInvocation):void" resolve="tell" />
<ref role="37wK5l" to="w7la:~EvaluationTrace.tell(jetbrains.mps.logic.reactor.evaluation.PredicateInvocation)" resolve="tell" />
<node concept="37vLTw" id="5mg4ZgLdgtG" role="37wK5m">
<ref role="3cqZAo" node="2UGjFq4bXFj" resolve="invocation" />
</node>
@ -3166,7 +3166,7 @@
</node>
</node>
<node concept="liA8E" id="5mg4ZgLdhHd" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationTrace.ask(boolean,jetbrains.mps.logic.reactor.evaluation.PredicateInvocation):void" resolve="ask" />
<ref role="37wK5l" to="w7la:~EvaluationTrace.ask(boolean,jetbrains.mps.logic.reactor.evaluation.PredicateInvocation)" resolve="ask" />
<node concept="37vLTw" id="5mg4ZgLdkzX" role="37wK5m">
<ref role="3cqZAo" node="2UGjFq4bXFr" resolve="result" />
</node>
@ -3515,7 +3515,7 @@
<node concept="3clFbF" id="19wqdqO45Oo" role="3cqZAp">
<node concept="2YIFZM" id="19wqdqO45Oq" role="3clFbG">
<ref role="1Pybhc" to="m4y7:~Schedulers" resolve="Schedulers" />
<ref role="37wK5l" to="m4y7:~Schedulers.from(java.util.concurrent.Executor):io.reactivex.Scheduler" resolve="from" />
<ref role="37wK5l" to="m4y7:~Schedulers.from(java.util.concurrent.Executor)" resolve="from" />
<node concept="10M0yZ" id="19wqdqO45Or" role="37wK5m">
<ref role="1PxDUh" to="e5vs:~PooledThreadExecutor" resolve="PooledThreadExecutor" />
<ref role="3cqZAo" to="e5vs:~PooledThreadExecutor.INSTANCE" resolve="INSTANCE" />
@ -3539,7 +3539,7 @@
<node concept="3cpWs6" id="3KwBCAA_Uqd" role="3cqZAp">
<node concept="2YIFZM" id="3KwBCAA_Uqe" role="3cqZAk">
<ref role="1Pybhc" to="m4y7:~Schedulers" resolve="Schedulers" />
<ref role="37wK5l" to="m4y7:~Schedulers.trampoline():io.reactivex.Scheduler" resolve="trampoline" />
<ref role="37wK5l" to="m4y7:~Schedulers.trampoline()" resolve="trampoline" />
</node>
</node>
</node>
@ -3557,20 +3557,20 @@
<node concept="3clFbS" id="3KwBCAA_rFk" role="9aQI4">
<node concept="3cpWs6" id="3KwBCAA_rFl" role="3cqZAp">
<node concept="2YIFZM" id="3KwBCAA_sPN" role="3cqZAk">
<ref role="37wK5l" to="f4yq:~SwingSchedulers.edt():io.reactivex.Scheduler" resolve="edt" />
<ref role="37wK5l" to="f4yq:~SwingSchedulers.edt()" resolve="edt" />
<ref role="1Pybhc" to="f4yq:~SwingSchedulers" resolve="SwingSchedulers" />
</node>
</node>
</node>
</node>
<node concept="2YIFZM" id="3KwBCAA_stb" role="3clFbw">
<ref role="37wK5l" to="dxuu:~SwingUtilities.isEventDispatchThread():boolean" resolve="isEventDispatchThread" />
<ref role="37wK5l" to="dxuu:~SwingUtilities.isEventDispatchThread()" resolve="isEventDispatchThread" />
<ref role="1Pybhc" to="dxuu:~SwingUtilities" resolve="SwingUtilities" />
</node>
<node concept="3clFbS" id="3KwBCAA_s6R" role="3clFbx">
<node concept="3cpWs6" id="3KwBCAA_st_" role="3cqZAp">
<node concept="2YIFZM" id="3KwBCAA_stA" role="3cqZAk">
<ref role="37wK5l" to="m4y7:~Schedulers.trampoline():io.reactivex.Scheduler" resolve="trampoline" />
<ref role="37wK5l" to="m4y7:~Schedulers.trampoline()" resolve="trampoline" />
<ref role="1Pybhc" to="m4y7:~Schedulers" resolve="Schedulers" />
</node>
</node>
@ -3766,7 +3766,7 @@
<ref role="37wK5l" node="Hg6End$aLl" resolve="scheduleExecute" />
</node>
<node concept="liA8E" id="Hg6EncO4Vl" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.subscribe(io.reactivex.SingleObserver):void" resolve="subscribe" />
<ref role="37wK5l" to="unkn:~Single.subscribe(io.reactivex.SingleObserver)" resolve="subscribe" />
<node concept="2ShNRf" id="Hg6EncPovE" role="37wK5m">
<node concept="YeOm9" id="Hg6EncPqlx" role="2ShVmc">
<node concept="1Y3b0j" id="Hg6EncPql$" role="YeSDq">
@ -3822,7 +3822,7 @@
<ref role="3cqZAo" node="Hg6EncPqlI" resolve="thr" />
</node>
<node concept="liA8E" id="4UWJfzxWevZ" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
<ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
</node>
</node>
</node>
@ -3865,7 +3865,7 @@
<ref role="37wK5l" node="Hg6End$aLl" resolve="scheduleExecute" />
</node>
<node concept="liA8E" id="Hg6EncO4cq" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.subscribe(io.reactivex.SingleObserver):void" resolve="subscribe" />
<ref role="37wK5l" to="unkn:~Single.subscribe(io.reactivex.SingleObserver)" resolve="subscribe" />
<node concept="37vLTw" id="Hg6EncO4t0" role="37wK5m">
<ref role="3cqZAo" node="Hg6EncNd4t" resolve="observer" />
</node>
@ -3927,7 +3927,7 @@
</node>
<node concept="2YIFZM" id="6kREIVkCl_L" role="33vP2m">
<ref role="1Pybhc" to="unkn:~Single" resolve="Single" />
<ref role="37wK5l" to="unkn:~Single.just(java.lang.Object):io.reactivex.Single" resolve="just" />
<ref role="37wK5l" to="unkn:~Single.just(java.lang.Object)" resolve="just" />
<node concept="2ShNRf" id="6kREIVkCl_M" role="37wK5m">
<node concept="HV5vD" id="6kREIVkCl_N" role="2ShVmc">
<ref role="HV5vE" node="Hg6Enc_35l" resolve="InitStep" />
@ -4006,7 +4006,7 @@
<ref role="3cqZAo" node="4BHjwwGi7In" resolve="last" />
</node>
<node concept="liA8E" id="4BHjwwGLnNl" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
<node concept="1bVj0M" id="4BHjwwGLp1f" role="37wK5m">
<node concept="37vLTG" id="4BHjwwGLq3q" role="1bW2Oz">
<property role="TrG5h" value="step" />
@ -4078,7 +4078,7 @@
</node>
</node>
<node concept="liA8E" id="19wqdqNSTzi" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.subscribeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="subscribeOn" />
<ref role="37wK5l" to="unkn:~Single.subscribeOn(io.reactivex.Scheduler)" resolve="subscribeOn" />
<node concept="37vLTw" id="19wqdqNSVSy" role="37wK5m">
<ref role="3cqZAo" node="2mbQB8J5_aK" resolve="subscribeScheduler" />
</node>
@ -4115,7 +4115,7 @@
<ref role="3cqZAo" node="6kREIVkpzoM" resolve="step" />
</node>
<node concept="liA8E" id="6kREIVkq2ib" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.doOnSuccess(io.reactivex.functions.Consumer):io.reactivex.Single" resolve="doOnSuccess" />
<ref role="37wK5l" to="unkn:~Single.doOnSuccess(io.reactivex.functions.Consumer)" resolve="doOnSuccess" />
<node concept="1bVj0M" id="6kREIVkq8QF" role="37wK5m">
<node concept="3clFbS" id="6kREIVkq8QG" role="1bW5cS">
<node concept="3clFbF" id="6kREIVku5V4" role="3cqZAp">
@ -4172,7 +4172,7 @@
<ref role="3cqZAo" node="6kREIVke7Pf" resolve="single" />
</node>
<node concept="liA8E" id="6kREIVkeglV" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.onErrorReturn(io.reactivex.functions.Function):io.reactivex.Single" resolve="onErrorReturn" />
<ref role="37wK5l" to="unkn:~Single.onErrorReturn(io.reactivex.functions.Function)" resolve="onErrorReturn" />
<node concept="1bVj0M" id="6kREIVkftIa" role="37wK5m">
<node concept="3clFbS" id="6kREIVkftIc" role="1bW5cS">
<node concept="3clFbH" id="2HYHa0WUUhS" role="3cqZAp" />
@ -4207,7 +4207,7 @@
<ref role="3cqZAo" node="6kREIVkerkd" resolve="resume" />
</node>
<node concept="liA8E" id="4BHjwwGLj1L" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Throwable.getCause():java.lang.Throwable" resolve="getCause" />
<ref role="37wK5l" to="wyt6:~Throwable.getCause()" resolve="getCause" />
</node>
</node>
</node>
@ -4226,7 +4226,7 @@
<ref role="3cqZAo" node="4BHjwwGLj1I" resolve="cause" />
</node>
<node concept="liA8E" id="4BHjwwGLhZI" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Throwable.addSuppressed(java.lang.Throwable):void" resolve="addSuppressed" />
<ref role="37wK5l" to="wyt6:~Throwable.addSuppressed(java.lang.Throwable)" resolve="addSuppressed" />
<node concept="37vLTw" id="4BHjwwGLihh" role="37wK5m">
<ref role="3cqZAo" node="4BHjwwGKJA$" resolve="failure" />
</node>
@ -4245,7 +4245,7 @@
<ref role="3cqZAo" node="6kREIVkftXC" resolve="t" />
</node>
<node concept="liA8E" id="5lxnBcU2ydy" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
<ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
</node>
</node>
</node>
@ -4347,7 +4347,7 @@
<ref role="3cqZAo" node="6kREIVkftXC" resolve="t" />
</node>
<node concept="liA8E" id="6kREIVkk1YN" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
<ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
</node>
</node>
</node>
@ -4384,7 +4384,7 @@
<ref role="3cqZAo" node="6kREIVkftXC" resolve="t" />
</node>
<node concept="liA8E" id="5lxnBcU2zaZ" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
<ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
</node>
</node>
</node>
@ -4398,7 +4398,7 @@
<ref role="3cqZAo" node="6kREIVkftXC" resolve="t" />
</node>
<node concept="liA8E" id="4BHjwwGLmpD" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Throwable.addSuppressed(java.lang.Throwable):void" resolve="addSuppressed" />
<ref role="37wK5l" to="wyt6:~Throwable.addSuppressed(java.lang.Throwable)" resolve="addSuppressed" />
<node concept="37vLTw" id="4BHjwwGLmEx" role="37wK5m">
<ref role="3cqZAo" node="4BHjwwGKJA$" resolve="failure" />
</node>
@ -4540,7 +4540,7 @@
<ref role="3cqZAo" node="1pPth$lAEQs" resolve="feedback" />
</node>
<node concept="liA8E" id="2mbQB8JmeFm" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
</node>
</node>
</node>
@ -4562,7 +4562,7 @@
<ref role="3cqZAo" node="1pPth$lAEQs" resolve="feedback" />
</node>
<node concept="liA8E" id="Hg6EnchKQ2" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
</node>
</node>
</node>
@ -4629,7 +4629,7 @@
</node>
</node>
<node concept="2YIFZM" id="1N_0WA5JZX7" role="3uHU7B">
<ref role="37wK5l" to="wyt6:~System.nanoTime():long" resolve="nanoTime" />
<ref role="37wK5l" to="wyt6:~System.nanoTime()" resolve="nanoTime" />
<ref role="1Pybhc" to="wyt6:~System" resolve="System" />
</node>
</node>
@ -4646,10 +4646,10 @@
<ref role="3cqZAo" node="1pPth$lAEQs" resolve="feedback" />
</node>
<node concept="liA8E" id="1N_0WA5JWB9" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
<node concept="2YIFZM" id="1N_0WA5JWBa" role="37wK5m">
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
<node concept="3cpWs3" id="1N_0WA5JWBb" role="37wK5m">
<node concept="Xl_RD" id="1N_0WA5JWBc" role="3uHU7w">
<property role="Xl_RC" value=" -- %s (took %2$Ts.%2$TLs)\n" />
@ -4700,14 +4700,14 @@
<ref role="3cqZAo" node="1pPth$lAEQs" resolve="feedback" />
</node>
<node concept="liA8E" id="1N_0WA5Kln7" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
<node concept="37vLTw" id="1N_0WA5KlZs" role="37wK5m">
<ref role="3cqZAo" node="1N_0WA5Kg9W" resolve="errorMsg" />
</node>
</node>
</node>
<node concept="liA8E" id="1N_0WA5Kmgw" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
<node concept="Xl_RD" id="1N_0WA5Km$P" role="37wK5m">
<property role="Xl_RC" value="\n" />
</node>

2
coderules/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd
View File

@ -30,7 +30,7 @@
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
<language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>

46
coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
View File

@ -5,7 +5,7 @@
<use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
<use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
<use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
@ -441,7 +441,7 @@
<node concept="3Tqbb2" id="6hqFpWnfbDz" role="1tU5fm" />
<node concept="2OqwBi" id="6hqFpWnfbD$" role="33vP2m">
<node concept="liA8E" id="6hqFpWnfbDC" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getContainingRoot():org.jetbrains.mps.openapi.model.SNode" resolve="getContainingRoot" />
<ref role="37wK5l" to="mhbf:~SNode.getContainingRoot()" resolve="getContainingRoot" />
</node>
<node concept="37vLTw" id="6hqFpWnfcn_" role="2Oq$k0">
<ref role="3cqZAo" node="6hqFpWnfbqG" resolve="node" />
@ -471,7 +471,7 @@
<ref role="3cqZAo" node="6hqFpWnfhk_" resolve="mpsProject" />
</node>
<node concept="liA8E" id="78H58oetzW8" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -501,7 +501,7 @@
<ref role="3cqZAo" node="6hqFpWnfcD1" resolve="editorComponent" />
</node>
<node concept="liA8E" id="6hqFpWnfbEg" role="2OqNvi">
<ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode():org.jetbrains.mps.openapi.model.SNode" resolve="getEditedNode" />
<ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode()" resolve="getEditedNode" />
</node>
</node>
</node>
@ -828,7 +828,7 @@
</node>
</node>
<node concept="liA8E" id="7WKNeR8SQxO" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -963,13 +963,13 @@
<node concept="2OqwBi" id="7WKNeR8SQyQ" role="3clFbG">
<node concept="2YIFZM" id="7WKNeR8SQyR" role="2Oq$k0">
<ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
<ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project):com.intellij.openapi.wm.ToolWindowManager" resolve="getInstance" />
<ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
<node concept="37vLTw" id="78H58oeurAk" role="37wK5m">
<ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
</node>
</node>
<node concept="liA8E" id="7WKNeR8SQyT" role="2OqNvi">
<ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String):void" resolve="notifyByBalloon" />
<ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String)" resolve="notifyByBalloon" />
<node concept="Xl_RD" id="7WKNeR8SQyU" role="37wK5m">
<property role="Xl_RC" value="Activation Trace" />
</node>
@ -990,7 +990,7 @@
<ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
</node>
<node concept="liA8E" id="7WKNeR8SQyZ" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1012,14 +1012,14 @@
<node concept="3clFbF" id="7WKNeR8SQz9" role="3cqZAp">
<node concept="2OqwBi" id="7WKNeR8SQza" role="3clFbG">
<node concept="2YIFZM" id="7WKNeR8SQzb" role="2Oq$k0">
<ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project):com.intellij.openapi.wm.ToolWindowManager" resolve="getInstance" />
<ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
<ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
<node concept="37vLTw" id="78H58oeurTN" role="37wK5m">
<ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
</node>
</node>
<node concept="liA8E" id="7WKNeR8SQzd" role="2OqNvi">
<ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String):void" resolve="notifyByBalloon" />
<ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String)" resolve="notifyByBalloon" />
<node concept="Xl_RD" id="7WKNeR8SQze" role="37wK5m">
<property role="Xl_RC" value="Activation Trace" />
</node>
@ -1040,7 +1040,7 @@
<ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
</node>
<node concept="liA8E" id="7WKNeR8SQzj" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1193,7 +1193,7 @@
<ref role="3cqZAo" node="Hg6EncbkRS" resolve="prevStep" />
</node>
<node concept="liA8E" id="5lxnBcU085M" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.flatMap(io.reactivex.functions.Function):io.reactivex.Single" resolve="flatMap" />
<ref role="37wK5l" to="unkn:~Single.flatMap(io.reactivex.functions.Function)" resolve="flatMap" />
<node concept="1bVj0M" id="5lxnBcU08CP" role="37wK5m">
<node concept="37vLTG" id="5lxnBcU09rm" role="1bW2Oz">
<property role="TrG5h" value="prev" />
@ -1220,7 +1220,7 @@
</node>
</node>
<node concept="liA8E" id="78H58of3fKh" role="2OqNvi">
<ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode():org.jetbrains.mps.openapi.model.SNode" resolve="getEditedNode" />
<ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode()" resolve="getEditedNode" />
</node>
</node>
<node concept="2OqwBi" id="78H58of3fKi" role="37wK5m">
@ -1296,10 +1296,10 @@
</node>
</node>
<node concept="liA8E" id="5lxnBcU0eq5" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Completable.andThen(io.reactivex.SingleSource):io.reactivex.Single" resolve="andThen" />
<ref role="37wK5l" to="unkn:~Completable.andThen(io.reactivex.SingleSource)" resolve="andThen" />
<node concept="2YIFZM" id="5lxnBcU0gP7" role="37wK5m">
<ref role="1Pybhc" to="unkn:~Single" resolve="Single" />
<ref role="37wK5l" to="unkn:~Single.fromCallable(java.util.concurrent.Callable):io.reactivex.Single" resolve="fromCallable" />
<ref role="37wK5l" to="unkn:~Single.fromCallable(java.util.concurrent.Callable)" resolve="fromCallable" />
<node concept="1bVj0M" id="5lxnBcU0iBX" role="37wK5m">
<node concept="3clFbS" id="5lxnBcU0iBY" role="1bW5cS">
<node concept="3clFbF" id="5lxnBcU0nAW" role="3cqZAp">
@ -1373,7 +1373,7 @@
<ref role="3cqZAo" node="55Q$YFtIX9v" resolve="mpsProject" />
</node>
<node concept="liA8E" id="6Yb9hAqUqv9" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -1406,7 +1406,7 @@
<ref role="3cqZAo" node="55Q$YFtIX9v" resolve="mpsProject" />
</node>
<node concept="liA8E" id="6kREIVkONuP" role="2OqNvi">
<ref role="37wK5l" to="z1c4:~MPSProject.getProject():com.intellij.openapi.project.Project" resolve="getProject" />
<ref role="37wK5l" to="z1c4:~MPSProject.getProject()" resolve="getProject" />
</node>
</node>
</node>
@ -1481,15 +1481,15 @@
<ref role="3cqZAo" node="6Yb9hAqUr3u" resolve="prevStep" />
</node>
<node concept="liA8E" id="6Yb9hAqUIG7" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="observeOn" />
<ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler)" resolve="observeOn" />
<node concept="2YIFZM" id="6Yb9hAqUIG8" role="37wK5m">
<ref role="37wK5l" to="f4yq:~SwingSchedulers.edt():io.reactivex.Scheduler" resolve="edt" />
<ref role="37wK5l" to="f4yq:~SwingSchedulers.edt()" resolve="edt" />
<ref role="1Pybhc" to="f4yq:~SwingSchedulers" resolve="SwingSchedulers" />
</node>
</node>
</node>
<node concept="liA8E" id="6Yb9hAqUIG9" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
<node concept="1bVj0M" id="6Yb9hAqUIGa" role="37wK5m">
<node concept="3clFbS" id="6Yb9hAqUIGb" role="1bW5cS">
<node concept="3clFbH" id="6Yb9hAqUIGc" role="3cqZAp" />
@ -1551,7 +1551,7 @@
<ref role="3cqZAo" node="6Yb9hAqUIGe" resolve="program" />
</node>
<node concept="liA8E" id="6Yb9hAqUIG_" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Program.name():java.lang.String" resolve="name" />
<ref role="37wK5l" to="av0y:~Program.name()" resolve="name" />
</node>
</node>
</node>
@ -1674,7 +1674,7 @@
</node>
</node>
<node concept="liA8E" id="6IQb_Rxsum7" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.doFinally(io.reactivex.functions.Action):io.reactivex.Single" resolve="doFinally" />
<ref role="37wK5l" to="unkn:~Single.doFinally(io.reactivex.functions.Action)" resolve="doFinally" />
<node concept="1bVj0M" id="6IQb_Rxswo2" role="37wK5m">
<node concept="3clFbS" id="6IQb_Rxswo3" role="1bW5cS">
<node concept="3clFbH" id="6IQb_Rxsy3D" role="3cqZAp" />
@ -1753,7 +1753,7 @@
<ref role="3cqZAo" node="443LGHBSGGx" resolve="mpsProject" />
</node>
<node concept="liA8E" id="6IQb_Rxsy6n" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>

2
coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd
View File

@ -18,7 +18,7 @@
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>

14
coderules/solutions/jetbrains.mps.controlflow/models/service.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
<use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
@ -232,7 +232,7 @@
</node>
</node>
<node concept="liA8E" id="4t7Xo7iw0Kl" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
<node concept="37vLTw" id="4t7Xo7iw11c" role="37wK5m">
<ref role="3cqZAo" node="4t7Xo7ivP5g" resolve="fqName" />
</node>
@ -302,14 +302,14 @@
<node concept="2OqwBi" id="4t7Xo7ivWyB" role="3uHU7B">
<node concept="2OqwBi" id="2Mi2iz0Yf4b" role="2Oq$k0">
<node concept="1rXfSq" id="4t7Xo7ivWek" role="2Oq$k0">
<ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
<ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
</node>
<node concept="liA8E" id="2Mi2iz0YfRL" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Class.getPackage():java.lang.Package" resolve="getPackage" />
<ref role="37wK5l" to="wyt6:~Class.getPackage()" resolve="getPackage" />
</node>
</node>
<node concept="liA8E" id="4t7Xo7ivWVU" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Package.getName():java.lang.String" resolve="getName" />
<ref role="37wK5l" to="wyt6:~Package.getName()" resolve="getName" />
</node>
</node>
<node concept="Xl_RD" id="4t7Xo7ivXoD" role="3uHU7w">
@ -396,7 +396,7 @@
</node>
</node>
<node concept="liA8E" id="6Yb9hAqJTJO" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
<node concept="1bVj0M" id="6Yb9hAqJUtw" role="37wK5m">
<node concept="37vLTG" id="6Yb9hAqJUBz" role="1bW2Oz">
<property role="TrG5h" value="step" />
@ -686,7 +686,7 @@
<ref role="3cqZAo" to="d6hs:~IssueKindReportItem.TYPESYSTEM" resolve="TYPESYSTEM" />
</node>
<node concept="liA8E" id="5t4mtEg03Sb" role="2OqNvi">
<ref role="37wK5l" to="d6hs:~IssueKindReportItem$CheckerCategory.deriveItemKind(java.lang.String):jetbrains.mps.errors.item.IssueKindReportItem$ItemKind" resolve="deriveItemKind" />
<ref role="37wK5l" to="d6hs:~IssueKindReportItem$CheckerCategory.deriveItemKind(java.lang.String)" resolve="deriveItemKind" />
<node concept="Xl_RD" id="5t4mtEg03Se" role="37wK5m">
<property role="Xl_RC" value="control flow" />
</node>

2
coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
View File

@ -23,7 +23,7 @@
<language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
</languageVersions>

34
coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
<use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
@ -376,13 +376,13 @@
<node concept="2OqwBi" id="NKt6ynp2kH" role="33vP2m">
<node concept="2YIFZM" id="NKt6ynp2kI" role="2Oq$k0">
<ref role="1Pybhc" to="vndm:~LanguageRegistry" resolve="LanguageRegistry" />
<ref role="37wK5l" to="vndm:~LanguageRegistry.getInstance(org.jetbrains.mps.openapi.module.SRepository):jetbrains.mps.smodel.language.LanguageRegistry" resolve="getInstance" />
<ref role="37wK5l" to="vndm:~LanguageRegistry.getInstance(org.jetbrains.mps.openapi.module.SRepository)" resolve="getInstance" />
<node concept="37vLTw" id="NKt6ynp2kJ" role="37wK5m">
<ref role="3cqZAo" node="NKt6ynp2k_" resolve="repository" />
</node>
</node>
<node concept="liA8E" id="NKt6ynp2kK" role="2OqNvi">
<ref role="37wK5l" to="vndm:~LanguageRegistry.getLanguage(org.jetbrains.mps.openapi.language.SLanguage):jetbrains.mps.smodel.language.LanguageRuntime" resolve="getLanguage" />
<ref role="37wK5l" to="vndm:~LanguageRegistry.getLanguage(org.jetbrains.mps.openapi.language.SLanguage)" resolve="getLanguage" />
<node concept="37vLTw" id="NKt6ynp2kL" role="37wK5m">
<ref role="3cqZAo" node="NKt6ynp2kz" resolve="slang" />
</node>
@ -467,7 +467,7 @@
<node concept="X8dFx" id="52Js5TE$0yw" role="2OqNvi">
<node concept="2YIFZM" id="52Js5TE$0D7" role="25WWJ7">
<ref role="1Pybhc" to="w1kc:~SModelOperations" resolve="SModelOperations" />
<ref role="37wK5l" to="w1kc:~SModelOperations.getAllLanguageImports(org.jetbrains.mps.openapi.model.SModel):java.util.Set" resolve="getAllLanguageImports" />
<ref role="37wK5l" to="w1kc:~SModelOperations.getAllLanguageImports(org.jetbrains.mps.openapi.model.SModel)" resolve="getAllLanguageImports" />
<node concept="2OqwBi" id="52Js5TE$1LH" role="37wK5m">
<node concept="37vLTw" id="52Js5TE$1LI" role="2Oq$k0">
<ref role="3cqZAo" node="7mB3viLmiiz" resolve="node" />
@ -505,11 +505,11 @@
</node>
</node>
<node concept="liA8E" id="7mB3viLmPxl" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getConcept():org.jetbrains.mps.openapi.language.SConcept" resolve="getConcept" />
<ref role="37wK5l" to="mhbf:~SNode.getConcept()" resolve="getConcept" />
</node>
</node>
<node concept="liA8E" id="7mB3viLmQ23" role="2OqNvi">
<ref role="37wK5l" to="c17a:~SAbstractConcept.getLanguage():org.jetbrains.mps.openapi.language.SLanguage" resolve="getLanguage" />
<ref role="37wK5l" to="c17a:~SAbstractConcept.getLanguage()" resolve="getLanguage" />
</node>
</node>
</node>
@ -614,7 +614,7 @@
<node concept="1rXfSq" id="NKt6ynpjDR" role="2Oq$k0">
<ref role="37wK5l" node="NKt6ynq5W5" resolve="extendedLangClosure" />
<node concept="2YIFZM" id="NKt6ynpjDS" role="37wK5m">
<ref role="37wK5l" to="w1kc:~SModelOperations.getAllLanguageImports(org.jetbrains.mps.openapi.model.SModel):java.util.Set" resolve="getAllLanguageImports" />
<ref role="37wK5l" to="w1kc:~SModelOperations.getAllLanguageImports(org.jetbrains.mps.openapi.model.SModel)" resolve="getAllLanguageImports" />
<ref role="1Pybhc" to="w1kc:~SModelOperations" resolve="SModelOperations" />
<node concept="37vLTw" id="NKt6ynpjDT" role="37wK5m">
<ref role="3cqZAo" node="NKt6ynoWQ9" resolve="model" />
@ -915,14 +915,14 @@
</node>
<node concept="2OqwBi" id="NKt6ynosk2" role="33vP2m">
<node concept="2YIFZM" id="NKt6ynosk3" role="2Oq$k0">
<ref role="37wK5l" to="vndm:~LanguageRegistry.getInstance(org.jetbrains.mps.openapi.module.SRepository):jetbrains.mps.smodel.language.LanguageRegistry" resolve="getInstance" />
<ref role="37wK5l" to="vndm:~LanguageRegistry.getInstance(org.jetbrains.mps.openapi.module.SRepository)" resolve="getInstance" />
<ref role="1Pybhc" to="vndm:~LanguageRegistry" resolve="LanguageRegistry" />
<node concept="37vLTw" id="NKt6ynosk4" role="37wK5m">
<ref role="3cqZAo" node="NKt6ynoskG" resolve="repository" />
</node>
</node>
<node concept="liA8E" id="NKt6ynosk5" role="2OqNvi">
<ref role="37wK5l" to="vndm:~LanguageRegistry.getLanguage(org.jetbrains.mps.openapi.language.SLanguage):jetbrains.mps.smodel.language.LanguageRuntime" resolve="getLanguage" />
<ref role="37wK5l" to="vndm:~LanguageRegistry.getLanguage(org.jetbrains.mps.openapi.language.SLanguage)" resolve="getLanguage" />
<node concept="37vLTw" id="NKt6ynosk6" role="37wK5m">
<ref role="3cqZAo" node="NKt6ynoskz" resolve="slang" />
</node>
@ -947,7 +947,7 @@
<ref role="3cqZAo" node="NKt6ynoskz" resolve="slang" />
</node>
<node concept="liA8E" id="NKt6ynoskg" role="2OqNvi">
<ref role="37wK5l" to="c17a:~SLanguage.getQualifiedName():java.lang.String" resolve="getQualifiedName" />
<ref role="37wK5l" to="c17a:~SLanguage.getQualifiedName()" resolve="getQualifiedName" />
</node>
</node>
</node>
@ -986,7 +986,7 @@
<ref role="3cqZAo" node="NKt6ynosk0" resolve="langrt" />
</node>
<node concept="liA8E" id="NKt6ynosky" role="2OqNvi">
<ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendedLanguages():java.util.Collection" resolve="getExtendedLanguages" />
<ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendedLanguages()" resolve="getExtendedLanguages" />
</node>
</node>
</node>
@ -1084,7 +1084,7 @@
<ref role="3cqZAo" node="NKt6ynosl9" resolve="langrt" />
</node>
<node concept="liA8E" id="NKt6ynosl8" role="2OqNvi">
<ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendedLanguages():java.util.Collection" resolve="getExtendedLanguages" />
<ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendedLanguages()" resolve="getExtendedLanguages" />
</node>
</node>
</node>
@ -1612,7 +1612,7 @@
<ref role="3cqZAo" node="NKt6ynospH" resolve="langDesc" />
</node>
<node concept="liA8E" id="NKt6ynospl" role="2OqNvi">
<ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendedLanguages():java.util.Collection" resolve="getExtendedLanguages" />
<ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendedLanguages()" resolve="getExtendedLanguages" />
</node>
</node>
</node>
@ -1664,7 +1664,7 @@
<ref role="3cqZAo" node="NKt6ynospH" resolve="langDesc" />
</node>
<node concept="liA8E" id="NKt6ynospF" role="2OqNvi">
<ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendingLanguages():java.lang.Iterable" resolve="getExtendingLanguages" />
<ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendingLanguages()" resolve="getExtendingLanguages" />
</node>
</node>
</node>
@ -1793,7 +1793,7 @@
<ref role="3cqZAo" node="78H58oefpDM" resolve="lr" />
</node>
<node concept="liA8E" id="78H58oefroc" role="2OqNvi">
<ref role="37wK5l" to="vndm:~LanguageRuntime.getAspect(java.lang.Class):jetbrains.mps.smodel.runtime.ILanguageAspect" resolve="getAspect" />
<ref role="37wK5l" to="vndm:~LanguageRuntime.getAspect(java.lang.Class)" resolve="getAspect" />
<node concept="37vLTw" id="78H58oefrod" role="37wK5m">
<ref role="3cqZAo" node="78H58oefoFj" resolve="aspectClass" />
</node>
@ -1883,7 +1883,7 @@
<ref role="3cqZAo" node="7P_FdVQ2BHb" resolve="languageRuntime" />
</node>
<node concept="liA8E" id="7P_FdVQ4e7J" role="2OqNvi">
<ref role="37wK5l" to="i5cy:~AtomicReference.get():java.lang.Object" resolve="get" />
<ref role="37wK5l" to="i5cy:~AtomicReference.get()" resolve="get" />
</node>
</node>
</node>
@ -1910,7 +1910,7 @@
</node>
</node>
<node concept="liA8E" id="7P_FdVQ4fZN" role="2OqNvi">
<ref role="37wK5l" to="i5cy:~AtomicReference.compareAndSet(java.lang.Object,java.lang.Object):boolean" resolve="compareAndSet" />
<ref role="37wK5l" to="i5cy:~AtomicReference.compareAndSet(java.lang.Object,java.lang.Object)" resolve="compareAndSet" />
<node concept="10Nm6u" id="7P_FdVQ4g7y" role="37wK5m" />
<node concept="37vLTw" id="7P_FdVQ4gmf" role="37wK5m">
<ref role="3cqZAo" node="7P_FdVQ2PYd" resolve="langrt" />

8
coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
View File

@ -4,7 +4,7 @@
<languages>
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
</languages>
@ -350,7 +350,7 @@
<ref role="3cqZAo" node="4MEOIDEhznZ" resolve="ref" />
</node>
<node concept="liA8E" id="4MEOIDEhAWs" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
<ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId()" resolve="getNodeId" />
</node>
</node>
</node>
@ -381,7 +381,7 @@
</node>
</node>
<node concept="liA8E" id="4MEOIDEip_e" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
<ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
</node>
</node>
</node>
@ -404,7 +404,7 @@
<ref role="3cqZAo" node="4MEOIDEh_rV" resolve="nodeId" />
</node>
<node concept="liA8E" id="4MEOIDEi6Bi" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>

106
coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
View File

@ -5,7 +5,7 @@
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="-1" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
</languages>
@ -796,19 +796,19 @@
</node>
</node>
<node concept="2YIFZM" id="1ffsG7bUgPf" role="3uHU7w">
<ref role="37wK5l" to="18ew:~NameUtil.compactNamespace(java.lang.String):java.lang.String" resolve="compactNamespace" />
<ref role="37wK5l" to="18ew:~NameUtil.compactNamespace(java.lang.String)" resolve="compactNamespace" />
<ref role="1Pybhc" to="18ew:~NameUtil" resolve="NameUtil" />
<node concept="2OqwBi" id="1ffsG7bUgPg" role="37wK5m">
<node concept="2OqwBi" id="1ffsG7bUgPh" role="2Oq$k0">
<node concept="1rXfSq" id="1ffsG7bUgPi" role="2Oq$k0">
<ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
<ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
</node>
<node concept="liA8E" id="1ffsG7bUgPj" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Class.getPackage():java.lang.Package" resolve="getPackage" />
<ref role="37wK5l" to="wyt6:~Class.getPackage()" resolve="getPackage" />
</node>
</node>
<node concept="liA8E" id="1ffsG7bUgPk" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Package.getName():java.lang.String" resolve="getName" />
<ref role="37wK5l" to="wyt6:~Package.getName()" resolve="getName" />
</node>
</node>
</node>
@ -1409,9 +1409,9 @@
<node concept="3clFbF" id="5uFPQ7BZvJl" role="3cqZAp">
<node concept="2YIFZM" id="5uFPQ7BZvJm" role="3clFbG">
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
<ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List):java.util.List" resolve="unmodifiableList" />
<ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List)" resolve="unmodifiableList" />
<node concept="2YIFZM" id="5uFPQ7BZvJn" role="37wK5m">
<ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
<ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...)" resolve="asList" />
<ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
<node concept="37vLTw" id="5uFPQ7BZvJo" role="37wK5m">
<ref role="3cqZAo" node="5uFPQ7BZuef" resolve="arguments" />
@ -1475,7 +1475,7 @@
<ref role="3cqZAo" node="78CwJJcO$LZ" resolve="types" />
</node>
<node concept="liA8E" id="7HUwyZbi4hh" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
<node concept="2OqwBi" id="7HUwyZbi4Af" role="37wK5m">
<node concept="1eOMI4" id="7HUwyZbi4o9" role="2Oq$k0">
<node concept="10QFUN" id="7HUwyZbi4o6" role="1eOMHV">
@ -1488,7 +1488,7 @@
</node>
</node>
<node concept="liA8E" id="7HUwyZbi4HE" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MetaLogical.type():java.lang.Class" resolve="type" />
<ref role="37wK5l" to="bj13:~MetaLogical.type()" resolve="type" />
</node>
</node>
</node>
@ -1525,7 +1525,7 @@
<ref role="3cqZAo" node="78CwJJcO$LZ" resolve="types" />
</node>
<node concept="liA8E" id="4sSe4$prIpP" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
<node concept="3VsKOn" id="4sSe4$prJvo" role="37wK5m">
<ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
</node>
@ -1543,13 +1543,13 @@
<ref role="3cqZAo" node="78CwJJcO$LZ" resolve="types" />
</node>
<node concept="liA8E" id="78CwJJcO_AW" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
<node concept="2OqwBi" id="78CwJJcO_HO" role="37wK5m">
<node concept="37vLTw" id="78CwJJcO_G3" role="2Oq$k0">
<ref role="3cqZAo" node="78CwJJcO_55" resolve="arg" />
</node>
<node concept="liA8E" id="78CwJJcO_ND" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
<ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
</node>
</node>
</node>
@ -1653,7 +1653,7 @@
<ref role="3cqZAo" node="4sSe4$p01mQ" resolve="res" />
</node>
<node concept="liA8E" id="4sSe4$p0iRE" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
<node concept="2ShNRf" id="4sSe4$p0jEu" role="37wK5m">
<node concept="1pGfFk" id="4sSe4$p0lnr" role="2ShVmc">
<ref role="37wK5l" to="cxk7:4xBopTzmopz" resolve="UnificationPredicate" />
@ -2674,7 +2674,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
</node>
<node concept="liA8E" id="32fHqDf93HR" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="2ShNRf" id="32fHqDf93HS" role="37wK5m">
<node concept="1pGfFk" id="32fHqDf93HT" role="2ShVmc">
<ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
@ -2718,7 +2718,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
</node>
<node concept="liA8E" id="2_NfR5wkwVz" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="2ShNRf" id="2_NfR5wkx09" role="37wK5m">
<node concept="1pGfFk" id="2_NfR5wkxkq" role="2ShVmc">
<ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
@ -2739,7 +2739,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
</node>
<node concept="liA8E" id="2_NfR5wktC6" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
<ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
</node>
</node>
</node>
@ -2758,7 +2758,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
</node>
<node concept="liA8E" id="2_NfR5wkyON" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
<node concept="3cpWsd" id="2_NfR5wkyOO" role="37wK5m">
<node concept="3cmrfG" id="2_NfR5wkyOP" role="3uHU7w">
<property role="3cmrfH" value="1" />
@ -2768,7 +2768,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
</node>
<node concept="liA8E" id="2_NfR5wkyOS" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
<ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
</node>
</node>
</node>
@ -2784,7 +2784,7 @@
<ref role="3cqZAo" node="2_NfR5wkuUQ" resolve="body" />
</node>
<node concept="liA8E" id="7eGEHDlc$aG" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="AH0OO" id="7eGEHDlc$aH" role="37wK5m">
<node concept="37vLTw" id="7eGEHDlc$aI" role="AHEQo">
<ref role="3cqZAo" node="7eGEHDlc$aK" resolve="i" />
@ -2850,7 +2850,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eP" resolve="guard" />
</node>
<node concept="liA8E" id="7eGEHDlc$b9" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="AH0OO" id="7eGEHDlc$ba" role="37wK5m">
<node concept="37vLTw" id="7eGEHDlc$bb" role="AHEQo">
<ref role="3cqZAo" node="7eGEHDlc$bd" resolve="i" />
@ -2908,7 +2908,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eH" resolve="headReplaced" />
</node>
<node concept="liA8E" id="7eGEHDlc$bz" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="AH0OO" id="7eGEHDlc$b$" role="37wK5m">
<node concept="37vLTw" id="7eGEHDlc$b_" role="AHEQo">
<ref role="3cqZAo" node="7eGEHDlc$bB" resolve="i" />
@ -2974,7 +2974,7 @@
<ref role="3cqZAo" node="7eGEHDlc$e_" resolve="headKept" />
</node>
<node concept="liA8E" id="7eGEHDlc$c0" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="AH0OO" id="7eGEHDlc$c1" role="37wK5m">
<node concept="37vLTw" id="7eGEHDlc$c2" role="AHEQo">
<ref role="3cqZAo" node="7eGEHDlc$c4" resolve="i" />
@ -3039,7 +3039,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eH" resolve="headReplaced" />
</node>
<node concept="liA8E" id="7nkyKX7mhwW" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
<ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
</node>
</node>
<node concept="2OqwBi" id="7nkyKX7mh4U" role="3uHU7B">
@ -3047,7 +3047,7 @@
<ref role="3cqZAo" node="7eGEHDlc$e_" resolve="headKept" />
</node>
<node concept="liA8E" id="7nkyKX7mh4W" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
<ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
</node>
</node>
</node>
@ -3069,7 +3069,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eP" resolve="guard" />
</node>
<node concept="liA8E" id="7nkyKX7mnTd" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
<ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
</node>
</node>
</node>
@ -3089,7 +3089,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
</node>
<node concept="liA8E" id="7nkyKX7mnWy" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
<ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
</node>
</node>
</node>
@ -3210,7 +3210,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eH" resolve="headReplaced" />
</node>
<node concept="liA8E" id="7eGEHDlc$c_" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
<ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
</node>
</node>
</node>
@ -3220,7 +3220,7 @@
<ref role="3cqZAo" node="7eGEHDlc$e_" resolve="headKept" />
</node>
<node concept="liA8E" id="7eGEHDlc$cD" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
<ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
</node>
</node>
</node>
@ -3246,7 +3246,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eH" resolve="headReplaced" />
</node>
<node concept="liA8E" id="7eGEHDlc$cN" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
<ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
</node>
</node>
</node>
@ -3258,7 +3258,7 @@
<ref role="3cqZAo" node="7eGEHDlc$e_" resolve="headKept" />
</node>
<node concept="liA8E" id="7eGEHDlc$cS" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
<ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
</node>
</node>
</node>
@ -3321,7 +3321,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
</node>
<node concept="liA8E" id="7eGEHDlc$dd" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
<ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
</node>
</node>
</node>
@ -3329,7 +3329,7 @@
<node concept="3clFbF" id="7eGEHDlc$df" role="3cqZAp">
<node concept="37vLTI" id="7eGEHDlc$dg" role="3clFbG">
<node concept="2YIFZM" id="7eGEHDlc$dh" role="37vLTx">
<ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List):java.util.List" resolve="unmodifiableList" />
<ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List)" resolve="unmodifiableList" />
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
<node concept="37vLTw" id="7eGEHDlc$di" role="37wK5m">
<ref role="3cqZAo" node="7eGEHDlc$e_" resolve="headKept" />
@ -3343,7 +3343,7 @@
<node concept="3clFbF" id="7eGEHDlc$dk" role="3cqZAp">
<node concept="37vLTI" id="7eGEHDlc$dl" role="3clFbG">
<node concept="2YIFZM" id="7eGEHDlc$dm" role="37vLTx">
<ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List):java.util.List" resolve="unmodifiableList" />
<ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List)" resolve="unmodifiableList" />
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
<node concept="37vLTw" id="7eGEHDlc$dn" role="37wK5m">
<ref role="3cqZAo" node="7eGEHDlc$eH" resolve="headReplaced" />
@ -3357,7 +3357,7 @@
<node concept="3clFbF" id="7eGEHDlc$dp" role="3cqZAp">
<node concept="37vLTI" id="7eGEHDlc$dq" role="3clFbG">
<node concept="2YIFZM" id="7eGEHDlc$dr" role="37vLTx">
<ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List):java.util.List" resolve="unmodifiableList" />
<ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List)" resolve="unmodifiableList" />
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
<node concept="37vLTw" id="7eGEHDlc$ds" role="37wK5m">
<ref role="3cqZAo" node="7eGEHDlc$eP" resolve="guard" />
@ -3371,7 +3371,7 @@
<node concept="3clFbF" id="7eGEHDlc$du" role="3cqZAp">
<node concept="37vLTI" id="7eGEHDlc$dv" role="3clFbG">
<node concept="2YIFZM" id="7eGEHDlc$dw" role="37vLTx">
<ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List):java.util.List" resolve="unmodifiableList" />
<ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List)" resolve="unmodifiableList" />
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
<node concept="37vLTw" id="7eGEHDlc$dx" role="37wK5m">
<ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
@ -3411,7 +3411,7 @@
<node concept="3clFbF" id="3KXGt7WsboW" role="3cqZAp">
<node concept="2YIFZM" id="3KXGt7Wsbqk" role="3clFbG">
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
<node concept="Xl_RD" id="3KXGt7WsbrR" role="37wK5m">
<property role="Xl_RC" value="%s (%d,%d,%d,%d)" />
</node>
@ -3423,7 +3423,7 @@
<ref role="3cqZAo" node="7eGEHDlc$e_" resolve="headKept" />
</node>
<node concept="liA8E" id="3KXGt7Wscd_" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
<ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
</node>
</node>
<node concept="2OqwBi" id="3KXGt7WsczF" role="37wK5m">
@ -3431,7 +3431,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eH" resolve="headReplaced" />
</node>
<node concept="liA8E" id="3KXGt7WscRr" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
<ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
</node>
</node>
<node concept="2OqwBi" id="3KXGt7WsdgT" role="37wK5m">
@ -3439,7 +3439,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eP" resolve="guard" />
</node>
<node concept="liA8E" id="3KXGt7WsdAI" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
<ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
</node>
</node>
<node concept="2OqwBi" id="3KXGt7Wse6B" role="37wK5m">
@ -3447,7 +3447,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
</node>
<node concept="liA8E" id="3KXGt7WseOV" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
<ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
</node>
</node>
</node>
@ -3507,7 +3507,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eH" resolve="headReplaced" />
</node>
<node concept="liA8E" id="2$F5QpusUuh" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection):boolean" resolve="addAll" />
<ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection)" resolve="addAll" />
<node concept="2OqwBi" id="2$F5QpusUui" role="37wK5m">
<node concept="37vLTw" id="2$F5QpusUuj" role="2Oq$k0">
<ref role="3cqZAo" node="2$F5QpusUu8" resolve="toMerge" />
@ -3525,7 +3525,7 @@
<ref role="3cqZAo" node="7eGEHDlc$e_" resolve="headKept" />
</node>
<node concept="liA8E" id="2$F5QpusUuo" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection):boolean" resolve="addAll" />
<ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection)" resolve="addAll" />
<node concept="2OqwBi" id="2$F5QpusUup" role="37wK5m">
<node concept="37vLTw" id="2$F5QpusUuq" role="2Oq$k0">
<ref role="3cqZAo" node="2$F5QpusUu8" resolve="toMerge" />
@ -3543,7 +3543,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eP" resolve="guard" />
</node>
<node concept="liA8E" id="2$F5QpusUuv" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection):boolean" resolve="addAll" />
<ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection)" resolve="addAll" />
<node concept="2OqwBi" id="2$F5QpusUuw" role="37wK5m">
<node concept="37vLTw" id="2$F5QpusUux" role="2Oq$k0">
<ref role="3cqZAo" node="2$F5QpusUu8" resolve="toMerge" />
@ -3593,7 +3593,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
</node>
<node concept="liA8E" id="2_NfR5wocuG" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="2ShNRf" id="2_NfR5wocuH" role="37wK5m">
<node concept="1pGfFk" id="2_NfR5wocuI" role="2ShVmc">
<ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
@ -3622,7 +3622,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
</node>
<node concept="liA8E" id="2_NfR5wocv0" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
<ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
</node>
</node>
</node>
@ -3635,7 +3635,7 @@
<ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
</node>
<node concept="liA8E" id="2_NfR5wnLkp" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
<node concept="3cpWs3" id="2_NfR5wobVk" role="37wK5m">
<node concept="37vLTw" id="2_NfR5woc7d" role="3uHU7w">
<ref role="3cqZAo" node="2_NfR5woa4k" resolve="intoAlt" />
@ -3647,13 +3647,13 @@
</node>
</node>
<node concept="liA8E" id="2_NfR5wnLF3" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection):boolean" resolve="addAll" />
<ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection)" resolve="addAll" />
<node concept="2OqwBi" id="2_NfR5wnLVl" role="37wK5m">
<node concept="37vLTw" id="2_NfR5wnLLI" role="2Oq$k0">
<ref role="3cqZAo" node="2_NfR5wnF33" resolve="bodyToMerge" />
</node>
<node concept="liA8E" id="2_NfR5wnM5M" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
<node concept="37vLTw" id="2_NfR5wnMd2" role="37wK5m">
<ref role="3cqZAo" node="2_NfR5wnGml" resolve="j" />
</node>
@ -3676,7 +3676,7 @@
<ref role="3cqZAo" node="2_NfR5wnF33" resolve="bodyToMerge" />
</node>
<node concept="liA8E" id="2_NfR5wnH6B" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
<ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
</node>
</node>
<node concept="37vLTw" id="2_NfR5wnWcT" role="3uHU7B">
@ -3950,7 +3950,7 @@
<ref role="3cqZAo" node="4cvjh$8B862" resolve="result" />
</node>
<node concept="liA8E" id="4cvjh$8BctK" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ArrayList.addAll(java.util.Collection):boolean" resolve="addAll" />
<ref role="37wK5l" to="33ny:~ArrayList.addAll(java.util.Collection)" resolve="addAll" />
<node concept="37vLTw" id="4cvjh$8BcBX" role="37wK5m">
<ref role="3cqZAo" node="7eGEHDlc$e_" resolve="headKept" />
</node>
@ -3963,7 +3963,7 @@
<ref role="3cqZAo" node="4cvjh$8B862" resolve="result" />
</node>
<node concept="liA8E" id="4cvjh$8BcUx" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ArrayList.addAll(java.util.Collection):boolean" resolve="addAll" />
<ref role="37wK5l" to="33ny:~ArrayList.addAll(java.util.Collection)" resolve="addAll" />
<node concept="37vLTw" id="4cvjh$8BdMl" role="37wK5m">
<ref role="3cqZAo" node="7eGEHDlc$eH" resolve="headReplaced" />
</node>
@ -3976,7 +3976,7 @@
<ref role="3cqZAo" node="4cvjh$8B862" resolve="result" />
</node>
<node concept="liA8E" id="4cvjh$8Be8c" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ArrayList.addAll(java.util.Collection):boolean" resolve="addAll" />
<ref role="37wK5l" to="33ny:~ArrayList.addAll(java.util.Collection)" resolve="addAll" />
<node concept="37vLTw" id="4cvjh$8Bf3k" role="37wK5m">
<ref role="3cqZAo" node="7eGEHDlc$eP" resolve="guard" />
</node>
@ -3991,7 +3991,7 @@
<ref role="3cqZAo" node="4cvjh$8B862" resolve="result" />
</node>
<node concept="liA8E" id="2_NfR5wkFnv" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ArrayList.addAll(java.util.Collection):boolean" resolve="addAll" />
<ref role="37wK5l" to="33ny:~ArrayList.addAll(java.util.Collection)" resolve="addAll" />
<node concept="37vLTw" id="2_NfR5wm6m8" role="37wK5m">
<ref role="3cqZAo" node="2_NfR5wkFnx" resolve="list" />
</node>

2
coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd
View File

@ -19,7 +19,7 @@
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>

2
coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
View File

@ -2,7 +2,7 @@
<model ref="r:bf5143f7-9856-43e8-8ae7-57cecc1fe6a9(jetbrains.mps.lang.controlflow.aspect)">
<persistence version="9" />
<languages>
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />

2
coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd
View File

@ -17,7 +17,7 @@
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>

2
coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
</languages>

6
coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
View File

@ -29,14 +29,16 @@
<language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
</languageVersions>
<dependencyVersions>
<module reference="1fd846c3-c5f9-4b9e-9ecc-e716f7149f86(Hamcrest)" version="0" />
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
<module reference="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" version="0" />
<module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
<module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
<module reference="b189d6c6-9397-4d64-88af-1ac73760a4f5(jetbrains.mps.logic.test)" version="0" />

228
coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
View File

@ -234,7 +234,7 @@
</node>
<node concept="2YIFZM" id="2ev$9JFEJ9d" role="10QFUP">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Matchers.anyObject():java.lang.Object" resolve="anyObject" />
<ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
</node>
</node>
</node>
@ -264,7 +264,7 @@
</node>
<node concept="2YIFZM" id="6MYr6JxszWa" role="10QFUP">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Matchers.anyObject():java.lang.Object" resolve="anyObject" />
<ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
</node>
</node>
</node>
@ -288,7 +288,7 @@
</node>
<node concept="2YIFZM" id="2ev$9JFEGHr" role="10QFUP">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Matchers.anyObject():java.lang.Object" resolve="anyObject" />
<ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
</node>
</node>
</node>
@ -309,7 +309,7 @@
</node>
<node concept="2YIFZM" id="6YPNC4Oxbib" role="10QFUP">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Matchers.anyObject():java.lang.Object" resolve="anyObject" />
<ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
</node>
</node>
</node>
@ -330,7 +330,7 @@
</node>
<node concept="2YIFZM" id="6YPNC4P9XGv" role="10QFUP">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Matchers.anyObject():java.lang.Object" resolve="anyObject" />
<ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
</node>
</node>
</node>
@ -351,7 +351,7 @@
</node>
<node concept="2YIFZM" id="2ev$9JFEHVa" role="10QFUP">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Matchers.anyObject():java.lang.Object" resolve="anyObject" />
<ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
</node>
</node>
</node>
@ -375,7 +375,7 @@
</node>
</node>
<node concept="2YIFZM" id="2ev$9JFF1GZ" role="10QFUP">
<ref role="37wK5l" to="n4y8:~Matchers.anyObject():java.lang.Object" resolve="anyObject" />
<ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
</node>
</node>
@ -398,7 +398,7 @@
<node concept="3clFbF" id="5YVX0wIlg0e" role="3cqZAp">
<node concept="10QFUN" id="5YVX0wIlg0f" role="3clFbG">
<node concept="2YIFZM" id="5YVX0wIlg0i" role="10QFUP">
<ref role="37wK5l" to="n4y8:~Matchers.anyObject():java.lang.Object" resolve="anyObject" />
<ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
</node>
<node concept="3uibUv" id="5YVX0wIlhe5" role="10QFUM">
@ -431,7 +431,7 @@
</node>
</node>
<node concept="2YIFZM" id="2ev$9JFF1T1" role="10QFUP">
<ref role="37wK5l" to="n4y8:~Matchers.anyObject():java.lang.Object" resolve="anyObject" />
<ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
</node>
</node>
@ -458,7 +458,7 @@
<ref role="16sUi3" node="6MYr6Jxs5Fh" resolve="T" />
</node>
<node concept="2YIFZM" id="2ev$9JFFamJ" role="10QFUP">
<ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object):java.lang.Object" resolve="eq" />
<ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object)" resolve="eq" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="37vLTw" id="2ev$9JFFa$M" role="37wK5m">
<ref role="3cqZAo" node="2ev$9JFF9OQ" resolve="root" />
@ -494,7 +494,7 @@
<ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
</node>
<node concept="2YIFZM" id="5YVX0wIlmGB" role="10QFUP">
<ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object):java.lang.Object" resolve="eq" />
<ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object)" resolve="eq" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="37vLTw" id="5YVX0wIlmGC" role="37wK5m">
<ref role="3cqZAo" node="5YVX0wIlmGv" resolve="root" />
@ -530,7 +530,7 @@
</node>
</node>
<node concept="2YIFZM" id="2ev$9JFFaOH" role="10QFUP">
<ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object):java.lang.Object" resolve="eq" />
<ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object)" resolve="eq" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="37vLTw" id="2ev$9JFFaOI" role="37wK5m">
<ref role="3cqZAo" node="2ev$9JFFaOy" resolve="root" />
@ -569,7 +569,7 @@
<ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
</node>
<node concept="2YIFZM" id="2ev$9JFBNlT" role="33vP2m">
<ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
<ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class)" resolve="mock" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="3VsKOn" id="2ev$9JFBNlU" role="37wK5m">
<ref role="3VsUkX" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
@ -580,7 +580,7 @@
<node concept="3clFbF" id="2ev$9JFD$a0" role="3cqZAp">
<node concept="2OqwBi" id="2ev$9JFD_sZ" role="3clFbG">
<node concept="2YIFZM" id="2ev$9JFD$gY" role="2Oq$k0">
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="2OqwBi" id="2ev$9JFD_cy" role="37wK5m">
<node concept="37vLTw" id="2ev$9JFD$lP" role="2Oq$k0">
@ -595,7 +595,7 @@
</node>
</node>
<node concept="liA8E" id="2ev$9JFDA_w" role="2OqNvi">
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
<node concept="Rm8GO" id="2ev$9JFDAMR" role="37wK5m">
<ref role="Rm8GQ" to="6exd:2q_78a95hAO" resolve="STOP" />
<ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@ -627,7 +627,7 @@
<node concept="2OqwBi" id="2ev$9JFD8AJ" role="3clFbG">
<node concept="2YIFZM" id="2ev$9JFCUun" role="2Oq$k0">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="2ev$9JFCU_6" role="37wK5m">
<ref role="3cqZAo" node="2ev$9JFBNlS" resolve="mock" />
</node>
@ -639,7 +639,7 @@
<ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
</node>
<node concept="2YIFZM" id="2ev$9JFDJDP" role="10QFUP">
<ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object):java.lang.Object" resolve="eq" />
<ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object)" resolve="eq" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="37vLTw" id="2ev$9JFDJDR" role="37wK5m">
<ref role="3cqZAo" node="2ev$9JFBKEx" resolve="tf" />
@ -660,7 +660,7 @@
<node concept="3clFbF" id="2ev$9JFCMRW" role="8Wnug">
<node concept="2OqwBi" id="2ev$9JFCN6D" role="3clFbG">
<node concept="2YIFZM" id="2ev$9JFCN0S" role="2Oq$k0">
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="37vLTw" id="2ev$9JFCN5N" role="37wK5m">
<ref role="3cqZAo" node="2ev$9JFBNlS" resolve="mock" />
@ -732,7 +732,7 @@
<ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
</node>
<node concept="2YIFZM" id="2ev$9JFDVC8" role="33vP2m">
<ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
<ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class)" resolve="mock" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="3VsKOn" id="2ev$9JFDVC9" role="37wK5m">
<ref role="3VsUkX" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
@ -743,7 +743,7 @@
<node concept="3clFbF" id="2ev$9JFE1bK" role="3cqZAp">
<node concept="2OqwBi" id="2ev$9JFE1bL" role="3clFbG">
<node concept="2YIFZM" id="2ev$9JFE1bM" role="2Oq$k0">
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="2OqwBi" id="2ev$9JFE1bN" role="37wK5m">
<node concept="37vLTw" id="2ev$9JFE1bO" role="2Oq$k0">
@ -758,7 +758,7 @@
</node>
</node>
<node concept="liA8E" id="2ev$9JFE1bW" role="2OqNvi">
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
<node concept="Rm8GO" id="2ev$9JFE9Ih" role="37wK5m">
<ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
<ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@ -769,7 +769,7 @@
<node concept="3clFbF" id="2ev$9JFDVCa" role="3cqZAp">
<node concept="2OqwBi" id="2ev$9JFDVCb" role="3clFbG">
<node concept="2YIFZM" id="2ev$9JFDVCc" role="2Oq$k0">
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="2OqwBi" id="2ev$9JFDVCd" role="37wK5m">
<node concept="37vLTw" id="2ev$9JFDVCe" role="2Oq$k0">
@ -784,7 +784,7 @@
</node>
</node>
<node concept="liA8E" id="2ev$9JFDVCm" role="2OqNvi">
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
<node concept="Rm8GO" id="2ev$9JFDVCn" role="37wK5m">
<ref role="Rm8GQ" to="6exd:2q_78a95hAO" resolve="STOP" />
<ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@ -815,7 +815,7 @@
<node concept="3clFbF" id="2ev$9JFDVCz" role="3cqZAp">
<node concept="2OqwBi" id="2ev$9JFDVC$" role="3clFbG">
<node concept="2YIFZM" id="2ev$9JFDVC_" role="2Oq$k0">
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="37vLTw" id="2ev$9JFDVCA" role="37wK5m">
<ref role="3cqZAo" node="2ev$9JFDVC6" resolve="mock" />
@ -835,7 +835,7 @@
<node concept="3clFbF" id="2ev$9JFEwbB" role="3cqZAp">
<node concept="2OqwBi" id="2ev$9JFEwbC" role="3clFbG">
<node concept="2YIFZM" id="2ev$9JFEwbD" role="2Oq$k0">
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="37vLTw" id="2ev$9JFEwbE" role="37wK5m">
<ref role="3cqZAo" node="2ev$9JFDVC6" resolve="mock" />
@ -860,7 +860,7 @@
</node>
<node concept="3clFbF" id="2ev$9JFEqKD" role="3cqZAp">
<node concept="2YIFZM" id="2ev$9JFEr5j" role="3clFbG">
<ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...):void" resolve="verifyNoMoreInteractions" />
<ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...)" resolve="verifyNoMoreInteractions" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="37vLTw" id="2ev$9JFErhz" role="37wK5m">
<ref role="3cqZAo" node="2ev$9JFDVC6" resolve="mock" />
@ -880,7 +880,7 @@
<node concept="2OqwBi" id="2ev$9JFDVCQ" role="3clFbG">
<node concept="2YIFZM" id="2ev$9JFDVCR" role="2Oq$k0">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="2ev$9JFDVCS" role="37wK5m">
<ref role="3cqZAo" node="2ev$9JFDVC6" resolve="mock" />
</node>
@ -1003,7 +1003,7 @@
<ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
</node>
<node concept="2YIFZM" id="2ev$9JFFqmH" role="33vP2m">
<ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
<ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class)" resolve="mock" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="3VsKOn" id="2ev$9JFFqmI" role="37wK5m">
<ref role="3VsUkX" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
@ -1014,7 +1014,7 @@
<node concept="3clFbF" id="2ev$9JFFqmJ" role="3cqZAp">
<node concept="2OqwBi" id="2ev$9JFFqmK" role="3clFbG">
<node concept="2YIFZM" id="2ev$9JFFqmL" role="2Oq$k0">
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="2OqwBi" id="2ev$9JFFqmM" role="37wK5m">
<node concept="37vLTw" id="2ev$9JFFqmN" role="2Oq$k0">
@ -1029,7 +1029,7 @@
</node>
</node>
<node concept="liA8E" id="2ev$9JFFqmR" role="2OqNvi">
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
<node concept="Rm8GO" id="2ev$9JFFqmS" role="37wK5m">
<ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
<ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@ -1040,7 +1040,7 @@
<node concept="3clFbF" id="6YPNC4OxdlG" role="3cqZAp">
<node concept="2OqwBi" id="6YPNC4OxdlH" role="3clFbG">
<node concept="2YIFZM" id="6YPNC4OxdlI" role="2Oq$k0">
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="2OqwBi" id="6YPNC4OxdlJ" role="37wK5m">
<node concept="37vLTw" id="6YPNC4OxdlK" role="2Oq$k0">
@ -1055,7 +1055,7 @@
</node>
</node>
<node concept="liA8E" id="6YPNC4OxdlN" role="2OqNvi">
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
<node concept="Rm8GO" id="6YPNC4OxdlO" role="37wK5m">
<ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
<ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@ -1066,7 +1066,7 @@
<node concept="3clFbF" id="2ev$9JFFqmT" role="3cqZAp">
<node concept="2OqwBi" id="2ev$9JFFqmU" role="3clFbG">
<node concept="2YIFZM" id="2ev$9JFFqmV" role="2Oq$k0">
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="2OqwBi" id="2ev$9JFFqmW" role="37wK5m">
<node concept="37vLTw" id="2ev$9JFFqmX" role="2Oq$k0">
@ -1081,7 +1081,7 @@
</node>
</node>
<node concept="liA8E" id="2ev$9JFFqn1" role="2OqNvi">
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
<node concept="Rm8GO" id="1G9MbtSLhK0" role="37wK5m">
<ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
<ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@ -1116,7 +1116,7 @@
<ref role="3uigEE" to="n4y8:~InOrder" resolve="InOrder" />
</node>
<node concept="2YIFZM" id="1G9MbtSL6UA" role="33vP2m">
<ref role="37wK5l" to="n4y8:~Mockito.inOrder(java.lang.Object...):org.mockito.InOrder" resolve="inOrder" />
<ref role="37wK5l" to="n4y8:~Mockito.inOrder(java.lang.Object...)" resolve="inOrder" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="37vLTw" id="1G9MbtSL6UB" role="37wK5m">
<ref role="3cqZAo" node="2ev$9JFFqmF" resolve="mock" />
@ -1132,7 +1132,7 @@
<ref role="3cqZAo" node="1G9MbtSL6U_" resolve="inOrder" />
</node>
<node concept="liA8E" id="1G9MbtSMabr" role="2OqNvi">
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="1G9MbtSMabs" role="37wK5m">
<ref role="3cqZAo" node="2ev$9JFFqmF" resolve="mock" />
</node>
@ -1156,7 +1156,7 @@
<ref role="3cqZAo" node="1G9MbtSL6U_" resolve="inOrder" />
</node>
<node concept="liA8E" id="1G9MbtSL9WN" role="2OqNvi">
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="1G9MbtSL9WO" role="37wK5m">
<ref role="3cqZAo" node="2ev$9JFFqmF" resolve="mock" />
</node>
@ -1180,7 +1180,7 @@
<ref role="3cqZAo" node="1G9MbtSL6U_" resolve="inOrder" />
</node>
<node concept="liA8E" id="1G9MbtSLa$w" role="2OqNvi">
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="1G9MbtSLa$x" role="37wK5m">
<ref role="3cqZAo" node="2ev$9JFFqmF" resolve="mock" />
</node>
@ -1204,7 +1204,7 @@
<ref role="3cqZAo" node="1G9MbtSL6U_" resolve="inOrder" />
</node>
<node concept="liA8E" id="1G9MbtSLbui" role="2OqNvi">
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="1G9MbtSLbuj" role="37wK5m">
<ref role="3cqZAo" node="2ev$9JFFqmF" resolve="mock" />
</node>
@ -1228,13 +1228,13 @@
<ref role="3cqZAo" node="1G9MbtSL6U_" resolve="inOrder" />
</node>
<node concept="liA8E" id="1G9MbtSLmaw" role="2OqNvi">
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode)" resolve="verify" />
<node concept="37vLTw" id="1G9MbtSLmax" role="37wK5m">
<ref role="3cqZAo" node="2ev$9JFFqmF" resolve="mock" />
</node>
<node concept="2YIFZM" id="1G9MbtSLmay" role="37wK5m">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Mockito.times(int):org.mockito.verification.VerificationMode" resolve="times" />
<ref role="37wK5l" to="n4y8:~Mockito.times(int)" resolve="times" />
<node concept="3cmrfG" id="1G9MbtSLmaz" role="37wK5m">
<property role="3cmrfH" value="3" />
</node>
@ -1253,13 +1253,13 @@
<ref role="3cqZAo" node="1G9MbtSL6U_" resolve="inOrder" />
</node>
<node concept="liA8E" id="1G9MbtSM9zH" role="2OqNvi">
<ref role="37wK5l" to="n4y8:~InOrder.verifyNoMoreInteractions():void" resolve="verifyNoMoreInteractions" />
<ref role="37wK5l" to="n4y8:~InOrder.verifyNoMoreInteractions()" resolve="verifyNoMoreInteractions" />
</node>
</node>
</node>
<node concept="3clFbF" id="1G9MbtSLrav" role="3cqZAp">
<node concept="2YIFZM" id="1G9MbtSLraw" role="3clFbG">
<ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...):void" resolve="verifyNoMoreInteractions" />
<ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...)" resolve="verifyNoMoreInteractions" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="37vLTw" id="1G9MbtSLrax" role="37wK5m">
<ref role="3cqZAo" node="2ev$9JFFqmF" resolve="mock" />
@ -1305,7 +1305,7 @@
<ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
</node>
<node concept="2YIFZM" id="6MYr6Jxs3nR" role="33vP2m">
<ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
<ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class)" resolve="mock" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="3VsKOn" id="6MYr6Jxs3nS" role="37wK5m">
<ref role="3VsUkX" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
@ -1316,7 +1316,7 @@
<node concept="3clFbF" id="6MYr6Jxs3nT" role="3cqZAp">
<node concept="2OqwBi" id="6MYr6Jxs3nU" role="3clFbG">
<node concept="2YIFZM" id="6MYr6Jxs3nV" role="2Oq$k0">
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="2OqwBi" id="6MYr6Jxs3nW" role="37wK5m">
<node concept="37vLTw" id="6MYr6Jxs3nX" role="2Oq$k0">
@ -1331,7 +1331,7 @@
</node>
</node>
<node concept="liA8E" id="6MYr6Jxs3o0" role="2OqNvi">
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
<node concept="Rm8GO" id="6MYr6Jxs3o1" role="37wK5m">
<ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
<ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@ -1363,7 +1363,7 @@
<node concept="2OqwBi" id="6MYr6Jxs3ol" role="3clFbG">
<node concept="2YIFZM" id="6MYr6Jxs3om" role="2Oq$k0">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="6MYr6Jxs3on" role="37wK5m">
<ref role="3cqZAo" node="6MYr6Jxs3nP" resolve="mock" />
</node>
@ -1387,7 +1387,7 @@
</node>
<node concept="3clFbF" id="6MYr6Jxs3oN" role="3cqZAp">
<node concept="2YIFZM" id="6MYr6Jxs3oO" role="3clFbG">
<ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...):void" resolve="verifyNoMoreInteractions" />
<ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...)" resolve="verifyNoMoreInteractions" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="37vLTw" id="6MYr6Jxs3oP" role="37wK5m">
<ref role="3cqZAo" node="6MYr6Jxs3nP" resolve="mock" />
@ -1407,7 +1407,7 @@
<node concept="2OqwBi" id="6MYr6Jxs3oV" role="3clFbG">
<node concept="2YIFZM" id="6MYr6Jxs3oW" role="2Oq$k0">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="6MYr6Jxs3oX" role="37wK5m">
<ref role="3cqZAo" node="6MYr6Jxs3nP" resolve="mock" />
</node>
@ -1617,7 +1617,7 @@
<ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
</node>
<node concept="2YIFZM" id="5YVX0wIjRT6" role="33vP2m">
<ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
<ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class)" resolve="mock" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="3VsKOn" id="5YVX0wIjRT7" role="37wK5m">
<ref role="3VsUkX" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
@ -1628,7 +1628,7 @@
<node concept="3clFbF" id="5YVX0wIjRT8" role="3cqZAp">
<node concept="2OqwBi" id="5YVX0wIjRT9" role="3clFbG">
<node concept="2YIFZM" id="5YVX0wIjRTa" role="2Oq$k0">
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="2OqwBi" id="5YVX0wIjRTb" role="37wK5m">
<node concept="37vLTw" id="5YVX0wIjRTc" role="2Oq$k0">
@ -1643,7 +1643,7 @@
</node>
</node>
<node concept="liA8E" id="5YVX0wIjRTg" role="2OqNvi">
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
<node concept="Rm8GO" id="5YVX0wIjRTh" role="37wK5m">
<ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
<ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@ -1654,7 +1654,7 @@
<node concept="3clFbF" id="6YPNC4OxmIB" role="3cqZAp">
<node concept="2OqwBi" id="6YPNC4OxmIC" role="3clFbG">
<node concept="2YIFZM" id="6YPNC4OxmID" role="2Oq$k0">
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="2OqwBi" id="6YPNC4OxmIE" role="37wK5m">
<node concept="37vLTw" id="6YPNC4OxmIF" role="2Oq$k0">
@ -1669,7 +1669,7 @@
</node>
</node>
<node concept="liA8E" id="6YPNC4OxmII" role="2OqNvi">
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
<node concept="Rm8GO" id="6YPNC4OxmIJ" role="37wK5m">
<ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
<ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@ -1680,7 +1680,7 @@
<node concept="3clFbF" id="6YPNC4Pa4ha" role="3cqZAp">
<node concept="2OqwBi" id="6YPNC4Pa4hb" role="3clFbG">
<node concept="2YIFZM" id="6YPNC4Pa4hc" role="2Oq$k0">
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="2OqwBi" id="6YPNC4Pa4hd" role="37wK5m">
<node concept="37vLTw" id="6YPNC4Pa4he" role="2Oq$k0">
@ -1695,7 +1695,7 @@
</node>
</node>
<node concept="liA8E" id="6YPNC4Pa4hh" role="2OqNvi">
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
<node concept="Rm8GO" id="6YPNC4Pa4hi" role="37wK5m">
<ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
<ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@ -1706,7 +1706,7 @@
<node concept="3clFbF" id="5YVX0wIleMN" role="3cqZAp">
<node concept="2OqwBi" id="5YVX0wIleMO" role="3clFbG">
<node concept="2YIFZM" id="5YVX0wIleMP" role="2Oq$k0">
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="2OqwBi" id="5YVX0wIleMQ" role="37wK5m">
<node concept="37vLTw" id="5YVX0wIleMR" role="2Oq$k0">
@ -1721,7 +1721,7 @@
</node>
</node>
<node concept="liA8E" id="5YVX0wIleMV" role="2OqNvi">
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
<node concept="Rm8GO" id="5YVX0wIleMW" role="37wK5m">
<ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
<ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@ -1732,7 +1732,7 @@
<node concept="3clFbF" id="5YVX0wIlkDU" role="3cqZAp">
<node concept="2OqwBi" id="5YVX0wIlkDV" role="3clFbG">
<node concept="2YIFZM" id="5YVX0wIlkDW" role="2Oq$k0">
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="2OqwBi" id="5YVX0wIlkDX" role="37wK5m">
<node concept="37vLTw" id="5YVX0wIlkDY" role="2Oq$k0">
@ -1747,7 +1747,7 @@
</node>
</node>
<node concept="liA8E" id="5YVX0wIlkE2" role="2OqNvi">
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
<node concept="Rm8GO" id="5YVX0wIlkVS" role="37wK5m">
<ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
<ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@ -1779,7 +1779,7 @@
<node concept="2OqwBi" id="5YVX0wIjRTA" role="3clFbG">
<node concept="2YIFZM" id="5YVX0wIjRTB" role="2Oq$k0">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="5YVX0wIjRTC" role="37wK5m">
<ref role="3cqZAo" node="5YVX0wIjRT4" resolve="mock" />
</node>
@ -1799,7 +1799,7 @@
<node concept="2OqwBi" id="5YVX0wIjRTI" role="3clFbG">
<node concept="2YIFZM" id="5YVX0wIjRTJ" role="2Oq$k0">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="5YVX0wIjRTK" role="37wK5m">
<ref role="3cqZAo" node="5YVX0wIjRT4" resolve="mock" />
</node>
@ -1819,7 +1819,7 @@
<node concept="2OqwBi" id="5YVX0wIjRTQ" role="3clFbG">
<node concept="2YIFZM" id="5YVX0wIjRTR" role="2Oq$k0">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="5YVX0wIjRTS" role="37wK5m">
<ref role="3cqZAo" node="5YVX0wIjRT4" resolve="mock" />
</node>
@ -1839,7 +1839,7 @@
<node concept="2OqwBi" id="5YVX0wIlmmy" role="3clFbG">
<node concept="2YIFZM" id="5YVX0wIlmmz" role="2Oq$k0">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="5YVX0wIlmm$" role="37wK5m">
<ref role="3cqZAo" node="5YVX0wIjRT4" resolve="mock" />
</node>
@ -1866,7 +1866,7 @@
<property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
<node concept="3clFbF" id="5YVX0wIjRU8" role="8Wnug">
<node concept="2YIFZM" id="5YVX0wIjRU9" role="3clFbG">
<ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...):void" resolve="verifyNoMoreInteractions" />
<ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...)" resolve="verifyNoMoreInteractions" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="37vLTw" id="5YVX0wIjRUa" role="37wK5m">
<ref role="3cqZAo" node="5YVX0wIjRT4" resolve="mock" />
@ -1887,7 +1887,7 @@
<node concept="2OqwBi" id="5YVX0wIjRUg" role="3clFbG">
<node concept="2YIFZM" id="5YVX0wIjRUh" role="2Oq$k0">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="5YVX0wIjRUi" role="37wK5m">
<ref role="3cqZAo" node="5YVX0wIjRT4" resolve="mock" />
</node>
@ -2054,7 +2054,7 @@
<ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
</node>
<node concept="2YIFZM" id="3t7_2Fg_0Jp" role="33vP2m">
<ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
<ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class)" resolve="mock" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="3VsKOn" id="3t7_2Fg_0Jq" role="37wK5m">
<ref role="3VsUkX" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
@ -2067,7 +2067,7 @@
<node concept="2OqwBi" id="3t7_2Fg_0Js" role="3clFbG">
<node concept="2YIFZM" id="3t7_2Fg_0Jt" role="2Oq$k0">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
<node concept="2OqwBi" id="3t7_2Fg_0Ju" role="37wK5m">
<node concept="37vLTw" id="3t7_2Fg_0Jv" role="2Oq$k0">
<ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
@ -2081,7 +2081,7 @@
</node>
</node>
<node concept="liA8E" id="3t7_2Fg_0Jy" role="2OqNvi">
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
<node concept="Rm8GO" id="3t7_2Fg_0Jz" role="37wK5m">
<ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
<ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@ -2093,7 +2093,7 @@
<node concept="2OqwBi" id="6YPNC4OxszY" role="3clFbG">
<node concept="2YIFZM" id="6YPNC4OxszZ" role="2Oq$k0">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
<node concept="2OqwBi" id="6YPNC4Oxs$0" role="37wK5m">
<node concept="37vLTw" id="6YPNC4Oxs$1" role="2Oq$k0">
<ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
@ -2107,7 +2107,7 @@
</node>
</node>
<node concept="liA8E" id="6YPNC4Oxs$4" role="2OqNvi">
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
<node concept="Rm8GO" id="6YPNC4Oxs$5" role="37wK5m">
<ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
<ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@ -2118,7 +2118,7 @@
<node concept="3clFbF" id="3t7_2Fg_0J$" role="3cqZAp">
<node concept="2OqwBi" id="3t7_2Fg_0J_" role="3clFbG">
<node concept="2YIFZM" id="3t7_2Fg_0JA" role="2Oq$k0">
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="2OqwBi" id="3t7_2Fg_0JB" role="37wK5m">
<node concept="37vLTw" id="3t7_2Fg_0JC" role="2Oq$k0">
@ -2133,7 +2133,7 @@
</node>
</node>
<node concept="liA8E" id="3t7_2Fg_0JF" role="2OqNvi">
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
<node concept="Rm8GO" id="3t7_2Fg_0JG" role="37wK5m">
<ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
<ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@ -2144,7 +2144,7 @@
<node concept="3clFbF" id="3t7_2Fg_0JH" role="3cqZAp">
<node concept="2OqwBi" id="3t7_2Fg_0JI" role="3clFbG">
<node concept="2YIFZM" id="3t7_2Fg_0JJ" role="2Oq$k0">
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
<ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="2OqwBi" id="3t7_2Fg_0JK" role="37wK5m">
<node concept="37vLTw" id="3t7_2Fg_0JL" role="2Oq$k0">
@ -2159,7 +2159,7 @@
</node>
</node>
<node concept="liA8E" id="3t7_2Fg_0JO" role="2OqNvi">
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
<ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
<node concept="Rm8GO" id="3t7_2Fg_0JP" role="37wK5m">
<ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
<ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
@ -2194,7 +2194,7 @@
<ref role="3uigEE" to="n4y8:~InOrder" resolve="InOrder" />
</node>
<node concept="2YIFZM" id="1G9MbtSKk2K" role="33vP2m">
<ref role="37wK5l" to="n4y8:~Mockito.inOrder(java.lang.Object...):org.mockito.InOrder" resolve="inOrder" />
<ref role="37wK5l" to="n4y8:~Mockito.inOrder(java.lang.Object...)" resolve="inOrder" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="37vLTw" id="1G9MbtSKk2L" role="37wK5m">
<ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
@ -2210,7 +2210,7 @@
<ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
</node>
<node concept="liA8E" id="1G9MbtSKoCf" role="2OqNvi">
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="1G9MbtSKoCg" role="37wK5m">
<ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
</node>
@ -2236,7 +2236,7 @@
<ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
</node>
<node concept="liA8E" id="1G9MbtSLIOx" role="2OqNvi">
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="1G9MbtSLIOy" role="37wK5m">
<ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
</node>
@ -2260,7 +2260,7 @@
<ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
</node>
<node concept="liA8E" id="1G9MbtSKloO" role="2OqNvi">
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="1G9MbtSKlw2" role="37wK5m">
<ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
</node>
@ -2284,12 +2284,12 @@
<ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
</node>
<node concept="liA8E" id="1G9MbtSK_GN" role="2OqNvi">
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode)" resolve="verify" />
<node concept="37vLTw" id="1G9MbtSK_GO" role="37wK5m">
<ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
</node>
<node concept="2YIFZM" id="1G9MbtSKK2F" role="37wK5m">
<ref role="37wK5l" to="n4y8:~Mockito.times(int):org.mockito.verification.VerificationMode" resolve="times" />
<ref role="37wK5l" to="n4y8:~Mockito.times(int)" resolve="times" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="3cmrfG" id="1G9MbtSKKil" role="37wK5m">
<property role="3cmrfH" value="2" />
@ -2312,7 +2312,7 @@
<ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
</node>
<node concept="liA8E" id="1G9MbtSLP6e" role="2OqNvi">
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="1G9MbtSLP6f" role="37wK5m">
<ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
</node>
@ -2330,7 +2330,7 @@
<ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
</node>
<node concept="liA8E" id="1G9MbtSKmNs" role="2OqNvi">
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="1G9MbtSKmNt" role="37wK5m">
<ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
</node>
@ -2354,12 +2354,12 @@
<ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
</node>
<node concept="liA8E" id="1G9MbtSKNjU" role="2OqNvi">
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode)" resolve="verify" />
<node concept="37vLTw" id="1G9MbtSKNjV" role="37wK5m">
<ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
</node>
<node concept="2YIFZM" id="1G9MbtSKNjW" role="37wK5m">
<ref role="37wK5l" to="n4y8:~Mockito.times(int):org.mockito.verification.VerificationMode" resolve="times" />
<ref role="37wK5l" to="n4y8:~Mockito.times(int)" resolve="times" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="3cmrfG" id="1G9MbtSKNjX" role="37wK5m">
<property role="3cmrfH" value="2" />
@ -2382,7 +2382,7 @@
<ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
</node>
<node concept="liA8E" id="1G9MbtSLRxd" role="2OqNvi">
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="1G9MbtSLRxe" role="37wK5m">
<ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
</node>
@ -2400,7 +2400,7 @@
<ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
</node>
<node concept="liA8E" id="1G9MbtSKnET" role="2OqNvi">
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
<node concept="37vLTw" id="1G9MbtSKnEU" role="37wK5m">
<ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
</node>
@ -2424,12 +2424,12 @@
<ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
</node>
<node concept="liA8E" id="1G9MbtSKPZ3" role="2OqNvi">
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode)" resolve="verify" />
<node concept="37vLTw" id="1G9MbtSKPZ4" role="37wK5m">
<ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
</node>
<node concept="2YIFZM" id="1G9MbtSKPZ5" role="37wK5m">
<ref role="37wK5l" to="n4y8:~Mockito.times(int):org.mockito.verification.VerificationMode" resolve="times" />
<ref role="37wK5l" to="n4y8:~Mockito.times(int)" resolve="times" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="3cmrfG" id="1G9MbtSKPZ6" role="37wK5m">
<property role="3cmrfH" value="2" />
@ -2452,13 +2452,13 @@
<ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
</node>
<node concept="liA8E" id="1G9MbtSKXZk" role="2OqNvi">
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode):java.lang.Object" resolve="verify" />
<ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode)" resolve="verify" />
<node concept="37vLTw" id="1G9MbtSKXZl" role="37wK5m">
<ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
</node>
<node concept="2YIFZM" id="1G9MbtSL2lD" role="37wK5m">
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<ref role="37wK5l" to="n4y8:~Mockito.times(int):org.mockito.verification.VerificationMode" resolve="times" />
<ref role="37wK5l" to="n4y8:~Mockito.times(int)" resolve="times" />
<node concept="3cmrfG" id="1G9MbtSL2lE" role="37wK5m">
<property role="3cmrfH" value="3" />
</node>
@ -2477,13 +2477,13 @@
<ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
</node>
<node concept="liA8E" id="1G9MbtSL$jS" role="2OqNvi">
<ref role="37wK5l" to="n4y8:~InOrder.verifyNoMoreInteractions():void" resolve="verifyNoMoreInteractions" />
<ref role="37wK5l" to="n4y8:~InOrder.verifyNoMoreInteractions()" resolve="verifyNoMoreInteractions" />
</node>
</node>
</node>
<node concept="3clFbF" id="1G9MbtSLD6S" role="3cqZAp">
<node concept="2YIFZM" id="1G9MbtSLDZk" role="3clFbG">
<ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...):void" resolve="verifyNoMoreInteractions" />
<ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...)" resolve="verifyNoMoreInteractions" />
<ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
<node concept="37vLTw" id="1G9MbtSLEfv" role="37wK5m">
<ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
@ -3165,7 +3165,7 @@
<ref role="3cqZAo" node="3t7_2FgAvGP" resolve="lists" />
</node>
<node concept="liA8E" id="3t7_2FgA$9A" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
<node concept="3cmrfG" id="3t7_2FgA$g$" role="37wK5m">
<property role="3cmrfH" value="0" />
</node>
@ -3201,7 +3201,7 @@
<ref role="3cqZAo" node="3t7_2FgAvGP" resolve="lists" />
</node>
<node concept="liA8E" id="3t7_2FgA$lO" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
<node concept="3cmrfG" id="3t7_2FgA$lP" role="37wK5m">
<property role="3cmrfH" value="1" />
</node>
@ -3464,7 +3464,7 @@
<ref role="3cqZAo" node="2DKqMqOqvLQ" resolve="wildcard" />
</node>
<node concept="liA8E" id="5kEUewdxCBF" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
<node concept="2OqwBi" id="5kEUewdxCDl" role="3tpDZA">
@ -3472,7 +3472,7 @@
<ref role="3cqZAo" node="2DKqMqOqw8M" resolve="anon1" />
</node>
<node concept="liA8E" id="5kEUewdxCGe" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
</node>
@ -3482,7 +3482,7 @@
<ref role="3cqZAo" node="2DKqMqOqw8M" resolve="anon1" />
</node>
<node concept="liA8E" id="5kEUewdxCNz" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
<node concept="2OqwBi" id="5kEUewdxCPd" role="3tpDZA">
@ -3490,7 +3490,7 @@
<ref role="3cqZAo" node="2DKqMqOqzLa" resolve="anon2" />
</node>
<node concept="liA8E" id="5kEUewdxCUU" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
</node>
@ -3633,7 +3633,7 @@
<ref role="3cqZAo" node="2DKqMqOqEKK" resolve="a" />
</node>
<node concept="liA8E" id="5kEUewdxFDZ" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
<node concept="2OqwBi" id="5kEUewdxFFM" role="3tpDZA">
@ -3641,7 +3641,7 @@
<ref role="3cqZAo" node="2DKqMqOqEO9" resolve="b" />
</node>
<node concept="liA8E" id="5kEUewdxFMZ" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
</node>
@ -3656,7 +3656,7 @@
<ref role="3cqZAo" node="2DKqMqOqEKK" resolve="a" />
</node>
<node concept="liA8E" id="5kEUewdxTde" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
<node concept="37vLTw" id="5kEUewdxTee" role="37wK5m">
<ref role="3cqZAo" node="2DKqMqOqEO9" resolve="b" />
</node>
@ -3675,7 +3675,7 @@
<ref role="3cqZAo" node="2DKqMqOqEO9" resolve="b" />
</node>
<node concept="liA8E" id="2DKqMqOqTiy" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.hashCode():int" resolve="hashCode" />
<ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
</node>
</node>
<node concept="2OqwBi" id="2DKqMqOqS_Q" role="3uHU7B">
@ -3683,7 +3683,7 @@
<ref role="3cqZAo" node="2DKqMqOqEKK" resolve="a" />
</node>
<node concept="liA8E" id="2DKqMqOqSKJ" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.hashCode():int" resolve="hashCode" />
<ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
</node>
</node>
</node>
@ -3695,17 +3695,17 @@
<ref role="3cqZAo" node="2DKqMqOqEKK" resolve="a" />
</node>
<node concept="liA8E" id="5kEUewdxPYk" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
<node concept="liA8E" id="2DKqMqOqFDj" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="5kEUewdxQ14" role="37wK5m">
<node concept="37vLTw" id="2DKqMqOqFFv" role="2Oq$k0">
<ref role="3cqZAo" node="2DKqMqOqFhe" resolve="c" />
</node>
<node concept="liA8E" id="5kEUewdxQ6z" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
</node>
@ -3717,7 +3717,7 @@
<ref role="3cqZAo" node="2DKqMqOqEKK" resolve="a" />
</node>
<node concept="liA8E" id="2DKqMqOqG9u" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
<node concept="37vLTw" id="5kEUewdxWe8" role="37wK5m">
<ref role="3cqZAo" node="5kEUewdxWe5" resolve="x" />
</node>
@ -3731,17 +3731,17 @@
<ref role="3cqZAo" node="2DKqMqOqEKK" resolve="a" />
</node>
<node concept="liA8E" id="5kEUewdxXjx" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
<node concept="liA8E" id="5kEUewdxXxg" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="5kEUewdxXAb" role="37wK5m">
<node concept="37vLTw" id="5kEUewdxXzF" role="2Oq$k0">
<ref role="3cqZAo" node="5kEUewdxWe5" resolve="x" />
</node>
<node concept="liA8E" id="5kEUewdxXDu" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
</node>
@ -3763,7 +3763,7 @@
<ref role="3cqZAo" node="5kEUewdxWe5" resolve="x" />
</node>
<node concept="liA8E" id="5kEUewdy5kA" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
<node concept="37vLTw" id="5kEUewdy5lL" role="37wK5m">
<ref role="3cqZAo" node="5kEUewdy0lU" resolve="y" />
</node>
@ -4757,7 +4757,7 @@
<ref role="3cqZAo" node="kTK1BfwVhs" resolve="list" />
</node>
<node concept="liA8E" id="kTK1Bfx1pW" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
<node concept="Xl_RD" id="kTK1Bfx1BR" role="37wK5m">
<property role="Xl_RC" value="foo" />
</node>
@ -4770,7 +4770,7 @@
<ref role="3cqZAo" node="kTK1BfwVhs" resolve="list" />
</node>
<node concept="liA8E" id="kTK1Bfx240" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
<node concept="Xl_RD" id="kTK1Bfx241" role="37wK5m">
<property role="Xl_RC" value="bar" />
</node>

4
coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
View File

@ -162,7 +162,7 @@
<node concept="3clFbF" id="7ISVfSIf2T" role="3cqZAp">
<node concept="2YIFZM" id="7ISVfSIf4g" role="3clFbG">
<ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
<ref role="37wK5l" to="w7la:~EvaluationSession.setBackend(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Backend):void" resolve="setBackend" />
<ref role="37wK5l" to="w7la:~EvaluationSession.setBackend(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Backend)" resolve="setBackend" />
<node concept="37vLTw" id="5jPBdK_KfE" role="37wK5m">
<ref role="3cqZAo" node="5jPBdK_KfB" resolve="ourBackend" />
</node>
@ -179,7 +179,7 @@
<node concept="3clFbF" id="5jPBdK_KqF" role="3cqZAp">
<node concept="2YIFZM" id="5jPBdK_KEq" role="3clFbG">
<ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
<ref role="37wK5l" to="w7la:~EvaluationSession.clearBackend(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Backend):void" resolve="clearBackend" />
<ref role="37wK5l" to="w7la:~EvaluationSession.clearBackend(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Backend)" resolve="clearBackend" />
<node concept="37vLTw" id="5jPBdK_KEr" role="37wK5m">
<ref role="3cqZAo" node="5jPBdK_KfB" resolve="ourBackend" />
</node>

164
coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
View File

@ -334,7 +334,7 @@
<ref role="3cqZAo" node="5TfjU0xmAUC" resolve="x" />
</node>
<node concept="liA8E" id="5TfjU0xmGY8" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="Xl_RD" id="5TfjU0xmH22" role="37wK5m">
<property role="Xl_RC" value="foo" />
</node>
@ -364,7 +364,7 @@
<ref role="3cqZAo" node="5TfjU0xmAUI" resolve="y" />
</node>
<node concept="liA8E" id="5TfjU0xmLGH" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="Xl_RD" id="5TfjU0xmLLa" role="37wK5m">
<property role="Xl_RC" value="foo" />
</node>
@ -394,7 +394,7 @@
<ref role="3cqZAo" node="5TfjU0xmAUO" resolve="z" />
</node>
<node concept="liA8E" id="5TfjU0xmNLi" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="Xl_RD" id="5TfjU0xmNRG" role="37wK5m">
<property role="Xl_RC" value="bar" />
</node>
@ -1116,7 +1116,7 @@
</node>
</node>
<node concept="liA8E" id="3gNap3g8MRy" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="Xl_RD" id="3gNap3g8MRS" role="37wK5m">
<property role="Xl_RC" value="xyz" />
</node>
@ -2484,7 +2484,7 @@
</node>
</node>
<node concept="liA8E" id="1OShD0IfIGc" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
</node>
</node>
<node concept="2OqwBi" id="1OShD0IfI6R" role="3tpDZB">
@ -2495,7 +2495,7 @@
</node>
</node>
<node concept="liA8E" id="1OShD0IfIj2" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
</node>
</node>
</node>
@ -3030,7 +3030,7 @@
</node>
</node>
<node concept="liA8E" id="3gNap3g823B" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
</node>
</node>
<node concept="2OqwBi" id="3gNap3g823C" role="3tpDZB">
@ -3041,7 +3041,7 @@
</node>
</node>
<node concept="liA8E" id="3gNap3g823F" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
</node>
</node>
</node>
@ -3088,7 +3088,7 @@
<ref role="3cqZAo" node="kTK1BfxNEZ" resolve="list" />
</node>
<node concept="liA8E" id="kTK1BfxPgH" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
<node concept="Xl_RD" id="kTK1BfxPuT" role="37wK5m">
<property role="Xl_RC" value="foo" />
</node>
@ -3101,7 +3101,7 @@
<ref role="3cqZAo" node="kTK1BfxNEZ" resolve="list" />
</node>
<node concept="liA8E" id="kTK1BfxQ7L" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
<node concept="Xl_RD" id="kTK1BfxQ7M" role="37wK5m">
<property role="Xl_RC" value="bar" />
</node>
@ -3249,7 +3249,7 @@
</node>
</node>
<node concept="liA8E" id="kTK1BfxL5W" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
</node>
</node>
<node concept="2OqwBi" id="kTK1BfxL5X" role="3tpDZB">
@ -3260,7 +3260,7 @@
</node>
</node>
<node concept="liA8E" id="kTK1BfxL60" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
</node>
</node>
</node>
@ -3376,11 +3376,11 @@
</node>
</node>
<node concept="liA8E" id="3HJTsBn466m" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
</node>
</node>
<node concept="liA8E" id="3HJTsBn466n" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
<node concept="1oi1Uc" id="3eLgHzX3GZl" role="3tpDZB">
@ -3501,11 +3501,11 @@
</node>
</node>
<node concept="liA8E" id="3gNap3g8enU" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
</node>
</node>
<node concept="liA8E" id="3gNap3g8enV" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
<node concept="Xl_RD" id="3gNap3g8eHS" role="3tpDZB">
@ -3551,7 +3551,7 @@
</node>
</node>
<node concept="liA8E" id="3gNap3g8lCn" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="Xl_RD" id="3gNap3g8lCK" role="37wK5m">
<property role="Xl_RC" value="xyz" />
</node>
@ -3801,11 +3801,11 @@
</node>
</node>
<node concept="liA8E" id="kTK1BfyxPc" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
</node>
</node>
<node concept="liA8E" id="kTK1BfyxPd" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
<node concept="1oi1Uc" id="kTK1BfyxPe" role="3tpDZB">
@ -4008,11 +4008,11 @@
</node>
</node>
<node concept="liA8E" id="6MYr6Jy8m2W" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
</node>
</node>
<node concept="liA8E" id="6MYr6Jy8m2X" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
<node concept="1oi1Uc" id="6MYr6Jy8lXX" role="3tpDZB">
@ -4189,7 +4189,7 @@
<ref role="3cqZAo" node="1OShD0IfO6H" resolve="x" />
</node>
<node concept="liA8E" id="3mz2_dYyyKt" role="2OqNvi">
<ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
<ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
</node>
</node>
</node>
@ -4199,7 +4199,7 @@
<ref role="3cqZAo" node="1OShD0IfP49" resolve="y" />
</node>
<node concept="liA8E" id="3mz2_dYyyKx" role="2OqNvi">
<ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
<ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
</node>
</node>
</node>
@ -4210,7 +4210,7 @@
<ref role="3cqZAo" node="1OShD0IfP49" resolve="y" />
</node>
<node concept="liA8E" id="3mz2_dYyyKA" role="2OqNvi">
<ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
<ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
</node>
</node>
<node concept="2OqwBi" id="3mz2_dYyyKB" role="3uHU7B">
@ -4218,7 +4218,7 @@
<ref role="3cqZAo" node="1OShD0IfO6H" resolve="x" />
</node>
<node concept="liA8E" id="3mz2_dYyyKD" role="2OqNvi">
<ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
<ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
</node>
</node>
</node>
@ -4268,7 +4268,7 @@
<ref role="3cqZAo" node="1OShD0IfO6H" resolve="x" />
</node>
<node concept="liA8E" id="3mz2_dYyzcE" role="2OqNvi">
<ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
<ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
</node>
</node>
<node concept="2OqwBi" id="3mz2_dYyzcF" role="3tpDZA">
@ -4276,7 +4276,7 @@
<ref role="3cqZAo" node="1OShD0IfP49" resolve="y" />
</node>
<node concept="liA8E" id="3mz2_dYyzcH" role="2OqNvi">
<ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
<ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
</node>
</node>
</node>
@ -4462,7 +4462,7 @@
<ref role="3cqZAo" node="4XqG8ivylRa" resolve="x" />
</node>
<node concept="liA8E" id="3mz2_dYylmd" role="2OqNvi">
<ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
<ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
</node>
</node>
</node>
@ -4472,7 +4472,7 @@
<ref role="3cqZAo" node="4XqG8ivylRq" resolve="y" />
</node>
<node concept="liA8E" id="3mz2_dYylm_" role="2OqNvi">
<ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
<ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
</node>
</node>
</node>
@ -4483,7 +4483,7 @@
<ref role="3cqZAo" node="4XqG8ivylRq" resolve="y" />
</node>
<node concept="liA8E" id="3mz2_dYyuoZ" role="2OqNvi">
<ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
<ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
</node>
</node>
<node concept="2OqwBi" id="3mz2_dYyu5J" role="3uHU7B">
@ -4491,7 +4491,7 @@
<ref role="3cqZAo" node="4XqG8ivylRa" resolve="x" />
</node>
<node concept="liA8E" id="3mz2_dYyudo" role="2OqNvi">
<ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
<ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
</node>
</node>
</node>
@ -4541,7 +4541,7 @@
<ref role="3cqZAo" node="4XqG8ivylRa" resolve="x" />
</node>
<node concept="liA8E" id="3mz2_dYym2e" role="2OqNvi">
<ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
<ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
</node>
</node>
<node concept="2OqwBi" id="3mz2_dYymac" role="3tpDZA">
@ -4549,7 +4549,7 @@
<ref role="3cqZAo" node="4XqG8ivylRq" resolve="y" />
</node>
<node concept="liA8E" id="3mz2_dYymhu" role="2OqNvi">
<ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
<ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
</node>
</node>
</node>
@ -4731,7 +4731,7 @@
</node>
</node>
<node concept="liA8E" id="4$OyT8IVxI_" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
<ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
</node>
</node>
</node>
@ -4947,7 +4947,7 @@
</node>
</node>
<node concept="liA8E" id="4$OyT8IVtAm" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
<ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
</node>
</node>
</node>
@ -4960,7 +4960,7 @@
</node>
</node>
<node concept="liA8E" id="4$OyT8IVuqF" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
<ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
</node>
</node>
</node>
@ -5177,7 +5177,7 @@
</node>
</node>
<node concept="liA8E" id="4$OyT8IVrZL" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
<ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
</node>
</node>
</node>
@ -5356,7 +5356,7 @@
</node>
</node>
<node concept="liA8E" id="4$OyT8IVqqO" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
<ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
</node>
</node>
</node>
@ -5485,7 +5485,7 @@
</node>
</node>
<node concept="liA8E" id="4$OyT8IVo6f" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
<ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
</node>
</node>
</node>
@ -5649,7 +5649,7 @@
</node>
</node>
<node concept="liA8E" id="4$OyT8IVknj" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
<ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
</node>
</node>
</node>
@ -5887,7 +5887,7 @@
</node>
</node>
<node concept="liA8E" id="4$OyT8IVcT8" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
<ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
</node>
</node>
</node>
@ -5916,7 +5916,7 @@
</node>
</node>
<node concept="liA8E" id="4$OyT8IVdCg" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
<ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
</node>
</node>
</node>
@ -6310,11 +6310,11 @@
<ref role="3cqZAo" node="3K_0akS_bIv" resolve="p1" />
</node>
<node concept="liA8E" id="6HT7BWBPd0X" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
</node>
</node>
<node concept="liA8E" id="6HT7BWBPd0Y" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
</node>
@ -6350,11 +6350,11 @@
<ref role="3cqZAo" node="6HT7BWBPd0T" resolve="value" />
</node>
<node concept="liA8E" id="3K_0akS_wH1" role="2OqNvi">
<ref role="37wK5l" to="yt73:~Term.arguments():java.util.Collection" resolve="arguments" />
<ref role="37wK5l" to="yt73:~Term.arguments()" resolve="arguments" />
</node>
</node>
<node concept="liA8E" id="3K_0akS_wH2" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Collection.iterator():java.util.Iterator" resolve="iterator" />
<ref role="37wK5l" to="33ny:~Collection.iterator()" resolve="iterator" />
</node>
</node>
</node>
@ -6365,7 +6365,7 @@
<ref role="3cqZAo" node="3K_0akS_wGU" resolve="it" />
</node>
<node concept="liA8E" id="3K_0akS_wH6" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
<ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
</node>
</node>
</node>
@ -6380,7 +6380,7 @@
<ref role="3cqZAo" node="3K_0akS_wGU" resolve="it" />
</node>
<node concept="liA8E" id="5YIOneOTrts" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
<ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
</node>
</node>
</node>
@ -6409,11 +6409,11 @@
</node>
</node>
<node concept="liA8E" id="3t7_2FgLmh_" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Collection.iterator():java.util.Iterator" resolve="iterator" />
<ref role="37wK5l" to="33ny:~Collection.iterator()" resolve="iterator" />
</node>
</node>
<node concept="liA8E" id="3t7_2FgLmhA" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
<ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
</node>
</node>
</node>
@ -6440,7 +6440,7 @@
</node>
</node>
<node concept="liA8E" id="3t7_2FgLjnj" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
<node concept="3cmrfG" id="3t7_2FgLjnk" role="37wK5m">
<property role="3cmrfH" value="0" />
</node>
@ -6666,11 +6666,11 @@
<ref role="3cqZAo" node="3K_0akS_pDi" resolve="p1" />
</node>
<node concept="liA8E" id="6HT7BWBPhwQ" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
</node>
</node>
<node concept="liA8E" id="6HT7BWBPhwR" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
</node>
@ -6706,11 +6706,11 @@
<ref role="3cqZAo" node="6HT7BWBPhwM" resolve="value" />
</node>
<node concept="liA8E" id="3K_0akS_pDV" role="2OqNvi">
<ref role="37wK5l" to="yt73:~Term.arguments():java.util.Collection" resolve="arguments" />
<ref role="37wK5l" to="yt73:~Term.arguments()" resolve="arguments" />
</node>
</node>
<node concept="liA8E" id="3K_0akS_pDW" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Collection.iterator():java.util.Iterator" resolve="iterator" />
<ref role="37wK5l" to="33ny:~Collection.iterator()" resolve="iterator" />
</node>
</node>
</node>
@ -6721,7 +6721,7 @@
<ref role="3cqZAo" node="3K_0akS_pDO" resolve="it" />
</node>
<node concept="liA8E" id="3K_0akS_pE0" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
<ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
</node>
</node>
</node>
@ -6736,7 +6736,7 @@
<ref role="3cqZAo" node="3K_0akS_pDO" resolve="it" />
</node>
<node concept="liA8E" id="5YIOneOTmzR" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
<ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
</node>
</node>
</node>
@ -6765,11 +6765,11 @@
</node>
</node>
<node concept="liA8E" id="3t7_2FgLnZI" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Collection.iterator():java.util.Iterator" resolve="iterator" />
<ref role="37wK5l" to="33ny:~Collection.iterator()" resolve="iterator" />
</node>
</node>
<node concept="liA8E" id="3t7_2FgLnZJ" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
<ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
</node>
</node>
</node>
@ -6796,7 +6796,7 @@
</node>
</node>
<node concept="liA8E" id="3t7_2FgLgwS" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
<node concept="3cmrfG" id="3t7_2FgLg_$" role="37wK5m">
<property role="3cmrfH" value="0" />
</node>
@ -7141,7 +7141,7 @@
<ref role="3cqZAo" node="6N2bvv_uTT3" resolve="x" />
</node>
<node concept="liA8E" id="6N2bvv_uVfr" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="Xl_RD" id="6N2bvv_uVfI" role="37wK5m">
<property role="Xl_RC" value="foo" />
</node>
@ -7187,7 +7187,7 @@
<ref role="3cqZAo" node="6N2bvv_uTTM" resolve="y" />
</node>
<node concept="liA8E" id="6N2bvv_uWmD" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="Xl_RD" id="6N2bvv_uWmW" role="37wK5m">
<property role="Xl_RC" value="foo" />
</node>
@ -7217,7 +7217,7 @@
<ref role="3cqZAo" node="6N2bvv_uWqJ" resolve="z" />
</node>
<node concept="liA8E" id="6N2bvv_uWrJ" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="Xl_RD" id="6N2bvv_uWrK" role="37wK5m">
<property role="Xl_RC" value="bar" />
</node>
@ -7682,7 +7682,7 @@
</node>
</node>
<node concept="liA8E" id="6SwZmzB$SYy" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
<node concept="1rXfSq" id="6SwZmzB$T98" role="37wK5m">
<ref role="37wK5l" node="390NiL15T3$" resolve="asTermLogical" />
<node concept="37vLTw" id="6SwZmzB$ThZ" role="37wK5m">
@ -7766,7 +7766,7 @@
</node>
</node>
<node concept="liA8E" id="6SwZmzBDVxE" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
<node concept="1rXfSq" id="6SwZmzBDVCz" role="37wK5m">
<ref role="37wK5l" node="6SwZmzBDxdZ" resolve="asStringLogical" />
<node concept="37vLTw" id="6SwZmzBDVQT" role="37wK5m">
@ -8207,7 +8207,7 @@
</node>
</node>
<node concept="liA8E" id="390NiL15UsS" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="1oi1Uc" id="390NiL15U$k" role="37wK5m">
<node concept="1oi5UN" id="390NiL15UG0" role="1oi0x0">
<node concept="1oi5Wm" id="390NiL15UG2" role="1ojpOf">
@ -8263,7 +8263,7 @@
</node>
</node>
<node concept="liA8E" id="6SwZmzBF$71" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
<node concept="1rXfSq" id="6SwZmzBF$j1" role="37wK5m">
<ref role="37wK5l" node="390NiL15T3$" resolve="asTermLogical" />
<node concept="37vLTw" id="6SwZmzBF$wl" role="37wK5m">
@ -8315,7 +8315,7 @@
</node>
</node>
<node concept="liA8E" id="6SwZmzBEcXI" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="Xl_RD" id="6SwZmzBEd4F" role="37wK5m">
<property role="Xl_RC" value="foo" />
</node>
@ -8364,7 +8364,7 @@
</node>
</node>
<node concept="liA8E" id="6SwZmzBEnlT" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
<node concept="1rXfSq" id="6SwZmzBEntc" role="37wK5m">
<ref role="37wK5l" node="6SwZmzBDxdZ" resolve="asStringLogical" />
<node concept="37vLTw" id="6SwZmzBEnGV" role="37wK5m">
@ -8545,7 +8545,7 @@
</node>
</node>
<node concept="liA8E" id="6SwZmzBARwE" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
<node concept="1rXfSq" id="6SwZmzBAR$P" role="37wK5m">
<ref role="37wK5l" node="390NiL15T3$" resolve="asTermLogical" />
<node concept="37vLTw" id="6SwZmzBARGN" role="37wK5m">
@ -8713,7 +8713,7 @@
</node>
</node>
<node concept="liA8E" id="390NiL16XbS" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="1oi1Uc" id="390NiL16Xcr" role="37wK5m">
<node concept="1oi5UN" id="390NiL16Xgj" role="1oi0x0">
<node concept="1oi5Wm" id="390NiL16Xgl" role="1ojpOf">
@ -9091,7 +9091,7 @@
<ref role="3cqZAo" node="390NiL14HhZ" resolve="x" />
</node>
<node concept="liA8E" id="390NiL14Hir" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="Xl_RD" id="390NiL14His" role="37wK5m">
<property role="Xl_RC" value="foo" />
</node>
@ -9147,7 +9147,7 @@
<ref role="3cqZAo" node="390NiL14Hi5" resolve="y" />
</node>
<node concept="liA8E" id="390NiL14HiB" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="Xl_RD" id="390NiL14HiC" role="37wK5m">
<property role="Xl_RC" value="foo" />
</node>
@ -9182,7 +9182,7 @@
<ref role="3cqZAo" node="390NiL14Hib" resolve="z" />
</node>
<node concept="liA8E" id="390NiL14HiN" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="Xl_RD" id="390NiL14HiO" role="37wK5m">
<property role="Xl_RC" value="bar" />
</node>
@ -9677,7 +9677,7 @@
</node>
</node>
<node concept="liA8E" id="6SwZmzBAFqu" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
<node concept="1rXfSq" id="6SwZmzBAFuk" role="37wK5m">
<ref role="37wK5l" node="390NiL16pUf" resolve="asTermLogical" />
<node concept="37vLTw" id="6SwZmzBAFBb" role="37wK5m">
@ -9761,7 +9761,7 @@
</node>
</node>
<node concept="liA8E" id="6SwZmzBF8hC" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
<node concept="1rXfSq" id="6SwZmzBF8hD" role="37wK5m">
<ref role="37wK5l" node="6SwZmzBEAPo" resolve="asStringLogical" />
<node concept="37vLTw" id="6SwZmzBF8hE" role="37wK5m">
@ -10232,7 +10232,7 @@
</node>
</node>
<node concept="liA8E" id="390NiL16dSg" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="1oi1Uc" id="390NiL16dSh" role="37wK5m">
<node concept="1oi5UN" id="390NiL16dSi" role="1oi0x0">
<node concept="1oi5Wm" id="390NiL16dSj" role="1ojpOf">
@ -10288,7 +10288,7 @@
</node>
</node>
<node concept="liA8E" id="6SwZmzBFIh7" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
<node concept="1rXfSq" id="6SwZmzBFIh8" role="37wK5m">
<ref role="37wK5l" node="390NiL16pUf" resolve="asTermLogical" />
<node concept="37vLTw" id="6SwZmzBFIh9" role="37wK5m">
@ -10340,7 +10340,7 @@
</node>
</node>
<node concept="liA8E" id="6SwZmzBFOXV" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="Xl_RD" id="6SwZmzBFOXW" role="37wK5m">
<property role="Xl_RC" value="foo" />
</node>
@ -10389,7 +10389,7 @@
</node>
</node>
<node concept="liA8E" id="6SwZmzBFSS4" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
<node concept="1rXfSq" id="6SwZmzBFSS5" role="37wK5m">
<ref role="37wK5l" node="6SwZmzBEAPo" resolve="asStringLogical" />
<node concept="37vLTw" id="6SwZmzBFSS6" role="37wK5m">
@ -10559,7 +10559,7 @@
</node>
</node>
<node concept="liA8E" id="6SwZmzBB4Lf" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
<ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
<node concept="1rXfSq" id="6SwZmzBB4Pq" role="37wK5m">
<ref role="37wK5l" node="390NiL16pUf" resolve="asTermLogical" />
<node concept="37vLTw" id="6SwZmzBB4YH" role="37wK5m">
@ -10722,7 +10722,7 @@
</node>
</node>
<node concept="liA8E" id="390NiL171eP" role="2OqNvi">
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
<ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
<node concept="1oi1Uc" id="390NiL171eQ" role="37wK5m">
<node concept="1oi5UN" id="390NiL171eR" role="1oi0x0">
<node concept="1oi5Wm" id="390NiL171eS" role="1ojpOf">

2
coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd
View File

@ -18,7 +18,7 @@
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>

2
coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />

2
samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps
View File

@ -359,7 +359,7 @@
<node concept="3clFbS" id="$u9BK_zdQj" role="2VODD2">
<node concept="3clFbF" id="$u9BK_zdQk" role="3cqZAp">
<node concept="2YIFZM" id="$u9BK_zdQl" role="3clFbG">
<ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<node concept="2OqwBi" id="$u9BK_zdQm" role="37wK5m">
<node concept="pncrf" id="$u9BK_zdQn" role="2Oq$k0" />

12
samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
View File

@ -23,12 +23,12 @@
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
@ -75,16 +75,16 @@
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
<language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />

12
samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
View File

@ -23,12 +23,12 @@
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
@ -76,16 +76,16 @@
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
<language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />

2
samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps
View File

@ -5,7 +5,7 @@
<use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
<devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />

2
samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps
View File

@ -4,7 +4,7 @@
<languages>
<use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="12" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
<devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />

2
samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
View File

@ -4,7 +4,7 @@
<languages>
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="15" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />

12
samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
View File

@ -23,12 +23,12 @@
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
@ -74,16 +74,16 @@
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
<language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />

2
samples/fitch/languages/samples.fitch/models/constraints.mps
View File

@ -426,7 +426,7 @@
<node concept="3clFbF" id="5p9vXslDHuK" role="3cqZAp">
<node concept="2YIFZM" id="5p9vXslDHuL" role="3clFbG">
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
<node concept="2OqwBi" id="5p9vXslDHuM" role="37wK5m">
<node concept="1PxgMI" id="5p9vXslDHuN" role="2Oq$k0">
<property role="1BlNFB" value="true" />

12
samples/fitch/languages/samples.fitch/models/editor.mps
View File

@ -292,7 +292,7 @@
<node concept="3clFbF" id="3JXBM6C3Sn7" role="3cqZAp">
<node concept="2YIFZM" id="3JXBM6C5W$o" role="3clFbG">
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
<node concept="2OqwBi" id="3JXBM6C5W$p" role="37wK5m">
<node concept="pncrf" id="3JXBM6C5W$q" role="2Oq$k0" />
<node concept="3TrcHB" id="3JXBM6C5W$r" role="2OqNvi">
@ -399,7 +399,7 @@
<node concept="3clFbF" id="3JXBM6C6Am4" role="3cqZAp">
<node concept="2YIFZM" id="3JXBM6C6BDU" role="3clFbG">
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
<node concept="2OqwBi" id="3JXBM6C6AC_" role="37wK5m">
<node concept="1WAUZh" id="3JXBM6C6Am3" role="2Oq$k0" />
<node concept="3TrcHB" id="3JXBM6C6AXv" role="2OqNvi">
@ -427,7 +427,7 @@
</node>
</node>
<node concept="2YIFZM" id="5jVx7S23rqO" role="3uHU7w">
<ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<node concept="2OqwBi" id="5jVx7S23rqP" role="37wK5m">
<node concept="1WAUZh" id="5jVx7S23rqQ" role="2Oq$k0" />
@ -523,7 +523,7 @@
<node concept="3clFbS" id="$u9BK_z3DS" role="2VODD2">
<node concept="3clFbF" id="$u9BK_z3DT" role="3cqZAp">
<node concept="2YIFZM" id="$u9BK_z3DU" role="3clFbG">
<ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<node concept="2OqwBi" id="$u9BK_z3DV" role="37wK5m">
<node concept="pncrf" id="$u9BK_z3DW" role="2Oq$k0" />
@ -560,7 +560,7 @@
<node concept="3clFbF" id="$u9BK_zdQk" role="3cqZAp">
<node concept="2YIFZM" id="$u9BK_zdQl" role="3clFbG">
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
<node concept="2OqwBi" id="$u9BK_zdQm" role="37wK5m">
<node concept="pncrf" id="$u9BK_zdQn" role="2Oq$k0" />
<node concept="3TrcHB" id="$u9BK_zdQo" role="2OqNvi">
@ -746,7 +746,7 @@
<node concept="3clFbF" id="$u9BK__JRI" role="3cqZAp">
<node concept="2YIFZM" id="$u9BK__JRJ" role="3clFbG">
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
<ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
<node concept="2OqwBi" id="$u9BK__JRK" role="37wK5m">
<node concept="pncrf" id="$u9BK__JRL" role="2Oq$k0" />
<node concept="3TrcHB" id="$u9BK__JRM" role="2OqNvi">

12
samples/fitch/languages/samples.fitch/samples.fitch.mpl
View File

@ -23,12 +23,12 @@
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
@ -75,18 +75,18 @@
<language slang="l:0272d3b4-4cc8-481e-9e2f-07793fbfcb41:jetbrains.mps.lang.editor.table" version="0" />
<language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
<language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="1" />
<language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
<language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />

6
samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps
View File

@ -4,7 +4,7 @@
<languages>
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
</languages>
<imports>
@ -409,7 +409,7 @@
<node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
<node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -425,7 +425,7 @@
<node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
<node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>

6
samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps
View File

@ -4,7 +4,7 @@
<languages>
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
</languages>
<imports>
@ -202,7 +202,7 @@
<node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
<node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -218,7 +218,7 @@
<node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
<node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>

6
samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps
View File

@ -4,7 +4,7 @@
<languages>
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
</languages>
<imports>
@ -576,7 +576,7 @@
<node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
<node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -592,7 +592,7 @@
<node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
<node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>

2
samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd
View File

@ -22,7 +22,7 @@
<language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:06b7c5c7-e359-4f4b-a581-5d0c9323af39:samples.fitch" version="1" />

30
samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps
View File

@ -349,7 +349,7 @@
<ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
</node>
<node concept="liA8E" id="48ZGLP7qpbn" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
<node concept="3cpWs3" id="48ZGLP7qugQ" role="37wK5m">
<node concept="Xl_RD" id="48ZGLP7quCC" role="3uHU7B">
<property role="Xl_RC" value=" " />
@ -384,7 +384,7 @@
<ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
</node>
<node concept="liA8E" id="48ZGLP7qSsi" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.append(char):java.lang.StringBuilder" resolve="append" />
<ref role="37wK5l" to="wyt6:~StringBuilder.append(char)" resolve="append" />
<node concept="1Xhbcc" id="48ZGLP7qSLW" role="37wK5m">
<property role="1XhdNS" value=" " />
</node>
@ -397,7 +397,7 @@
<ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
</node>
<node concept="liA8E" id="48ZGLP7qWSm" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
<node concept="2EnYce" id="48ZGLP7r6m5" role="37wK5m">
<node concept="37vLTw" id="48ZGLP7qXAG" role="2Oq$k0">
<ref role="3cqZAo" node="48ZGLP7q4CP" resolve="tv" />
@ -429,7 +429,7 @@
<ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
</node>
<node concept="liA8E" id="48ZGLP7rlnw" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
<node concept="Xl_RD" id="2O9ahh6oTGb" role="37wK5m">
<property role="Xl_RC" value=". " />
</node>
@ -491,7 +491,7 @@
<ref role="3cqZAo" node="2O9ahh6o8KR" resolve="it" />
</node>
<node concept="liA8E" id="2O9ahh6o8Lq" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
<ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
</node>
</node>
</node>
@ -505,7 +505,7 @@
<ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
</node>
<node concept="liA8E" id="2O9ahh6p9BQ" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.append(char):java.lang.StringBuilder" resolve="append" />
<ref role="37wK5l" to="wyt6:~StringBuilder.append(char)" resolve="append" />
<node concept="1Xhbcc" id="2O9ahh6pau5" role="37wK5m">
<property role="1XhdNS" value="(" />
</node>
@ -523,7 +523,7 @@
<ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
</node>
<node concept="liA8E" id="2O9ahh6o$J4" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
<node concept="2EnYce" id="2O9ahh6oEkk" role="37wK5m">
<node concept="37vLTw" id="2O9ahh6o_AG" role="2Oq$k0">
<ref role="3cqZAo" node="2O9ahh6o8Lk" resolve="ctr" />
@ -545,7 +545,7 @@
<ref role="3cqZAo" node="2O9ahh6o8KR" resolve="it" />
</node>
<node concept="liA8E" id="2O9ahh6oRK$" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
<ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
</node>
</node>
<node concept="37vLTw" id="2O9ahh6oNi2" role="37vLTJ">
@ -559,7 +559,7 @@
<ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
</node>
<node concept="liA8E" id="2O9ahh6ou4$" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
<node concept="Xl_RD" id="2O9ahh6ouSV" role="37wK5m">
<property role="Xl_RC" value=", " />
</node>
@ -572,7 +572,7 @@
<ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
</node>
<node concept="liA8E" id="2O9ahh6oJvQ" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
<node concept="2EnYce" id="2O9ahh6oJvR" role="37wK5m">
<node concept="37vLTw" id="2O9ahh6oJvS" role="2Oq$k0">
<ref role="3cqZAo" node="2O9ahh6o8Lk" resolve="ctr" />
@ -590,7 +590,7 @@
<ref role="3cqZAo" node="2O9ahh6o8KR" resolve="it" />
</node>
<node concept="liA8E" id="2O9ahh6omjU" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
<ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
</node>
</node>
</node>
@ -603,7 +603,7 @@
<ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
</node>
<node concept="liA8E" id="2O9ahh6pedQ" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.append(char):java.lang.StringBuilder" resolve="append" />
<ref role="37wK5l" to="wyt6:~StringBuilder.append(char)" resolve="append" />
<node concept="1Xhbcc" id="2O9ahh6pedR" role="37wK5m">
<property role="1XhdNS" value=")" />
</node>
@ -621,7 +621,7 @@
<ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
</node>
<node concept="liA8E" id="2O9ahh6nVDm" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
<node concept="Xl_RD" id="2O9ahh6o3Ol" role="37wK5m">
<property role="Xl_RC" value=" ⇒ " />
</node>
@ -648,7 +648,7 @@
<ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
</node>
<node concept="liA8E" id="48ZGLP7ryWq" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
<ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
<node concept="2EnYce" id="48ZGLP7rBly" role="37wK5m">
<node concept="2OqwBi" id="48ZGLP7r__E" role="2Oq$k0">
<node concept="13iPFW" id="48ZGLP7rzTU" role="2Oq$k0" />
@ -669,7 +669,7 @@
<ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
</node>
<node concept="liA8E" id="48ZGLP7rrdq" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
</node>
</node>
</node>

4
samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps
View File

@ -336,7 +336,7 @@
<node concept="2OqwBi" id="hDMFLSy" role="3clFbG">
<node concept="1Wqviy" id="hDMFLSz" role="2Oq$k0" />
<node concept="liA8E" id="hDMFLS$" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.matches(java.lang.String):boolean" resolve="matches" />
<ref role="37wK5l" to="wyt6:~String.matches(java.lang.String)" resolve="matches" />
<node concept="Xl_RD" id="hDMFLS_" role="37wK5m">
<property role="Xl_RC" value="[a-zA-Z$[_]][a-zA-Z0-9$[_]]*" />
</node>
@ -1855,7 +1855,7 @@
<node concept="2OqwBi" id="48ZGLP8$iQH" role="3clFbG">
<node concept="1Wqviy" id="48ZGLP8$g_T" role="2Oq$k0" />
<node concept="liA8E" id="48ZGLP8$jpb" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.matches(java.lang.String):boolean" resolve="matches" />
<ref role="37wK5l" to="wyt6:~String.matches(java.lang.String)" resolve="matches" />
<node concept="Xl_RD" id="48ZGLP8$j_d" role="37wK5m">
<property role="Xl_RC" value="[a-z$[_]][a-z0-9$[_]]*" />
</node>

12
samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
View File

@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="-1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="samples.lambdacalc" version="-1" />
<use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="-1" />
<use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="-1" />
@ -3285,7 +3285,7 @@
<property role="2s7ueQ" value="error" />
<node concept="2YIFZM" id="6K6UrSyIfsz" role="2s7u9n">
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
<node concept="Xl_RD" id="6K6UrSyIfs$" role="37wK5m">
<property role="Xl_RC" value="cannot unify '%s' and '%s'" />
</node>
@ -4092,11 +4092,11 @@
</node>
</node>
<node concept="liA8E" id="5zncGqweSkF" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
</node>
</node>
<node concept="liA8E" id="5zncGqweSkG" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
</node>
@ -4169,11 +4169,11 @@
</node>
</node>
<node concept="liA8E" id="48ZGLP8jezM" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
</node>
</node>
<node concept="liA8E" id="48ZGLP8jhiA" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
<ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
</node>
</node>
</node>

6
samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
View File

@ -41,16 +41,16 @@
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
<language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />

6
samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
View File

@ -4,7 +4,7 @@
<languages>
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
</languages>
<imports>
@ -723,7 +723,7 @@
<node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
<node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -739,7 +739,7 @@
<node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
<node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>

2
samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd
View File

@ -19,7 +19,7 @@
<language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />

4
samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
View File

@ -36,9 +36,9 @@
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />

4
samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
View File

@ -1251,7 +1251,7 @@
<ref role="359W_E" to="tpee:hGd03cG" resolve="BaseAssignmentExpression" />
</node>
<node concept="liA8E" id="5YmBCzQLx57" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="5YmBCzQLxjw" role="37wK5m">
<node concept="3A2sRY" id="5YmBCzQLx5i" role="2Oq$k0">
<ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
@ -6572,7 +6572,7 @@
<ref role="359W_E" to="tpee:hGd03cG" resolve="BaseAssignmentExpression" />
</node>
<node concept="liA8E" id="6Yb9hAqRblB" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="6Yb9hAqRb_n" role="37wK5m">
<node concept="3A2sRY" id="6Yb9hAqRbn9" role="2Oq$k0">
<ref role="3A2yKK" node="6Yb9hAqNAzu" resolve="varref" />

146
samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
View File

@ -7,10 +7,10 @@
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="15" />
<use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
<use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="-1" />
<use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="1" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
<use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="-1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
<use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="-1" />
<use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="-1" />
@ -4366,7 +4366,7 @@
</node>
</node>
<node concept="liA8E" id="6EY0p2ymzYJ" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -6960,7 +6960,7 @@
</node>
</node>
<node concept="liA8E" id="3jXBvmTFgtM" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
</node>
</node>
<node concept="2OqwBi" id="3jXBvmTFgtN" role="3uHU7B">
@ -6977,7 +6977,7 @@
</node>
</node>
<node concept="liA8E" id="3jXBvmTFgtT" role="2OqNvi">
<ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
<ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
</node>
</node>
</node>
@ -13289,7 +13289,7 @@
</node>
</node>
<node concept="liA8E" id="12QmIo_9Mxv" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -14296,7 +14296,7 @@
</node>
</node>
<node concept="liA8E" id="72RDgINqSZb" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
<node concept="2tJFMh" id="72RDgINng5g" role="3uHU7w">
@ -19425,7 +19425,7 @@
</node>
</node>
<node concept="liA8E" id="Lu45F7uK9i" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -19565,7 +19565,7 @@
</node>
</node>
<node concept="liA8E" id="Lu45F7uK5M" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -19648,7 +19648,7 @@
</node>
</node>
<node concept="liA8E" id="7lt0LtQoNGD" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="2OqwBi" id="7lt0LtQmO_N" role="37wK5m">
<node concept="1TmgYN" id="7lt0LtQmO_O" role="2Oq$k0">
<node concept="1nq8_$" id="7lt0LtQmO_P" role="1Tms7$">
@ -19778,7 +19778,7 @@
</node>
</node>
<node concept="liA8E" id="Lu45F7uK6m" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -21528,7 +21528,7 @@
<ref role="3cqZAo" node="3KV3FXk1ku9" resolve="resultList" />
</node>
<node concept="liA8E" id="3KV3FXk1lxk" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
<ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
</node>
</node>
</node>
@ -21740,7 +21740,7 @@
<node concept="3clFbS" id="3KV3FXk1J8f" role="3clFbx">
<node concept="3cpWs6" id="3KV3FXk1J8g" role="3cqZAp">
<node concept="2YIFZM" id="3KV3FXk1J8h" role="3cqZAk">
<ref role="37wK5l" to="33ny:~Collections.emptyList():java.util.List" resolve="emptyList" />
<ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
</node>
</node>
@ -21752,11 +21752,11 @@
<ref role="3cqZAo" node="3KV3FXk1J2H" resolve="allPathsList" />
</node>
<node concept="liA8E" id="3KV3FXk1J8t" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.iterator():java.util.Iterator" resolve="iterator" />
<ref role="37wK5l" to="33ny:~List.iterator()" resolve="iterator" />
</node>
</node>
<node concept="liA8E" id="3KV3FXk1J8u" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
<ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
</node>
</node>
</node>
@ -21829,7 +21829,7 @@
<ref role="3cqZAo" node="3KV3FXk1Nl3" resolve="pathListIt" />
</node>
<node concept="liA8E" id="3KV3FXk1OUC" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
<ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
</node>
</node>
</node>
@ -21857,7 +21857,7 @@
<ref role="3cqZAo" node="3KV3FXk1Lsq" resolve="candidatePath" />
</node>
<node concept="liA8E" id="3KV3FXk1PPB" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="37vLTw" id="3KV3FXk1PRF" role="37wK5m">
<ref role="3cqZAo" node="3KV3FXk1OU$" resolve="next" />
</node>
@ -21872,13 +21872,13 @@
<ref role="3cqZAo" node="3KV3FXk1Lsq" resolve="candidatePath" />
</node>
<node concept="liA8E" id="3KV3FXk1QzY" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="2OqwBi" id="3KV3FXk1QE9" role="37wK5m">
<node concept="37vLTw" id="3KV3FXk1QAl" role="2Oq$k0">
<ref role="3cqZAo" node="3KV3FXk1Nl3" resolve="pathListIt" />
</node>
<node concept="liA8E" id="3KV3FXk1QMB" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
<ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
</node>
</node>
</node>
@ -21890,7 +21890,7 @@
<ref role="3cqZAo" node="3KV3FXk1Nl3" resolve="pathListIt" />
</node>
<node concept="liA8E" id="3KV3FXk1Qbe" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
<ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
</node>
</node>
</node>
@ -21910,7 +21910,7 @@
<ref role="3cqZAo" node="3KV3FXk1Nag" resolve="pathList" />
</node>
<node concept="liA8E" id="3KV3FXk1O93" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.iterator():java.util.Iterator" resolve="iterator" />
<ref role="37wK5l" to="33ny:~List.iterator()" resolve="iterator" />
</node>
</node>
</node>
@ -21919,7 +21919,7 @@
<ref role="3cqZAo" node="3KV3FXk1Nl3" resolve="pathListIt" />
</node>
<node concept="liA8E" id="3KV3FXk1Ovm" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
<ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
</node>
</node>
</node>
@ -21928,7 +21928,7 @@
<node concept="3clFbS" id="3KV3FXk1R1n" role="3clFbx">
<node concept="3clFbF" id="5_6ImQZl_Vo" role="3cqZAp">
<node concept="2YIFZM" id="5_6ImQZl_Y0" role="3clFbG">
<ref role="37wK5l" to="33ny:~Collections.reverse(java.util.List):void" resolve="reverse" />
<ref role="37wK5l" to="33ny:~Collections.reverse(java.util.List)" resolve="reverse" />
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
<node concept="37vLTw" id="5_6ImQZl_Z7" role="37wK5m">
<ref role="3cqZAo" node="3KV3FXk1Lsq" resolve="candidatePath" />
@ -21961,7 +21961,7 @@
<ref role="3cqZAo" node="3KV3FXk1KVn" resolve="result" />
</node>
<node concept="liA8E" id="3KV3FXk2gcq" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
<ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
</node>
</node>
<node concept="2OqwBi" id="3KV3FXk2gcr" role="3uHU7B">
@ -21969,7 +21969,7 @@
<ref role="3cqZAo" node="3KV3FXk1Lsq" resolve="candidatePath" />
</node>
<node concept="liA8E" id="3KV3FXk2gct" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
<ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
</node>
</node>
</node>
@ -21981,7 +21981,7 @@
<ref role="3cqZAo" node="3KV3FXk1Lsq" resolve="candidatePath" />
</node>
<node concept="liA8E" id="3KV3FXk1T2N" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
<ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
</node>
</node>
</node>
@ -22087,7 +22087,7 @@
<ref role="3cqZAo" node="5H6hZahoMRV" resolve="components" />
</node>
<node concept="liA8E" id="5H6hZahszJg" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
<ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
</node>
</node>
</node>
@ -22113,7 +22113,7 @@
<ref role="3cqZAo" node="5H6hZahoMRV" resolve="components" />
</node>
<node concept="liA8E" id="5H6hZahszJr" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
<node concept="37vLTw" id="5H6hZahszJs" role="37wK5m">
<ref role="3cqZAo" node="5H6hZahszJx" resolve="i" />
</node>
@ -22147,7 +22147,7 @@
<ref role="3cqZAo" node="5H6hZahoMRV" resolve="components" />
</node>
<node concept="liA8E" id="5H6hZahszJB" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
<ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
</node>
</node>
<node concept="37vLTw" id="5H6hZahszJC" role="3uHU7B">
@ -22462,7 +22462,7 @@
<ref role="3cqZAo" node="3KV3FXk0pld" resolve="resultList" />
</node>
<node concept="liA8E" id="3KV3FXjZMUC" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
<ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
</node>
</node>
<node concept="3clFbS" id="3KV3FXjZMUD" role="3clFbx">
@ -22707,7 +22707,7 @@
<node concept="3clFbS" id="3KV3FXjZHiu" role="3clFbx">
<node concept="3cpWs6" id="3KV3FXjZHiv" role="3cqZAp">
<node concept="2YIFZM" id="3KV3FXk0Mm4" role="3cqZAk">
<ref role="37wK5l" to="33ny:~Collections.emptyList():java.util.List" resolve="emptyList" />
<ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
</node>
</node>
@ -22720,11 +22720,11 @@
<ref role="3cqZAo" node="3KV3FXjZHik" resolve="rightPaths" />
</node>
<node concept="liA8E" id="3KV3FXjZHiA" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.iterator():java.util.Iterator" resolve="iterator" />
<ref role="37wK5l" to="33ny:~List.iterator()" resolve="iterator" />
</node>
</node>
<node concept="liA8E" id="3KV3FXjZHiB" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
<ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
</node>
</node>
</node>
@ -22735,11 +22735,11 @@
<ref role="3cqZAo" node="3KV3FXjZHia" resolve="leftPaths" />
</node>
<node concept="liA8E" id="3KV3FXjZHiG" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.iterator():java.util.Iterator" resolve="iterator" />
<ref role="37wK5l" to="33ny:~List.iterator()" resolve="iterator" />
</node>
</node>
<node concept="liA8E" id="3KV3FXjZHiH" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
<ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
</node>
</node>
</node>
@ -22803,7 +22803,7 @@
<ref role="3cqZAo" node="3KV3FXjZMUd" resolve="resultList" />
</node>
<node concept="liA8E" id="3KV3FXjZMUq" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="37vLTw" id="3KV3FXjZMUr" role="37wK5m">
<ref role="3cqZAo" node="3KV3FXjZMUx" resolve="c" />
</node>
@ -22920,7 +22920,7 @@
<ref role="3cqZAo" node="3KV3FXjZDGL" resolve="leftPath" />
</node>
<node concept="liA8E" id="3KV3FXjZDHc" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.iterator():java.util.Iterator" resolve="iterator" />
<ref role="37wK5l" to="33ny:~List.iterator()" resolve="iterator" />
</node>
</node>
</node>
@ -22941,7 +22941,7 @@
<ref role="3cqZAo" node="3KV3FXjZDGV" resolve="rightPath" />
</node>
<node concept="liA8E" id="3KV3FXjZDHk" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.iterator():java.util.Iterator" resolve="iterator" />
<ref role="37wK5l" to="33ny:~List.iterator()" resolve="iterator" />
</node>
</node>
</node>
@ -22968,7 +22968,7 @@
<ref role="3cqZAo" node="3KV3FXjZDH6" resolve="leftIt" />
</node>
<node concept="liA8E" id="3KV3FXjZDHx" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
<ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
</node>
</node>
</node>
@ -22984,7 +22984,7 @@
<ref role="3cqZAo" node="3KV3FXjZDHe" resolve="rightIt" />
</node>
<node concept="liA8E" id="3KV3FXjZDHB" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
<ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
</node>
</node>
</node>
@ -23015,7 +23015,7 @@
<ref role="3cqZAo" node="3KV3FXjZG69" resolve="intermediateList" />
</node>
<node concept="liA8E" id="3KV3FXjZDHR" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="37vLTw" id="3KV3FXjZDHS" role="37wK5m">
<ref role="3cqZAo" node="3KV3FXjZDHn" resolve="lastMatch" />
</node>
@ -23078,7 +23078,7 @@
<ref role="3cqZAo" node="3KV3FXjZDHe" resolve="rightIt" />
</node>
<node concept="liA8E" id="3KV3FXjZDIi" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
<ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
</node>
</node>
<node concept="2OqwBi" id="3KV3FXjZDIj" role="3uHU7B">
@ -23086,7 +23086,7 @@
<ref role="3cqZAo" node="3KV3FXjZDH6" resolve="leftIt" />
</node>
<node concept="liA8E" id="3KV3FXjZDIl" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
<ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
</node>
</node>
</node>
@ -23100,7 +23100,7 @@
<ref role="3cqZAo" node="3KV3FXjZG64" resolve="candidateList" />
</node>
<node concept="liA8E" id="3KV3FXjZDIs" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="37vLTw" id="3KV3FXjZDIt" role="37wK5m">
<ref role="3cqZAo" node="3KV3FXjZDHn" resolve="lastMatch" />
</node>
@ -23293,7 +23293,7 @@
<ref role="3cqZAo" node="3KV3FXk0DmJ" resolve="pathIt" />
</node>
<node concept="liA8E" id="3KV3FXk0DlC" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
<ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
</node>
</node>
<node concept="37vLTw" id="3KV3FXk0DlD" role="37vLTJ">
@ -23323,7 +23323,7 @@
<ref role="3cqZAo" node="3KV3FXk0Dli" resolve="tmpList" />
</node>
<node concept="liA8E" id="3KV3FXk0DlR" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="37vLTw" id="3KV3FXk0DlS" role="37wK5m">
<ref role="3cqZAo" node="3KV3FXk0Dlw" resolve="next" />
</node>
@ -23339,7 +23339,7 @@
<ref role="3cqZAo" node="3KV3FXk0DmJ" resolve="pathIt" />
</node>
<node concept="liA8E" id="3KV3FXk0Dm4" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
<ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
</node>
</node>
<node concept="37vLTw" id="3KV3FXk0Dm5" role="37vLTJ">
@ -23355,7 +23355,7 @@
<ref role="3cqZAo" node="3KV3FXjZG69" resolve="intermediateList" />
</node>
<node concept="liA8E" id="3KV3FXk0Dmr" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection):boolean" resolve="addAll" />
<ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection)" resolve="addAll" />
<node concept="37vLTw" id="3KV3FXk0Dms" role="37wK5m">
<ref role="3cqZAo" node="3KV3FXk0Dli" resolve="tmpList" />
</node>
@ -23368,7 +23368,7 @@
<ref role="3cqZAo" node="3KV3FXk0Dli" resolve="tmpList" />
</node>
<node concept="liA8E" id="3KV3FXk0Dmw" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.clear():void" resolve="clear" />
<ref role="37wK5l" to="33ny:~List.clear()" resolve="clear" />
</node>
</node>
</node>
@ -23378,7 +23378,7 @@
<ref role="3cqZAo" node="3KV3FXk0Dli" resolve="tmpList" />
</node>
<node concept="liA8E" id="3KV3FXk0Dm$" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="37vLTw" id="3KV3FXk0Dm_" role="37wK5m">
<ref role="3cqZAo" node="3KV3FXk0Dlw" resolve="next" />
</node>
@ -23404,7 +23404,7 @@
<ref role="3cqZAo" node="3KV3FXk0Dli" resolve="tmpList" />
</node>
<node concept="liA8E" id="3KV3FXk0Dmb" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="37vLTw" id="3KV3FXk0Dmc" role="37wK5m">
<ref role="3cqZAo" node="3KV3FXk0Dlw" resolve="next" />
</node>
@ -23444,7 +23444,7 @@
<ref role="3cqZAo" node="3KV3FXk0DmJ" resolve="pathIt" />
</node>
<node concept="liA8E" id="3KV3FXk0DmF" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
<ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
</node>
</node>
</node>
@ -23475,7 +23475,7 @@
<ref role="3cqZAo" node="3KV3FXk0Dlp" resolve="path" />
</node>
<node concept="liA8E" id="3KV3FXk0DmP" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.iterator():java.util.Iterator" resolve="iterator" />
<ref role="37wK5l" to="33ny:~List.iterator()" resolve="iterator" />
</node>
</node>
</node>
@ -23484,7 +23484,7 @@
<ref role="3cqZAo" node="3KV3FXk0DmJ" resolve="pathIt" />
</node>
<node concept="liA8E" id="3KV3FXk0DmS" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
<ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
</node>
</node>
</node>
@ -23886,7 +23886,7 @@
</node>
</node>
<node concept="liA8E" id="Lu45F7uK6Y" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -24027,7 +24027,7 @@
</node>
</node>
<node concept="liA8E" id="Lu45F7uK8N" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -28066,7 +28066,7 @@
</node>
</node>
<node concept="liA8E" id="7XRk2O3zfrf" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -28240,7 +28240,7 @@
</node>
</node>
<node concept="liA8E" id="7XRk2O3zfzf" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -28293,7 +28293,7 @@
</node>
</node>
<node concept="liA8E" id="7XRk2O3zf$t" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -28577,7 +28577,7 @@
</node>
</node>
<node concept="liA8E" id="7XRk2O3zfyn" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
<node concept="3txIi4" id="7XRk2O3zfAp" role="37wK5m" />
@ -28690,7 +28690,7 @@
</node>
</node>
<node concept="liA8E" id="7XRk2O3zfmX" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -28725,7 +28725,7 @@
</node>
</node>
<node concept="liA8E" id="7XRk2O3zfn_" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -28806,7 +28806,7 @@
</node>
</node>
<node concept="liA8E" id="Lu45F7uK6P" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
@ -29484,14 +29484,14 @@
</node>
<node concept="2OqwBi" id="5XJPBczy$Fo" role="3K4GZi">
<node concept="2YIFZM" id="5XJPBczy$Fp" role="2Oq$k0">
<ref role="37wK5l" to="zdap:~StringUtil.unescapeStringCharacters(java.lang.String):java.lang.String" resolve="unescapeStringCharacters" />
<ref role="37wK5l" to="zdap:~StringUtil.unescapeStringCharacters(java.lang.String)" resolve="unescapeStringCharacters" />
<ref role="1Pybhc" to="zdap:~StringUtil" resolve="StringUtil" />
<node concept="3tDTZT" id="5XJPBczy$FJ" role="37wK5m">
<ref role="3tDTNw" node="5XJPBczyma3" resolve="value" />
</node>
</node>
<node concept="liA8E" id="5XJPBczy$Ft" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
<ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
<node concept="3cmrfG" id="5XJPBczy$Fu" role="37wK5m">
<property role="3cmrfH" value="0" />
</node>
@ -29623,7 +29623,7 @@
<node concept="37vLTI" id="5XJPBczAdnD" role="3clFbG">
<node concept="2YIFZM" id="5XJPBczAdnE" role="37vLTx">
<ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
<ref role="37wK5l" to="wyt6:~Integer.parseInt(java.lang.String,int):int" resolve="parseInt" />
<ref role="37wK5l" to="wyt6:~Integer.parseInt(java.lang.String,int)" resolve="parseInt" />
<node concept="3tDTZT" id="5XJPBczBJDe" role="37wK5m">
<ref role="3tDTNw" node="5XJPBczyI4u" resolve="valueHex" />
</node>
@ -29747,14 +29747,14 @@
<node concept="3clFbF" id="5XJPBczUo95" role="3cqZAp">
<node concept="37vLTI" id="5XJPBczUo97" role="3clFbG">
<node concept="2YIFZM" id="5XJPBczy_f5" role="37vLTx">
<ref role="37wK5l" to="wyt6:~Long.parseLong(java.lang.String):long" resolve="parseLong" />
<ref role="37wK5l" to="wyt6:~Long.parseLong(java.lang.String)" resolve="parseLong" />
<ref role="1Pybhc" to="wyt6:~Long" resolve="Long" />
<node concept="2OqwBi" id="7AyqXCdL52A" role="37wK5m">
<node concept="3tDTZT" id="5XJPBczyH9f" role="2Oq$k0">
<ref role="3tDTNw" node="5XJPBczy$RT" resolve="value" />
</node>
<node concept="liA8E" id="7AyqXCdL5oJ" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
<ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
<node concept="3cmrfG" id="7AyqXCdL5oM" role="37wK5m">
<property role="3cmrfH" value="0" />
</node>
@ -29767,7 +29767,7 @@
<ref role="3tDTNw" node="5XJPBczy$RT" resolve="value" />
</node>
<node concept="liA8E" id="7AyqXCdL6Xp" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
<ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
</node>
</node>
</node>
@ -29794,7 +29794,7 @@
<ref role="3tDTNw" node="5XJPBczy$RT" resolve="value" />
</node>
<node concept="liA8E" id="7AyqXCdL4s$" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String):boolean" resolve="endsWith" />
<ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
<node concept="Xl_RD" id="7AyqXCdL4sB" role="37wK5m">
<property role="Xl_RC" value="L" />
</node>
@ -29805,7 +29805,7 @@
<ref role="3tDTNw" node="5XJPBczy$RT" resolve="value" />
</node>
<node concept="liA8E" id="7AyqXCdL4K1" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String):boolean" resolve="endsWith" />
<ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
<node concept="Xl_RD" id="7AyqXCdL4K2" role="37wK5m">
<property role="Xl_RC" value="l" />
</node>
@ -29898,7 +29898,7 @@
<node concept="3clFbF" id="5XJPBczUoxN" role="3cqZAp">
<node concept="37vLTI" id="5XJPBczUoxP" role="3clFbG">
<node concept="2YIFZM" id="5XJPBczyBML" role="37vLTx">
<ref role="37wK5l" to="wyt6:~Float.parseFloat(java.lang.String):float" resolve="parseFloat" />
<ref role="37wK5l" to="wyt6:~Float.parseFloat(java.lang.String)" resolve="parseFloat" />
<ref role="1Pybhc" to="wyt6:~Float" resolve="Float" />
<node concept="3tDTZT" id="5XJPBczz8zC" role="37wK5m">
<ref role="3tDTNw" node="5XJPBczy_gf" resolve="value" />
@ -30000,7 +30000,7 @@
<node concept="3clFbF" id="5XJPBczUoV8" role="3cqZAp">
<node concept="37vLTI" id="5XJPBczUoVa" role="3clFbG">
<node concept="2YIFZM" id="5XJPBczyDT1" role="37vLTx">
<ref role="37wK5l" to="wyt6:~Double.parseDouble(java.lang.String):double" resolve="parseDouble" />
<ref role="37wK5l" to="wyt6:~Double.parseDouble(java.lang.String)" resolve="parseDouble" />
<ref role="1Pybhc" to="wyt6:~Double" resolve="Double" />
<node concept="3tDTZT" id="5XJPBczz8zH" role="37wK5m">
<ref role="3tDTNw" node="5XJPBczyDUk" resolve="value" />

2
samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd
View File

@ -24,7 +24,7 @@
<language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
<language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />

6
samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
View File

@ -7,7 +7,7 @@
<use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
<use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
@ -828,7 +828,7 @@
</node>
</node>
<node concept="liA8E" id="4cvvxaYgWs1" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -5338,7 +5338,7 @@
<ref role="3cqZAo" node="3KV3FXk0pld" resolve="resultList" />
</node>
<node concept="liA8E" id="3KV3FXjZMUC" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
<ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
</node>
</node>
<node concept="3clFbS" id="3KV3FXjZMUD" role="3clFbx">

6
samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps
View File

@ -5,7 +5,7 @@
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
</languages>
<imports>
@ -176,7 +176,7 @@
<node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
<node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -192,7 +192,7 @@
<node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
<node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>

6
samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps
View File

@ -5,7 +5,7 @@
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
<use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
@ -179,7 +179,7 @@
<node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
<node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -195,7 +195,7 @@
<node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
<node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>

6
samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps
View File

@ -8,7 +8,7 @@
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
<use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
<use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
</languages>
@ -207,7 +207,7 @@
<node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
<node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -223,7 +223,7 @@
<node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
<node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>

70
samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features.mps
View File

@ -475,7 +475,7 @@
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
</node>
<node concept="liA8E" id="1Py6iKGKdl" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println(int):void" resolve="println" />
<ref role="37wK5l" to="guwi:~PrintStream.println(int)" resolve="println" />
<node concept="3cpWs3" id="1Py6iKGU27" role="37wK5m">
<node concept="37vLTw" id="1Py6iKGU2L" role="3uHU7w">
<ref role="3cqZAo" node="5s5QomKHG9_" resolve="b8" />
@ -689,7 +689,7 @@
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
</node>
<node concept="liA8E" id="1Py6iKHgZV" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println(int):void" resolve="println" />
<ref role="37wK5l" to="guwi:~PrintStream.println(int)" resolve="println" />
<node concept="3cpWs3" id="1Py6iKHh0s" role="37wK5m">
<node concept="3cpWs3" id="1Py6iKHh0t" role="3uHU7B">
<node concept="3cpWs3" id="1Py6iKHh0u" role="3uHU7B">
@ -919,7 +919,7 @@
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
</node>
<node concept="liA8E" id="3Cu2imBSO9l" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
<node concept="3cpWs3" id="2HYHa0WD5Ev" role="37wK5m">
<node concept="37vLTw" id="2HYHa0WD5EG" role="3uHU7w">
<ref role="3cqZAo" node="2HYHa0WBjre" resolve="j" />
@ -1047,7 +1047,7 @@
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
</node>
<node concept="liA8E" id="2HYHa0WIw1P" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
<node concept="3cpWs3" id="2HYHa0WIyAW" role="37wK5m">
<node concept="37vLTw" id="2HYHa0WIyPV" role="3uHU7w">
<ref role="3cqZAo" node="2HYHa0WIw0y" resolve="e" />
@ -1177,7 +1177,7 @@
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
</node>
<node concept="liA8E" id="2HYHa0WUsBR" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
<node concept="3cpWs3" id="2HYHa0WUuDM" role="37wK5m">
<node concept="37vLTw" id="2HYHa0WUuDZ" role="3uHU7w">
<ref role="3cqZAo" node="2HYHa0WUot3" resolve="s" />
@ -1493,7 +1493,7 @@
<ref role="3cqZAo" node="2HYHa0WUE1q" resolve="a" />
</node>
<node concept="liA8E" id="2HYHa0WUEeq" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -1531,7 +1531,7 @@
<ref role="3cqZAo" node="2HYHa0WUEt3" resolve="b" />
</node>
<node concept="liA8E" id="2HYHa0WUEE8" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -1583,7 +1583,7 @@
<ref role="3cqZAo" node="2HYHa0WUETz" resolve="c" />
</node>
<node concept="liA8E" id="2HYHa0WUF9F" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -1631,7 +1631,7 @@
<ref role="3cqZAo" node="2HYHa0WUFz4" resolve="d" />
</node>
<node concept="liA8E" id="2HYHa0WUFOC" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -1685,7 +1685,7 @@
<ref role="3cqZAo" node="70Wv0dIXe9L" resolve="a" />
</node>
<node concept="liA8E" id="70Wv0dIXeBL" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -1729,7 +1729,7 @@
<ref role="3cqZAo" node="70Wv0dIXeaZ" resolve="b" />
</node>
<node concept="liA8E" id="70Wv0dIXeZr" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -1786,7 +1786,7 @@
<ref role="3cqZAo" node="70Wv0dIXedQ" resolve="c" />
</node>
<node concept="liA8E" id="70Wv0dIXfn_" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -1839,7 +1839,7 @@
<ref role="3cqZAo" node="70Wv0dIXfnD" resolve="d" />
</node>
<node concept="liA8E" id="70Wv0dIXfRf" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -1888,7 +1888,7 @@
<ref role="3cqZAo" node="70Wv0dJ5qpK" resolve="a" />
</node>
<node concept="liA8E" id="70Wv0dJ5qpI" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -1926,7 +1926,7 @@
<ref role="3cqZAo" node="70Wv0dJ5qlg" resolve="b" />
</node>
<node concept="liA8E" id="70Wv0dJ5qle" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -1978,7 +1978,7 @@
<ref role="3cqZAo" node="70Wv0dJ5pNI" resolve="c" />
</node>
<node concept="liA8E" id="70Wv0dJ5qk$" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -2026,7 +2026,7 @@
<ref role="3cqZAo" node="70Wv0dJ5qvq" resolve="d" />
</node>
<node concept="liA8E" id="70Wv0dJ5qvo" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -2080,7 +2080,7 @@
<ref role="3cqZAo" node="70Wv0dJgAAn" resolve="a" />
</node>
<node concept="liA8E" id="70Wv0dJgAA$" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -2123,7 +2123,7 @@
<ref role="3cqZAo" node="70Wv0dJgAAB" resolve="b" />
</node>
<node concept="liA8E" id="70Wv0dJgAAO" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -2180,7 +2180,7 @@
<ref role="3cqZAo" node="70Wv0dJgAAR" resolve="c" />
</node>
<node concept="liA8E" id="70Wv0dJgAB8" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -2233,7 +2233,7 @@
<ref role="3cqZAo" node="70Wv0dJgABb" resolve="d" />
</node>
<node concept="liA8E" id="70Wv0dJgABq" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -2276,7 +2276,7 @@
<ref role="3cqZAo" node="70Wv0dJgFsK" resolve="a" />
</node>
<node concept="liA8E" id="70Wv0dJgGcg" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -2312,7 +2312,7 @@
<ref role="3cqZAo" node="6EY0p2xWgfT" resolve="b" />
</node>
<node concept="liA8E" id="6EY0p2xWgfR" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -2348,7 +2348,7 @@
<ref role="3cqZAo" node="6EY0p2xWi9x" resolve="c" />
</node>
<node concept="liA8E" id="6EY0p2xWi9v" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -2409,7 +2409,7 @@
<ref role="3cqZAo" node="70Wv0dJgMTb" resolve="a" />
</node>
<node concept="liA8E" id="70Wv0dJgNKW" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -2467,7 +2467,7 @@
<ref role="3cqZAo" node="70Wv0dJgNRg" resolve="b" />
</node>
<node concept="liA8E" id="70Wv0dJgNRe" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -2521,7 +2521,7 @@
<ref role="3cqZAo" node="6EY0p2wscxb" resolve="c" />
</node>
<node concept="liA8E" id="6EY0p2wscx9" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -2583,7 +2583,7 @@
<ref role="3cqZAo" node="6EY0p2wscLO" resolve="d" />
</node>
<node concept="liA8E" id="6EY0p2wscLM" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -2657,7 +2657,7 @@
<ref role="3cqZAo" node="6EY0p2wscZw" resolve="e" />
</node>
<node concept="liA8E" id="6EY0p2wscZu" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -2709,7 +2709,7 @@
<ref role="3cqZAo" node="6EY0p2wsdjW" resolve="f" />
</node>
<node concept="liA8E" id="6EY0p2wsdjU" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -2767,7 +2767,7 @@
<ref role="3cqZAo" node="6EY0p2wshVK" resolve="g" />
</node>
<node concept="liA8E" id="6EY0p2wshVI" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
</node>
</node>
</node>
@ -3821,7 +3821,7 @@
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
</node>
<node concept="liA8E" id="6EY0p2ylE1g" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println():void" resolve="println" />
<ref role="37wK5l" to="guwi:~PrintStream.println()" resolve="println" />
<node concept="3cpWs3" id="6EY0p2ylIhm" role="37wK5m">
<node concept="37vLTw" id="6EY0p2ylIi0" role="3uHU7w">
<ref role="3cqZAo" node="6EY0p2ylwbu" resolve="b8" />
@ -4031,7 +4031,7 @@
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
</node>
<node concept="liA8E" id="6EY0p2ylTSL" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println():void" resolve="println" />
<ref role="37wK5l" to="guwi:~PrintStream.println()" resolve="println" />
<node concept="3cpWs3" id="6EY0p2ylW7t" role="37wK5m">
<node concept="37vLTw" id="6EY0p2ylW7R" role="3uHU7w">
<ref role="3cqZAo" node="6EY0p2ylTSs" resolve="you" />
@ -7371,7 +7371,7 @@
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
</node>
<node concept="liA8E" id="5XJPBczXwKJ" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.Object):void" resolve="println" />
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.Object)" resolve="println" />
<node concept="2ShNRf" id="5XJPBczXwNH" role="37wK5m">
<node concept="3g6Rrh" id="5XJPBczXBf7" role="2ShVmc">
<node concept="10P55v" id="5XJPBczX$1l" role="3g7fb8" />
@ -7823,7 +7823,7 @@
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
</node>
<node concept="liA8E" id="7AyqXCd$XW4" role="2OqNvi">
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.Object):void" resolve="println" />
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.Object)" resolve="println" />
<node concept="2ShNRf" id="7AyqXCd$XW5" role="37wK5m">
<node concept="3g6Rrh" id="7AyqXCd$XW6" role="2ShVmc">
<node concept="3uibUv" id="7AyqXCd$Yta" role="3g7fb8">

6
samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features@tests.mps
View File

@ -4,7 +4,7 @@
<languages>
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
</languages>
<imports>
@ -179,7 +179,7 @@
<node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
<node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -195,7 +195,7 @@
<node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
<node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>

6
samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
View File

@ -4,7 +4,7 @@
<languages>
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
</languages>
<imports>
@ -178,7 +178,7 @@
<node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
<node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -194,7 +194,7 @@
<node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
<node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>

6
samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps
View File

@ -4,7 +4,7 @@
<languages>
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
</languages>
<imports>
@ -178,7 +178,7 @@
<node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
<node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -194,7 +194,7 @@
<node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
<node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>

6
samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps
View File

@ -4,7 +4,7 @@
<languages>
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
</languages>
<imports>
@ -178,7 +178,7 @@
<node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
<node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
@ -194,7 +194,7 @@
<node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
<node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
<node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>

Some files were not shown because too many files have changed in this diff Show More