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

Finishing refactoring the constraints API: extracted JCHR launcher

This commit is contained in:
Fedor Isakov 2015-11-26 18:22:08 +01:00
parent b81b875197
commit 7f20db92a6
11 changed files with 2315 additions and 2176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

971
languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
View File

File diff suppressed because it is too large Load Diff

1460
languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
View File

File diff suppressed because it is too large Load Diff

15
languages/jetbrains.mps.logic/jchr/jetbrains.mps.logic.jchr.msd
View File

@ -11,17 +11,32 @@
<dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
<dependency reexport="true">b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)</dependency>
<dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
<dependency reexport="false">35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)</dependency>
<dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
<dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
<dependency reexport="false">c246f30f-e11c-4dc1-80c6-154d0aebc8b3(jetbrains.mps.lang.typesystem2.samplechecker.runner)</dependency>
</dependencies>
<languageVersions>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="4" />
<language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
<language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
<language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
<language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
<language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" 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="b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)" version="0" />
<module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
<module reference="c246f30f-e11c-4dc1-80c6-154d0aebc8b3(jetbrains.mps.lang.typesystem2.samplechecker.runner)" version="0" />
<module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)" version="0" />
<module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
<module reference="760652ad-c01a-495e-9510-ed51532f617b(jetbrains.mps.logic.jchr)" version="0" />
<module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />

1683
languages/jetbrains.mps.logic/jchr/models/jetbrains/mps/logic/jchr/program.mps
View File

File diff suppressed because it is too large Load Diff

42
languages/jetbrains.mps.logic/reactor/models/jetbrains/mps/logic/reactor/constraint.mps
View File

@ -2333,7 +2333,7 @@
<node concept="2OqwBi" id="5uFPQ7BZueq" role="37vLTJ">
<node concept="Xjq3P" id="5uFPQ7BZuet" role="2Oq$k0" />
<node concept="2OwXpG" id="5uFPQ7BZuep" role="2OqNvi">
<ref role="2Oxat5" node="5uFPQ7BZuef" resolve="argTypes" />
<ref role="2Oxat5" node="5uFPQ7BZuef" resolve="arguments" />
</node>
</node>
<node concept="37vLTw" id="5uFPQ7BZueu" role="37vLTx">
@ -2405,42 +2405,6 @@
</node>
</node>
<node concept="2tJIrI" id="5uFPQ7BZv8C" role="jymVt" />
<node concept="3clFb_" id="5uFPQ7BZuRF" role="jymVt">
<property role="TrG5h" value="asConstraint" />
<node concept="3uibUv" id="5uFPQ7BZuRG" role="3clF45">
<ref role="3uigEE" node="6Kcfpq7BfEn" resolve="Constraint" />
</node>
<node concept="3Tm1VV" id="5uFPQ7BZuRH" role="1B3o_S" />
<node concept="3clFbS" id="5uFPQ7BZuRI" role="3clF47">
<node concept="3clFbF" id="5uFPQ7BZuRJ" role="3cqZAp">
<node concept="10QFUN" id="5uFPQ7BZuRK" role="3clFbG">
<node concept="Xjq3P" id="5uFPQ7BZuRL" role="10QFUP" />
<node concept="3uibUv" id="5uFPQ7BZuRM" role="10QFUM">
<ref role="3uigEE" node="6Kcfpq7BfEn" resolve="Constraint" />
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="5uFPQ7BZuRN" role="jymVt" />
<node concept="3clFb_" id="5uFPQ7BZuRO" role="jymVt">
<property role="TrG5h" value="asAutoConstraint" />
<node concept="3uibUv" id="5uFPQ7BZuRP" role="3clF45">
<ref role="3uigEE" node="6Kcfpq7Bj7q" resolve="Predicate" />
</node>
<node concept="3Tm1VV" id="5uFPQ7BZuRQ" role="1B3o_S" />
<node concept="3clFbS" id="5uFPQ7BZuRR" role="3clF47">
<node concept="3clFbF" id="5uFPQ7BZuRS" role="3cqZAp">
<node concept="10QFUN" id="5uFPQ7BZuRT" role="3clFbG">
<node concept="Xjq3P" id="5uFPQ7BZuRU" role="10QFUP" />
<node concept="3uibUv" id="5uFPQ7BZuRV" role="10QFUM">
<ref role="3uigEE" node="6Kcfpq7Bj7q" resolve="Predicate" />
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="5uFPQ7BZuQo" role="jymVt" />
<node concept="3clFb_" id="5uFPQ7BZsCD" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="symbol" />
@ -2476,7 +2440,7 @@
<ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
<ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
<node concept="37vLTw" id="5uFPQ7BZvJo" role="37wK5m">
<ref role="3cqZAo" node="5uFPQ7BZuef" resolve="argTypes" />
<ref role="3cqZAo" node="5uFPQ7BZuef" resolve="arguments" />
</node>
</node>
</node>
@ -2496,7 +2460,7 @@
</node>
</node>
<node concept="312cEg" id="5uFPQ7BZuef" role="jymVt">
<property role="TrG5h" value="argTypes" />
<property role="TrG5h" value="arguments" />
<node concept="3Tm6S6" id="5uFPQ7BZueg" role="1B3o_S" />
<node concept="10Q1$e" id="5uFPQ7BZzdN" role="1tU5fm">
<node concept="3uibUv" id="5uFPQ7BZzdK" role="10Q1$1">

