Skip to content

Commit

Permalink
Merge branch 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomcat7 committed May 8, 2016
2 parents 202d4a2 + 1132ede commit 525e560
Show file tree
Hide file tree
Showing 3 changed files with 96 additions and 42 deletions.
90 changes: 49 additions & 41 deletions ...nguages/com.mbeddr.analyses.cbmc.rt/models/com/mbeddr/analyses/cbmc/rt/analyses/loops.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
<import index="q9jj" ref="r:9bb65e44-f83e-4e38-ac95-7e443359a2f7(com.mbeddr.analyses.utils.log)" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
</imports>
<registry>
Expand Down Expand Up @@ -103,7 +104,6 @@
<concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
<property id="1178608670077" name="isAbstract" index="1EzhhJ" />
</concept>
<concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
<child id="1068580123156" name="expression" index="3clFbG" />
</concept>
Expand All @@ -119,9 +119,7 @@
<property id="1068580123138" name="value" index="3clFbU" />
</concept>
<concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
<concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
<property id="1068580320021" name="value" index="3cmrfH" />
</concept>
<concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
<concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
<child id="1068581517676" name="expression" index="3cqZAk" />
</concept>
Expand Down Expand Up @@ -187,6 +185,7 @@
<concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
<child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
</concept>
<concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
<concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS" />
<concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
<child id="1180636770616" name="createdType" index="3zrR0E" />
Expand Down Expand Up @@ -223,9 +222,6 @@
<concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
<child id="1151688676805" name="elementType" index="_ZDj9" />
</concept>
<concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
<child id="1151689745422" name="elementType" index="A3Ik2" />
</concept>
<concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
<child id="1153944400369" name="variable" index="2Gsz3X" />
<child id="1153944424730" name="inputSequence" index="2GsD0m" />
Expand All @@ -242,7 +238,6 @@
<concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
<concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
<concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
<child id="1197683466920" name="keyType" index="3rvQeY" />
<child id="1197683475734" name="valueType" index="3rvSg0" />
Expand All @@ -251,7 +246,6 @@
<child id="1197687026896" name="keyType" index="3rHrn6" />
<child id="1197687035757" name="valueType" index="3rHtpV" />
</concept>
<concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
<concept id="1240824834947" name="jetbrains.mps.baseLanguage.collections.structure.ValueAccessOperation" flags="nn" index="3AV6Ez" />
<concept id="1240825616499" name="jetbrains.mps.baseLanguage.collections.structure.KeyAccessOperation" flags="nn" index="3AY5_j" />
<concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
Expand Down Expand Up @@ -633,28 +627,11 @@
</node>
</node>
</node>
<node concept="3cpWs8" id="1$MI$rgLeZO" role="3cqZAp">
<node concept="3cpWsn" id="1$MI$rgLeZP" role="3cpWs9">
<property role="TrG5h" value="possibleLoopStatements" />
<node concept="A3Dl8" id="1$MI$rgLeZg" role="1tU5fm">
<node concept="3Tqbb2" id="1$MI$rgLeZj" role="A3Ik2">
<ref role="ehGHo" to="c4fa:7HkFchP0Cf3" resolve="ILoopStatement" />
</node>
</node>
<node concept="2OqwBi" id="1$MI$rgLeZQ" role="33vP2m">
<node concept="37vLTw" id="1$MI$rgLeZR" role="2Oq$k0">
<ref role="3cqZAo" node="3x0R1LIQ83I" resolve="allPossibleOriginalNodes" />
</node>
<node concept="v3k3i" id="1$MI$rgLeZS" role="2OqNvi">
<node concept="chp4Y" id="1$MI$rgLeZT" role="v3oSu">
<ref role="cht4Q" to="c4fa:7HkFchP0Cf3" resolve="ILoopStatement" />
</node>
</node>
</node>
<node concept="2Gpval" id="5uusKVkJ6yT" role="3cqZAp">
<node concept="2GrKxI" id="5uusKVkJ6yV" role="2Gsz3X">
<property role="TrG5h" value="ls" />
</node>
</node>
<node concept="3clFbJ" id="1$MI$rgLI_x" role="3cqZAp">
<node concept="3clFbS" id="1$MI$rgLI_z" role="3clFbx">
<node concept="3clFbS" id="5uusKVkJ6yX" role="2LFqv$">
<node concept="3clFbF" id="5etR5IKktVA" role="3cqZAp">
<node concept="37vLTI" id="5etR5IKkI1i" role="3clFbG">
<node concept="2OqwBi" id="5etR5IKkTmv" role="37vLTx">
Expand All @@ -669,25 +646,56 @@
<node concept="37vLTw" id="5etR5IKktV$" role="3ElQJh">
<ref role="3cqZAo" node="5etR5IKiSdk" resolve="loopStatements2Id" />
</node>
<node concept="2OqwBi" id="5etR5IKkNCY" role="3ElVtu">
<node concept="37vLTw" id="5etR5IKkNCZ" role="2Oq$k0">
<ref role="3cqZAo" node="1$MI$rgLeZP" resolve="possibleLoopStatements" />
<node concept="2GrUjf" id="5uusKVkJ960" role="3ElVtu">
<ref role="2Gs0qQ" node="5uusKVkJ6yV" resolve="ls" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="5uusKVkJgqG" role="3cqZAp">
<node concept="2YIFZM" id="5uusKVkJgqH" role="3clFbG">
<ref role="1Pybhc" to="q9jj:SWpRmW$Kvn" resolve="MbeddrLogger" />
<ref role="37wK5l" to="q9jj:sn0OadN1wd" resolve="debug" />
<node concept="37vLTw" id="5uusKVkJgsm" role="37wK5m">
<ref role="3cqZAo" node="1Cle9_ntxQ" resolve="DEBUG" />
</node>
<node concept="3cpWs3" id="5uusKVkJiYT" role="37wK5m">
<node concept="2OqwBi" id="5uusKVkJjZA" role="3uHU7w">
<node concept="2OqwBi" id="5uusKVkJjx$" role="2Oq$k0">
<node concept="2GrUjf" id="5uusKVkJjjD" role="2Oq$k0">
<ref role="2Gs0qQ" node="5uusKVkJ6yV" resolve="ls" />
</node>
<node concept="2yIwOk" id="5uusKVkJjPf" role="2OqNvi" />
</node>
<node concept="liA8E" id="5uusKVkJkke" role="2OqNvi">
<ref role="37wK5l" to="c17a:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
</node>
</node>
<node concept="3cpWs3" id="5uusKVkJhCP" role="3uHU7B">
<node concept="2OqwBi" id="5uusKVkJgqI" role="3uHU7B">
<node concept="2GrUjf" id="5uusKVkJgOA" role="2Oq$k0">
<ref role="2Gs0qQ" node="1$MI$rgHj51" resolve="l" />
</node>
<node concept="2S8uIT" id="5uusKVkJgqK" role="2OqNvi">
<ref role="2S8YL0" to="rbq9:1$MI$rgH1u2" resolve="loopId" />
</node>
</node>
<node concept="Xl_RD" id="5uusKVkJhWO" role="3uHU7w">
<property role="Xl_RC" value=" -&gt; " />
</node>
<node concept="1uHKPH" id="5etR5IKkND0" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbC" id="1$MI$rgLJhR" role="3clFbw">
<node concept="3cmrfG" id="1$MI$rgLJor" role="3uHU7w">
<property role="3cmrfH" value="1" />
<node concept="2OqwBi" id="5uusKVkJ7pK" role="2GsD0m">
<node concept="37vLTw" id="5uusKVkJ73u" role="2Oq$k0">
<ref role="3cqZAo" node="3x0R1LIQ83I" resolve="allPossibleOriginalNodes" />
</node>
<node concept="2OqwBi" id="1$MI$rgLJ1d" role="3uHU7B">
<node concept="37vLTw" id="1$MI$rgLIQz" role="2Oq$k0">
<ref role="3cqZAo" node="1$MI$rgLeZP" resolve="possibleLoopStatements" />
<node concept="v3k3i" id="5uusKVkJ8uJ" role="2OqNvi">
<node concept="chp4Y" id="5uusKVkJ8Au" role="v3oSu">
<ref role="cht4Q" to="c4fa:7HkFchP0Cf3" resolve="ILoopStatement" />
</node>
<node concept="34oBXx" id="1$MI$rgLJ8L" role="2OqNvi" />
</node>
</node>
</node>
Expand Down
32 changes: 31 additions & 1 deletion ...ddr.analyses.cbmc.rt/models/com/mbeddr/analyses/cbmc/rt/counterexample/lifted/builder.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,7 @@
<concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
<child id="5686963296372573084" name="elementType" index="3O5elw" />
</concept>
<concept id="1178894719932" name="jetbrains.mps.baseLanguage.collections.structure.DistinctOperation" flags="nn" index="1VAtEI" />
</language>
</registry>
<node concept="312cEu" id="6GZ1x5GshiS">
Expand Down Expand Up @@ -5716,6 +5717,35 @@
</node>
</node>
</node>
<node concept="3clFbF" id="5uusKVkKkfA" role="3cqZAp">
<node concept="37vLTI" id="5uusKVkKk$H" role="3clFbG">
<node concept="3K4zz7" id="5uusKVkKmbz" role="37vLTx">
<node concept="2OqwBi" id="5uusKVkKo7i" role="3K4E3e">
<node concept="2OqwBi" id="5uusKVkKmpb" role="2Oq$k0">
<node concept="37vLTw" id="5uusKVkKmet" role="2Oq$k0">
<ref role="3cqZAo" node="4a8JajkM8BC" resolve="originalNodes" />
</node>
<node concept="1VAtEI" id="5uusKVkKnym" role="2OqNvi" />
</node>
<node concept="ANE8D" id="5uusKVkKoh0" role="2OqNvi" />
</node>
<node concept="2ShNRf" id="5uusKVkKoi$" role="3K4GZi">
<node concept="2T8Vx0" id="5uusKVkKpTf" role="2ShVmc">
<node concept="2I9FWS" id="5uusKVkKpTh" role="2T96Bj" />
</node>
</node>
<node concept="3y3z36" id="5uusKVkKm7w" role="3K4Cdx">
<node concept="10Nm6u" id="5uusKVkKm9H" role="3uHU7w" />
<node concept="37vLTw" id="5uusKVkKkBj" role="3uHU7B">
<ref role="3cqZAo" node="4a8JajkM8BC" resolve="originalNodes" />
</node>
</node>
</node>
<node concept="37vLTw" id="5uusKVkKkf$" role="37vLTJ">
<ref role="3cqZAo" node="4a8JajkM8BC" resolve="originalNodes" />
</node>
</node>
</node>
<node concept="3clFbJ" id="4a8JajkM8C0" role="3cqZAp">
<node concept="1Wc70l" id="4a8JajkM8C_" role="3clFbw">
<node concept="3clFbT" id="4a8JajkM8CA" role="3uHU7w">
Expand Down Expand Up @@ -6294,7 +6324,7 @@
<node concept="3clFbF" id="3RNYYaJ2Fra" role="3cqZAp">
<node concept="2YIFZM" id="3RNYYaJ2GfF" role="3clFbG">
<ref role="37wK5l" to="q9jj:SWpRmW$KWu" resolve="logError" />
<ref role="1Pybhc" to="q9jj:SWpRmW$Kvn" resolve="Logger" />
<ref role="1Pybhc" to="q9jj:SWpRmW$Kvn" resolve="MbeddrLogger" />
<node concept="2OqwBi" id="3RNYYaJ2H0N" role="37wK5m">
<node concept="Xjq3P" id="3RNYYaJ2GrI" role="2Oq$k0" />
<node concept="liA8E" id="3RNYYaJ2Hru" role="2OqNvi">
Expand Down
16 changes: 16 additions & 0 deletions ...mbeddr.mpsutil.jfreechart.runtime/models/com/mbeddr/mpsutil/jfreechart/runtime/plugin.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,22 @@
</node>
<node concept="2UmK3q" id="75t_nimFd6p" role="2Um5zG">
<node concept="3clFbS" id="75t_nimFd6q" role="2VODD2">
<node concept="3clFbF" id="1cPvvekEyJx" role="3cqZAp">
<node concept="37vLTI" id="1cPvvekEyOo" role="3clFbG">
<node concept="2ShNRf" id="1cPvvekEyR1" role="37vLTx">
<node concept="1pGfFk" id="1cPvvekEyQl" role="2ShVmc">
<ref role="37wK5l" node="7uOgiT959T" resolve="ChartManager" />
<node concept="2WthIp" id="1cPvvekEyT2" role="37wK5m" />
</node>
</node>
<node concept="2OqwBi" id="1cPvvekEyJr" role="37vLTJ">
<node concept="2WthIp" id="1cPvvekEyJu" role="2Oq$k0" />
<node concept="2BZ7hE" id="1cPvvekEyJw" role="2OqNvi">
<ref role="2WH_rO" node="7uOgiT8Uq1" resolve="myChartManager" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="75t_nimFdlj" role="3cqZAp">
<node concept="2OqwBi" id="75t_nimFdld" role="3clFbG">
<node concept="2WthIp" id="75t_nimFdlg" role="2Oq$k0" />
Expand Down

0 comments on commit 525e560

Please sign in to comment.