Skip to content

Commit e9a0b66

Browse files
alexanderpannalexanderpann
authored
Merge pull request #726 from IETS3/bugfix/stringValidation_successor_20213
2 parents 7fa3452 + 158c3b9 commit e9a0b66

File tree

3 files changed

+192
-40
lines changed

3 files changed

+192
-40
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
2525

2626
### Fixed
2727

28-
- String validation: A bug in the number detection logic was fixed
28+
- String validation: A bug in the successor execution logic was fixed
2929

3030
## Oktober 2023
3131

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.stringvalidation.runtime/models/org.iets3.core.expr.stringvalidation.runtime.runtime.mps‎

Lines changed: 26 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,57 +1118,47 @@
11181118
<ref role="3cqZAo" node="3dTPcTTfXvv" resolve="findings" />
11191119
</node>
11201120
<node concept="TSZUe" id="3dTPcTTfXvN" role="2OqNvi">
1121-
<node concept="2ShNRf" id="3dTPcTTfXvO" role="25WWJ7">
1122-
<node concept="1pGfFk" id="3dTPcTTfXvP" role="2ShVmc">
1121+
<node concept="2ShNRf" id="6jG9W4I5ITw" role="25WWJ7">
1122+
<node concept="1pGfFk" id="6jG9W4I5ITx" role="2ShVmc">
11231123
<ref role="37wK5l" node="4lCUG7OtV3T" resolve="OccurenceMatchFind" />
1124-
<node concept="3cpWs3" id="3dTPcTTfXvQ" role="37wK5m">
1125-
<node concept="Xl_RD" id="3dTPcTTfXvR" role="3uHU7w">
1124+
<node concept="3cpWs3" id="6jG9W4I5ITy" role="37wK5m">
1125+
<node concept="Xl_RD" id="6jG9W4I5ITz" role="3uHU7w">
11261126
<property role="Xl_RC" value="" />
11271127
</node>
1128-
<node concept="2OqwBi" id="3dTPcTTgf4s" role="3uHU7B">
1129-
<node concept="37vLTw" id="3dTPcTTfXvS" role="2Oq$k0">
1128+
<node concept="2OqwBi" id="6jG9W4I5IT$" role="3uHU7B">
1129+
<node concept="37vLTw" id="6jG9W4I5IT_" role="2Oq$k0">
11301130
<ref role="3cqZAo" node="3dTPcTTg1fa" resolve="m" />
11311131
</node>
1132-
<node concept="liA8E" id="3dTPcTTgfuC" role="2OqNvi">
1132+
<node concept="liA8E" id="6jG9W4I5ITA" role="2OqNvi">
11331133
<ref role="37wK5l" to="ni5j:~Matcher.group()" resolve="group" />
11341134
</node>
11351135
</node>
11361136
</node>
1137-
<node concept="37vLTw" id="3dTPcTTfXvT" role="37wK5m">
1137+
<node concept="37vLTw" id="6jG9W4I5ITB" role="37wK5m">
11381138
<ref role="3cqZAo" node="3dTPcTTfXwf" resolve="candidate" />
11391139
</node>
1140-
<node concept="1eOMI4" id="5qf1oe$xK33" role="37wK5m">
1141-
<node concept="3cpWsd" id="5qf1oe$xNfj" role="1eOMHV">
1142-
<node concept="3cmrfG" id="5qf1oe$xNgA" role="3uHU7w">
1143-
<property role="3cmrfH" value="1" />
1140+
<node concept="1eOMI4" id="6jG9W4I5ITC" role="37wK5m">
1141+
<node concept="2OqwBi" id="6jG9W4I5ITF" role="1eOMHV">
1142+
<node concept="37vLTw" id="6jG9W4I5ITG" role="2Oq$k0">
1143+
<ref role="3cqZAo" node="3dTPcTTg1fa" resolve="m" />
11441144
</node>
1145-
<node concept="2OqwBi" id="5qf1oe$xKT6" role="3uHU7B">
1146-
<node concept="37vLTw" id="5qf1oe$xKue" role="2Oq$k0">
1147-
<ref role="3cqZAo" node="3dTPcTTg1fa" resolve="m" />
1148-
</node>
1149-
<node concept="liA8E" id="5qf1oe$xL9r" role="2OqNvi">
1150-
<ref role="37wK5l" to="ni5j:~Matcher.end()" resolve="end" />
1151-
</node>
1145+
<node concept="liA8E" id="6jG9W4I5ITH" role="2OqNvi">
1146+
<ref role="37wK5l" to="ni5j:~Matcher.start()" resolve="start" />
11521147
</node>
11531148
</node>
11541149
</node>
1155-
<node concept="2OqwBi" id="3dTPcTTfXvV" role="37wK5m">
1156-
<node concept="37vLTw" id="3dTPcTTfXvW" role="2Oq$k0">
1150+
<node concept="2OqwBi" id="6jG9W4I5ITI" role="37wK5m">
1151+
<node concept="37vLTw" id="6jG9W4I5ITJ" role="2Oq$k0">
11571152
<ref role="3cqZAo" node="3dTPcTTfXwf" resolve="candidate" />
11581153
</node>
1159-
<node concept="liA8E" id="3dTPcTTfXvX" role="2OqNvi">
1154+
<node concept="liA8E" id="6jG9W4I5ITK" role="2OqNvi">
11601155
<ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
1161-
<node concept="3cpWs3" id="3dTPcTTfXvY" role="37wK5m">
1162-
<node concept="3cmrfG" id="3dTPcTTfXvZ" role="3uHU7w">
1163-
<property role="3cmrfH" value="1" />
1156+
<node concept="2OqwBi" id="6jG9W4I5ITN" role="37wK5m">
1157+
<node concept="37vLTw" id="6jG9W4I5ITO" role="2Oq$k0">
1158+
<ref role="3cqZAo" node="3dTPcTTg1fa" resolve="m" />
11641159
</node>
1165-
<node concept="2OqwBi" id="3dTPcTTgieF" role="3uHU7B">
1166-
<node concept="37vLTw" id="3dTPcTTfXw0" role="2Oq$k0">
1167-
<ref role="3cqZAo" node="3dTPcTTg1fa" resolve="m" />
1168-
</node>
1169-
<node concept="liA8E" id="3dTPcTTgiBZ" role="2OqNvi">
1170-
<ref role="37wK5l" to="ni5j:~Matcher.end()" resolve="end" />
1171-
</node>
1160+
<node concept="liA8E" id="6jG9W4I5ITP" role="2OqNvi">
1161+
<ref role="37wK5l" to="ni5j:~Matcher.end()" resolve="end" />
11721162
</node>
11731163
</node>
11741164
</node>
@@ -5420,12 +5410,12 @@
54205410
<node concept="3cpWsn" id="4xzR2e_x3MO" role="3cpWs9">
54215411
<property role="TrG5h" value="pos" />
54225412
<node concept="10Oyi0" id="4xzR2e_x3MP" role="1tU5fm" />
5423-
<node concept="2OqwBi" id="4xzR2e_x3MQ" role="33vP2m">
5424-
<node concept="37vLTw" id="4xzR2e_x3MR" role="2Oq$k0">
5413+
<node concept="2OqwBi" id="6jG9W4Ienir" role="33vP2m">
5414+
<node concept="37vLTw" id="6jG9W4Iek5b" role="2Oq$k0">
54255415
<ref role="3cqZAo" node="4xzR2e_x3My" resolve="finding" />
54265416
</node>
5427-
<node concept="2OwXpG" id="4xzR2e_x3MS" role="2OqNvi">
5428-
<ref role="2Oxat5" node="4lCUG7OtV5D" resolve="position" />
5417+
<node concept="liA8E" id="6jG9W4IerKG" role="2OqNvi">
5418+
<ref role="37wK5l" node="2LaXqmVKne0" resolve="endPos" />
54295419
</node>
54305420
</node>
54315421
</node>