251
languages/jetbrains.mps.logic/reactor/models/jetbrains/mps/logic/reactor/program.mps
View File

@ -40,9 +40,6 @@
<property id="1070475926801" name="value" index="Xl_RC" />
</concept>
<concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
</concept>
<concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
<child id="1164991057263" name="throwable" index="YScLw" />
</concept>
@ -54,11 +51,15 @@
<concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
<property id="1075300953594" name="abstractClass" index="1sVAO0" />
</concept>
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
<child id="1068431790190" name="initializer" index="33vP2m" />
</concept>
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
</concept>
<concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
<concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
<child id="5680397130376446158" name="type" index="1tU5fm" />
</concept>
@ -87,7 +88,9 @@
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
</concept>
<concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
<concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
<child id="1212687122400" name="typeParameter" index="1pMfVU" />
</concept>
<concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
<property id="521412098689998745" name="nonStatic" index="2bfB8j" />
<child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
@ -228,10 +231,33 @@
</node>
<node concept="3Tm1VV" id="7ISVfSIwfK" role="1B3o_S" />
<node concept="3clFbS" id="7ISVfSIwfL" role="3clF47">
<node concept="3clFbF" id="7ISVfSIwKa" role="3cqZAp">
<node concept="2ShNRf" id="7ISVfSIwK8" role="3clFbG">
<node concept="1pGfFk" id="7ISVfSIxpi" role="2ShVmc">
<ref role="37wK5l" node="7ISVfSIxgm" resolve="EvaluationSession.Config" />
<node concept="3clFbJ" id="5mr7UHcbuz5" role="3cqZAp">
<node concept="3clFbS" id="5mr7UHcbuz6" role="3clFbx">
<node concept="YS8fn" id="5mr7UHcbuz7" role="3cqZAp">
<node concept="2ShNRf" id="5mr7UHcbuz8" role="YScLw">
<node concept="1pGfFk" id="5mr7UHcbuz9" role="2ShVmc">
<ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
<node concept="Xl_RD" id="5mr7UHcbuza" role="37wK5m">
<property role="Xl_RC" value="no backend" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbC" id="5mr7UHcbuzb" role="3clFbw">
<node concept="10Nm6u" id="5mr7UHcbuzc" role="3uHU7w" />
<node concept="37vLTw" id="5mr7UHcbuzf" role="3uHU7B">
<ref role="3cqZAo" node="5uFPQ7BwtFE" resolve="ourBackend" />
</node>
</node>
</node>
<node concept="3clFbF" id="5mr7UHcbuzh" role="3cqZAp">
<node concept="2OqwBi" id="5mr7UHcbuzi" role="3clFbG">
<node concept="37vLTw" id="5mr7UHcbuzm" role="2Oq$k0">
<ref role="3cqZAo" node="5uFPQ7BwtFE" resolve="ourBackend" />
</node>
<node concept="liA8E" id="5mr7UHcbuzj" role="2OqNvi">
<ref role="37wK5l" node="5mr7UHcbuF5" resolve="createConfig" />
</node>
</node>
</node>
@ -241,10 +267,11 @@
<node concept="312cEu" id="5uFPQ7Bwt8Z" role="jymVt">
<property role="2bfB8j" value="false" />
<property role="TrG5h" value="Config" />
<property role="1sVAO0" value="true" />
<node concept="2tJIrI" id="5uFPQ7BwtaY" role="jymVt" />
<node concept="3clFbW" id="7ISVfSIxgm" role="jymVt">
<node concept="3cqZAl" id="7ISVfSIxgp" role="3clF45" />
<node concept="3Tm6S6" id="7ISVfSIxsy" role="1B3o_S" />
<node concept="3Tmbuc" id="5mr7UHcbwBO" role="1B3o_S" />
<node concept="3clFbS" id="7ISVfSIxgr" role="3clF47" />
</node>
<node concept="2tJIrI" id="7ISVfSIwT4" role="jymVt" />
@ -284,61 +311,122 @@
<node concept="2tJIrI" id="5uFPQ7Bwvfj" role="jymVt" />
<node concept="3clFb_" id="5uFPQ7Bwvg_" role="jymVt">
<property role="TrG5h" value="withTrace" />
<node concept="37vLTG" id="5mr7UHcbrGT" role="3clF46">
<property role="TrG5h" value="computingTracer" />
<node concept="3uibUv" id="5mr7UHcbrPY" role="1tU5fm">
<ref role="3uigEE" to="qrld:24Vro6cQnrj" resolve="ComputingTracer" />
</node>
</node>
<node concept="3uibUv" id="5uFPQ7Bwvia" role="3clF45">
<ref role="3uigEE" node="5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
</node>
<node concept="3Tm1VV" id="5uFPQ7BwvgC" role="1B3o_S" />
<node concept="3clFbS" id="5uFPQ7BwvgD" role="3clF47">
<node concept="3clFbF" id="5mr7UHcbs2E" role="3cqZAp">
<node concept="37vLTI" id="5mr7UHcbs2G" role="3clFbG">
<node concept="2OqwBi" id="5mr7UHcbs2K" role="37vLTJ">
<node concept="Xjq3P" id="5mr7UHcbs2N" role="2Oq$k0" />
<node concept="2OwXpG" id="5mr7UHcbs2J" role="2OqNvi">
<ref role="2Oxat5" node="5mr7UHcbs2A" resolve="computingTracer" />
</node>
</node>
<node concept="37vLTw" id="5mr7UHcbs2O" role="37vLTx">
<ref role="3cqZAo" node="5mr7UHcbrGT" resolve="computingTracer" />
</node>
</node>
</node>
<node concept="3clFbF" id="5uFPQ7BwvnB" role="3cqZAp">
<node concept="Xjq3P" id="5uFPQ7BwvnA" role="3clFbG" />
</node>
</node>
</node>
<node concept="2tJIrI" id="7ISVfSIuJo" role="jymVt" />
<node concept="2tJIrI" id="5mr7UHcbcbV" role="jymVt" />
<node concept="3clFb_" id="5mr7UHcbbR2" role="jymVt">
<property role="TrG5h" value="withParam" />
<node concept="37vLTG" id="5mr7UHcbcpj" role="3clF46">
<property role="TrG5h" value="key" />
<node concept="17QB3L" id="5mr7UHcbcs$" role="1tU5fm" />
</node>
<node concept="37vLTG" id="5mr7UHcbctA" role="3clF46">
<property role="TrG5h" value="param" />
<node concept="3uibUv" id="5mr7UHcbcxl" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
<node concept="3uibUv" id="5mr7UHcbjuP" role="3clF45">
<ref role="3uigEE" node="5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
</node>
<node concept="3Tm1VV" id="5mr7UHcbbR5" role="1B3o_S" />
<node concept="3clFbS" id="5mr7UHcbbR6" role="3clF47">
<node concept="3clFbF" id="5mr7UHcbdeU" role="3cqZAp">
<node concept="2OqwBi" id="5mr7UHcbdgN" role="3clFbG">
<node concept="37vLTw" id="5mr7UHcbdeT" role="2Oq$k0">
<ref role="3cqZAo" node="5mr7UHcbcAv" resolve="parameters" />
</node>
<node concept="liA8E" id="5mr7UHcbdni" role="2OqNvi">
<ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
<node concept="37vLTw" id="5mr7UHcbdq7" role="37wK5m">
<ref role="3cqZAo" node="5mr7UHcbcpj" resolve="key" />
</node>
<node concept="37vLTw" id="5mr7UHcbdvq" role="37wK5m">
<ref role="3cqZAo" node="5mr7UHcbctA" resolve="param" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="5mr7UHcbjFr" role="3cqZAp">
<node concept="Xjq3P" id="5mr7UHcbjFp" role="3clFbG" />
</node>
</node>
</node>
<node concept="2tJIrI" id="5mr7UHcb$Ol" role="jymVt" />
<node concept="3clFb_" id="7ISVfSIuSh" role="jymVt">
<property role="TrG5h" value="start" />
<property role="1EzhhJ" value="true" />
<node concept="3uibUv" id="7ISVfSIv24" role="3clF45">
<ref role="3uigEE" node="5uFPQ7BvN_d" resolve="EvaluationSession" />
</node>
<node concept="3Tm1VV" id="7ISVfSIuSk" role="1B3o_S" />
<node concept="3clFbS" id="7ISVfSIuSl" role="3clF47">
<node concept="3clFbF" id="7ISVfSIvk2" role="3cqZAp">
<node concept="2YIFZM" id="7ISVfSIvp7" role="3clFbG">
<ref role="37wK5l" node="5uFPQ7Bwthk" resolve="start" />
<ref role="1Pybhc" node="5uFPQ7BvN_d" resolve="EvaluationSession" />
<node concept="Xjq3P" id="7ISVfSIvu9" role="37wK5m" />
</node>
</node>
</node>
<node concept="3clFbS" id="7ISVfSIuSl" role="3clF47" />
</node>
<node concept="2tJIrI" id="5uFPQ7Bwuj4" role="jymVt" />
<node concept="3clFb_" id="7ISVfSIiZn" role="jymVt">
<property role="TrG5h" value="getPredicateSymbols" />
<node concept="10Q1$e" id="7ISVfSIiZo" role="3clF45">
<node concept="3uibUv" id="7ISVfSIiZp" role="10Q1$1">
<ref role="3uigEE" to="qrld:5uFPQ7B$$3f" resolve="PredicateSymbol" />
</node>
</node>
<node concept="3Tm1VV" id="7ISVfSIiZq" role="1B3o_S" />
<node concept="3clFbS" id="7ISVfSIiZr" role="3clF47">
<node concept="3clFbF" id="7ISVfSIiZs" role="3cqZAp">
<node concept="37vLTw" id="7ISVfSIiZm" role="3clFbG">
<ref role="3cqZAo" node="7ISVfSIioQ" resolve="predicateSymbols" />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="7ISVfSIjE_" role="jymVt" />
<node concept="2tJIrI" id="5mr7UHcbwTX" role="jymVt" />
<node concept="3Tm1VV" id="5uFPQ7Bwt90" role="1B3o_S" />
<node concept="312cEg" id="7ISVfSIioQ" role="jymVt">
<property role="TrG5h" value="predicateSymbols" />
<node concept="3Tm6S6" id="7ISVfSIioR" role="1B3o_S" />
<node concept="3Tmbuc" id="5mr7UHcbtUi" role="1B3o_S" />
<node concept="10Q1$e" id="7ISVfSIix5" role="1tU5fm">
<node concept="3uibUv" id="7ISVfSIix7" role="10Q1$1">
<ref role="3uigEE" to="qrld:5uFPQ7B$$3f" resolve="PredicateSymbol" />
</node>
</node>
</node>
<node concept="312cEg" id="5mr7UHcbcAv" role="jymVt">
<property role="TrG5h" value="parameters" />
<node concept="3Tmbuc" id="5mr7UHcbtVS" role="1B3o_S" />
<node concept="3uibUv" id="5mr7UHcbcEh" role="1tU5fm">
<ref role="3uigEE" to="33ny:~Map" resolve="Map" />
<node concept="17QB3L" id="5mr7UHcbcEz" role="11_B2D" />
<node concept="3uibUv" id="5mr7UHcbcF8" role="11_B2D">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
<node concept="2ShNRf" id="5mr7UHcbcTG" role="33vP2m">
<node concept="1pGfFk" id="5mr7UHcbd42" role="2ShVmc">
<ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
<node concept="17QB3L" id="5mr7UHcbd7P" role="1pMfVU" />
<node concept="3uibUv" id="5mr7UHcbdce" role="1pMfVU">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
</node>
</node>
<node concept="312cEg" id="5mr7UHcbs2A" role="jymVt">
<property role="TrG5h" value="computingTracer" />
<node concept="3Tmbuc" id="5mr7UHcbtYG" role="1B3o_S" />
<node concept="3uibUv" id="5mr7UHcbs2D" role="1tU5fm">
<ref role="3uigEE" to="qrld:24Vro6cQnrj" resolve="ComputingTracer" />
</node>
</node>
</node>
<node concept="2tJIrI" id="5uFPQ7Bwwl1" role="jymVt" />
<node concept="3clFb_" id="7ISVfSIWX_" role="jymVt">
@ -421,12 +509,6 @@
<node concept="3clFb_" id="5uFPQ7BvQxv" role="jymVt">
<property role="TrG5h" value="constraintOccurrences" />
<property role="1EzhhJ" value="true" />
<node concept="37vLTG" id="5uFPQ7BvQzF" role="3clF46">
<property role="TrG5h" value="symbol" />
<node concept="3uibUv" id="5uFPQ7BZbEn" role="1tU5fm">
<ref role="3uigEE" to="qrld:54i3FxcZHHF" resolve="ConstraintSymbol" />
</node>
</node>
<node concept="3uibUv" id="5uFPQ7BZbCW" role="3clF45">
<ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
<node concept="3uibUv" id="5uFPQ7BZbEd" role="11_B2D">
@ -436,57 +518,26 @@
<node concept="3Tm1VV" id="5uFPQ7BvQxy" role="1B3o_S" />
<node concept="3clFbS" id="5uFPQ7BvQxz" role="3clF47" />
</node>
<node concept="2tJIrI" id="5uFPQ7BZbRm" role="jymVt" />
<node concept="2tJIrI" id="5uFPQ7BZbUe" role="jymVt" />
<node concept="2YIFZL" id="5uFPQ7Bwthk" role="jymVt">
<property role="TrG5h" value="start" />
<node concept="37vLTG" id="5uFPQ7BwtjP" role="3clF46">
<property role="TrG5h" value="config" />
<node concept="3uibUv" id="5uFPQ7Bwtko" role="1tU5fm">
<ref role="3uigEE" node="5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
<node concept="2tJIrI" id="5mr7UHccvSI" role="jymVt" />
<node concept="3clFb_" id="5mr7UHccvdG" role="jymVt">
<property role="TrG5h" value="constraintOccurrences" />
<property role="1EzhhJ" value="true" />
<node concept="37vLTG" id="5mr7UHccvdH" role="3clF46">
<property role="TrG5h" value="symbol" />
<node concept="3uibUv" id="5mr7UHccvdI" role="1tU5fm">
<ref role="3uigEE" to="qrld:54i3FxcZHHF" resolve="ConstraintSymbol" />
</node>
</node>
<node concept="3uibUv" id="5uFPQ7Bwtiq" role="3clF45">
<ref role="3uigEE" node="5uFPQ7BvN_d" resolve="EvaluationSession" />
</node>
<node concept="3Tmbuc" id="7ISVfSIuGU" role="1B3o_S" />
<node concept="3clFbS" id="5uFPQ7Bwtho" role="3clF47">
<node concept="3clFbJ" id="5uFPQ7Bwu4q" role="3cqZAp">
<node concept="3clFbS" id="5uFPQ7Bwu4r" role="3clFbx">
<node concept="YS8fn" id="5uFPQ7Bwu4s" role="3cqZAp">
<node concept="2ShNRf" id="5uFPQ7Bwu4t" role="YScLw">
<node concept="1pGfFk" id="5uFPQ7Bwu4u" role="2ShVmc">
<ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
<node concept="Xl_RD" id="5uFPQ7Bwu4v" role="37wK5m">
<property role="Xl_RC" value="no backend" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbC" id="5uFPQ7Bwu4w" role="3clFbw">
<node concept="10Nm6u" id="5uFPQ7Bwu4x" role="3uHU7w" />
<node concept="37vLTw" id="5uFPQ7Bwu4_" role="3uHU7B">
<ref role="3cqZAo" node="5uFPQ7BwtFE" resolve="ourBackend" />
</node>
</node>
</node>
<node concept="3clFbF" id="5uFPQ7Bwu4B" role="3cqZAp">
<node concept="2OqwBi" id="5uFPQ7Bwu4C" role="3clFbG">
<node concept="37vLTw" id="5uFPQ7Bwu4H" role="2Oq$k0">
<ref role="3cqZAo" node="5uFPQ7BwtFE" resolve="ourBackend" />
</node>
<node concept="liA8E" id="5uFPQ7Bwu4D" role="2OqNvi">
<ref role="37wK5l" node="5uFPQ7Bwtr5" resolve="start" />
<node concept="37vLTw" id="5uFPQ7Bwu8$" role="37wK5m">
<ref role="3cqZAo" node="5uFPQ7BwtjP" resolve="config" />
</node>
</node>
</node>
<node concept="3uibUv" id="5mr7UHccvdJ" role="3clF45">
<ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
<node concept="3uibUv" id="5mr7UHccvdK" role="11_B2D">
<ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
</node>
</node>
<node concept="3Tm1VV" id="5mr7UHccvdL" role="1B3o_S" />
<node concept="3clFbS" id="5mr7UHccvdM" role="3clF47" />
</node>
<node concept="2tJIrI" id="5uFPQ7Bwtfy" role="jymVt" />
<node concept="2tJIrI" id="5uFPQ7BZbRm" role="jymVt" />
<node concept="3HP615" id="5uFPQ7BwtoR" role="jymVt">
<property role="2bfB8j" value="true" />
<property role="TrG5h" value="Backend" />
@ -501,22 +552,16 @@
<node concept="3clFbS" id="5uFPQ7BwtvS" role="3clF47" />
</node>
<node concept="2tJIrI" id="5uFPQ7Bwtvq" role="jymVt" />
<node concept="3clFb_" id="5uFPQ7Bwtr5" role="jymVt">
<node concept="3clFb_" id="5mr7UHcbuF5" role="jymVt">
<property role="1EzhhJ" value="true" />
<property role="TrG5h" value="start" />
<node concept="37vLTG" id="5uFPQ7BwttK" role="3clF46">
<property role="TrG5h" value="config" />
<node concept="3uibUv" id="5uFPQ7Bwtum" role="1tU5fm">
<ref role="3uigEE" node="5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
</node>
<property role="TrG5h" value="createConfig" />
<node concept="3uibUv" id="5mr7UHcbuIP" role="3clF45">
<ref role="3uigEE" node="5uFPQ7Bwt8Z" resolve="EvaluationSession.Config" />
</node>
<node concept="3uibUv" id="5uFPQ7BwtrQ" role="3clF45">
<ref role="3uigEE" node="5uFPQ7BvN_d" resolve="EvaluationSession" />
</node>
<node concept="3Tm1VV" id="5uFPQ7Bwtr8" role="1B3o_S" />
<node concept="3clFbS" id="5uFPQ7Bwtr9" role="3clF47" />
<node concept="3Tm1VV" id="5mr7UHcbuF8" role="1B3o_S" />
<node concept="3clFbS" id="5mr7UHcbuF9" role="3clF47" />
</node>
<node concept="2tJIrI" id="5uFPQ7Bwtqz" role="jymVt" />
<node concept="2tJIrI" id="5mr7UHcbuCs" role="jymVt" />
<node concept="3Tmbuc" id="5uFPQ7Bwtsc" role="1B3o_S" />
</node>
<node concept="2tJIrI" id="5uFPQ7BvQ$M" role="jymVt" />

