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

Displaying failures as error nodes in the activation trace, navigate to the first failure. Minor fixes.

This commit is contained in:
Fedor Isakov 2016-04-04 16:03:36 +02:00
parent 2c6dbd433e
commit 5bcf1ce3d6
5 changed files with 1623 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -827,6 +827,19 @@
<node concept="3Tm1VV" id="2UGjFq48k4N" role="1B3o_S" />
<node concept="3clFbS" id="2UGjFq48k4R" role="3clF47" />
</node>
<node concept="3clFb_" id="7vxJ_H4tnOC" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="failure" />
<node concept="37vLTG" id="7vxJ_H4tnOD" role="3clF46">
<property role="TrG5h" value="fail" />
<node concept="3uibUv" id="7vxJ_H4tnOE" role="1tU5fm">
<ref role="3uigEE" to="qrld:7vxJ_H4qn42" resolve="EvaluationFailureException" />
</node>
</node>
<node concept="3cqZAl" id="7vxJ_H4tnOF" role="3clF45" />
<node concept="3Tm1VV" id="7vxJ_H4tnOG" role="1B3o_S" />
<node concept="3clFbS" id="7vxJ_H4tnOK" role="3clF47" />
</node>
<node concept="3Tm1VV" id="24Vro6cS5SP" role="1B3o_S" />
<node concept="3clFb_" id="7feMCq_cIyn" role="jymVt">
<property role="1EzhhJ" value="false" />

37
logic/solutions/jetbrains.mps.logic.jchr/models/jetbrains/mps/logic/jchr/program.mps
View File

@ -163,9 +163,6 @@
</concept>
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
<concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
<concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
<child id="1079359253376" name="expression" index="1eOMHV" />
</concept>
<concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
@ -1648,29 +1645,6 @@
<node concept="3clFbH" id="7feMCq_c0I4" role="3cqZAp" />
<node concept="3clFbJ" id="7feMCq_c1nB" role="3cqZAp">
<node concept="3clFbS" id="7feMCq_c1nD" role="3clFbx">
<node concept="3cpWs8" id="7feMCq_c3KS" role="3cqZAp">
<node concept="3cpWsn" id="7feMCq_c3KT" role="3cpWs9">
<property role="TrG5h" value="message" />
<node concept="3uibUv" id="7feMCq_c3KN" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
</node>
<node concept="2OqwBi" id="7feMCq_c3KU" role="33vP2m">
<node concept="1eOMI4" id="7feMCq_c3KV" role="2Oq$k0">
<node concept="10QFUN" id="7feMCq_c3KW" role="1eOMHV">
<node concept="3uibUv" id="7feMCq_c3KX" role="10QFUM">
<ref role="3uigEE" to="eifs:~FailureException" resolve="FailureException" />
</node>
<node concept="37vLTw" id="7feMCq_c3KY" role="10QFUP">
<ref role="3cqZAo" node="41ox5VneSgC" resolve="exception" />
</node>
</node>
</node>
<node concept="liA8E" id="7feMCq_c3KZ" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="7feMCq_d5O3" role="3cqZAp">
<node concept="3clFbS" id="7feMCq_d5O5" role="3clFbx">
<node concept="3clFbF" id="7feMCq_d6yU" role="3cqZAp">
@ -1679,9 +1653,14 @@
<ref role="3cqZAo" node="7feMCq_d56g" resolve="computingTracer" />
</node>
<node concept="liA8E" id="7feMCq_d6Sw" role="2OqNvi">
<ref role="37wK5l" to="qrld:7feMCq_cIni" resolve="reportFailure" />
<node concept="37vLTw" id="7feMCq_d7dp" role="37wK5m">
<ref role="3cqZAo" node="7feMCq_c3KT" resolve="message" />
<ref role="37wK5l" to="qrld:7vxJ_H4th$o" resolve="failure" />
<node concept="2ShNRf" id="7vxJ_H4u2Pw" role="37wK5m">
<node concept="1pGfFk" id="7vxJ_H4u2Pn" role="2ShVmc">
<ref role="37wK5l" to="qrld:7vxJ_H4qqnq" resolve="EvaluationFailureException" />
<node concept="37vLTw" id="7vxJ_H4u2QX" role="37wK5m">
<ref role="3cqZAo" node="41ox5VneSgC" resolve="exception" />
</node>
</node>
</node>
</node>
</node>

76
logic/solutions/jetbrains.mps.logic.reactor/models/jetbrains/mps/logic/reactor/evaluation.mps
View File

