Skip to content

Commit cad50e4

Browse files
arimerarimer
authored
Merge pull request #669 from IETS3/bugfix/typesystem-improvement-(#668)
fixed type inference of FieldSetter to allow override
2 parents 5a3c3e9 + 03123bf commit cad50e4

File tree

2 files changed

+52
-26
lines changed
  • code/languages/org.iets3.opensource/languages

2 files changed

+52
-26
lines changed

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

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,9 @@
256256
<child id="1180636770616" name="createdType" index="3zrR0E" />
257257
</concept>
258258
<concept id="1144146199828" name="jetbrains.mps.lang.smodel.structure.Node_CopyOperation" flags="nn" index="1$rogu" />
259-
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
259+
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
260+
<property id="1238684351431" name="asCast" index="1BlNFB" />
261+
</concept>
260262
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
261263
<reference id="1138405853777" name="concept" index="ehGHo" />
262264
</concept>
@@ -1116,26 +1118,50 @@
11161118
<property role="TrG5h" value="typeof_IFunctionCall" />
11171119
<property role="3GE5qa" value="function" />
11181120
<node concept="3clFbS" id="49WTic8gvz4" role="18ibNy">
1119-
<node concept="1Z5TYs" id="49WTic8gv_C" role="3cqZAp">
1120-
<node concept="mw_s8" id="49WTic8gv_T" role="1ZfhKB">
1121-
<node concept="1Z2H0r" id="49WTic8gv_P" role="mwGJk">
1122-
<node concept="2OqwBi" id="49WTic8gvBy" role="1Z2MuG">
1123-
<node concept="1YBJjd" id="49WTic8gvAd" role="2Oq$k0">
1124-
<ref role="1YBMHb" node="49WTic8gvz6" resolve="ifc" />
1121+
<node concept="nvevp" id="2hrkfft7i1p" role="3cqZAp">
1122+
<node concept="3clFbS" id="2hrkfft7i1r" role="nvhr_">
1123+
<node concept="1Z5TYs" id="2hrkfft7jFT" role="3cqZAp">
1124+
<node concept="mw_s8" id="2hrkfft7jGa" role="1ZfhKB">
1125+
<node concept="2YIFZM" id="2hrkfft7jHT" role="mwGJk">
1126+
<ref role="37wK5l" to="oq0c:4$QBvTqTZCM" resolve="override" />
1127+
<ref role="1Pybhc" to="oq0c:4$QBvTqTPch" resolve="TOF" />
1128+
<node concept="1YBJjd" id="2hrkfft7jJ7" role="37wK5m">
1129+
<ref role="1YBMHb" node="49WTic8gvz6" resolve="ifc" />
1130+
</node>
1131+
<node concept="1PxgMI" id="2hrkfft7lqZ" role="37wK5m">
1132+
<property role="1BlNFB" value="true" />
1133+
<node concept="chp4Y" id="2hrkfft7lx3" role="3oSUPX">
1134+
<ref role="cht4Q" to="hm2y:6sdnDbSlaok" resolve="Type" />
1135+
</node>
1136+
<node concept="2X3wrD" id="2hrkfft7ksj" role="1m5AlR">
1137+
<ref role="2X3Bk0" node="2hrkfft7i1v" resolve="type" />
1138+
</node>
1139+
</node>
11251140
</node>
1126-
<node concept="3TrEf2" id="49WTic8gvEq" role="2OqNvi">
1127-
<ref role="3Tt5mk" to="zzzn:49WTic8gvyC" resolve="function" />
1141+
</node>
1142+
<node concept="mw_s8" id="2hrkfft7jFW" role="1ZfhK$">
1143+
<node concept="1Z2H0r" id="2hrkfft7ju$" role="mwGJk">
1144+
<node concept="1YBJjd" id="2hrkfft7jwu" role="1Z2MuG">
1145+
<ref role="1YBMHb" node="49WTic8gvz6" resolve="ifc" />
1146+
</node>
11281147
</node>
11291148
</node>
11301149
</node>
11311150
</node>
1132-
<node concept="mw_s8" id="49WTic8gv_F" role="1ZfhK$">
1133-
<node concept="1Z2H0r" id="49WTic8gvzg" role="mwGJk">
1134-
<node concept="1YBJjd" id="49WTic8gvzG" role="1Z2MuG">
1151+
<node concept="1Z2H0r" id="2hrkfft7i34" role="nvjzm">
1152+
<node concept="2OqwBi" id="2hrkfft7ieh" role="1Z2MuG">
1153+
<node concept="1YBJjd" id="2hrkfft7i3w" role="2Oq$k0">
11351154
<ref role="1YBMHb" node="49WTic8gvz6" resolve="ifc" />
11361155
</node>
1156+
<node concept="3TrEf2" id="2hrkfft7jle" role="2OqNvi">
1157+
<ref role="3Tt5mk" to="zzzn:49WTic8gvyC" resolve="function" />
1158+
</node>
11371159
</node>
11381160
</node>
1161+
<node concept="2X1qdy" id="2hrkfft7i1v" role="2X0Ygz">
1162+
<property role="TrG5h" value="type" />
1163+
<node concept="2jxLKc" id="2hrkfft7i1w" role="1tU5fm" />
1164+
</node>
11391165
</node>
11401166
<node concept="3clFbJ" id="49WTic8gvFK" role="3cqZAp">
11411167
<node concept="3clFbS" id="49WTic8gvFM" role="3clFbx">

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3716,20 +3716,6 @@
37163716
</node>
37173717
<node concept="nvevp" id="3N0gPb2kZ3u" role="3cqZAp">
37183718
<node concept="3clFbS" id="3N0gPb2kZ3w" role="nvhr_">
3719-
<node concept="1Z5TYs" id="6gVedWjb_78" role="3cqZAp">
3720-
<node concept="mw_s8" id="6gVedWjb_fi" role="1ZfhKB">
3721-
<node concept="2X3wrD" id="6gVedWjb_fg" role="mwGJk">
3722-
<ref role="2X3Bk0" node="3N0gPb2kZ3$" resolve="orgFieldType" />
3723-
</node>
3724-
</node>
3725-
<node concept="mw_s8" id="6gVedWjb_7b" role="1ZfhK$">
3726-
<node concept="1Z2H0r" id="6gVedWjb$Yl" role="mwGJk">
3727-
<node concept="1YBJjd" id="6gVedWjb_06" role="1Z2MuG">
3728-
<ref role="1YBMHb" node="4ptnK4jiabU" resolve="fs" />
3729-
</node>
3730-
</node>
3731-
</node>
3732-
</node>
37333719
<node concept="1ZxtTE" id="kxHAhaMUEK" role="3cqZAp">
37343720
<property role="TrG5h" value="realFieldType" />
37353721
</node>
@@ -3757,6 +3743,20 @@
37573743
</node>
37583744
</node>
37593745
</node>
3746+
<node concept="1Z5TYs" id="2hrkfft7f_W" role="3cqZAp">
3747+
<node concept="mw_s8" id="2hrkfft7hbs" role="1ZfhKB">
3748+
<node concept="1Z$b5t" id="2hrkfft7hbq" role="mwGJk">
3749+
<ref role="1Z$eMM" node="kxHAhaMUEK" resolve="realFieldType" />
3750+
</node>
3751+
</node>
3752+
<node concept="mw_s8" id="2hrkfft7f_Z" role="1ZfhK$">
3753+
<node concept="1Z2H0r" id="2hrkfft7f5i" role="mwGJk">
3754+
<node concept="1YBJjd" id="2hrkfft7fge" role="1Z2MuG">
3755+
<ref role="1YBMHb" node="4ptnK4jiabU" resolve="fs" />
3756+
</node>
3757+
</node>
3758+
</node>
3759+
</node>
37603760
<node concept="1ZobV4" id="4ptnK4jiaV0" role="3cqZAp">
37613761
<node concept="mw_s8" id="3N0gPb2kZPF" role="1ZfhKB">
37623762
<node concept="1Z$b5t" id="3N0gPb2kZP_" role="mwGJk">

0 commit comments

Comments
 (0)