16
languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
View File

@ -1200,8 +1200,8 @@
<property role="TrG5h" value="result" />
<node concept="37vLTG" id="7nkyKX7gU0U" role="3clF46">
<property role="TrG5h" value="constraint" />
<node concept="3uibUv" id="7nkyKX7gU0V" role="1tU5fm">
<ref role="3uigEE" to="eifs:~IConstraint" resolve="IConstraint" />
<node concept="3uibUv" id="5mr7UHccdcS" role="1tU5fm">
<ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
</node>
</node>
<node concept="3cqZAl" id="7nkyKX7gU0Y" role="3clF45" />
@ -1214,8 +1214,8 @@
<property role="TrG5h" value="garbage" />
<node concept="37vLTG" id="7nkyKX7gU3M" role="3clF46">
<property role="TrG5h" value="constraint" />
<node concept="3uibUv" id="7nkyKX7gU3N" role="1tU5fm">
<ref role="3uigEE" to="eifs:~IConstraint" resolve="IConstraint" />
<node concept="3uibUv" id="5mr7UHccdlH" role="1tU5fm">
<ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
</node>
</node>
<node concept="3cqZAl" id="7nkyKX7gU3Q" role="3clF45" />
@ -1281,8 +1281,8 @@
<property role="TrG5h" value="result" />
<node concept="37vLTG" id="7nkyKX7h9eH" role="3clF46">
<property role="TrG5h" value="constraint" />
<node concept="3uibUv" id="7nkyKX7h9eI" role="1tU5fm">
<ref role="3uigEE" to="eifs:~IConstraint" resolve="IConstraint" />
<node concept="3uibUv" id="5mr7UHccduP" role="1tU5fm">
<ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
</node>
</node>
<node concept="3cqZAl" id="7nkyKX7h9eJ" role="3clF45" />
@ -1294,8 +1294,8 @@
<property role="TrG5h" value="garbage" />
<node concept="37vLTG" id="7nkyKX7h9eP" role="3clF46">
<property role="TrG5h" value="constraint" />
<node concept="3uibUv" id="7nkyKX7h9eQ" role="1tU5fm">
<ref role="3uigEE" to="eifs:~IConstraint" resolve="IConstraint" />
<node concept="3uibUv" id="5mr7UHccd_Z" role="1tU5fm">
<ref role="3uigEE" to="qrld:5uFPQ7BZac$" resolve="ConstraintOccurrence" />
</node>
</node>
<node concept="3cqZAl" id="7nkyKX7h9eR" role="3clF45" />

