Skip to content

Commit ba94d61

Browse files
author
Alexander Pann
committed
Fix constraint logic
1 parent 92eb83f commit ba94d61

File tree

1 file changed

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

1 file changed

+96
-74
lines changed

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

Lines changed: 96 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
<reference id="1144433057691" name="classifier" index="1PxDUh" />
5252
</concept>
5353
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
54+
<concept id="1070534555686" name="jetbrains.mps.baseLanguage.structure.CharType" flags="in" index="10Pfzv" />
55+
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
5456
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
5557
<property id="1176718929932" name="isFinal" index="3TUv4t" />
5658
<child id="1068431790190" name="initializer" index="33vP2m" />
@@ -70,6 +72,7 @@
7072
<child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
7173
<child id="1068580123160" name="condition" index="3clFbw" />
7274
<child id="1068580123161" name="ifTrue" index="3clFbx" />
75+
<child id="1206060520071" name="elsifClauses" index="3eNLev" />
7376
</concept>
7477
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
7578
<child id="1068581517665" name="statement" index="3cqZAp" />
@@ -86,9 +89,15 @@
8689
<concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
8790
<child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
8891
</concept>
89-
<concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
9092
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
93+
<concept id="1206060495898" name="jetbrains.mps.baseLanguage.structure.ElsifClause" flags="ng" index="3eNFk2">
94+
<child id="1206060619838" name="condition" index="3eO9$A" />
95+
<child id="1206060644605" name="statementList" index="3eOfB_" />
96+
</concept>
9197
<concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
98+
<concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
99+
<child id="1081516765348" name="expression" index="3fr31v" />
100+
</concept>
92101
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
93102
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
94103
<child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -105,7 +114,6 @@
105114
<child id="8276990574895933173" name="catchBody" index="1zc67A" />
106115
<child id="8276990574895933172" name="throwable" index="1zc67B" />
107116
</concept>
108-
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
109117
<concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
110118
<child id="1144230900587" name="variable" index="1Duv9x" />
111119
</concept>
@@ -251,108 +259,122 @@
251259
</node>
252260
</node>
253261
</node>
254-
<node concept="3clFbJ" id="3VHXNElX2F7" role="3cqZAp">
255-
<node concept="3clFbS" id="3VHXNElX2F9" role="3clFbx">
256-
<node concept="3cpWs6" id="3VHXNElX8Nm" role="3cqZAp">
257-
<node concept="3clFbT" id="3VHXNElX8Nv" role="3cqZAk" />
258-
</node>
262+
<node concept="3cpWs8" id="1pqGdr9hXPJ" role="3cqZAp">
263+
<node concept="3cpWsn" id="1pqGdr9hXPM" role="3cpWs9">
264+
<property role="TrG5h" value="isEscapeMode" />
265+
<node concept="10P_77" id="1pqGdr9hXPH" role="1tU5fm" />
266+
<node concept="3clFbT" id="1pqGdr9hY52" role="33vP2m" />
259267
</node>
260-
<node concept="1Wc70l" id="3VHXNElX5Ty" role="3clFbw">
261-
<node concept="3clFbC" id="3VHXNElX8ec" role="3uHU7w">
262-
<node concept="3cmrfG" id="3VHXNElX8eo" role="3uHU7w">
263-
<property role="3cmrfH" value="1" />
264-
</node>
265-
<node concept="2OqwBi" id="3VHXNElX6wz" role="3uHU7B">
266-
<node concept="1Wqviy" id="3VHXNElX5XB" role="2Oq$k0" />
267-
<node concept="liA8E" id="3VHXNElX7mq" role="2OqNvi">
268-
<ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
268+
</node>
269+
<node concept="1Dw8fO" id="1pqGdr9hTYM" role="3cqZAp">
270+
<node concept="3clFbS" id="1pqGdr9hTYO" role="2LFqv$">
271+
<node concept="3cpWs8" id="1pqGdr9hYNd" role="3cqZAp">
272+
<node concept="3cpWsn" id="1pqGdr9hYNg" role="3cpWs9">
273+
<property role="TrG5h" value="currentChar" />
274+
<node concept="10Pfzv" id="1pqGdr9hYNc" role="1tU5fm" />
275+
<node concept="2OqwBi" id="1pqGdr9i0iA" role="33vP2m">
276+
<node concept="1Wqviy" id="1pqGdr9hZJq" role="2Oq$k0" />
277+
<node concept="liA8E" id="1pqGdr9i0AB" role="2OqNvi">
278+
<ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
279+
<node concept="37vLTw" id="1pqGdr9i0Gs" role="37wK5m">
280+
<ref role="3cqZAo" node="1pqGdr9hTYP" resolve="i" />
281+
</node>
282+
</node>
269283
</node>
270284
</node>
271285
</node>
272-
<node concept="3clFbC" id="3VHXNElX5G7" role="3uHU7B">
273-
<node concept="2OqwBi" id="3VHXNElX4mD" role="3uHU7B">
274-
<node concept="1Wqviy" id="3VHXNElX2K0" role="2Oq$k0" />
275-
<node concept="liA8E" id="3VHXNElX4tB" role="2OqNvi">
276-
<ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
277-
<node concept="3cmrfG" id="3VHXNElX4EV" role="37wK5m">
278-
<property role="3cmrfH" value="0" />
286+
<node concept="3clFbJ" id="1pqGdr9i0S8" role="3cqZAp">
287+
<node concept="3clFbS" id="1pqGdr9i0Sa" role="3clFbx">
288+
<node concept="3clFbF" id="1pqGdr9i45I" role="3cqZAp">
289+
<node concept="37vLTI" id="1pqGdr9i4tU" role="3clFbG">
290+
<node concept="3fqX7Q" id="1pqGdr9i4KG" role="37vLTx">
291+
<node concept="37vLTw" id="1pqGdr9i4UM" role="3fr31v">
292+
<ref role="3cqZAo" node="1pqGdr9hXPM" resolve="isEscapeMode" />
293+
</node>
294+
</node>
295+
<node concept="37vLTw" id="1pqGdr9i45G" role="37vLTJ">
296+
<ref role="3cqZAo" node="1pqGdr9hXPM" resolve="isEscapeMode" />
297+
</node>
279298
</node>
280299
</node>
281300
</node>
282-
<node concept="1Xhbcc" id="3VHXNElX5Le" role="3uHU7w">
283-
<property role="1XhdNS" value="\\" />
284-
</node>
285-
</node>
286-
</node>
287-
</node>
288-
<node concept="1Dw8fO" id="3VHXNElWUOp" role="3cqZAp">
289-
<node concept="3clFbS" id="3VHXNElWUOr" role="2LFqv$">
290-
<node concept="3clFbJ" id="3VHXNElWWW8" role="3cqZAp">
291-
<node concept="3clFbS" id="3VHXNElWWWa" role="3clFbx">
292-
<node concept="3cpWs6" id="3VHXNElX8RH" role="3cqZAp">
293-
<node concept="3clFbT" id="3VHXNElX8RQ" role="3cqZAk" />
301+
<node concept="3clFbC" id="1pqGdr9i21_" role="3clFbw">
302+
<node concept="1Xhbcc" id="1pqGdr9i27$" role="3uHU7w">
303+
<property role="1XhdNS" value="\\" />
304+
</node>
305+
<node concept="37vLTw" id="1pqGdr9i0Y6" role="3uHU7B">
306+
<ref role="3cqZAo" node="1pqGdr9hYNg" resolve="currentChar" />
294307
</node>
295308
</node>
296-
<node concept="1Wc70l" id="3VHXNElWZJc" role="3clFbw">
297-
<node concept="3y3z36" id="3VHXNElX2mX" role="3uHU7w">
298-
<node concept="1Xhbcc" id="3VHXNElX2qP" role="3uHU7w">
299-
<property role="1XhdNS" value="\\" />
309+
<node concept="3eNFk2" id="1pqGdr9i51j" role="3eNLev">
310+
<node concept="1Wc70l" id="1pqGdr9i7Ra" role="3eO9$A">
311+
<node concept="3fqX7Q" id="1pqGdr9i7Uk" role="3uHU7w">
312+
<node concept="37vLTw" id="1pqGdr9i7Xs" role="3fr31v">
313+
<ref role="3cqZAo" node="1pqGdr9hXPM" resolve="isEscapeMode" />
314+
</node>
300315
</node>
301-
<node concept="2OqwBi" id="3VHXNElWZOX" role="3uHU7B">
302-
<node concept="1Wqviy" id="3VHXNElWZMu" role="2Oq$k0" />
303-
<node concept="liA8E" id="3VHXNElX0O6" role="2OqNvi">
304-
<ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
305-
<node concept="3cpWsd" id="3VHXNElX21F" role="37wK5m">
306-
<node concept="3cmrfG" id="3VHXNElX21J" role="3uHU7w">
307-
<property role="3cmrfH" value="1" />
308-
</node>
309-
<node concept="37vLTw" id="3VHXNElX189" role="3uHU7B">
310-
<ref role="3cqZAo" node="3VHXNElWUOs" resolve="i" />
311-
</node>
312-
</node>
316+
<node concept="3clFbC" id="1pqGdr9i6lV" role="3uHU7B">
317+
<node concept="37vLTw" id="1pqGdr9i57E" role="3uHU7B">
318+
<ref role="3cqZAo" node="1pqGdr9hYNg" resolve="currentChar" />
319+
</node>
320+
<node concept="1Xhbcc" id="1pqGdr9i7FA" role="3uHU7w">
321+
<property role="1XhdNS" value="&quot;" />
313322
</node>
314323
</node>
315324
</node>
316-
<node concept="3clFbC" id="3VHXNElWZ89" role="3uHU7B">
317-
<node concept="2OqwBi" id="3VHXNElWXEg" role="3uHU7B">
318-
<node concept="1Wqviy" id="3VHXNElWX8x" role="2Oq$k0" />
319-
<node concept="liA8E" id="3VHXNElWXUW" role="2OqNvi">
320-
<ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
321-
<node concept="37vLTw" id="3VHXNElWY7K" role="37wK5m">
322-
<ref role="3cqZAo" node="3VHXNElWUOs" resolve="i" />
325+
<node concept="3clFbS" id="1pqGdr9i51l" role="3eOfB_">
326+
<node concept="3cpWs6" id="1pqGdr9i80y" role="3cqZAp">
327+
<node concept="3clFbT" id="1pqGdr9i80E" role="3cqZAk" />
328+
</node>
329+
</node>
330+
</node>
331+
<node concept="9aQIb" id="1pqGdr9i83W" role="9aQIa">
332+
<node concept="3clFbS" id="1pqGdr9i83X" role="9aQI4">
333+
<node concept="3clFbF" id="1pqGdr9i8Qj" role="3cqZAp">
334+
<node concept="37vLTI" id="1pqGdr9i9bx" role="3clFbG">
335+
<node concept="3clFbT" id="1pqGdr9i9n7" role="37vLTx" />
336+
<node concept="37vLTw" id="1pqGdr9i8Qi" role="37vLTJ">
337+
<ref role="3cqZAo" node="1pqGdr9hXPM" resolve="isEscapeMode" />
323338
</node>
324339
</node>
325340
</node>
326-
<node concept="1Xhbcc" id="3VHXNElWZDO" role="3uHU7w">
327-
<property role="1XhdNS" value="&quot;" />
328-
</node>
329341
</node>
330342
</node>
331343
</node>
332344
</node>
333-
<node concept="3cpWsn" id="3VHXNElWUOs" role="1Duv9x">
345+
<node concept="3cpWsn" id="1pqGdr9hTYP" role="1Duv9x">
334346
<property role="TrG5h" value="i" />
335-
<node concept="10Oyi0" id="3VHXNElWUQk" role="1tU5fm" />
336-
<node concept="3cmrfG" id="3VHXNElWUTi" role="33vP2m">
337-
<property role="3cmrfH" value="1" />
347+
<node concept="10Oyi0" id="1pqGdr9hTZP" role="1tU5fm" />
348+
<node concept="3cmrfG" id="1pqGdr9hTZY" role="33vP2m">
349+
<property role="3cmrfH" value="0" />
338350
</node>
339351
</node>
340-
<node concept="3eOVzh" id="3VHXNElWVOO" role="1Dwp0S">
341-
<node concept="2OqwBi" id="3VHXNElWWq4" role="3uHU7w">
342-
<node concept="1Wqviy" id="3VHXNElWVRY" role="2Oq$k0" />
343-
<node concept="liA8E" id="3VHXNElWWFC" role="2OqNvi">
352+
<node concept="3eOVzh" id="1pqGdr9hV6w" role="1Dwp0S">
353+
<node concept="2OqwBi" id="1pqGdr9hVFm" role="3uHU7w">
354+
<node concept="1Wqviy" id="1pqGdr9hVd1" role="2Oq$k0" />
355+
<node concept="liA8E" id="1pqGdr9hW1D" role="2OqNvi">
344356
<ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
345357
</node>
346358
</node>
347-
<node concept="37vLTw" id="3VHXNElWUUY" role="3uHU7B">
348-
<ref role="3cqZAo" node="3VHXNElWUOs" resolve="i" />
359+
<node concept="37vLTw" id="1pqGdr9hU53" role="3uHU7B">
360+
<ref role="3cqZAo" node="1pqGdr9hTYP" resolve="i" />
361+
</node>
362+
</node>
363+
<node concept="3uNrnE" id="1pqGdr9hXHJ" role="1Dwrff">
364+
<node concept="37vLTw" id="1pqGdr9hXHL" role="2$L3a6">
365+
<ref role="3cqZAo" node="1pqGdr9hTYP" resolve="i" />
349366
</node>
350367
</node>
351-
<node concept="3uNrnE" id="3VHXNElWWQh" role="1Dwrff">
352-
<node concept="37vLTw" id="3VHXNElWWQj" role="2$L3a6">
353-
<ref role="3cqZAo" node="3VHXNElWUOs" resolve="i" />
368+
</node>
369+
<node concept="3clFbJ" id="1pqGdr9i9zD" role="3cqZAp">
370+
<node concept="3clFbS" id="1pqGdr9i9zF" role="3clFbx">
371+
<node concept="3cpWs6" id="1pqGdr9iaD2" role="3cqZAp">
372+
<node concept="3clFbT" id="1pqGdr9iaDb" role="3cqZAk" />
354373
</node>
355374
</node>
375+
<node concept="37vLTw" id="1pqGdr9i9Dn" role="3clFbw">
376+
<ref role="3cqZAo" node="1pqGdr9hXPM" resolve="isEscapeMode" />
377+
</node>
356378
</node>
357379
<node concept="3cpWs6" id="3VHXNElX8XK" role="3cqZAp">
358380
<node concept="3clFbT" id="3VHXNElX9CP" role="3cqZAk">

0 commit comments

Comments
 (0)