Skip to content

Commit 55fb64a

Browse files
alexanderpannalexanderpann
authored
Merge pull request #720 from IETS3/bugfix/minor_fixes_nov_2021_3
2 parents 7edb816 + 2eeda99 commit 55fb64a

File tree

3 files changed

+185
-10
lines changed

3 files changed

+185
-10
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1010

1111
- Generation of nested short lambda expression now use the correct type for "it" as a variable.
1212

13+
## November 2023
14+
15+
### Fixed
16+
17+
- String validation: A bug in the number detection logic was fixed
18+
1319
## September 2023
1420

1521
### Added

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

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,12 +1137,19 @@
11371137
<node concept="37vLTw" id="3dTPcTTfXvT" role="37wK5m">
11381138
<ref role="3cqZAo" node="3dTPcTTfXwf" resolve="candidate" />
11391139
</node>
1140-
<node concept="2OqwBi" id="3dTPcTTggDS" role="37wK5m">
1141-
<node concept="37vLTw" id="3dTPcTTfXvU" role="2Oq$k0">
1142-
<ref role="3cqZAo" node="3dTPcTTg1fa" resolve="m" />
1143-
</node>
1144-
<node concept="liA8E" id="3dTPcTTgh2P" role="2OqNvi">
1145-
<ref role="37wK5l" to="ni5j:~Matcher.start()" resolve="start" />
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" />
1144+
</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>
1152+
</node>
11461153
</node>
11471154
</node>
11481155
<node concept="2OqwBi" id="3dTPcTTfXvV" role="37wK5m">
@@ -1160,7 +1167,7 @@
11601167
<ref role="3cqZAo" node="3dTPcTTg1fa" resolve="m" />
11611168
</node>
11621169
<node concept="liA8E" id="3dTPcTTgiBZ" role="2OqNvi">
1163-
<ref role="37wK5l" to="ni5j:~Matcher.start()" resolve="start" />
1170+
<ref role="37wK5l" to="ni5j:~Matcher.end()" resolve="end" />
11641171
</node>
11651172
</node>
11661173
</node>
@@ -5606,9 +5613,6 @@
56065613
</node>
56075614
</node>
56085615
</node>
5609-
<node concept="37vLTw" id="4aXqgIrpMDH" role="3clFbw">
5610-
<ref role="3cqZAo" node="4aXqgIrpDHe" resolve="success" />
5611-
</node>
56125616
<node concept="9aQIb" id="4xzR2e_x3NQ" role="9aQIa">
56135617
<node concept="3clFbS" id="4xzR2e_x3NR" role="9aQI4">
56145618
<node concept="3cpWs6" id="4xzR2e_x3NS" role="3cqZAp">
@@ -5634,6 +5638,9 @@
56345638
</node>
56355639
</node>
56365640
</node>
5641+
<node concept="37vLTw" id="4aXqgIrpMDH" role="3clFbw">
5642+
<ref role="3cqZAo" node="4aXqgIrpDHe" resolve="success" />
5643+
</node>
56375644
</node>
56385645
</node>
56395646
<node concept="1wplmZ" id="4xzR2e_x3O3" role="1zxBo6">

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

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2995,6 +2995,168 @@
29952995
</node>
29962996
<node concept="2vmpnb" id="4aXqgIrnJL_" role="_fkuS" />
29972997
</node>
2998+
<node concept="_fkuZ" id="11uo6L7CRcd" role="_fkp5">
2999+
<node concept="_fku$" id="11uo6L7CRce" role="_fkur" />
3000+
<node concept="2vmpnb" id="11uo6L7CRfz" role="_fkuS" />
3001+
<node concept="1QScDb" id="11uo6L7CReg" role="_fkuY">
3002+
<node concept="jdvZO" id="11uo6L7CRfh" role="1QScD9" />
3003+
<node concept="2L0563" id="11uo6L7CRei" role="30czhm">
3004+
<node concept="30bdrP" id="11uo6L7CRej" role="2L6No8">
3005+
<property role="30bdrQ" value="1A2A" />
3006+
</node>
3007+
<node concept="2L6KGn" id="11uo6L7CRek" role="2L6KGm">
3008+
<node concept="2L79uL" id="11uo6L7CRel" role="2L79uM" />
3009+
<node concept="3HS0E4" id="11uo6L7CRen" role="2L7ll4">
3010+
<node concept="2L7lk8" id="11uo6L7CReo" role="2L7lkK" />
3011+
<node concept="3s$PjR" id="5qf1oe$ahr_" role="2hOYAl" />
3012+
</node>
3013+
<node concept="1ahN3a" id="11uo6L7CReU" role="2L79uO" />
3014+
</node>
3015+
</node>
3016+
</node>
3017+
</node>
3018+
<node concept="_fkuZ" id="5qf1oe$ie29" role="_fkp5">
3019+
<node concept="_fku$" id="5qf1oe$ie2a" role="_fkur" />
3020+
<node concept="2vmpnb" id="5qf1oe$ie2b" role="_fkuS" />
3021+
<node concept="1QScDb" id="5qf1oe$ie2c" role="_fkuY">
3022+
<node concept="jdvZO" id="5qf1oe$ie2d" role="1QScD9" />
3023+
<node concept="2L0563" id="5qf1oe$ie2e" role="30czhm">
3024+
<node concept="30bdrP" id="5qf1oe$ie2f" role="2L6No8">
3025+
<property role="30bdrQ" value="19A" />
3026+
</node>
3027+
<node concept="2L6KGn" id="5qf1oe$ie2g" role="2L6KGm">
3028+
<node concept="2L79uL" id="5qf1oe$ie2h" role="2L79uM" />
3029+
<node concept="3HS0E4" id="5qf1oe$ie2i" role="2L7ll4">
3030+
<node concept="2L7lk8" id="5qf1oe$ie2j" role="2L7lkK" />
3031+
<node concept="3s$PjR" id="5qf1oe$ie2k" role="2hOYAl" />
3032+
</node>
3033+
<node concept="1ahN3a" id="5qf1oe$ie2l" role="2L79uO" />
3034+
</node>
3035+
</node>
3036+
</node>
3037+
</node>
3038+
<node concept="_fkuZ" id="5qf1oe$xYN_" role="_fkp5">
3039+
<node concept="_fku$" id="5qf1oe$xYNA" role="_fkur" />
3040+
<node concept="2vmpnb" id="5qf1oe$xYNB" role="_fkuS" />
3041+
<node concept="1QScDb" id="5qf1oe$xYNC" role="_fkuY">
3042+
<node concept="jdvZO" id="5qf1oe$xYND" role="1QScD9" />
3043+
<node concept="2L0563" id="5qf1oe$xYNE" role="30czhm">
3044+
<node concept="30bdrP" id="5qf1oe$xYNF" role="2L6No8">
3045+
<property role="30bdrQ" value="A19A" />
3046+
</node>
3047+
<node concept="2L6KGn" id="5qf1oe$xYNG" role="2L6KGm">
3048+
<node concept="2L79uL" id="5qf1oe$xYNH" role="2L79uM" />
3049+
<node concept="3HS0E4" id="5qf1oe$xYNI" role="2L7ll4">
3050+
<node concept="2L7lk8" id="5qf1oe$xYNJ" role="2L7lkK" />
3051+
<node concept="3s$PjR" id="5qf1oe$xYNK" role="2hOYAl" />
3052+
</node>
3053+
<node concept="1ahN3a" id="5qf1oe$xYNL" role="2L79uO" />
3054+
</node>
3055+
</node>
3056+
</node>
3057+
</node>
3058+
<node concept="_fkuZ" id="5qf1oe$yAE1" role="_fkp5">
3059+
<node concept="_fku$" id="5qf1oe$yAE2" role="_fkur" />
3060+
<node concept="2vmpnb" id="5qf1oe$yAE3" role="_fkuS" />
3061+
<node concept="1QScDb" id="5qf1oe$yAE4" role="_fkuY">
3062+
<node concept="jdvZO" id="5qf1oe$yAE5" role="1QScD9" />
3063+
<node concept="2L0563" id="5qf1oe$yAE6" role="30czhm">
3064+
<node concept="30bdrP" id="5qf1oe$yAE7" role="2L6No8">
3065+
<property role="30bdrQ" value="AA19A" />
3066+
</node>
3067+
<node concept="2L6KGn" id="5qf1oe$yAE8" role="2L6KGm">
3068+
<node concept="2L79uL" id="5qf1oe$yAE9" role="2L79uM" />
3069+
<node concept="3HS0E4" id="5qf1oe$yAEa" role="2L7ll4">
3070+
<node concept="2L7lk8" id="5qf1oe$yAEb" role="2L7lkK" />
3071+
<node concept="3s$PjR" id="5qf1oe$yAEc" role="2hOYAl" />
3072+
</node>
3073+
<node concept="1ahN3a" id="5qf1oe$yAEd" role="2L79uO" />
3074+
</node>
3075+
</node>
3076+
</node>
3077+
</node>
3078+
<node concept="_fkuZ" id="5qf1oe$yBwp" role="_fkp5">
3079+
<node concept="_fku$" id="5qf1oe$yBwq" role="_fkur" />
3080+
<node concept="2vmpnb" id="5qf1oe$yBwr" role="_fkuS" />
3081+
<node concept="1QScDb" id="5qf1oe$yBws" role="_fkuY">
3082+
<node concept="jdvZO" id="5qf1oe$yBwt" role="1QScD9" />
3083+
<node concept="2L0563" id="5qf1oe$yBwu" role="30czhm">
3084+
<node concept="30bdrP" id="5qf1oe$yBwv" role="2L6No8">
3085+
<property role="30bdrQ" value="AA19AA19A" />
3086+
</node>
3087+
<node concept="2L6KGn" id="5qf1oe$yBww" role="2L6KGm">
3088+
<node concept="2L79uL" id="5qf1oe$yBwx" role="2L79uM" />
3089+
<node concept="3HS0E4" id="5qf1oe$yBwy" role="2L7ll4">
3090+
<node concept="2L7lk8" id="5qf1oe$yBwz" role="2L7lkK" />
3091+
<node concept="3s$PjR" id="5qf1oe$yBw$" role="2hOYAl" />
3092+
</node>
3093+
<node concept="1ahN3a" id="5qf1oe$yBw_" role="2L79uO" />
3094+
</node>
3095+
</node>
3096+
</node>
3097+
</node>
3098+
<node concept="_fkuZ" id="5qf1oe$yL7m" role="_fkp5">
3099+
<node concept="_fku$" id="5qf1oe$yL7n" role="_fkur" />
3100+
<node concept="2vmpn$" id="5qf1oe$yLal" role="_fkuS" />
3101+
<node concept="1QScDb" id="5qf1oe$yL7p" role="_fkuY">
3102+
<node concept="jdvZO" id="5qf1oe$yL7q" role="1QScD9" />
3103+
<node concept="2L0563" id="5qf1oe$yL7r" role="30czhm">
3104+
<node concept="30bdrP" id="5qf1oe$yL7s" role="2L6No8">
3105+
<property role="30bdrQ" value="A19_" />
3106+
</node>
3107+
<node concept="2L6KGn" id="5qf1oe$yL7t" role="2L6KGm">
3108+
<node concept="2L79uL" id="5qf1oe$yL7u" role="2L79uM" />
3109+
<node concept="3HS0E4" id="5qf1oe$yL7v" role="2L7ll4">
3110+
<node concept="2L7lk8" id="5qf1oe$yL7w" role="2L7lkK" />
3111+
<node concept="3s$PjR" id="5qf1oe$yL7x" role="2hOYAl" />
3112+
</node>
3113+
<node concept="1ahN3a" id="5qf1oe$yL7y" role="2L79uO" />
3114+
</node>
3115+
</node>
3116+
</node>
3117+
</node>
3118+
<node concept="_fkuZ" id="5qf1oe$yOtt" role="_fkp5">
3119+
<node concept="_fku$" id="5qf1oe$yOtu" role="_fkur" />
3120+
<node concept="2vmpn$" id="5qf1oe$yOtv" role="_fkuS" />
3121+
<node concept="1QScDb" id="5qf1oe$yOtw" role="_fkuY">
3122+
<node concept="jdvZO" id="5qf1oe$yOtx" role="1QScD9" />
3123+
<node concept="2L0563" id="5qf1oe$yOty" role="30czhm">
3124+
<node concept="30bdrP" id="5qf1oe$yOtz" role="2L6No8">
3125+
<property role="30bdrQ" value="19_" />
3126+
</node>
3127+
<node concept="2L6KGn" id="5qf1oe$yOt$" role="2L6KGm">
3128+
<node concept="2L79uL" id="5qf1oe$yOt_" role="2L79uM" />
3129+
<node concept="3HS0E4" id="5qf1oe$yOtA" role="2L7ll4">
3130+
<node concept="2L7lk8" id="5qf1oe$yOtB" role="2L7lkK" />
3131+
<node concept="3s$PjR" id="5qf1oe$yOtC" role="2hOYAl" />
3132+
</node>
3133+
<node concept="1ahN3a" id="5qf1oe$yOtD" role="2L79uO" />
3134+
</node>
3135+
</node>
3136+
</node>
3137+
</node>
3138+
<node concept="_fkuZ" id="1oWxB4rg8eD" role="_fkp5">
3139+
<node concept="_fku$" id="1oWxB4rg8eE" role="_fkur" />
3140+
<node concept="2vmpnb" id="1oWxB4rg8ic" role="_fkuS" />
3141+
<node concept="1QScDb" id="1oWxB4rguRx" role="_fkuY">
3142+
<node concept="jdvZO" id="1oWxB4rguRy" role="1QScD9" />
3143+
<node concept="2L0563" id="1oWxB4rguRz" role="30czhm">
3144+
<node concept="30bdrP" id="1oWxB4rguR$" role="2L6No8">
3145+
<property role="30bdrQ" value="xx19yy" />
3146+
</node>
3147+
<node concept="2L6KGn" id="1oWxB4rguR_" role="2L6KGm">
3148+
<node concept="2L79uL" id="1oWxB4rguRA" role="2L79uM" />
3149+
<node concept="1ahN3a" id="1oWxB4rguRE" role="2L79uO" />
3150+
<node concept="2L7llq" id="1oWxB4rguS8" role="2L7ll4">
3151+
<node concept="2L7lk8" id="1oWxB4rguS9" role="2L7lkK" />
3152+
<node concept="3spgBY" id="1oWxB4rguSf" role="3spgZC">
3153+
<property role="3spgBZ" value="3" />
3154+
</node>
3155+
</node>
3156+
</node>
3157+
</node>
3158+
</node>
3159+
</node>
29983160
</node>
29993161
<node concept="_ixoA" id="6Sp$RJ7bBHK" role="_iOnB" />
30003162
<node concept="_ixoA" id="6Sp$RJ7bBZ1" role="_iOnB" />

0 commit comments

Comments
 (0)