18
languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/java.mps
View File

@ -40,12 +40,7 @@
</concept>
<concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
<concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
<concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
<property id="1070475926801" name="value" index="Xl_RC" />
</concept>
<concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
<child id="1164991057263" name="throwable" index="YScLw" />
</concept>
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
<concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
<concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
<property id="1075300953594" name="abstractClass" index="1sVAO0" />
@ -189,15 +184,8 @@
<property role="3SKdUp" value="FIXME: implement me" />
</node>
</node>
<node concept="YS8fn" id="5uFPQ7Cjcze" role="3cqZAp">
<node concept="2ShNRf" id="5uFPQ7Cjc$3" role="YScLw">
<node concept="1pGfFk" id="5uFPQ7CjcGN" role="2ShVmc">
<ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;(java.lang.String)" resolve="UnsupportedOperationException" />
<node concept="Xl_RD" id="5uFPQ7CjcHH" role="37wK5m">
<property role="Xl_RC" value="not implemented" />
</node>
</node>
</node>
<node concept="3clFbF" id="5mr7UHclimT" role="3cqZAp">
<node concept="10Nm6u" id="5mr7UHclimR" role="3clFbG" />
</node>
</node>
<node concept="2AHcQZ" id="4xBopTzrlec" role="2AJF6D">

