Skip to content

Commit 3da6dc8

Browse files
HeikoBeckerHeikoBecker
committed
Add a test for val stmts and fix error messages
1 parent 5718aed commit 3da6dc8

File tree

3 files changed

+101
-35
lines changed
  • code/languages/org.iets3.opensource

3 files changed

+101
-35
lines changed

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

Lines changed: 73 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -340,12 +340,14 @@
340340
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
341341
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
342342
</concept>
343+
<concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
343344
<concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
344345
<reference id="1145383142433" name="elementConcept" index="2I9WkF" />
345346
</concept>
346347
<concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
347348
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
348349
</concept>
350+
<concept id="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
349351
<concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
350352
<concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
351353
<concept id="1145567426890" name="jetbrains.mps.lang.smodel.structure.SNodeListCreator" flags="nn" index="2T8Vx0">
@@ -1287,42 +1289,82 @@
12871289
</node>
12881290
</node>
12891291
<node concept="3cpWs6" id="2Ux6GHgX$Ku" role="3cqZAp">
1290-
<node concept="3cpWs3" id="2Ux6GHgX$Kv" role="3cqZAk">
1291-
<node concept="1eOMI4" id="2Ux6GHgX$Kw" role="3uHU7w">
1292-
<node concept="3K4zz7" id="2Ux6GHgX$Kx" role="1eOMHV">
1293-
<node concept="2OqwBi" id="2Ux6GHgX$Ky" role="3K4Cdx">
1294-
<node concept="37vLTw" id="2Ux6GHgX$Kz" role="2Oq$k0">
1295-
<ref role="3cqZAo" node="lqDNwvmrgZ" resolve="exp" />
1292+
<node concept="3cpWs3" id="J6oDkVJgYd" role="3cqZAk">
1293+
<node concept="2OqwBi" id="J6oDkVJf6L" role="3uHU7w">
1294+
<node concept="2OqwBi" id="J6oDkVJe0C" role="2Oq$k0">
1295+
<node concept="2OqwBi" id="J6oDkVJcKC" role="2Oq$k0">
1296+
<node concept="13iPFW" id="J6oDkVJcx0" role="2Oq$k0" />
1297+
<node concept="3TrEf2" id="J6oDkVJdGn" role="2OqNvi">
1298+
<ref role="3Tt5mk" to="b0gq:7eOyx9r3qFW" resolve="unit" />
12961299
</node>
1297-
<node concept="17RlXB" id="2Ux6GHgX$K$" role="2OqNvi" />
1298-
</node>
1299-
<node concept="Xl_RD" id="2Ux6GHgX$K_" role="3K4E3e">
1300-
<property role="Xl_RC" value="" />
13011300
</node>
1302-
<node concept="3cpWs3" id="2Ux6GHgX$KA" role="3K4GZi">
1303-
<node concept="Xl_RD" id="2Ux6GHgX$KB" role="3uHU7w">
1304-
<property role="Xl_RC" value=")" />
1305-
</node>
1306-
<node concept="3cpWs3" id="2Ux6GHgX$KC" role="3uHU7B">
1307-
<node concept="Xl_RD" id="2Ux6GHgX$KD" role="3uHU7B">
1308-
<property role="Xl_RC" value="^(" />
1301+
<node concept="2Rxl7S" id="J6oDkVJeWz" role="2OqNvi" />
1302+
</node>
1303+
<node concept="2qgKlT" id="J6oDkVJfZe" role="2OqNvi">
1304+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
1305+
</node>
1306+
</node>
1307+
<node concept="3cpWs3" id="J6oDkVJcbm" role="3uHU7B">
1308+
<node concept="3cpWs3" id="J6oDkVJaM$" role="3uHU7B">
1309+
<node concept="3cpWs3" id="J6oDkVI_UL" role="3uHU7B">
1310+
<node concept="3cpWs3" id="2Ux6GHgX$Kv" role="3uHU7B">
1311+
<node concept="2OqwBi" id="2Ux6GHgX$KF" role="3uHU7B">
1312+
<node concept="2OqwBi" id="2Ux6GHgX$KG" role="2Oq$k0">
1313+
<node concept="13iPFW" id="2Ux6GHgX$KH" role="2Oq$k0" />
1314+
<node concept="3TrEf2" id="2Ux6GHgX$KI" role="2OqNvi">
1315+
<ref role="3Tt5mk" to="b0gq:7eOyx9r3qFW" resolve="unit" />
1316+
</node>
1317+
</node>
1318+
<node concept="2qgKlT" id="2Ux6GHgX$KJ" role="2OqNvi">
1319+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
1320+
</node>
13091321
</node>
1310-
<node concept="37vLTw" id="2Ux6GHgX$KE" role="3uHU7w">
1311-
<ref role="3cqZAo" node="lqDNwvmrgZ" resolve="exp" />
1322+
<node concept="1eOMI4" id="2Ux6GHgX$Kw" role="3uHU7w">
1323+
<node concept="3K4zz7" id="2Ux6GHgX$Kx" role="1eOMHV">
1324+
<node concept="2OqwBi" id="2Ux6GHgX$Ky" role="3K4Cdx">
1325+
<node concept="37vLTw" id="2Ux6GHgX$Kz" role="2Oq$k0">
1326+
<ref role="3cqZAo" node="lqDNwvmrgZ" resolve="exp" />
1327+
</node>
1328+
<node concept="17RlXB" id="2Ux6GHgX$K$" role="2OqNvi" />
1329+
</node>
1330+
<node concept="Xl_RD" id="2Ux6GHgX$K_" role="3K4E3e">
1331+
<property role="Xl_RC" value="" />
1332+
</node>
1333+
<node concept="3cpWs3" id="2Ux6GHgX$KA" role="3K4GZi">
1334+
<node concept="Xl_RD" id="2Ux6GHgX$KB" role="3uHU7w">
1335+
<property role="Xl_RC" value=")" />
1336+
</node>
1337+
<node concept="3cpWs3" id="2Ux6GHgX$KC" role="3uHU7B">
1338+
<node concept="Xl_RD" id="2Ux6GHgX$KD" role="3uHU7B">
1339+
<property role="Xl_RC" value="^(" />
1340+
</node>
1341+
<node concept="37vLTw" id="2Ux6GHgX$KE" role="3uHU7w">
1342+
<ref role="3cqZAo" node="lqDNwvmrgZ" resolve="exp" />
1343+
</node>
1344+
</node>
1345+
</node>
1346+
</node>
13121347
</node>
13131348
</node>
1349+
<node concept="Xl_RD" id="J6oDkVJb7O" role="3uHU7w">
1350+
<property role="Xl_RC" value=" in " />
1351+
</node>
13141352
</node>
1315-
</node>
1316-
</node>
1317-
<node concept="2OqwBi" id="2Ux6GHgX$KF" role="3uHU7B">
1318-
<node concept="2OqwBi" id="2Ux6GHgX$KG" role="2Oq$k0">
1319-
<node concept="13iPFW" id="2Ux6GHgX$KH" role="2Oq$k0" />
1320-
<node concept="3TrEf2" id="2Ux6GHgX$KI" role="2OqNvi">
1321-
<ref role="3Tt5mk" to="b0gq:7eOyx9r3qFW" resolve="unit" />
1353+
<node concept="2OqwBi" id="J6oDkVIB3C" role="3uHU7w">
1354+
<node concept="2OqwBi" id="J6oDkVJ9vv" role="2Oq$k0">
1355+
<node concept="2OqwBi" id="J6oDkVIAyY" role="2Oq$k0">
1356+
<node concept="13iPFW" id="J6oDkVIAjN" role="2Oq$k0" />
1357+
<node concept="3TrEf2" id="J6oDkVJ8Fv" role="2OqNvi">
1358+
<ref role="3Tt5mk" to="b0gq:7eOyx9r3qFW" resolve="unit" />
1359+
</node>
1360+
</node>
1361+
<node concept="I4A8Y" id="J6oDkVJatK" role="2OqNvi" />
1362+
</node>
1363+
<node concept="LkI2h" id="J6oDkVIBfI" role="2OqNvi" />
13221364
</node>
13231365
</node>
1324-
<node concept="2qgKlT" id="2Ux6GHgX$KJ" role="2OqNvi">
1325-
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
1366+
<node concept="Xl_RD" id="J6oDkVJhnc" role="3uHU7w">
1367+
<property role="Xl_RC" value="/" />
13261368
</node>
13271369
</node>
13281370
</node>
@@ -1918,7 +1960,7 @@
19181960
</node>
19191961
</node>
19201962
<node concept="Xl_RD" id="5sKgdctVSzH" role="3uHU7w">
1921-
<property role="Xl_RC" value=" model:" />
1963+
<property role="Xl_RC" value=" in " />
19221964
</node>
19231965
</node>
19241966
<node concept="2OqwBi" id="5sKgdcu1dYe" role="3uHU7w">
@@ -1938,7 +1980,7 @@
19381980
</node>
19391981
</node>
19401982
<node concept="Xl_RD" id="5sKgdctW1hD" role="3uHU7w">
1941-
<property role="Xl_RC" value=", root:" />
1983+
<property role="Xl_RC" value="/" />
19421984
</node>
19431985
</node>
19441986
</node>
@@ -1953,7 +1995,7 @@
19531995
</node>
19541996
<node concept="3uJxvA" id="5sKgdctWdlf" role="2OqNvi">
19551997
<node concept="Xl_RD" id="5sKgdctWfVl" role="3uJOhx">
1956-
<property role="Xl_RC" value="; " />
1998+
<property role="Xl_RC" value=", " />
19571999
</node>
19582000
</node>
19592001
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/typesystem.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,6 +668,7 @@
668668
</node>
669669
</node>
670670
</node>
671+
<node concept="3clFbH" id="J6oDkVFusu" role="3cqZAp" />
671672
</node>
672673
<node concept="1YaCAy" id="5SUxxv_TnWf" role="1YuTPh">
673674
<property role="TrG5h" value="sub" />
@@ -951,7 +952,6 @@
951952
</node>
952953
</node>
953954
</node>
954-
<node concept="3clFbH" id="1WJTL5jyVJJ" role="3cqZAp" />
955955
<node concept="3clFbJ" id="1WJTL5jvdwY" role="3cqZAp">
956956
<node concept="3clFbS" id="1WJTL5jvdx0" role="3clFbx">
957957
<node concept="3clFbF" id="1WJTL5jve5u" role="3cqZAp">

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

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5763,8 +5763,8 @@
57635763
<property role="30bXRw" value="5" />
57645764
</node>
57655765
</node>
5766-
<node concept="7CXmI" id="2UZH4PMTreE" role="lGtFl">
5767-
<node concept="1TM$A" id="2UZH4PMTreF" role="7EUXB" />
5766+
<node concept="7CXmI" id="J6oDkVK5ne" role="lGtFl">
5767+
<node concept="1TM$A" id="J6oDkVK5nf" role="7EUXB" />
57685768
</node>
57695769
</node>
57705770
</node>
@@ -5802,6 +5802,30 @@
58025802
</node>
58035803
</node>
58045804
</node>
5805+
<node concept="2zPypq" id="J6oDkVCEx7" role="_iOnC">
5806+
<property role="TrG5h" value="errorOnAssign" />
5807+
<node concept="1YnStw" id="J6oDkVCECV" role="2zPyp_">
5808+
<node concept="CIsGf" id="J6oDkVCECe" role="2c7tTI">
5809+
<node concept="CIsvn" id="J6oDkVCECf" role="CIi4h">
5810+
<ref role="CIi3I" node="2UZH4PMT5ot" resolve="m" />
5811+
</node>
5812+
</node>
5813+
<node concept="30bXRB" id="J6oDkVCE_c" role="1YnStB">
5814+
<property role="30bXRw" value="5" />
5815+
</node>
5816+
<node concept="7CXmI" id="J6oDkVK5xB" role="lGtFl">
5817+
<node concept="1TM$A" id="J6oDkVK5xC" role="7EUXB" />
5818+
</node>
5819+
</node>
5820+
<node concept="2c7tTJ" id="J6oDkVCE$8" role="2zM23F">
5821+
<node concept="CIsGf" id="J6oDkVCE$A" role="2c7tTI">
5822+
<node concept="CIsvn" id="J6oDkVCE$$" role="CIi4h">
5823+
<ref role="CIi3I" to="ku0a:5XaocLWHSS4" resolve="m" />
5824+
</node>
5825+
</node>
5826+
<node concept="mLuIC" id="J6oDkVCEzW" role="2c7tTw" />
5827+
</node>
5828+
</node>
58055829
</node>
58065830
</node>
58075831
</node>
@@ -6992,8 +7016,8 @@
69927016
<node concept="_fku$" id="69HsIy5G$zO" role="_fkur" />
69937017
<node concept="1QScDb" id="69HsIy5G$zP" role="_fkuY">
69947018
<node concept="3EXbTZ" id="69HsIy5G$zQ" role="1QScD9">
6995-
<ref role="3EXiBN" node="2JXkwhJfQ5c" resolve="cm" />
69967019
<ref role="3EXiBM" to="ku0a:69HsIy5Fw98" resolve="conversion_m_cm (any)" />
7020+
<ref role="3EXiBN" node="2JXkwhJfQ5c" resolve="cm" />
69977021
</node>
69987022
<node concept="1YnStw" id="69HsIy5G$zR" role="30czhm">
69997023
<node concept="CIsGf" id="69HsIy5G$zS" role="2c7tTI">

0 commit comments

Comments
 (0)