Skip to content

Commit bafb130

Browse files
enikaoenikao
authored
Merge pull request #1227 from IETS3/bugfix/nix-vs-tuples
fix for mixing nix and tuple types, add EmptyType to PTF
2 parents 1eeffaf + ff7d1fe commit bafb130

File tree

10 files changed

+459
-114
lines changed

10 files changed

+459
-114
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1010
### Added
1111

1212
- a new approach to run interpreter test case from command line (and inside MPS) directly without invoking JUnit code generation
13+
- Added EmptyType to Pluggable Type Facade (PTF). If your language has some kind of _NixType_, you should override `PrimitiveTypeMapper.isEmptyType()` to recognize your _NixType_.
1314

1415
### Fixed
1516

‎build/scripts/build-allScripts.xml‎

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
<module ref="3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)" kind="cl" />
6060
<module ref="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)" kind="cl" />
6161
<module ref="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" kind="cl" />
62-
<module ref="9d000fbd-bdca-4a46-b39b-c5ba9e79b38c(org.iets3.opensource.build.gentests)" kind="cl" />
6362
</dependencies>
6463
<uses>
6564
<language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
@@ -273,7 +272,7 @@
273272

274273
<target name="makeDependents" />
275274

276-
<target name="java.compile.org.iets3.opensource.build" depends="java.compile.org.iets3.opensource.build.gentests, java.compile.org.iets3.opensource.build.gentests.rt, fetchDependencies">
275+
<target name="java.compile.org.iets3.opensource.build" depends="java.compile.org.iets3.opensource.build.gentests.rt, fetchDependencies">
277276
<mkdir dir="${iets3.lang.opensource}/solutions/org.iets3.opensource.build/source_gen" />
278277
<mkdir dir="${build.tmp}/java/out/org.iets3.opensource.build" />
279278
<javac destdir="${build.tmp}/java/out/org.iets3.opensource.build" fork="false" encoding="utf8" includeantruntime="false" debug="true">
@@ -282,54 +281,11 @@
282281
<path location="${iets3.lang.opensource}/solutions/org.iets3.opensource.build/source_gen" />
283282
</src>
284283
<classpath>
285-
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
286-
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
287-
<fileset file="${artifacts.mps}/lib/mps-context.jar" />
288-
<fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
289-
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
290-
<fileset file="${artifacts.mps}/lib/mps-problem.jar" />
291-
<fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
292-
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
293-
<fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
294-
<fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
295-
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
296-
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
297-
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
298-
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
299-
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
300284
<fileset file="${artifacts.mps}/lib/mps-references.jar" />
301-
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
302-
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
303-
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
304-
<fileset file="${artifacts.mps}/lib/mps-generator.jar" />
305-
<fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
306-
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
307-
<fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
308-
<pathelement path="${build.tmp}/java/out/org.iets3.opensource.build.gentests" />
309285
<pathelement path="${build.tmp}/java/out/org.iets3.opensource.build.gentests.rt" />
310286
<fileset file="${iets3.lang.opensource}/solutions/org.iets3.opensource.build.gentests.rt/lib/takari-cpsuite-1.2.7.jar" />
311-
<fileset file="${artifacts.mps}/lib/annotations.jar" />
312-
<fileset file="${artifacts.mps}/lib/app.jar" />
313-
<fileset file="${artifacts.mps}/lib/app-client.jar" />
314-
<fileset file="${artifacts.mps}/lib/lib.jar" />
315-
<fileset file="${artifacts.mps}/lib/lib-client.jar" />
316-
<fileset file="${artifacts.mps}/lib/util.jar" />
317-
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
318-
<fileset file="${artifacts.mps}/lib/util-8.jar" />
319-
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
320-
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
321-
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
322-
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
323-
<fileset file="${artifacts.mps}/lib/stats.jar" />
324-
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
325287
<fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.platform.jar" />
326288
<fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.extensions.build/languages/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.jar" />
327-
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />
328-
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.mps.runner.jar" />
329-
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.workflow.jar" />
330-
<fileset file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
331-
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
332-
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
333289
</classpath>
334290
</javac>
335291
<copy todir="${build.tmp}/java/out/org.iets3.opensource.build">

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,6 +1119,15 @@
11191119
<node concept="3Tm1VV" id="2Qbt$1tSx2G" role="1B3o_S" />
11201120
<node concept="3clFbS" id="2Qbt$1tSx2H" role="3clF47" />
11211121
</node>
1122+
<node concept="3clFb_" id="1$atYL2NvF5" role="jymVt">
1123+
<property role="TrG5h" value="createEmptyType" />
1124+
<property role="1EzhhJ" value="true" />
1125+
<node concept="3Tqbb2" id="1$atYL2NvF6" role="3clF45">
1126+
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
1127+
</node>
1128+
<node concept="3Tm1VV" id="1$atYL2NvF7" role="1B3o_S" />
1129+
<node concept="3clFbS" id="1$atYL2NvF8" role="3clF47" />
1130+
</node>
11221131
<node concept="3clFb_" id="3tudP__T$3q" role="jymVt">
11231132
<property role="TrG5h" value="createNumberLiteral" />
11241133
<property role="1EzhhJ" value="true" />
@@ -1297,6 +1306,43 @@
12971306
</node>
12981307
<node concept="3Tm1VV" id="2q0DACtKs0c" role="1B3o_S" />
12991308
</node>
1309+
<node concept="2tJIrI" id="1$atYL2Myu6" role="jymVt" />
1310+
<node concept="3clFb_" id="1$atYL2M_8d" role="jymVt">
1311+
<property role="TrG5h" value="isEmptyType" />
1312+
<node concept="3clFbS" id="1$atYL2M_8g" role="3clF47">
1313+
<node concept="3clFbF" id="1$atYL2Nwo1" role="3cqZAp">
1314+
<node concept="2OqwBi" id="1$atYL2Nwo2" role="3clFbG">
1315+
<node concept="2OqwBi" id="1$atYL2Nwo3" role="2Oq$k0">
1316+
<node concept="2YIFZM" id="1$atYL2Nwo4" role="2Oq$k0">
1317+
<ref role="37wK5l" to="u78q:~TypeChecker.getInstance()" resolve="getInstance" />
1318+
<ref role="1Pybhc" to="u78q:~TypeChecker" resolve="TypeChecker" />
1319+
</node>
1320+
<node concept="liA8E" id="1$atYL2Nwo5" role="2OqNvi">
1321+
<ref role="37wK5l" to="u78q:~TypeChecker.getSubtypingManager()" resolve="getSubtypingManager" />
1322+
</node>
1323+
</node>
1324+
<node concept="liA8E" id="1$atYL2Nwo6" role="2OqNvi">
1325+
<ref role="37wK5l" to="u78q:~SubtypingManager.isSubtype(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.model.SNode)" resolve="isSubtype" />
1326+
<node concept="37vLTw" id="1$atYL2Nwo7" role="37wK5m">
1327+
<ref role="3cqZAo" node="1$atYL2M_AZ" resolve="type" />
1328+
</node>
1329+
<node concept="2YIFZM" id="1$atYL2N$yE" role="37wK5m">
1330+
<ref role="37wK5l" to="xfg9:1$atYL2Nr$T" resolve="createEmptyType" />
1331+
<ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
1332+
</node>
1333+
</node>
1334+
</node>
1335+
</node>
1336+
</node>
1337+
<node concept="3Tm1VV" id="1$atYL2Mzcw" role="1B3o_S" />
1338+
<node concept="10P_77" id="1$atYL2M_6r" role="3clF45" />
1339+
<node concept="37vLTG" id="1$atYL2M_AZ" role="3clF46">
1340+
<property role="TrG5h" value="type" />
1341+
<node concept="3Tqbb2" id="1$atYL2M_AY" role="1tU5fm">
1342+
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
1343+
</node>
1344+
</node>
1345+
</node>
13001346
<node concept="2tJIrI" id="2q0DACtJfg1" role="jymVt" />
13011347
<node concept="3clFb_" id="2oUyrt$Q$EB" role="jymVt">
13021348
<property role="TrG5h" value="useCommaInsteadOfDotForDecimals" />

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

