Skip to content

Commit

Permalink
small fixes in harness generator
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielratiu @DomenikP
danielratiu authored and DomenikP committed Feb 26, 2017
1 parent 8c04978 commit d8f9862
Showing 3 changed files with 111 additions and 4 deletions.
65 changes: 63 additions & 2 deletions ...lyses/languages/com.mbeddr.analyses.spin.c.patterns/generator/template/[email protected]
View file
Original file line number Diff line number Diff line change
@@ -47,6 +47,7 @@
<import index="velc" ref="r:1af48fac-0627-4691-aa49-4813fdc5ca8e(com.mbeddr.analyses.spin.c.structure)" />
<import index="5do7" ref="r:42e0f0fc-96f0-4fca-9aeb-f9625e145b23(com.mbeddr.analyses.spin.promela.rt.analyzer)" />
<import index="i3mj" ref="r:828f323f-b068-42aa-8988-4151fb6af01f(com.mbeddr.analyses.spin.promela.patterns.structure)" />
<import index="imq8" ref="r:828869ae-99a6-40b2-b521-4aef1ed3af63(com.mbeddr.analyses.spin.promela.rt.analyzer.model)" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
</imports>
<registry>
@@ -2280,7 +2281,6 @@
</node>
</node>
</node>
<node concept="3clFbH" id="5hi7ucOvPnI" role="3cqZAp" />
<node concept="3clFbF" id="5hi7ucOmXiP" role="3cqZAp">
<node concept="3clFbT" id="5hi7ucOmXiQ" role="3clFbG">
<property role="3clFbU" value="false" />
@@ -2349,7 +2349,6 @@
</node>
</node>
</node>
<node concept="3clFbH" id="4b2d3GUroxs" role="3cqZAp" />
<node concept="3clFbF" id="4b2d3GUriLz" role="3cqZAp">
<node concept="2OqwBi" id="4b2d3GUrk5U" role="3clFbG">
<node concept="2OqwBi" id="4b2d3GUrj3H" role="2Oq$k0">
@@ -2471,6 +2470,25 @@
<node concept="1w9QyX" id="5hi7ucOv6ba" role="3XIRFZ">
<node concept="PhEJO" id="5hi7ucOv6bb" role="1waQm9">
<property role="PhEJT" value="#Default" />
<node concept="17Uvod" id="4ATA_JBle5Q" role="lGtFl">
<property role="P4ACc" value="3bf5377a-e904-4ded-9754-5a516023bfaa/6113173064526131575/6113173064526131578" />
<property role="2qtEX9" value="value" />
<node concept="3zFVjK" id="4ATA_JBle5R" role="3zH0cK">
<node concept="3clFbS" id="4ATA_JBle5S" role="2VODD2">
<node concept="3clFbF" id="4ATA_JBlees" role="3cqZAp">
<node concept="3cpWs3" id="4ATA_JBleP3" role="3clFbG">
<node concept="Xl_RD" id="4ATA_JBleXE" role="3uHU7w">
<property role="Xl_RC" value="Default" />
</node>
<node concept="10M0yZ" id="4ATA_JBlevs" role="3uHU7B">
<ref role="3cqZAo" to="imq8:4ATA_JBl866" resolve="MAJOR_STATE_LHS_PREFIX_MARKER" />
<ref role="1PxDUh" to="imq8:7XCY$_r9H8M" resolve="SpinWhitnessEntry" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1_9egQ" id="5hi7ucOsNI$" role="3XIRFZ">
@@ -2537,6 +2555,25 @@
<node concept="1w9QyX" id="5hi7ucOv5nI" role="3XIRFZ">
<node concept="PhEJO" id="5hi7ucOv5nJ" role="1waQm9">
<property role="PhEJT" value="#Choice" />
<node concept="17Uvod" id="4ATA_JBlgyL" role="lGtFl">
<property role="P4ACc" value="3bf5377a-e904-4ded-9754-5a516023bfaa/6113173064526131575/6113173064526131578" />
<property role="2qtEX9" value="value" />
<node concept="3zFVjK" id="4ATA_JBlgyM" role="3zH0cK">
<node concept="3clFbS" id="4ATA_JBlgyN" role="2VODD2">
<node concept="3clFbF" id="4ATA_JBlgFn" role="3cqZAp">
<node concept="3cpWs3" id="4ATA_JBlh9B" role="3clFbG">
<node concept="Xl_RD" id="4ATA_JBlhiq" role="3uHU7w">
<property role="Xl_RC" value="Choice" />
</node>
<node concept="10M0yZ" id="4ATA_JBlgNV" role="3uHU7B">
<ref role="3cqZAo" to="imq8:4ATA_JBl866" resolve="MAJOR_STATE_LHS_PREFIX_MARKER" />
<ref role="1PxDUh" to="imq8:7XCY$_r9H8M" resolve="SpinWhitnessEntry" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="PhEJO" id="5hi7ucOv5nK" role="1waQl2">
<property role="PhEJT" value="N" />
@@ -2636,6 +2673,25 @@
<node concept="1w9QyX" id="5hi7ucOv4e8" role="3XIRFZ">
<node concept="PhEJO" id="5hi7ucOv4e9" role="1waQm9">
<property role="PhEJT" value="#Choice" />
<node concept="17Uvod" id="4ATA_JBliuh" role="lGtFl">
<property role="P4ACc" value="3bf5377a-e904-4ded-9754-5a516023bfaa/6113173064526131575/6113173064526131578" />
<property role="2qtEX9" value="value" />
<node concept="3zFVjK" id="4ATA_JBliui" role="3zH0cK">
<node concept="3clFbS" id="4ATA_JBliuj" role="2VODD2">
<node concept="3clFbF" id="4ATA_JBliAR" role="3cqZAp">
<node concept="3cpWs3" id="4ATA_JBlj5j" role="3clFbG">
<node concept="Xl_RD" id="4ATA_JBljei" role="3uHU7w">
<property role="Xl_RC" value="Choice" />
</node>
<node concept="10M0yZ" id="4ATA_JBliJr" role="3uHU7B">
<ref role="3cqZAo" to="imq8:4ATA_JBl866" resolve="MAJOR_STATE_LHS_PREFIX_MARKER" />
<ref role="1PxDUh" to="imq8:7XCY$_r9H8M" resolve="SpinWhitnessEntry" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="PhEJO" id="5hi7ucOv4ea" role="1waQl2">
<property role="PhEJT" value="N" />
@@ -2734,6 +2790,11 @@
<property role="19_wF3" value="\#include &lt;stdbool.h&gt;" />
</node>
</node>
<node concept="1PSHZ" id="4ATA_JBmQ5G" role="fMItF">
<node concept="19_wF0" id="4ATA_JBmQ5H" role="19_wF2">
<property role="19_wF3" value="\#include &lt;stdint.h&gt;" />
</node>
</node>
</node>
<node concept="1S7NMz" id="6efVUW9vjkr" role="N3F5h">
<property role="TrG5h" value="dummy" />
10 changes: 8 additions & 2 deletions ...m.mbeddr.analyses.spin.promela.rt/models/com/mbeddr/analyses/spin/promela/rt/analyzer.mps
View file
Original file line number Diff line number Diff line change
@@ -1164,8 +1164,14 @@
<property role="3TUv4t" value="true" />
<node concept="17QB3L" id="36pDmrEZV9z" role="1tU5fm" />
<node concept="3Tm1VV" id="36pDmrEZV9$" role="1B3o_S" />
<node concept="Xl_RD" id="36pDmrEZV9_" role="33vP2m">
<property role="Xl_RC" value="#Iteration" />
<node concept="3cpWs3" id="4ATA_JBl9Me" role="33vP2m">
<node concept="10M0yZ" id="4ATA_JBldU$" role="3uHU7B">
<ref role="3cqZAo" to="imq8:4ATA_JBl866" resolve="MAJOR_STATE_LHS_PREFIX_MARKER" />
<ref role="1PxDUh" to="imq8:7XCY$_r9H8M" resolve="SpinWhitnessEntry" />
</node>
<node concept="Xl_RD" id="36pDmrEZV9_" role="3uHU7w">
<property role="Xl_RC" value="Iteration" />
</node>
</node>
</node>
<node concept="2tJIrI" id="7XCY$_rajCk" role="jymVt" />
40 changes: 40 additions & 0 deletions ...dr.analyses.spin.promela.rt/models/com/mbeddr/analyses/spin/promela/rt/analyzer/model.mps
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@
<child id="1068498886297" name="rValue" index="37vLTx" />
<child id="1068498886295" name="lValue" index="37vLTJ" />
</concept>
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
<concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
<concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
@@ -38,6 +39,10 @@
<reference id="1083260308426" name="enumConstantDeclaration" index="Rm8GQ" />
<reference id="1144432896254" name="enumClass" index="1Px2BO" />
</concept>
<concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA">
<property id="6468716278899126575" name="isVolatile" index="2dlcS1" />
<property id="6468716278899125786" name="isTransient" index="2dld4O" />
</concept>
<concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
<concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
<property id="1070475926801" name="value" index="Xl_RC" />
@@ -53,6 +58,7 @@
</concept>
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
<property id="1176718929932" name="isFinal" index="3TUv4t" />
<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" />
@@ -77,6 +83,11 @@
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
<child id="1068580123156" name="expression" index="3clFbG" />
</concept>
<concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
<concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
<child id="1068580123160" name="condition" index="3clFbw" />
<child id="1068580123161" name="ifTrue" index="3clFbx" />
</concept>
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
<child id="1068581517665" name="statement" index="3cqZAp" />
</concept>
@@ -89,6 +100,7 @@
<concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
</concept>
<concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
<child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
@@ -799,6 +811,18 @@
<ref role="3uigEE" to="npwl:1EZfgaQmLrT" resolve="IWhitnessEntry" />
</node>
<node concept="2tJIrI" id="7XCY$_r9MI4" role="jymVt" />
<node concept="Wx3nA" id="4ATA_JBl866" role="jymVt">
<property role="2dlcS1" value="false" />
<property role="2dld4O" value="false" />
<property role="TrG5h" value="MAJOR_STATE_LHS_PREFIX_MARKER" />
<property role="3TUv4t" value="true" />
<node concept="3Tm1VV" id="4ATA_JBl7XQ" role="1B3o_S" />
<node concept="Xl_RD" id="4ATA_JBl8dO" role="33vP2m">
<property role="Xl_RC" value="#" />
</node>
<node concept="17QB3L" id="4ATA_JBl8cp" role="1tU5fm" />
</node>
<node concept="2tJIrI" id="4ATA_JBl7RB" role="jymVt" />
<node concept="312cEg" id="2lN4cj_MEyJ" role="jymVt">
<property role="34CwA1" value="false" />
<property role="eg7rD" value="false" />
@@ -960,6 +984,22 @@
<node concept="3Tm1VV" id="7XCY$_r9MIu" role="1B3o_S" />
<node concept="10P_77" id="7XCY$_r9MIv" role="3clF45" />
<node concept="3clFbS" id="7XCY$_r9MIx" role="3clF47">
<node concept="3clFbJ" id="4ATA_JBl3lP" role="3cqZAp">
<node concept="3clFbS" id="4ATA_JBl3lR" role="3clFbx">
<node concept="3clFbH" id="4ATA_JBl3lQ" role="3cqZAp" />
</node>
<node concept="2OqwBi" id="4ATA_JBl3C_" role="3clFbw">
<node concept="37vLTw" id="4ATA_JBl3mz" role="2Oq$k0">
<ref role="3cqZAo" node="2lN4cj_MEyJ" resolve="lhs" />
</node>
<node concept="liA8E" id="4ATA_JBl4d_" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String):boolean" resolve="startsWith" />
<node concept="37vLTw" id="4ATA_JBlkV$" role="37wK5m">
<ref role="3cqZAo" node="4ATA_JBl866" resolve="MAJOR_STATE_LHS_PREFIX_MARKER" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="7XCY$_r9MI$" role="3cqZAp">
<node concept="3clFbT" id="7XCY$_r9MIz" role="3clFbG" />
</node>

0 comments on commit d8f9862

Please sign in to comment.