‎code/languages/org.iets3.opensource/tests/test.in.expr.os/models/[email protected]‎ renamed to ‎code/languages/org.iets3.opensource/tests/test.in.expr.os/models/[email protected]‎

Lines changed: 165 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<model ref="r:4498a3f1-ffdc-46cb-b225-63bf7159e69e(test.in.expr.os.stringvaliation@tests)">
2+
<model ref="r:4498a3f1-ffdc-46cb-b225-63bf7159e69e(test.in.expr.os.stringvalidation@tests)">
33
<persistence version="9" />
44
<languages>
55
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
@@ -3035,6 +3035,26 @@
30353035
</node>
30363036
</node>
30373037
</node>
3038+
<node concept="_fkuZ" id="6jG9W4IhTFc" role="_fkp5">
3039+
<node concept="_fku$" id="6jG9W4IhTFd" role="_fkur" />
3040+
<node concept="2vmpnb" id="6jG9W4IhTFe" role="_fkuS" />
3041+
<node concept="1QScDb" id="6jG9W4IhTFf" role="_fkuY">
3042+
<node concept="jdvZO" id="6jG9W4IhTFg" role="1QScD9" />
3043+
<node concept="2L0563" id="6jG9W4IhTFh" role="30czhm">
3044+
<node concept="30bdrP" id="6jG9W4IhTFi" role="2L6No8">
3045+
<property role="30bdrQ" value="A19" />
3046+
</node>
3047+
<node concept="2L6KGn" id="6jG9W4IhTFj" role="2L6KGm">
3048+
<node concept="2L79uL" id="6jG9W4IhTFk" role="2L79uM" />
3049+
<node concept="1ahN3a" id="6jG9W4IhTFo" role="2L79uO" />
3050+
<node concept="2hOZQp" id="6jG9W4IhTYa" role="2L7ll4">
3051+
<node concept="2L7lk8" id="6jG9W4IhTYb" role="2L7lkK" />
3052+
<node concept="3s$PjR" id="6jG9W4IhU4x" role="2hOYAk" />
3053+
</node>
3054+
</node>
3055+
</node>
3056+
</node>
3057+
</node>
30383058
<node concept="_fkuZ" id="5qf1oe$xYN_" role="_fkp5">
30393059
<node concept="_fku$" id="5qf1oe$xYNA" role="_fkur" />
30403060
<node concept="2vmpnb" id="5qf1oe$xYNB" role="_fkuS" />
@@ -3075,6 +3095,26 @@
30753095
</node>
30763096
</node>
30773097
</node>
3098+
<node concept="_fkuZ" id="6jG9W4Ii0yZ" role="_fkp5">
3099+
<node concept="_fku$" id="6jG9W4Ii0z0" role="_fkur" />
3100+
<node concept="2vmpnb" id="6jG9W4Ii0z1" role="_fkuS" />
3101+
<node concept="1QScDb" id="6jG9W4Ii0z2" role="_fkuY">
3102+
<node concept="jdvZO" id="6jG9W4Ii0z3" role="1QScD9" />
3103+
<node concept="2L0563" id="6jG9W4Ii0z4" role="30czhm">
3104+
<node concept="30bdrP" id="6jG9W4Ii0z5" role="2L6No8">
3105+
<property role="30bdrQ" value="AA19A" />
3106+
</node>
3107+
<node concept="2L6KGn" id="6jG9W4Ii0z6" role="2L6KGm">
3108+
<node concept="2L79uL" id="6jG9W4Ii0z7" role="2L79uM" />
3109+
<node concept="1ahN3a" id="6jG9W4Ii0zb" role="2L79uO" />
3110+
<node concept="2hOZQp" id="6jG9W4Ii0N2" role="2L7ll4">
3111+
<node concept="2L7lk8" id="6jG9W4Ii0N3" role="2L7lkK" />
3112+
<node concept="3s$PjR" id="6jG9W4Ii0Tp" role="2hOYAk" />
3113+
</node>
3114+
</node>
3115+
</node>
3116+
</node>
3117+
</node>
30783118
<node concept="_fkuZ" id="5qf1oe$yBwp" role="_fkp5">
30793119
<node concept="_fku$" id="5qf1oe$yBwq" role="_fkur" />
30803120
<node concept="2vmpnb" id="5qf1oe$yBwr" role="_fkuS" />
@@ -3095,14 +3135,74 @@
30953135
</node>
30963136
</node>
30973137
</node>
3138+
<node concept="_fkuZ" id="6jG9W4Ii5s$" role="_fkp5">
3139+
<node concept="_fku$" id="6jG9W4Ii5s_" role="_fkur" />
3140+
<node concept="2vmpnb" id="6jG9W4Ii5sA" role="_fkuS" />
3141+
<node concept="1QScDb" id="6jG9W4Ii5sB" role="_fkuY">
3142+
<node concept="jdvZO" id="6jG9W4Ii5sC" role="1QScD9" />
3143+
<node concept="2L0563" id="6jG9W4Ii5sD" role="30czhm">
3144+
<node concept="30bdrP" id="6jG9W4Ii5sE" role="2L6No8">
3145+
<property role="30bdrQ" value="AA19AA19A" />
3146+
</node>
3147+
<node concept="2L6KGn" id="6jG9W4Ii5sF" role="2L6KGm">
3148+
<node concept="2L79uL" id="6jG9W4Ii5sG" role="2L79uM" />
3149+
<node concept="1ahN3a" id="6jG9W4Ii5sK" role="2L79uO" />
3150+
<node concept="2hOZQp" id="6jG9W4Ii5QA" role="2L7ll4">
3151+
<node concept="2L7lk8" id="6jG9W4Ii5QB" role="2L7lkK" />
3152+
<node concept="3s$PjR" id="6jG9W4Ii5TP" role="2hOYAk" />
3153+
</node>
3154+
</node>
3155+
</node>
3156+
</node>
3157+
</node>
3158+
<node concept="_fkuZ" id="6jG9W4Ii6Os" role="_fkp5">
3159+
<node concept="_fku$" id="6jG9W4Ii6Ot" role="_fkur" />
3160+
<node concept="2vmpn$" id="6jG9W4Ii6Zf" role="_fkuS" />
3161+
<node concept="1QScDb" id="6jG9W4Ii6Ov" role="_fkuY">
3162+
<node concept="jdvZO" id="6jG9W4Ii6Ow" role="1QScD9" />
3163+
<node concept="2L0563" id="6jG9W4Ii6Ox" role="30czhm">
3164+
<node concept="30bdrP" id="6jG9W4Ii6Oy" role="2L6No8">
3165+
<property role="30bdrQ" value="A_19AA19A" />
3166+
</node>
3167+
<node concept="2L6KGn" id="6jG9W4Ii6Oz" role="2L6KGm">
3168+
<node concept="2L79uL" id="6jG9W4Ii6O$" role="2L79uM" />
3169+
<node concept="1ahN3a" id="6jG9W4Ii6O_" role="2L79uO" />
3170+
<node concept="2hOZQp" id="6jG9W4Ii6OA" role="2L7ll4">
3171+
<node concept="2L7lk8" id="6jG9W4Ii6OB" role="2L7lkK" />
3172+
<node concept="3s$PjR" id="6jG9W4Ii6OC" role="2hOYAk" />
3173+
</node>
3174+
</node>
3175+
</node>
3176+
</node>
3177+
</node>
3178+
<node concept="_fkuZ" id="6jG9W4Ii80t" role="_fkp5">
3179+
<node concept="_fku$" id="6jG9W4Ii80u" role="_fkur" />
3180+
<node concept="2vmpn$" id="6jG9W4Ii80v" role="_fkuS" />
3181+
<node concept="1QScDb" id="6jG9W4Ii80w" role="_fkuY">
3182+
<node concept="jdvZO" id="6jG9W4Ii80x" role="1QScD9" />
3183+
<node concept="2L0563" id="6jG9W4Ii80y" role="30czhm">
3184+
<node concept="30bdrP" id="6jG9W4Ii80z" role="2L6No8">
3185+
<property role="30bdrQ" value="AA19A_19A" />
3186+
</node>
3187+
<node concept="2L6KGn" id="6jG9W4Ii80$" role="2L6KGm">
3188+
<node concept="2L79uL" id="6jG9W4Ii80_" role="2L79uM" />
3189+
<node concept="1ahN3a" id="6jG9W4Ii80A" role="2L79uO" />
3190+
<node concept="2hOZQp" id="6jG9W4Ii80B" role="2L7ll4">
3191+
<node concept="2L7lk8" id="6jG9W4Ii80C" role="2L7lkK" />
3192+
<node concept="3s$PjR" id="6jG9W4Ii80D" role="2hOYAk" />
3193+
</node>
3194+
</node>
3195+
</node>
3196+
</node>
3197+
</node>
30983198
<node concept="_fkuZ" id="5qf1oe$yL7m" role="_fkp5">
30993199
<node concept="_fku$" id="5qf1oe$yL7n" role="_fkur" />
31003200
<node concept="2vmpn$" id="5qf1oe$yLal" role="_fkuS" />
31013201
<node concept="1QScDb" id="5qf1oe$yL7p" role="_fkuY">
31023202
<node concept="jdvZO" id="5qf1oe$yL7q" role="1QScD9" />
31033203
<node concept="2L0563" id="5qf1oe$yL7r" role="30czhm">
31043204
<node concept="30bdrP" id="5qf1oe$yL7s" role="2L6No8">
3105-
<property role="30bdrQ" value="A19_" />
3205+
<property role="30bdrQ" value="A19?" />
31063206
</node>
31073207
<node concept="2L6KGn" id="5qf1oe$yL7t" role="2L6KGm">
31083208
<node concept="2L79uL" id="5qf1oe$yL7u" role="2L79uM" />
@@ -3115,6 +3215,26 @@
31153215
</node>
31163216
</node>
31173217
</node>
3218+
<node concept="_fkuZ" id="6jG9W4Ii1Ql" role="_fkp5">
3219+
<node concept="_fku$" id="6jG9W4Ii1Qm" role="_fkur" />
3220+
<node concept="2vmpn$" id="6jG9W4Ii1Qn" role="_fkuS" />
3221+
<node concept="1QScDb" id="6jG9W4Ii1Qo" role="_fkuY">
3222+
<node concept="jdvZO" id="6jG9W4Ii1Qp" role="1QScD9" />
3223+
<node concept="2L0563" id="6jG9W4Ii1Qq" role="30czhm">
3224+
<node concept="30bdrP" id="6jG9W4Ii1Qr" role="2L6No8">
3225+
<property role="30bdrQ" value="?19A" />
3226+
</node>
3227+
<node concept="2L6KGn" id="6jG9W4Ii1Qs" role="2L6KGm">
3228+
<node concept="2L79uL" id="6jG9W4Ii1Qt" role="2L79uM" />
3229+
<node concept="1ahN3a" id="6jG9W4Ii1Qx" role="2L79uO" />
3230+
<node concept="2hOZQp" id="6jG9W4Ii29H" role="2L7ll4">
3231+
<node concept="2L7lk8" id="6jG9W4Ii29I" role="2L7lkK" />
3232+
<node concept="3s$PjR" id="6jG9W4Ii2cW" role="2hOYAk" />
3233+
</node>
3234+
</node>
3235+
</node>
3236+
</node>
3237+
</node>
31183238
<node concept="_fkuZ" id="5qf1oe$yOtt" role="_fkp5">
31193239
<node concept="_fku$" id="5qf1oe$yOtu" role="_fkur" />
31203240
<node concept="2vmpn$" id="5qf1oe$yOtv" role="_fkuS" />
@@ -3135,6 +3255,26 @@
31353255
</node>
31363256
</node>
31373257
</node>
3258+
<node concept="_fkuZ" id="6jG9W4Ii3gv" role="_fkp5">
3259+
<node concept="_fku$" id="6jG9W4Ii3gw" role="_fkur" />
3260+
<node concept="2vmpn$" id="6jG9W4Ii3gx" role="_fkuS" />
3261+
<node concept="1QScDb" id="6jG9W4Ii3gy" role="_fkuY">
3262+
<node concept="jdvZO" id="6jG9W4Ii3gz" role="1QScD9" />
3263+
<node concept="2L0563" id="6jG9W4Ii3g$" role="30czhm">
3264+
<node concept="30bdrP" id="6jG9W4Ii3g_" role="2L6No8">
3265+
<property role="30bdrQ" value="_19" />
3266+
</node>
3267+
<node concept="2L6KGn" id="6jG9W4Ii3gA" role="2L6KGm">
3268+
<node concept="2L79uL" id="6jG9W4Ii3gB" role="2L79uM" />
3269+
<node concept="1ahN3a" id="6jG9W4Ii3gF" role="2L79uO" />
3270+
<node concept="2hOZQp" id="6jG9W4Ii3wW" role="2L7ll4">
3271+
<node concept="2L7lk8" id="6jG9W4Ii3wX" role="2L7lkK" />
3272+
<node concept="3s$PjR" id="6jG9W4Ii3$b" role="2hOYAk" />
3273+
</node>
3274+
</node>
3275+
</node>
3276+
</node>
3277+
</node>
31383278
<node concept="_fkuZ" id="1oWxB4rg8eD" role="_fkp5">
31393279
<node concept="_fku$" id="1oWxB4rg8eE" role="_fkur" />
31403280
<node concept="2vmpnb" id="1oWxB4rg8ic" role="_fkuS" />
@@ -3150,7 +3290,29 @@
31503290
<node concept="2L7llq" id="1oWxB4rguS8" role="2L7ll4">
31513291
<node concept="2L7lk8" id="1oWxB4rguS9" role="2L7lkK" />
31523292
<node concept="3spgBY" id="1oWxB4rguSf" role="3spgZC">
3153-
<property role="3spgBZ" value="3" />
3293+
<property role="3spgBZ" value="2" />
3294+
</node>
3295+
</node>
3296+
</node>
3297+
</node>
3298+
</node>
3299+
</node>
3300+
<node concept="_fkuZ" id="6jG9W4I5DW7" role="_fkp5">
3301+
<node concept="_fku$" id="6jG9W4I5DW8" role="_fkur" />
3302+
<node concept="2vmpnb" id="6jG9W4I5DW9" role="_fkuS" />
3303+
<node concept="1QScDb" id="6jG9W4I5DWa" role="_fkuY">
3304+
<node concept="jdvZO" id="6jG9W4I5DWb" role="1QScD9" />
3305+
<node concept="2L0563" id="6jG9W4I5DWc" role="30czhm">
3306+
<node concept="30bdrP" id="6jG9W4I5DWd" role="2L6No8">
3307+
<property role="30bdrQ" value="xx123yy" />
3308+
</node>
3309+
<node concept="2L6KGn" id="6jG9W4I5DWe" role="2L6KGm">
3310+
<node concept="2L79uL" id="6jG9W4I5DWf" role="2L79uM" />
3311+
<node concept="1ahN3a" id="6jG9W4I5DWg" role="2L79uO" />
3312+
<node concept="2L7llq" id="6jG9W4I5DWh" role="2L7ll4">
3313+
<node concept="2L7lk8" id="6jG9W4I5DWi" role="2L7lkK" />
3314+
<node concept="3spgBY" id="6jG9W4I5DWj" role="3spgZC">
3315+
<property role="3spgBZ" value="2" />
31543316
</node>
31553317
</node>
31563318
</node>

0 commit comments

Comments
 (0)