Skip to content

Commit 01d5060

Browse files
enikaoenikao
committed
fix for mixing nix and tuple types
1 parent 0ec7c86 commit 01d5060

File tree

2 files changed

+114
-2
lines changed

2 files changed

+114
-2
lines changed

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

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@
88
<imports>
99
<import index="eddd" ref="r:76654092-7126-4d48-8113-566c63e58f87(test.ts.expr.os.nix.structure)" implicit="true" />
1010
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" implicit="true" />
11+
<import index="6rhc" ref="f:diff_diff_model_0#r:ca8aadc0-6e3c-46b0-b047-1d58cf243066(test.ts.expr.os.nix.typesystem@diff_model_0)" implicit="true" />
1112
</imports>
1213
<registry>
1314
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
15+
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
16+
<child id="1068580123156" name="expression" index="3clFbG" />
17+
</concept>
1418
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
1519
<child id="1068581517665" name="statement" index="3cqZAp" />
1620
</concept>
@@ -36,6 +40,9 @@
3640
<concept id="1195213580585" name="jetbrains.mps.lang.typesystem.structure.AbstractCheckingRule" flags="ig" index="18hYwZ">
3741
<child id="1195213635060" name="body" index="18ibNy" />
3842
</concept>
43+
<concept id="6405009306797516074" name="jetbrains.mps.lang.typesystem.structure.SubstituteTypeRule" flags="ig" index="3qnSWH">
44+
<child id="7323318266641100480" name="body" index="3hT0BD" />
45+
</concept>
3946
<concept id="1174642788531" name="jetbrains.mps.lang.typesystem.structure.ConceptReference" flags="ig" index="1YaCAy">
4047
<reference id="1174642800329" name="concept" index="1YaFvo" />
4148
</concept>
@@ -86,19 +93,35 @@
8693
<ref role="1YaFvo" to="eddd:7DMIV6UA9Ve" resolve="NixLiteral" />
8794
</node>
8895
</node>
96+
<node concept="3qnSWH" id="1$atYL2BipY">
97+
<property role="TrG5h" value="substituteType_NixType" />
98+
<node concept="3clFbS" id="1$atYL2BipZ" role="3hT0BD">
99+
<node concept="3clFbF" id="1$atYL2Biqq" role="3cqZAp">
100+
<node concept="2pJPEk" id="1$atYL2Biqo" role="3clFbG">
101+
<node concept="2pJPED" id="1$atYL2Biqp" role="2pJPEn">
102+
<ref role="2pJxaS" to="hm2y:3tcv7J0pmjC" resolve="EmptyType" />
103+
</node>
104+
</node>
105+
</node>
106+
</node>
107+
<node concept="1YaCAy" id="1$atYL2Biq1" role="1YuTPh">
108+
<property role="TrG5h" value="nixType" />
109+
<ref role="1YaFvo" to="eddd:7DMIV6UAjuN" resolve="NixType" />
110+
</node>
111+
</node>
89112
<node concept="1YbPZF" id="7DMIV6UAjzk">
90113
<property role="TrG5h" value="typeof_NixType" />
91114
<node concept="3clFbS" id="7DMIV6UAjzl" role="18ibNy">
92115
<node concept="1Z5TYs" id="7DMIV6UAjMC" role="3cqZAp">
93116
<node concept="mw_s8" id="7DMIV6UAjNd" role="1ZfhKB">
94117
<node concept="1YBJjd" id="7DMIV6UAjNb" role="mwGJk">
95-
<ref role="1YBMHb" node="7DMIV6UAjzn" resolve="nixType" />
118+
<ref role="1YBMHb" to="6rhc:7DMIV6UAjzn" resolve="nixType" />
96119
</node>
97120
</node>
98121
<node concept="mw_s8" id="7DMIV6UAjMF" role="1ZfhK$">
99122
<node concept="1Z2H0r" id="7DMIV6UAjAd" role="mwGJk">
100123
<node concept="1YBJjd" id="7DMIV6UAjCz" role="1Z2MuG">
101-
<ref role="1YBMHb" node="7DMIV6UAjzn" resolve="nixType" />
124+
<ref role="1YBMHb" to="6rhc:7DMIV6UAjzn" resolve="nixType" />
102125
</node>
103126
</node>
104127
</node>

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

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31701,5 +31701,94 @@
3170131701
</node>
3170231702
</node>
3170331703
</node>
31704+
<node concept="1lH9Xt" id="1$atYL2xo6g">
31705+
<property role="TrG5h" value="tuplesVsNix" />
31706+
<property role="3DII0k" value="2hh8MJdVwqX/command" />
31707+
<node concept="1qefOq" id="1$atYL2xo6h" role="1SKRRt">
31708+
<node concept="_iOnV" id="1$atYL2xo6i" role="1qenE9">
31709+
<property role="TrG5h" value="tuples" />
31710+
<node concept="2zPypq" id="1$atYL2xo6j" role="_iOnC">
31711+
<property role="TrG5h" value="t1" />
31712+
<node concept="7CXmI" id="1$atYL2xo6p" role="lGtFl">
31713+
<node concept="7OXhh" id="1$atYL2xo6q" role="7EUXB">
31714+
<property role="GvXf4" value="true" />
31715+
</node>
31716+
</node>
31717+
<node concept="39w5ZF" id="1$atYL2xpkn" role="2lDidJ">
31718+
<node concept="pf3Wd" id="1$atYL2xpko" role="pf3W8">
31719+
<node concept="30UylZ" id="1$atYL2xptI" role="2lDidJ" />
31720+
</node>
31721+
<node concept="2vmpnb" id="1$atYL2xplY" role="39w5ZE" />
31722+
<node concept="m5g4o" id="1$atYL2xpnk" role="39w5ZG">
31723+
<node concept="30bXRB" id="1$atYL2xpoE" role="m5g4p">
31724+
<property role="30bXRw" value="1" />
31725+
</node>
31726+
<node concept="30bXRB" id="1$atYL2xpoM" role="m5g4p">
31727+
<property role="30bXRw" value="2" />
31728+
</node>
31729+
</node>
31730+
</node>
31731+
<node concept="m5gfS" id="1$atYL2xo6l" role="2zM23F">
31732+
<node concept="30bXR$" id="1$atYL2xo6m" role="m5gfT" />
31733+
<node concept="30bXR$" id="1$atYL2xpzI" role="m5gfT" />
31734+
</node>
31735+
</node>
31736+
<node concept="2zPypq" id="1$atYL2B6ks" role="_iOnC">
31737+
<property role="TrG5h" value="t2" />
31738+
<node concept="7CXmI" id="1$atYL2B6kt" role="lGtFl">
31739+
<node concept="7OXhh" id="1$atYL2B6ku" role="7EUXB">
31740+
<property role="GvXf4" value="true" />
31741+
</node>
31742+
</node>
31743+
<node concept="39w5ZF" id="1$atYL2B6kv" role="2lDidJ">
31744+
<node concept="pf3Wd" id="1$atYL2B6kw" role="pf3W8">
31745+
<node concept="UmHTt" id="1$atYL2B6Jm" role="2lDidJ" />
31746+
</node>
31747+
<node concept="2vmpnb" id="1$atYL2B6ky" role="39w5ZE" />
31748+
<node concept="m5g4o" id="1$atYL2B6kz" role="39w5ZG">
31749+
<node concept="30bXRB" id="1$atYL2B6k$" role="m5g4p">
31750+
<property role="30bXRw" value="1" />
31751+
</node>
31752+
<node concept="30bXRB" id="1$atYL2B6k_" role="m5g4p">
31753+
<property role="30bXRw" value="2" />
31754+
</node>
31755+
</node>
31756+
</node>
31757+
<node concept="Uns6S" id="1$atYL2BjbY" role="2zM23F">
31758+
<node concept="m5gfS" id="1$atYL2BjbZ" role="Uns6T">
31759+
<node concept="30bXR$" id="1$atYL2Bjc0" role="m5gfT" />
31760+
<node concept="30bXR$" id="1$atYL2Bjc1" role="m5gfT" />
31761+
</node>
31762+
</node>
31763+
</node>
31764+
<node concept="2zPypq" id="1$atYL2B6pA" role="_iOnC">
31765+
<property role="TrG5h" value="t3" />
31766+
<node concept="7CXmI" id="1$atYL2B6pB" role="lGtFl">
31767+
<node concept="7OXhh" id="1$atYL2B6pC" role="7EUXB">
31768+
<property role="GvXf4" value="true" />
31769+
</node>
31770+
</node>
31771+
<node concept="39w5ZF" id="1$atYL2B6pD" role="2lDidJ">
31772+
<node concept="pf3Wd" id="1$atYL2B6pE" role="pf3W8">
31773+
<node concept="1I1voI" id="1$atYL2B74r" role="2lDidJ" />
31774+
</node>
31775+
<node concept="2vmpnb" id="1$atYL2B6pG" role="39w5ZE" />
31776+
<node concept="m5g4o" id="1$atYL2B6pH" role="39w5ZG">
31777+
<node concept="30bXRB" id="1$atYL2B6pI" role="m5g4p">
31778+
<property role="30bXRw" value="1" />
31779+
</node>
31780+
<node concept="30bXRB" id="1$atYL2B6pJ" role="m5g4p">
31781+
<property role="30bXRw" value="2" />
31782+
</node>
31783+
</node>
31784+
</node>
31785+
<node concept="m5gfS" id="1$atYL2B6pK" role="2zM23F">
31786+
<node concept="30bXR$" id="1$atYL2B6pL" role="m5gfT" />
31787+
<node concept="30bXR$" id="1$atYL2B6pM" role="m5gfT" />
31788+
</node>
31789+
</node>
31790+
</node>
31791+
</node>
31792+
</node>
3170431793
</model>
3170531794

0 commit comments

Comments
 (0)