Lines changed: 105 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,9 @@
192192
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
193193
<child id="1178549979242" name="visibility" index="1B3o_S" />
194194
</concept>
195+
<concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
196+
<reference id="5497648299878491909" name="baseVariableDeclaration" index="1M0zk5" />
197+
</concept>
195198
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
196199
<child id="8356039341262087992" name="line" index="1aUNEU" />
197200
</concept>
@@ -274,6 +277,14 @@
274277
<concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
275278
<reference id="1145383142433" name="elementConcept" index="2I9WkF" />
276279
</concept>
280+
<concept id="1883223317721008708" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfStatement" flags="nn" index="Jncv_">
281+
<reference id="1883223317721008712" name="nodeConcept" index="JncvD" />
282+
<child id="1883223317721008709" name="body" index="Jncv$" />
283+
<child id="1883223317721008711" name="variable" index="JncvA" />
284+
<child id="1883223317721008710" name="nodeExpression" index="JncvB" />
285+
</concept>
286+
<concept id="1883223317721008713" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVariable" flags="ng" index="JncvC" />
287+
<concept id="1883223317721107059" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVarReference" flags="nn" index="Jnkvi" />
277288
<concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
278289
<concept id="1145567426890" name="jetbrains.mps.lang.smodel.structure.SNodeListCreator" flags="nn" index="2T8Vx0">
279290
<child id="1145567471833" name="createdType" index="2T96Bj" />
@@ -288,6 +299,7 @@
288299
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
289300
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
290301
</concept>
302+
<concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
291303
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
292304
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
293305
</concept>
@@ -388,6 +400,7 @@
388400
<child id="1225711191269" name="index" index="1y58nS" />
389401
</concept>
390402
<concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
403+
<concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
391404
<concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
392405
<concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
393406
<concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
@@ -1347,6 +1360,27 @@
13471360
</node>
13481361
</node>
13491362
</node>
1363+
<node concept="3clFb_" id="1$atYL2NIrC" role="jymVt">
1364+
<property role="TrG5h" value="createEmptyType" />
1365+
<node concept="3Tqbb2" id="1$atYL2NIrD" role="3clF45">
1366+
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
1367+
</node>
1368+
<node concept="3Tm1VV" id="1$atYL2NIrE" role="1B3o_S" />
1369+
<node concept="3clFbS" id="1$atYL2NIrG" role="3clF47">
1370+
<node concept="3clFbF" id="1$atYL2NYrT" role="3cqZAp">
1371+
<node concept="2ShNRf" id="1$atYL2NYrR" role="3clFbG">
1372+
<node concept="3zrR0B" id="1$atYL2O6ud" role="2ShVmc">
1373+
<node concept="3Tqbb2" id="1$atYL2O6uf" role="3zrR0E">
1374+
<ref role="ehGHo" to="hm2y:3tcv7J0pmjC" resolve="EmptyType" />
1375+
</node>
1376+
</node>
1377+
</node>
1378+
</node>
1379+
</node>
1380+
<node concept="2AHcQZ" id="1$atYL2NIrH" role="2AJF6D">
1381+
<ref role="2AI5Lk" to="wyt6:~Override" />
1382+
</node>
1383+
</node>
13501384
<node concept="3clFb_" id="5ye9uPrx1Ac" role="jymVt">
13511385
<property role="TrG5h" value="isOtherwiseLiteral" />
13521386
<property role="1EzhhJ" value="false" />
@@ -2369,6 +2403,42 @@
23692403
</node>
23702404
</node>
23712405
</node>
2406+
<node concept="3cpWs8" id="1$atYL3anCu" role="3cqZAp">
2407+
<node concept="3cpWsn" id="1$atYL3anCx" role="3cpWs9">
2408+
<property role="TrG5h" value="emptyType" />
2409+
<node concept="3Tqbb2" id="1$atYL3anCs" role="1tU5fm">
2410+
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
2411+
</node>
2412+
<node concept="2OqwBi" id="1$atYL3bXA6" role="33vP2m">
2413+
<node concept="2OqwBi" id="1$atYL3bJEf" role="2Oq$k0">
2414+
<node concept="37vLTw" id="1$atYL3bGjL" role="2Oq$k0">
2415+
<ref role="3cqZAo" node="1cX0cm8Zurw" resolve="jt" />
2416+
</node>
2417+
<node concept="3Tsc0h" id="1$atYL3bQVU" role="2OqNvi">
2418+
<ref role="3TtcxE" to="hm2y:7VuYlCQZ3lm" resolve="types" />
2419+
</node>
2420+
</node>
2421+
<node concept="1z4cxt" id="1$atYL3c9gh" role="2OqNvi">
2422+
<node concept="1bVj0M" id="1$atYL3c9gj" role="23t8la">
2423+
<node concept="3clFbS" id="1$atYL3c9gk" role="1bW5cS">
2424+
<node concept="3clFbF" id="1$atYL3cdUD" role="3cqZAp">
2425+
<node concept="1rXfSq" id="1$atYL3cdUC" role="3clFbG">
2426+
<ref role="37wK5l" to="oq0c:1$atYL2M_8d" resolve="isEmptyType" />
2427+
<node concept="37vLTw" id="1$atYL3chNx" role="37wK5m">
2428+
<ref role="3cqZAo" node="1$atYL3c9gl" resolve="it" />
2429+
</node>
2430+
</node>
2431+
</node>
2432+
</node>
2433+
<node concept="gl6BB" id="1$atYL3c9gl" role="1bW2Oz">
2434+
<property role="TrG5h" value="it" />
2435+
<node concept="2jxLKc" id="1$atYL3c9gm" role="1tU5fm" />
2436+
</node>
2437+
</node>
2438+
</node>
2439+
</node>
2440+
</node>
2441+
</node>
23722442
<node concept="3clFbF" id="7JCDpchDZwS" role="3cqZAp">
23732443
<node concept="2OqwBi" id="7JCDpchEFHq" role="3clFbG">
23742444
<node concept="2OqwBi" id="7JCDpchEaLn" role="2Oq$k0">
@@ -2400,18 +2470,28 @@
24002470
</node>
24012471
</node>
24022472
<node concept="3clFbS" id="7JCDpchL_ez" role="3clF47">
2403-
<node concept="3clFbF" id="7JCDpchLOGR" role="3cqZAp">
2404-
<node concept="2OqwBi" id="7JCDpchLYU4" role="3clFbG">
2405-
<node concept="37vLTw" id="7JCDpchLOGQ" role="2Oq$k0">
2406-
<ref role="3cqZAo" node="7JCDpchL_ex" resolve="p1" />
2407-
</node>
2408-
<node concept="liA8E" id="7JCDpchMax_" role="2OqNvi">
2409-
<ref role="37wK5l" to="mhbf:~SNode.isInstanceOfConcept(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="isInstanceOfConcept" />
2410-
<node concept="35c_gC" id="7JCDpchMp6y" role="37wK5m">
2411-
<ref role="35c_gD" to="hm2y:3tcv7J0pmjC" resolve="EmptyType" />
2473+
<node concept="Jncv_" id="1$atYL2OVmF" role="3cqZAp">
2474+
<ref role="JncvD" to="hm2y:6sdnDbSlaok" resolve="Type" />
2475+
<node concept="37vLTw" id="1$atYL2OZp7" role="JncvB">
2476+
<ref role="3cqZAo" node="7JCDpchL_ex" resolve="p1" />
2477+
</node>
2478+
<node concept="3clFbS" id="1$atYL2OVmJ" role="Jncv$">
2479+
<node concept="3cpWs6" id="1$atYL2PaEc" role="3cqZAp">
2480+
<node concept="1rXfSq" id="1$atYL2Pjyi" role="3cqZAk">
2481+
<ref role="37wK5l" to="oq0c:1$atYL2M_8d" resolve="isEmptyType" />
2482+
<node concept="Jnkvi" id="1$atYL2Pnge" role="37wK5m">
2483+
<ref role="1M0zk5" node="1$atYL2OVmL" resolve="t" />
2484+
</node>
24122485
</node>
24132486
</node>
24142487
</node>
2488+
<node concept="JncvC" id="1$atYL2OVmL" role="JncvA">
2489+
<property role="TrG5h" value="t" />
2490+
<node concept="2jxLKc" id="1$atYL2OVmM" role="1tU5fm" />
2491+
</node>
2492+
</node>
2493+
<node concept="3cpWs6" id="1$atYL2Pu7t" role="3cqZAp">
2494+
<node concept="3clFbT" id="1$atYL2P$fF" role="3cqZAk" />
24152495
</node>
24162496
</node>
24172497
<node concept="2AHcQZ" id="7JCDpchL_e_" role="2AJF6D">
@@ -2429,14 +2509,25 @@
24292509
</node>
24302510
<node concept="3clFbJ" id="7JCDpch_jK9" role="3cqZAp">
24312511
<node concept="3clFbS" id="7JCDpch_jKb" role="3clFbx">
2432-
<node concept="3cpWs6" id="7JCDpchOmSQ" role="3cqZAp">
2433-
<node concept="2ShNRf" id="7JCDpchOI_u" role="3cqZAk">
2434-
<node concept="3zrR0B" id="7JCDpchOIyJ" role="2ShVmc">
2435-
<node concept="3Tqbb2" id="7JCDpchOIyK" role="3zrR0E">
2436-
<ref role="ehGHo" to="hm2y:3tcv7J0pmjC" resolve="EmptyType" />
2512+
<node concept="3clFbJ" id="1$atYL3cwL7" role="3cqZAp">
2513+
<node concept="3clFbS" id="1$atYL3cwL9" role="3clFbx">
2514+
<node concept="3cpWs6" id="1$atYL3cLWL" role="3cqZAp">
2515+
<node concept="37vLTw" id="1$atYL3cTJM" role="3cqZAk">
2516+
<ref role="3cqZAo" node="1$atYL3anCx" resolve="emptyType" />
24372517
</node>
24382518
</node>
24392519
</node>
2520+
<node concept="2OqwBi" id="1$atYL3cDwY" role="3clFbw">
2521+
<node concept="37vLTw" id="1$atYL3c_xi" role="2Oq$k0">
2522+
<ref role="3cqZAo" node="1$atYL3anCx" resolve="emptyType" />
2523+
</node>
2524+
<node concept="3x8VRR" id="1$atYL3cHAq" role="2OqNvi" />
2525+
</node>
2526+
</node>
2527+
<node concept="3cpWs6" id="7JCDpchOmSQ" role="3cqZAp">
2528+
<node concept="1rXfSq" id="1$atYL2PILG" role="3cqZAk">
2529+
<ref role="37wK5l" node="1$atYL2NIrC" resolve="createEmptyType" />
2530+
</node>
24402531
</node>
24412532
</node>
24422533
<node concept="2OqwBi" id="7JCDpch$tFj" role="3clFbw">

0 commit comments

Comments
 (0)