Skip to content

Commit 94ae618

Browse files
wsafonovwsafonov
committed
defined grammar rule for tolerance
- ensures proper setting of parenthesis around tolerance expression
1 parent 1f887b9 commit 94ae618

File tree

1 file changed

+53
-30
lines changed
  • code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models

1 file changed

+53
-30
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/editor.mps‎

Lines changed: 53 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,9 @@
207207
<child id="5083944728298846681" name="option" index="_tjki" />
208208
<child id="8945098465480008160" name="transformationText" index="ZWbT9" />
209209
</concept>
210-
<concept id="8207263695490893775" name="com.mbeddr.mpsutil.grammarcells.structure.CellBasedRule" flags="ng" index="2ElW$n" />
210+
<concept id="8207263695490893775" name="com.mbeddr.mpsutil.grammarcells.structure.CellBasedRule" flags="ng" index="2ElW$n">
211+
<child id="8207263695491670784" name="priority" index="2EmURo" />
212+
</concept>
211213
<concept id="2283544813052478257" name="com.mbeddr.mpsutil.grammarcells.structure.GrammarCellsTransformationMenuPart" flags="ng" index="2X7gjp" />
212214
<concept id="8945098465480383073" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell_TransformationText" flags="ig" index="ZYGn8" />
213215
<concept id="7363578995839435357" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell" flags="ng" index="1kIj98">
@@ -225,6 +227,10 @@
225227
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
226228
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
227229
</concept>
230+
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
231+
<concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
232+
<reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
233+
</concept>
228234
<concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
229235
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
230236
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
@@ -996,43 +1002,60 @@
9961002
</node>
9971003
<node concept="24kQdi" id="4399ITS_eHs">
9981004
<ref role="1XX52x" to="5qo5:4399ITS_dMM" resolve="ToleranceExpr" />
999-
<node concept="3EZMnI" id="4399ITS_eQc" role="2wV5jI">
1000-
<node concept="1kIj98" id="4399ITS_fbA" role="3EZMnx">
1001-
<node concept="3F1sOY" id="4399ITS_eTk" role="1kIj9b">
1002-
<ref role="1NtTu8" to="5qo5:4399ITS_ea3" resolve="value" />
1003-
</node>
1004-
<node concept="2ee1ZP" id="5PdB3P1rtlG" role="2ee62g">
1005-
<node concept="3clFbS" id="5PdB3P1rtlH" role="2VODD2">
1006-
<node concept="3clFbF" id="5PdB3P1rtmn" role="3cqZAp">
1007-
<node concept="Xl_RD" id="5PdB3P1rtmm" role="3clFbG">
1008-
<property role="Xl_RC" value="+/-" />
1009-
</node>
1005+
<node concept="1WcQYu" id="2ZN8kqCh_mw" role="2wV5jI">
1006+
<node concept="2ElW$n" id="2ZN8kqCh_my" role="2El2Yn">
1007+
<node concept="3cpWs3" id="2ZN8kqCjznp" role="2EmURo">
1008+
<node concept="2OqwBi" id="2ZN8kqCj3LW" role="3uHU7B">
1009+
<node concept="35c_gC" id="2ZN8kqCj3tG" role="2Oq$k0">
1010+
<ref role="35c_gD" to="hm2y:4rZeNQ6N6Qp" resolve="BinaryEqualityExpression" />
10101011
</node>
1012+
<node concept="2qgKlT" id="2ZN8kqCj49W" role="2OqNvi">
1013+
<ref role="37wK5l" to="pbu6:4rZeNQ6MpZB" resolve="priority" />
1014+
</node>
1015+
</node>
1016+
<node concept="3cmrfG" id="2ZN8kqCj4Ni" role="3uHU7w">
1017+
<property role="3cmrfH" value="50" />
10111018
</node>
10121019
</node>
10131020
</node>
1014-
<node concept="3F0ifn" id="4399ITS_eWn" role="3EZMnx">
1015-
<property role="3F0ifm" value="±" />
1016-
<node concept="11L4FC" id="5PdB3P1nDHO" role="3F10Kt">
1017-
<property role="VOm3f" value="true" />
1018-
</node>
1019-
<node concept="11LMrY" id="5PdB3P1nDI0" role="3F10Kt">
1020-
<property role="VOm3f" value="true" />
1021+
<node concept="3EZMnI" id="4399ITS_eQc" role="1LiK7o">
1022+
<node concept="1kIj98" id="4399ITS_fbA" role="3EZMnx">
1023+
<node concept="3F1sOY" id="4399ITS_eTk" role="1kIj9b">
1024+
<ref role="1NtTu8" to="5qo5:4399ITS_ea3" resolve="value" />
1025+
</node>
1026+
<node concept="2ee1ZP" id="5PdB3P1rtlG" role="2ee62g">
1027+
<node concept="3clFbS" id="5PdB3P1rtlH" role="2VODD2">
1028+
<node concept="3clFbF" id="5PdB3P1rtmn" role="3cqZAp">
1029+
<node concept="Xl_RD" id="5PdB3P1rtmm" role="3clFbG">
1030+
<property role="Xl_RC" value="+/-" />
1031+
</node>
1032+
</node>
1033+
</node>
1034+
</node>
10211035
</node>
1022-
<node concept="3$7fVu" id="5PdB3P1oBIu" role="3F10Kt">
1023-
<property role="3$6WeP" value="2" />
1024-
<property role="2hoDZC" value="hQhnRQp/PIXELS" />
1036+
<node concept="3F0ifn" id="4399ITS_eWn" role="3EZMnx">
1037+
<property role="3F0ifm" value="±" />
1038+
<node concept="11L4FC" id="5PdB3P1nDHO" role="3F10Kt">
1039+
<property role="VOm3f" value="true" />
1040+
</node>
1041+
<node concept="11LMrY" id="5PdB3P1nDI0" role="3F10Kt">
1042+
<property role="VOm3f" value="true" />
1043+
</node>
1044+
<node concept="3$7fVu" id="5PdB3P1oBIu" role="3F10Kt">
1045+
<property role="3$6WeP" value="2" />
1046+
<property role="2hoDZC" value="hQhnRQp/PIXELS" />
1047+
</node>
1048+
<node concept="3$7jql" id="5PdB3P1p5Mv" role="3F10Kt">
1049+
<property role="3$6WeP" value="2" />
1050+
<property role="2hoDZC" value="hQhnRQp/PIXELS" />
1051+
</node>
1052+
<node concept="Vb9p2" id="5PdB3P1s1T1" role="3F10Kt" />
10251053
</node>
1026-
<node concept="3$7jql" id="5PdB3P1p5Mv" role="3F10Kt">
1027-
<property role="3$6WeP" value="2" />
1028-
<property role="2hoDZC" value="hQhnRQp/PIXELS" />
1054+
<node concept="3F1sOY" id="4399ITS_f2o" role="3EZMnx">
1055+
<ref role="1NtTu8" to="5qo5:4399ITS_elI" resolve="tolerance" />
10291056
</node>
1030-
<node concept="Vb9p2" id="5PdB3P1s1T1" role="3F10Kt" />
1031-
</node>
1032-
<node concept="3F1sOY" id="4399ITS_f2o" role="3EZMnx">
1033-
<ref role="1NtTu8" to="5qo5:4399ITS_elI" resolve="tolerance" />
1057+
<node concept="2iRfu4" id="4399ITS_eQf" role="2iSdaV" />
10341058
</node>
1035-
<node concept="2iRfu4" id="4399ITS_eQf" role="2iSdaV" />
10361059
</node>
10371060
</node>
10381061
<node concept="24kQdi" id="5bvGQanjMKR">

0 commit comments

Comments
 (0)