9
languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
View File

@ -1167,9 +1167,6 @@
<node concept="3clFbS" id="4xBopTzmopB" role="3clF47">
<node concept="XkiVB" id="4xBopTzmoNB" role="3cqZAp">
<ref role="37wK5l" to="qrld:6Kcfpq7B1f7" resolve="AbstractPredicate" />
<node concept="37vLTw" id="5uFPQ7C29mz" role="37wK5m">
<ref role="3cqZAo" node="5uFPQ7C29mw" resolve="UNI_SYM" />
</node>
<node concept="37vLTw" id="5uFPQ7C29Rp" role="37wK5m">
<ref role="3cqZAo" node="5uFPQ7C29xx" resolve="left" />
</node>
@ -1936,9 +1933,6 @@
<node concept="3clFbS" id="4xBopTzo_Q5" role="3clF47">
<node concept="XkiVB" id="4xBopTzoAs2" role="3cqZAp">
<ref role="37wK5l" to="qrld:6Kcfpq7B1f7" resolve="AbstractPredicate" />
<node concept="37vLTw" id="5uFPQ7C23RY" role="37wK5m">
<ref role="3cqZAo" node="5uFPQ7C23RV" resolve="EQ_SYM" />
</node>
<node concept="37vLTw" id="5uFPQ7C24EQ" role="37wK5m">
<ref role="3cqZAo" node="5uFPQ7C24iY" resolve="left" />
</node>
@ -2054,9 +2048,6 @@
<node concept="3clFbS" id="4xBopTzrPWp" role="3clF47">
<node concept="XkiVB" id="4xBopTzrQgb" role="3cqZAp">
<ref role="37wK5l" to="qrld:6Kcfpq7B1f7" resolve="AbstractPredicate" />
<node concept="37vLTw" id="5uFPQ7BZnLE" role="37wK5m">
<ref role="3cqZAo" node="5uFPQ7BZnLB" resolve="ASSERT_SYM" />
</node>
<node concept="37vLTw" id="5uFPQ7C25fP" role="37wK5m">
<ref role="3cqZAo" node="5uFPQ7C251x" resolve="expression" />
</node>