@ -44,6 +44,7 @@
</concept>
<concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
<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>
@ -73,6 +74,7 @@
<concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
<property id="1075300953594" name="abstractClass" index="1sVAO0" />
<child id="1095933932569" name="implementedInterface" index="EKbjA" />
<child id="1165602531693" name="superclass" index="1zkMxy" />
</concept>
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
<property id="1176718929932" name="isFinal" index="3TUv4t" />
@ -1283,6 +1285,20 @@
<node concept="3clFbS" id="2UGjFq48iLQ" role="3clF47" />
</node>
<node concept="2tJIrI" id="qubcdtxLy5" role="jymVt" />
<node concept="3clFb_" id="7vxJ_H4th$o" role="jymVt">
<property role="1EzhhJ" value="true" />
<property role="TrG5h" value="failure" />
<node concept="37vLTG" id="7vxJ_H4th$p" role="3clF46">
<property role="TrG5h" value="fail" />
<node concept="3uibUv" id="7vxJ_H4tn9n" role="1tU5fm">
<ref role="3uigEE" node="7vxJ_H4qn42" resolve="EvaluationFailureException" />
</node>
</node>
<node concept="3cqZAl" id="7vxJ_H4th$r" role="3clF45" />
<node concept="3Tm1VV" id="7vxJ_H4th$s" role="1B3o_S" />
<node concept="3clFbS" id="7vxJ_H4th$t" role="3clF47" />
</node>
<node concept="2tJIrI" id="7vxJ_H4tlg_" role="jymVt" />
<node concept="3clFb_" id="7feMCq_cIni" role="jymVt">
<property role="1EzhhJ" value="true" />
<property role="TrG5h" value="reportFailure" />
@ -1293,6 +1309,9 @@
<node concept="3cqZAl" id="7feMCq_cInl" role="3clF45" />
<node concept="3Tm1VV" id="7feMCq_cInm" role="1B3o_S" />
<node concept="3clFbS" id="7feMCq_cInn" role="3clF47" />
<node concept="2AHcQZ" id="7vxJ_H4tqK5" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
</node>
</node>
<node concept="2tJIrI" id="7feMCq_cIlr" role="jymVt" />
<node concept="Wx3nA" id="4ut_d$0E9Px" role="jymVt">
@ -1441,6 +1460,19 @@
<node concept="3Tm1VV" id="2UGjFq48jzF" role="1B3o_S" />
<node concept="3clFbS" id="2UGjFq48jzI" role="3clF47" />
</node>
<node concept="3clFb_" id="7vxJ_H4tnme" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="failure" />
<node concept="37vLTG" id="7vxJ_H4tnmf" role="3clF46">
<property role="TrG5h" value="fail" />
<node concept="3uibUv" id="7vxJ_H4tnmg" role="1tU5fm">
<ref role="3uigEE" node="7vxJ_H4qn42" resolve="EvaluationFailureException" />
</node>
</node>
<node concept="3cqZAl" id="7vxJ_H4tnmh" role="3clF45" />
<node concept="3Tm1VV" id="7vxJ_H4tnmi" role="1B3o_S" />
<node concept="3clFbS" id="7vxJ_H4tnml" role="3clF47" />
</node>
<node concept="3clFb_" id="4ut_d$0EaYR" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="reportFailure" />
@ -1933,5 +1965,49 @@
<ref role="3uigEE" to="rchb:2UGjFq4fSyv" resolve="PredicateFactory" />
</node>
</node>
<node concept="312cEu" id="7vxJ_H4qn42">
<property role="TrG5h" value="EvaluationFailureException" />
<node concept="2tJIrI" id="7vxJ_H4qqkR" role="jymVt" />
<node concept="3clFbW" id="7vxJ_H4qql2" role="jymVt">
<node concept="37vLTG" id="7vxJ_H4qqle" role="3clF46">
<property role="TrG5h" value="message" />
<node concept="17QB3L" id="7vxJ_H4qqlj" role="1tU5fm" />
</node>
<node concept="3cqZAl" id="7vxJ_H4qql4" role="3clF45" />
<node concept="3Tm1VV" id="7vxJ_H4qql5" role="1B3o_S" />
<node concept="3clFbS" id="7vxJ_H4qql6" role="3clF47">
<node concept="XkiVB" id="7vxJ_H4qqlI" role="3cqZAp">
<ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
<node concept="37vLTw" id="7vxJ_H4qqlY" role="37wK5m">
<ref role="3cqZAo" node="7vxJ_H4qqle" resolve="message" />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="7vxJ_H4qqkW" role="jymVt" />
<node concept="3clFbW" id="7vxJ_H4qqnq" role="jymVt">
<node concept="3cqZAl" id="7vxJ_H4qqns" role="3clF45" />
<node concept="3Tm1VV" id="7vxJ_H4qqnt" role="1B3o_S" />
<node concept="3clFbS" id="7vxJ_H4qqnu" role="3clF47">
<node concept="XkiVB" id="7vxJ_H4qqom" role="3cqZAp">
<ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.Throwable)" resolve="RuntimeException" />
<node concept="37vLTw" id="7vxJ_H4qqoA" role="37wK5m">
<ref role="3cqZAo" node="7vxJ_H4qqnW" resolve="cause" />
</node>
</node>
</node>
<node concept="37vLTG" id="7vxJ_H4qqnW" role="3clF46">
<property role="TrG5h" value="cause" />
<node concept="3uibUv" id="7vxJ_H4qqnV" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
</node>
</node>
</node>
<node concept="2tJIrI" id="7vxJ_H4qqn1" role="jymVt" />
<node concept="3Tm1VV" id="7vxJ_H4qn43" role="1B3o_S" />
<node concept="3uibUv" id="7vxJ_H4qqka" role="1zkMxy">
<ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
</node>
</node>
</model>

1573
typechecking/solutions/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

2
typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
View File

@ -12631,7 +12631,7 @@
<node concept="YS8fn" id="2UGjFq4pFcT" role="3cqZAp">
<node concept="2ShNRf" id="2UGjFq4pFcU" role="YScLw">
<node concept="1pGfFk" id="2UGjFq4pFcV" role="2ShVmc">
<ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
<ref role="37wK5l" to="qrld:7vxJ_H4qql2" resolve="EvaluationFailureException" />
<node concept="3cpWs3" id="2UGjFq4pFcW" role="37wK5m">
<node concept="2OqwBi" id="2UGjFq4pGID" role="3uHU7w">
<node concept="2OqwBi" id="2UGjFq4pG$q" role="2Oq$k0">