Skip to content

Commit 2672d3c

Browse files
wsafonovwsafonov
committed
new syntax for tolerance expr using ± symbol
1 parent 3e7b892 commit 2672d3c

File tree

3 files changed

+58
-45
lines changed

3 files changed

+58
-45
lines changed

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

Lines changed: 21 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6562,43 +6562,33 @@
65626562
<node concept="3Tm1VV" id="4399ITSBJQ8" role="1B3o_S" />
65636563
<node concept="3clFbS" id="4399ITSBJQl" role="3clF47">
65646564
<node concept="3clFbF" id="4399ITSBK5l" role="3cqZAp">
6565-
<node concept="3cpWs3" id="4399ITSBRFL" role="3clFbG">
6566-
<node concept="Xl_RD" id="4399ITSBRFO" role="3uHU7w">
6567-
<property role="Xl_RC" value="]" />
6568-
</node>
6569-
<node concept="3cpWs3" id="4399ITSBOr9" role="3uHU7B">
6570-
<node concept="3cpWs3" id="4399ITSBMZd" role="3uHU7B">
6571-
<node concept="3cpWs3" id="4399ITSBKq6" role="3uHU7B">
6572-
<node concept="Xl_RD" id="4399ITSBK5k" role="3uHU7B">
6573-
<property role="Xl_RC" value="[" />
6574-
</node>
6575-
<node concept="2OqwBi" id="4399ITSBLOJ" role="3uHU7w">
6576-
<node concept="2OqwBi" id="4399ITSBKCQ" role="2Oq$k0">
6577-
<node concept="13iPFW" id="4399ITSBKqh" role="2Oq$k0" />
6578-
<node concept="3TrEf2" id="4399ITSBKVp" role="2OqNvi">
6579-
<ref role="3Tt5mk" to="5qo5:4399ITS_ea3" resolve="value" />
6580-
</node>
6581-
</node>
6582-
<node concept="2qgKlT" id="4399ITSBMDj" role="2OqNvi">
6583-
<ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
6584-
</node>
6565+
<node concept="3cpWs3" id="4399ITSBOr9" role="3clFbG">
6566+
<node concept="3cpWs3" id="4399ITSBMZd" role="3uHU7B">
6567+
<node concept="2OqwBi" id="4399ITSBLOJ" role="3uHU7B">
6568+
<node concept="2OqwBi" id="4399ITSBKCQ" role="2Oq$k0">
6569+
<node concept="13iPFW" id="4399ITSBKqh" role="2Oq$k0" />
6570+
<node concept="3TrEf2" id="4399ITSBKVp" role="2OqNvi">
6571+
<ref role="3Tt5mk" to="5qo5:4399ITS_ea3" resolve="value" />
65856572
</node>
65866573
</node>
6587-
<node concept="Xl_RD" id="4399ITSBMZg" role="3uHU7w">
6588-
<property role="Xl_RC" value=" tolerance " />
6574+
<node concept="2qgKlT" id="4399ITSBMDj" role="2OqNvi">
6575+
<ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
65896576
</node>
65906577
</node>
6591-
<node concept="2OqwBi" id="4399ITSBPPF" role="3uHU7w">
6592-
<node concept="2OqwBi" id="4399ITSBOEV" role="2Oq$k0">
6593-
<node concept="13iPFW" id="4399ITSBOrQ" role="2Oq$k0" />
6594-
<node concept="3TrEf2" id="4399ITSBP84" role="2OqNvi">
6595-
<ref role="3Tt5mk" to="5qo5:4399ITS_elI" resolve="tolerance" />
6596-
</node>
6597-
</node>
6598-
<node concept="2qgKlT" id="4399ITSBQK7" role="2OqNvi">
6599-
<ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
6578+
<node concept="Xl_RD" id="4399ITSBMZg" role="3uHU7w">
6579+
<property role="Xl_RC" value="±" />
6580+
</node>
6581+
</node>
6582+
<node concept="2OqwBi" id="4399ITSBPPF" role="3uHU7w">
6583+
<node concept="2OqwBi" id="4399ITSBOEV" role="2Oq$k0">
6584+
<node concept="13iPFW" id="4399ITSBOrQ" role="2Oq$k0" />
6585+
<node concept="3TrEf2" id="4399ITSBP84" role="2OqNvi">
6586+
<ref role="3Tt5mk" to="5qo5:4399ITS_elI" resolve="tolerance" />
66006587
</node>
66016588
</node>
6589+
<node concept="2qgKlT" id="4399ITSBQK7" role="2OqNvi">
6590+
<ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
6591+
</node>
66026592
</node>
66036593
</node>
66046594
</node>

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

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
<concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
2626
<concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
2727
<concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi" />
28+
<concept id="1226339938453" name="jetbrains.mps.lang.editor.structure.AbstractPaddingStyleClassItem" flags="ln" index="27zB68">
29+
<property id="1226504838901" name="measure" index="2hoDZC" />
30+
</concept>
2831
<concept id="1597643335227097138" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_TransformationMenu_node" flags="ng" index="7Obwk" />
2932
<concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
3033
<concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
@@ -77,6 +80,11 @@
7780
<concept id="9122903797312246523" name="jetbrains.mps.lang.editor.structure.StyleReference" flags="ng" index="1wgc9g">
7881
<reference id="9122903797312247166" name="style" index="1wgcnl" />
7982
</concept>
83+
<concept id="1215007762405" name="jetbrains.mps.lang.editor.structure.FloatStyleClassItem" flags="ln" index="3$6MrZ">
84+
<property id="1215007802031" name="value" index="3$6WeP" />
85+
</concept>
86+
<concept id="1215007883204" name="jetbrains.mps.lang.editor.structure.PaddingLeftStyleClassItem" flags="ln" index="3$7fVu" />
87+
<concept id="1215007897487" name="jetbrains.mps.lang.editor.structure.PaddingRightStyleClassItem" flags="ln" index="3$7jql" />
8088
<concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
8189
<property id="1214560368769" name="emptyNoTargetText" index="39s7Ar" />
8290
<property id="1140114345053" name="allowEmptyText" index="1O74Pk" />
@@ -191,6 +199,7 @@
191199
<concept id="1954385921685784800" name="com.mbeddr.mpsutil.grammarcells.structure.PostprocessFunction" flags="ig" index="315t4" />
192200
<concept id="1381973545438177171" name="com.mbeddr.mpsutil.grammarcells.structure.NumberLiteralTokenizer" flags="ng" index="bYqod" />
193201
<concept id="1381973545438177151" name="com.mbeddr.mpsutil.grammarcells.structure.StringLiteralTokenizer" flags="ng" index="bYqrx" />
202+
<concept id="1984422498404534858" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell_TransformationText" flags="ig" index="2ee1ZP" />
194203
<concept id="3921456275302774825" name="com.mbeddr.mpsutil.grammarcells.structure.SplittableCell" flags="sg" stub="3921456275302774831" index="2lNzut">
195204
<child id="3921456275305506525" name="tokenizer" index="2lD6_D" />
196205
</concept>
@@ -203,6 +212,7 @@
203212
<concept id="8945098465480383073" name="com.mbeddr.mpsutil.grammarcells.structure.OptionalCell_TransformationText" flags="ig" index="ZYGn8" />
204213
<concept id="7363578995839435357" name="com.mbeddr.mpsutil.grammarcells.structure.WrapperCell" flags="ng" index="1kIj98">
205214
<child id="1954385921685817946" name="postprocessNodeSubstitute" index="31dnY" />
215+
<child id="1984422498404562223" name="rightTransformationText" index="2ee62g" />
206216
<child id="7363578995839435358" name="wrapped" index="1kIj9b" />
207217
</concept>
208218
<concept id="904978958140335648" name="com.mbeddr.mpsutil.grammarcells.structure.Parameter_parentNode" flags="ng" index="1tDOuL" />
@@ -987,30 +997,42 @@
987997
<node concept="24kQdi" id="4399ITS_eHs">
988998
<ref role="1XX52x" to="5qo5:4399ITS_dMM" resolve="ToleranceExpr" />
989999
<node concept="3EZMnI" id="4399ITS_eQc" role="2wV5jI">
990-
<node concept="3F0ifn" id="4399ITS_fJ1" role="3EZMnx">
991-
<property role="3F0ifm" value="[" />
992-
<node concept="11LMrY" id="4399ITS_fRV" role="3F10Kt">
993-
<property role="VOm3f" value="true" />
994-
</node>
995-
</node>
9961000
<node concept="1kIj98" id="4399ITS_fbA" role="3EZMnx">
9971001
<node concept="3F1sOY" id="4399ITS_eTk" role="1kIj9b">
9981002
<ref role="1NtTu8" to="5qo5:4399ITS_ea3" resolve="value" />
9991003
</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>
1010+
</node>
1011+
</node>
1012+
</node>
10001013
</node>
10011014
<node concept="3F0ifn" id="4399ITS_eWn" role="3EZMnx">
1002-
<property role="3F0ifm" value="tolerance" />
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>
1022+
<node concept="3$7fVu" id="5PdB3P1oBIu" role="3F10Kt">
1023+
<property role="3$6WeP" value="2" />
1024+
<property role="2hoDZC" value="hQhnRQp/PIXELS" />
1025+
</node>
1026+
<node concept="3$7jql" id="5PdB3P1p5Mv" role="3F10Kt">
1027+
<property role="3$6WeP" value="2" />
1028+
<property role="2hoDZC" value="hQhnRQp/PIXELS" />
1029+
</node>
1030+
<node concept="Vb9p2" id="5PdB3P1s1T1" role="3F10Kt" />
10031031
</node>
10041032
<node concept="3F1sOY" id="4399ITS_f2o" role="3EZMnx">
10051033
<ref role="1NtTu8" to="5qo5:4399ITS_elI" resolve="tolerance" />
10061034
</node>
10071035
<node concept="2iRfu4" id="4399ITS_eQf" role="2iSdaV" />
1008-
<node concept="3F0ifn" id="4399ITS_fV7" role="3EZMnx">
1009-
<property role="3F0ifm" value="]" />
1010-
<node concept="11L4FC" id="4399ITS_g1b" role="3F10Kt">
1011-
<property role="VOm3f" value="true" />
1012-
</node>
1013-
</node>
10141036
</node>
10151037
</node>
10161038
<node concept="24kQdi" id="5bvGQanjMKR">

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,8 @@
441441
<node concept="1TIwiD" id="4399ITS_dMM">
442442
<property role="EcuMT" value="4668305294413323442" />
443443
<property role="TrG5h" value="ToleranceExpr" />
444-
<property role="34LRSv" value="tolerance" />
444+
<property role="34LRSv" value="±" />
445+
<property role="R4oN_" value="tolerance" />
445446
<ref role="1TJDcQ" to="hm2y:6sdnDbSla17" resolve="Expression" />
446447
<node concept="1TJgyj" id="4399ITS_ea3" role="1TKVEi">
447448
<property role="IQ2ns" value="4668305294413324931" />

0 commit comments

Comments
 (0)