5
languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/var.mps
View File

@ -144,7 +144,6 @@
<node concept="312cEu" id="5$WbtTOYoMb">
<property role="TrG5h" value="LogicalBuiltinConstraint" />
<property role="1sVAO0" value="false" />
<node concept="2tJIrI" id="7ISVfSJpRF" role="jymVt" />
<node concept="2tJIrI" id="5$WbtTOYpQU" role="jymVt" />
<node concept="Wx3nA" id="5uFPQ7C26$b" role="jymVt">
<property role="TrG5h" value="BOUND_SYM" />
@ -157,7 +156,7 @@
<node concept="1pGfFk" id="5uFPQ7C26X5" role="2ShVmc">
<ref role="37wK5l" to="qrld:5uFPQ7B$$fT" resolve="PredicateSymbol" />
<node concept="Xl_RD" id="5uFPQ7C272B" role="37wK5m">
<property role="Xl_RC" value="bound" />
<property role="Xl_RC" value="isNonVar" />
</node>
<node concept="3cmrfG" id="5uFPQ7C276T" role="37wK5m">
<property role="3cmrfH" value="1" />
@ -177,7 +176,7 @@
<node concept="1pGfFk" id="5uFPQ7C279C" role="2ShVmc">
<ref role="37wK5l" to="qrld:5uFPQ7B$$fT" resolve="PredicateSymbol" />
<node concept="Xl_RD" id="5uFPQ7C279D" role="37wK5m">
<property role="Xl_RC" value="free" />
<property role="Xl_RC" value="isVar" />
</node>
<node concept="3cmrfG" id="5uFPQ7C279E" role="37wK5m">
<property role="3cmrfH" value="1" />

