Skip to content

Commit 31945b8

Browse files
enikaoenikao
committed
added EmptyType to Pluggable Type Facade
1 parent a8ec28e commit 31945b8

File tree

6 files changed

+255
-37
lines changed

6 files changed

+255
-37
lines changed

‎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: 53 additions & 15 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" />
@@ -1347,6 +1358,27 @@
13471358
</node>
13481359
</node>
13491360
</node>
1361+
<node concept="3clFb_" id="1$atYL2NIrC" role="jymVt">
1362+
<property role="TrG5h" value="createEmptyType" />
1363+
<node concept="3Tqbb2" id="1$atYL2NIrD" role="3clF45">
1364+
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
1365+
</node>
1366+
<node concept="3Tm1VV" id="1$atYL2NIrE" role="1B3o_S" />
1367+
<node concept="3clFbS" id="1$atYL2NIrG" role="3clF47">
1368+
<node concept="3clFbF" id="1$atYL2NYrT" role="3cqZAp">
1369+
<node concept="2ShNRf" id="1$atYL2NYrR" role="3clFbG">
1370+
<node concept="3zrR0B" id="1$atYL2O6ud" role="2ShVmc">
1371+
<node concept="3Tqbb2" id="1$atYL2O6uf" role="3zrR0E">
1372+
<ref role="ehGHo" to="hm2y:3tcv7J0pmjC" resolve="EmptyType" />
1373+
</node>
1374+
</node>
1375+
</node>
1376+
</node>
1377+
</node>
1378+
<node concept="2AHcQZ" id="1$atYL2NIrH" role="2AJF6D">
1379+
<ref role="2AI5Lk" to="wyt6:~Override" />
1380+
</node>
1381+
</node>
13501382
<node concept="3clFb_" id="5ye9uPrx1Ac" role="jymVt">
13511383
<property role="TrG5h" value="isOtherwiseLiteral" />
13521384
<property role="1EzhhJ" value="false" />
@@ -2400,18 +2432,28 @@
24002432
</node>
24012433
</node>
24022434
<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" />
2435+
<node concept="Jncv_" id="1$atYL2OVmF" role="3cqZAp">
2436+
<ref role="JncvD" to="hm2y:6sdnDbSlaok" resolve="Type" />
2437+
<node concept="37vLTw" id="1$atYL2OZp7" role="JncvB">
2438+
<ref role="3cqZAo" node="7JCDpchL_ex" resolve="p1" />
2439+
</node>
2440+
<node concept="3clFbS" id="1$atYL2OVmJ" role="Jncv$">
2441+
<node concept="3cpWs6" id="1$atYL2PaEc" role="3cqZAp">
2442+
<node concept="1rXfSq" id="1$atYL2Pjyi" role="3cqZAk">
2443+
<ref role="37wK5l" to="oq0c:1$atYL2M_8d" resolve="isEmptyType" />
2444+
<node concept="Jnkvi" id="1$atYL2Pnge" role="37wK5m">
2445+
<ref role="1M0zk5" node="1$atYL2OVmL" resolve="t" />
2446+
</node>
24122447
</node>
24132448
</node>
24142449
</node>
2450+
<node concept="JncvC" id="1$atYL2OVmL" role="JncvA">
2451+
<property role="TrG5h" value="t" />
2452+
<node concept="2jxLKc" id="1$atYL2OVmM" role="1tU5fm" />
2453+
</node>
2454+
</node>
2455+
<node concept="3cpWs6" id="1$atYL2Pu7t" role="3cqZAp">
2456+
<node concept="3clFbT" id="1$atYL2P$fF" role="3cqZAk" />
24152457
</node>
24162458
</node>
24172459
<node concept="2AHcQZ" id="7JCDpchL_e_" role="2AJF6D">
@@ -2430,12 +2472,8 @@
24302472
<node concept="3clFbJ" id="7JCDpch_jK9" role="3cqZAp">
24312473
<node concept="3clFbS" id="7JCDpch_jKb" role="3clFbx">
24322474
<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" />
2437-
</node>
2438-
</node>
2475+
<node concept="1rXfSq" id="1$atYL2PILG" role="3cqZAk">
2476+
<ref role="37wK5l" node="1$atYL2NIrC" resolve="createEmptyType" />
24392477
</node>
24402478
</node>
24412479
</node>

