Skip to content

Commit

Permalink
minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@El-Khalilov
El-Khalilov committed Mar 2, 2017
1 parent 06b41ce commit 41db0bc
Show file tree
Hide file tree
Showing 6 changed files with 260 additions and 1,026 deletions.
190 changes: 97 additions & 93 deletions ...g.clafer.mps/languages/org.clafer.architecture.core/generator/template/[email protected]
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,120 +485,124 @@
<ref role="v9R2y" node="1kFIkf_ovVI" resolve="reduce_FragmentRef" />
</node>
</node>
<node concept="3aamgX" id="1kFIkf_wdEF" role="3acgRq">
<ref role="30HIoZ" to="xnt3:1kFIkf_9FX9" resolve="FragmentRefExpr" />
<node concept="1Koe21" id="1kFIkf_we$M" role="1lVwrX">
<node concept="UzPwm" id="1kFIkf_we$S" role="1Koe22">
<property role="3wNgFz" value="0" />
<property role="TrG5h" value="_Module_" />
<node concept="UH0sd" id="1kFIkf_we$V" role="UzTCv">
<property role="TrG5h" value="ref" />
<node concept="UH0sd" id="yM9JMK5qcR" role="2vwUiP">
<property role="TrG5h" value="subref" />
<node concept="1X3_iC" id="71szcjGO7oi" role="lGtFl">
<property role="3V$3am" value="reductionMappingRule" />
<property role="3V$3ak" value="b401a680-8325-4110-8fd3-84331ff25bef/1095416546421/1167328349397" />
<node concept="3aamgX" id="1kFIkf_wdEF" role="8Wnug">
<ref role="30HIoZ" to="xnt3:1kFIkf_9FX9" resolve="FragmentRefExpr" />
<node concept="1Koe21" id="1kFIkf_we$M" role="1lVwrX">
<node concept="UzPwm" id="1kFIkf_we$S" role="1Koe22">
<property role="3wNgFz" value="0" />
<property role="TrG5h" value="_Module_" />
<node concept="UH0sd" id="1kFIkf_we$V" role="UzTCv">
<property role="TrG5h" value="ref" />
<node concept="UH0sd" id="yM9JMK5qcR" role="2vwUiP">
<property role="TrG5h" value="subref" />
</node>
<node concept="UzEYP" id="yM9JMK5qdV" role="2vwUiP" />
</node>
<node concept="UzEYP" id="yM9JMK5qdV" role="2vwUiP" />
</node>
<node concept="2vxuzR" id="1kFIkf_we_0" role="UzTCv">
<node concept="2qmXGp" id="yM9JMK5qfs" role="3WnoGb">
<node concept="raruj" id="yM9JMK5qfR" role="lGtFl" />
<node concept="ZpONE" id="yM9JMK5qfi" role="1_9fRO">
<ref role="ZpOSt" node="1kFIkf_we$V" resolve="ref" />
<node concept="1ZhdrF" id="yM9JMK5qfZ" role="lGtFl">
<property role="P3scX" value="137e622e-709a-48af-8f85-420e945711de/2851923306472496585/2851923306472496958" />
<property role="2qtEX8" value="clafer" />
<node concept="3$xsQk" id="yM9JMK5qg0" role="3$ytzL">
<node concept="3clFbS" id="yM9JMK5qg1" role="2VODD2">
<node concept="3cpWs8" id="yM9JMK5XQH" role="3cqZAp">
<node concept="3cpWsn" id="yM9JMK5XQK" role="3cpWs9">
<property role="TrG5h" value="original" />
<node concept="3Tqbb2" id="yM9JMK5XQL" role="1tU5fm">
<ref role="ehGHo" to="xnt3:1kFIkf$RTXv" resolve="FragmentRef" />
</node>
<node concept="2OqwBi" id="yM9JMK5XQM" role="33vP2m">
<node concept="1PxgMI" id="yM9JMK5XQN" role="2Oq$k0">
<ref role="1PxNhF" to="xnt3:1kFIkf$RTXv" resolve="FragmentRef" />
<node concept="2OqwBi" id="yM9JMK5XQO" role="1PxMeX">
<node concept="1iwH7S" id="yM9JMK5XQP" role="2Oq$k0" />
<node concept="12$id9" id="yM9JMK5XQQ" role="2OqNvi">
<node concept="2OqwBi" id="yM9JMK5XQR" role="12$y8L">
<node concept="30H73N" id="yM9JMK6dNm" role="2Oq$k0" />
<node concept="3TrEf2" id="yM9JMK6dW$" role="2OqNvi">
<ref role="3Tt5mk" to="xnt3:1kFIkf_edvs" />
<node concept="2vxuzR" id="1kFIkf_we_0" role="UzTCv">
<node concept="2qmXGp" id="yM9JMK5qfs" role="3WnoGb">
<node concept="raruj" id="yM9JMK5qfR" role="lGtFl" />
<node concept="ZpONE" id="yM9JMK5qfi" role="1_9fRO">
<ref role="ZpOSt" node="1kFIkf_we$V" resolve="ref" />
<node concept="1ZhdrF" id="yM9JMK5qfZ" role="lGtFl">
<property role="P3scX" value="137e622e-709a-48af-8f85-420e945711de/2851923306472496585/2851923306472496958" />
<property role="2qtEX8" value="clafer" />
<node concept="3$xsQk" id="yM9JMK5qg0" role="3$ytzL">
<node concept="3clFbS" id="yM9JMK5qg1" role="2VODD2">
<node concept="3cpWs8" id="yM9JMK5XQH" role="3cqZAp">
<node concept="3cpWsn" id="yM9JMK5XQK" role="3cpWs9">
<property role="TrG5h" value="original" />
<node concept="3Tqbb2" id="yM9JMK5XQL" role="1tU5fm">
<ref role="ehGHo" to="xnt3:1kFIkf$RTXv" resolve="FragmentRef" />
</node>
<node concept="2OqwBi" id="yM9JMK5XQM" role="33vP2m">
<node concept="1PxgMI" id="yM9JMK5XQN" role="2Oq$k0">
<ref role="1PxNhF" to="xnt3:1kFIkf$RTXv" resolve="FragmentRef" />
<node concept="2OqwBi" id="yM9JMK5XQO" role="1PxMeX">
<node concept="1iwH7S" id="yM9JMK5XQP" role="2Oq$k0" />
<node concept="12$id9" id="yM9JMK5XQQ" role="2OqNvi">
<node concept="2OqwBi" id="yM9JMK5XQR" role="12$y8L">
<node concept="30H73N" id="yM9JMK6dNm" role="2Oq$k0" />
<node concept="3TrEf2" id="yM9JMK6dW$" role="2OqNvi">
<ref role="3Tt5mk" to="xnt3:1kFIkf_edvs" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2qgKlT" id="yM9JMK5XQU" role="2OqNvi">
<ref role="37wK5l" to="3636:1kFIkf_wjvu" resolve="getSuperFragmentRef" />
<node concept="2qgKlT" id="yM9JMK5XQU" role="2OqNvi">
<ref role="37wK5l" to="3636:1kFIkf_wjvu" resolve="getSuperFragmentRef" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="yM9JMK7WsN" role="3cqZAp">
<node concept="2OqwBi" id="yM9JMK8do6" role="3clFbG">
<node concept="2OqwBi" id="yM9JMK7WsP" role="2Oq$k0">
<node concept="2Xjw5R" id="yM9JMK7WsQ" role="2OqNvi">
<node concept="1xMEDy" id="yM9JMK7WsR" role="1xVPHs">
<node concept="chp4Y" id="yM9JMK7WsS" role="ri$Ld">
<ref role="cht4Q" to="xnt3:1Z9B1UhMN__" resolve="BaseFragment" />
<node concept="3clFbF" id="yM9JMK7WsN" role="3cqZAp">
<node concept="2OqwBi" id="yM9JMK8do6" role="3clFbG">
<node concept="2OqwBi" id="yM9JMK7WsP" role="2Oq$k0">
<node concept="2Xjw5R" id="yM9JMK7WsQ" role="2OqNvi">
<node concept="1xMEDy" id="yM9JMK7WsR" role="1xVPHs">
<node concept="chp4Y" id="yM9JMK7WsS" role="ri$Ld">
<ref role="cht4Q" to="xnt3:1Z9B1UhMN__" resolve="BaseFragment" />
</node>
</node>
</node>
<node concept="37vLTw" id="yM9JMK7WsT" role="2Oq$k0">
<ref role="3cqZAo" node="yM9JMK5XQK" resolve="original" />
</node>
</node>
<node concept="37vLTw" id="yM9JMK7WsT" role="2Oq$k0">
<ref role="3cqZAo" node="yM9JMK5XQK" resolve="original" />
<node concept="3TrcHB" id="yM9JMK8dO8" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
<node concept="3TrcHB" id="yM9JMK8dO8" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2ZqYGZ" id="yM9JMK5qfI" role="1ESnxz">
<ref role="2ZqYFj" node="yM9JMK5qcR" resolve="subref" />
<node concept="1ZhdrF" id="yM9JMK5G0T" role="lGtFl">
<property role="P3scX" value="137e622e-709a-48af-8f85-420e945711de/7750719112879013576/7750719112879013668" />
<property role="2qtEX8" value="clafer" />
<node concept="3$xsQk" id="yM9JMK5G0U" role="3$ytzL">
<node concept="3clFbS" id="yM9JMK5G0V" role="2VODD2">
<node concept="3cpWs8" id="yM9JMK5G3j" role="3cqZAp">
<node concept="3cpWsn" id="yM9JMK5G3k" role="3cpWs9">
<property role="TrG5h" value="original" />
<node concept="3Tqbb2" id="yM9JMK5G3l" role="1tU5fm">
<ref role="ehGHo" to="xnt3:1kFIkf$RTXv" resolve="FragmentRef" />
</node>
<node concept="2OqwBi" id="yM9JMK5G3m" role="33vP2m">
<node concept="1PxgMI" id="yM9JMK5G3n" role="2Oq$k0">
<ref role="1PxNhF" to="xnt3:1kFIkf$RTXv" resolve="FragmentRef" />
<node concept="2OqwBi" id="yM9JMK5G3o" role="1PxMeX">
<node concept="1iwH7S" id="yM9JMK5G3p" role="2Oq$k0" />
<node concept="12$id9" id="yM9JMK5G3q" role="2OqNvi">
<node concept="2OqwBi" id="yM9JMK5G3r" role="12$y8L">
<node concept="30H73N" id="yM9JMK5H_G" role="2Oq$k0" />
<node concept="3TrEf2" id="yM9JMK5HFF" role="2OqNvi">
<ref role="3Tt5mk" to="xnt3:1kFIkf_edvs" />
<node concept="2ZqYGZ" id="yM9JMK5qfI" role="1ESnxz">
<ref role="2ZqYFj" node="yM9JMK5qcR" resolve="subref" />
<node concept="1ZhdrF" id="yM9JMK5G0T" role="lGtFl">
<property role="P3scX" value="137e622e-709a-48af-8f85-420e945711de/7750719112879013576/7750719112879013668" />
<property role="2qtEX8" value="clafer" />
<node concept="3$xsQk" id="yM9JMK5G0U" role="3$ytzL">
<node concept="3clFbS" id="yM9JMK5G0V" role="2VODD2">
<node concept="3cpWs8" id="yM9JMK5G3j" role="3cqZAp">
<node concept="3cpWsn" id="yM9JMK5G3k" role="3cpWs9">
<property role="TrG5h" value="original" />
<node concept="3Tqbb2" id="yM9JMK5G3l" role="1tU5fm">
<ref role="ehGHo" to="xnt3:1kFIkf$RTXv" resolve="FragmentRef" />
</node>
<node concept="2OqwBi" id="yM9JMK5G3m" role="33vP2m">
<node concept="1PxgMI" id="yM9JMK5G3n" role="2Oq$k0">
<ref role="1PxNhF" to="xnt3:1kFIkf$RTXv" resolve="FragmentRef" />
<node concept="2OqwBi" id="yM9JMK5G3o" role="1PxMeX">
<node concept="1iwH7S" id="yM9JMK5G3p" role="2Oq$k0" />
<node concept="12$id9" id="yM9JMK5G3q" role="2OqNvi">
<node concept="2OqwBi" id="yM9JMK5G3r" role="12$y8L">
<node concept="30H73N" id="yM9JMK5H_G" role="2Oq$k0" />
<node concept="3TrEf2" id="yM9JMK5HFF" role="2OqNvi">
<ref role="3Tt5mk" to="xnt3:1kFIkf_edvs" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2qgKlT" id="yM9JMK5G3u" role="2OqNvi">
<ref role="37wK5l" to="3636:1kFIkf_wjvu" resolve="getSuperFragmentRef" />
<node concept="2qgKlT" id="yM9JMK5G3u" role="2OqNvi">
<ref role="37wK5l" to="3636:1kFIkf_wjvu" resolve="getSuperFragmentRef" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="yM9JMK5G3v" role="3cqZAp">
<node concept="2OqwBi" id="yM9JMK5G3w" role="3clFbG">
<node concept="37vLTw" id="yM9JMK5G3x" role="2Oq$k0">
<ref role="3cqZAo" node="yM9JMK5G3k" resolve="original" />
</node>
<node concept="3TrcHB" id="yM9JMK5G3y" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
<node concept="3clFbF" id="yM9JMK5G3v" role="3cqZAp">
<node concept="2OqwBi" id="yM9JMK5G3w" role="3clFbG">
<node concept="37vLTw" id="yM9JMK5G3x" role="2Oq$k0">
<ref role="3cqZAo" node="yM9JMK5G3k" resolve="original" />
</node>
<node concept="3TrcHB" id="yM9JMK5G3y" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -982,10 +986,10 @@
<node concept="3$xsQk" id="298fCgNfYNP" role="3$ytzL">
<node concept="3clFbS" id="298fCgNfYNQ" role="2VODD2">
<node concept="3clFbF" id="298fCgNfZwe" role="3cqZAp">
<node concept="2OqwBi" id="298fCgNfZAN" role="3clFbG">
<node concept="30H73N" id="298fCgNfZwd" role="2Oq$k0" />
<node concept="3TrcHB" id="298fCgNg02B" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
<node concept="2OqwBi" id="71szcjGOWlv" role="3clFbG">
<node concept="30H73N" id="71szcjGOWlw" role="2Oq$k0" />
<node concept="3TrEf2" id="71szcjGOWlx" role="2OqNvi">
<ref role="3Tt5mk" to="xnt3:4diOXa0$snd" />
</node>
</node>
</node>
Expand Down
1 change: 1 addition & 0 deletions ...nguages/org.clafer.mps/languages/org.clafer.slicing/generator/template/[email protected]
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
<use id="3caa48f5-b58c-40e5-8e9c-25dcd3ac80e4" name="org.clafer.slicing" version="-1" />
<use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
<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)" />
</languages>
<imports>
Expand Down
1 change: 1 addition & 0 deletions code/languages/org.clafer.mps/languages/org.clafer.slicing/org.clafer.slicing.mpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<language id="b401a680-8325-4110-8fd3-84331ff25bef" fqName="jetbrains.mps.lang.generator" version="0" />
<language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" fqName="jetbrains.mps.lang.generator.generationContext" version="0" />
<language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
<language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="2" />
<language id="c72da2b9-7cce-4447-8389-f407dc1158b7" fqName="jetbrains.mps.lang.structure" version="1" />
<language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
Expand Down
23 changes: 23 additions & 0 deletions ...ns/org.clafer.architecture.example/models/org/clafer/architecture/sandbox/Preferences.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@
<child id="7285997757218440687" name="tuples" index="sklmO" />
</concept>
<concept id="8071399195256502219" name="org.clafer.architecture.core.structure.QualityThisExpr" flags="ng" index="2xC6$6" />
<concept id="8271111493163428837" name="org.clafer.architecture.core.structure.Preferences" flags="ng" index="3tocZL">
<property id="8556599590877743536" name="generateQA" index="1deALe" />
<child id="8271111493164032678" name="constants" index="3tuoqM" />
</concept>
<concept id="598358034644499232" name="org.clafer.architecture.core.structure.Constant" flags="ng" index="1vcr1m">
<child id="598358034644520346" name="value" index="1vcgrG" />
</concept>
<concept id="598358034645073916" name="org.clafer.architecture.core.structure.ConstantsGroup" flags="ng" index="1vMfia">
<child id="598358034645073932" name="children" index="1vM8HU" />
</concept>
<concept id="5902858924256204711" name="org.clafer.architecture.core.structure.QualityDeclaration" flags="ng" index="3EozPd">
<child id="9179073984346905094" name="constraints" index="2jp4kx" />
</concept>
Expand Down Expand Up @@ -204,5 +214,18 @@
<property role="TrG5h" value="Test2" />
</node>
</node>
<node concept="3tocZL" id="71szcjGPq58">
<property role="TrG5h" value="Pref" />
<property role="1deALe" value="true" />
<node concept="1vMfia" id="71szcjGPq5c" role="3tuoqM">
<property role="TrG5h" value="constantGroup" />
<node concept="1vcr1m" id="71szcjGPq5E" role="1vM8HU">
<property role="TrG5h" value="constant" />
<node concept="3TlMh9" id="71szcjGPq60" role="1vcgrG">
<property role="2hmy$m" value="10" />
</node>
</node>
</node>
</node>
</model>

Loading

0 comments on commit 41db0bc

Please sign in to comment.