21
solutions/jetbrains.mps.typechecking.handling/models/jetbrains/mps/typechecking/handler/producer.mps
View File

@ -726,13 +726,6 @@
</node>
<node concept="3clFbF" id="ZqZbw4Sir2" role="3cqZAp">
<node concept="37vLTI" id="ZqZbw4SjaZ" role="3clFbG">
<node concept="2YIFZM" id="ZqZbw4SkvJ" role="37vLTx">
<ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<node concept="37vLTw" id="ZqZbw4SkC2" role="37wK5m">
<ref role="3cqZAo" node="ZqZbw4S7uo" resolve="sym" />
</node>
</node>
<node concept="2OqwBi" id="ZqZbw4Siu$" role="37vLTJ">
<node concept="37vLTw" id="ZqZbw4Sir0" role="2Oq$k0">
<ref role="3cqZAo" node="ZqZbw4SgSk" resolve="cdeclNode" />
@ -741,6 +734,14 @@
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
<node concept="2OqwBi" id="3ec9Qj4Ph$E" role="37vLTx">
<node concept="37vLTw" id="ZqZbw4SkC2" role="2Oq$k0">
<ref role="3cqZAo" node="ZqZbw4S7uo" resolve="sym" />
</node>
<node concept="liA8E" id="3ec9Qj4PhBb" role="2OqNvi">
<ref role="37wK5l" to="qrld:54i3FxcZMvt" resolve="id" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="xMpT0BhQwy" role="3cqZAp" />
@ -2988,7 +2989,7 @@
</node>
<node concept="liA8E" id="5uFPQ7BM_qD" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
<node concept="2OqwBi" id="5uFPQ7BM_qE" role="37wK5m">
<node concept="2OqwBi" id="3ec9Qj4KInG" role="37wK5m">
<node concept="2OqwBi" id="5uFPQ7BM_qF" role="2Oq$k0">
<node concept="37vLTw" id="5uFPQ7BRz7x" role="2Oq$k0">
<ref role="3cqZAo" node="5uFPQ7BMz7a" resolve="pred" />
@ -2997,8 +2998,8 @@
<ref role="37wK5l" to="qrld:6Kcfpq7Bjgi" resolve="symbol" />
</node>
</node>
<node concept="liA8E" id="5uFPQ7BM_qI" role="2OqNvi">
<ref role="37wK5l" to="qrld:5uFPQ7B$$w_" resolve="toString" />
<node concept="liA8E" id="3ec9Qj4KItp" role="2OqNvi">
<ref role="37wK5l" to="qrld:54i3FxcZMvt" resolve="id" />
</node>
</node>
</node>