‎code/languages/org.iets3.opensource/languages/test.ts.expr.os.nix/models/test.ts.expr.os.nix.typesystem.mps‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
</imports>
1212
<registry>
1313
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
14-
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
15-
<child id="1068580123156" name="expression" index="3clFbG" />
16-
</concept>
1714
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
1815
<child id="1068581517665" name="statement" index="3cqZAp" />
1916
</concept>
@@ -39,9 +36,6 @@
3936
<concept id="1195213580585" name="jetbrains.mps.lang.typesystem.structure.AbstractCheckingRule" flags="ig" index="18hYwZ">
4037
<child id="1195213635060" name="body" index="18ibNy" />
4138
</concept>
42-
<concept id="6405009306797516074" name="jetbrains.mps.lang.typesystem.structure.SubstituteTypeRule" flags="ig" index="3qnSWH">
43-
<child id="7323318266641100480" name="body" index="3hT0BD" />
44-
</concept>
4539
<concept id="1174642788531" name="jetbrains.mps.lang.typesystem.structure.ConceptReference" flags="ig" index="1YaCAy">
4640
<reference id="1174642800329" name="concept" index="1YaFvo" />
4741
</concept>
@@ -92,22 +86,6 @@
9286
<ref role="1YaFvo" to="eddd:7DMIV6UA9Ve" resolve="NixLiteral" />
9387
</node>
9488
</node>
95-
<node concept="3qnSWH" id="1$atYL2BipY">
96-
<property role="TrG5h" value="substituteType_NixType" />
97-
<node concept="3clFbS" id="1$atYL2BipZ" role="3hT0BD">
98-
<node concept="3clFbF" id="1$atYL2Biqq" role="3cqZAp">
99-
<node concept="2pJPEk" id="1$atYL2Biqo" role="3clFbG">
100-
<node concept="2pJPED" id="1$atYL2Biqp" role="2pJPEn">
101-
<ref role="2pJxaS" to="hm2y:3tcv7J0pmjC" resolve="EmptyType" />
102-
</node>
103-
</node>
104-
</node>
105-
</node>
106-
<node concept="1YaCAy" id="1$atYL2Biq1" role="1YuTPh">
107-
<property role="TrG5h" value="nixType" />
108-
<ref role="1YaFvo" to="eddd:7DMIV6UAjuN" resolve="NixType" />
109-
</node>
110-
</node>
11189
<node concept="1YbPZF" id="7DMIV6UAjzk">
11290
<property role="TrG5h" value="typeof_NixType" />
11391
<node concept="3clFbS" id="7DMIV6UAjzl" role="18ibNy">

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,28 @@
783783
</node>
784784
<node concept="3Tm1VV" id="2Qbt$1tTQbX" role="1B3o_S" />
785785
</node>
786+
<node concept="2tJIrI" id="1$atYL2Ntwr" role="jymVt" />
787+
<node concept="2YIFZL" id="1$atYL2Nr$T" role="jymVt">
788+
<property role="TrG5h" value="createEmptyType" />
789+
<property role="DiZV1" value="false" />
790+
<property role="od$2w" value="false" />
791+
<node concept="3clFbS" id="1$atYL2Nr$U" role="3clF47">
792+
<node concept="3clFbF" id="1$atYL2Nr$V" role="3cqZAp">
793+
<node concept="2OqwBi" id="1$atYL2Nr$W" role="3clFbG">
794+
<node concept="1rXfSq" id="1$atYL2Nr$X" role="2Oq$k0">
795+
<ref role="37wK5l" node="2Qbt$1tTQn5" resolve="resolveMapper" />
796+
</node>
797+
<node concept="liA8E" id="1$atYL2Nr$Y" role="2OqNvi">
798+
<ref role="37wK5l" to="oq0c:1$atYL2NvF5" resolve="createEmptyType" />
799+
</node>
800+
</node>
801+
</node>
802+
</node>
803+
<node concept="3Tqbb2" id="1$atYL2Nr$Z" role="3clF45">
804+
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
805+
</node>
806+
<node concept="3Tm1VV" id="1$atYL2Nr_0" role="1B3o_S" />
807+
</node>
786808
<node concept="2tJIrI" id="2Qbt$1tTQaX" role="jymVt" />
787809
<node concept="2YIFZL" id="2Qbt$1tTWDY" role="jymVt">
788810
<property role="TrG5h" value="isBooleanType" />
@@ -942,6 +964,33 @@
942964
<node concept="3Tqbb2" id="2PhSkOglBKK" role="1tU5fm" />
943965
</node>
944966
</node>
967+
<node concept="2tJIrI" id="1$atYL2MnsF" role="jymVt" />
968+
<node concept="2YIFZL" id="1$atYL2MsHQ" role="jymVt">
969+
<property role="TrG5h" value="isEmptyType" />
970+
<node concept="3clFbS" id="1$atYL2MsHT" role="3clF47">
971+
<node concept="3clFbF" id="1$atYL2MvTj" role="3cqZAp">
972+
<node concept="2OqwBi" id="1$atYL2MvTk" role="3clFbG">
973+
<node concept="1rXfSq" id="1$atYL2MvTl" role="2Oq$k0">
974+
<ref role="37wK5l" node="2Qbt$1tTQn5" resolve="resolveMapper" />
975+
</node>
976+
<node concept="liA8E" id="1$atYL2MvTm" role="2OqNvi">
977+
<ref role="37wK5l" to="oq0c:1$atYL2M_8d" resolve="isEmptyType" />
978+
<node concept="37vLTw" id="1$atYL2MvTn" role="37wK5m">
979+
<ref role="3cqZAo" node="1$atYL2MuAe" resolve="type" />
980+
</node>
981+
</node>
982+
</node>
983+
</node>
984+
</node>
985+
<node concept="3Tm1VV" id="1$atYL2Mqvu" role="1B3o_S" />
986+
<node concept="10P_77" id="1$atYL2Msns" role="3clF45" />
987+
<node concept="37vLTG" id="1$atYL2MuAe" role="3clF46">
988+
<property role="TrG5h" value="type" />
989+
<node concept="3Tqbb2" id="1$atYL2MuAd" role="1tU5fm">
990+
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
991+
</node>
992+
</node>
993+
</node>
945994
<node concept="2tJIrI" id="5ye9uPrx0iw" role="jymVt" />
946995
<node concept="2YIFZL" id="5ye9uPrx0ez" role="jymVt">
947996
<property role="TrG5h" value="isOtherwiseLiteral" />

0 commit comments

Comments
 (0)